renamed material name to product name, removed headings
This commit is contained in:
VLE2FE
parent
250b04e096
commit
8fd993b362
|
|
@ -1,4 +1,3 @@
|
|||
<h2>Changelog</h2>
|
||||
|
||||
<div class="header">
|
||||
<rb-form-date-input name="dateInput" label="older than" [options]="{enableTime: true}"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<h4>Architecture</h4>
|
||||
|
||||
<img src="/assets/imgs/architecture.svg" alt="architecture" class="space-below">
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<h2>Database</h2>
|
||||
|
||||
<p>
|
||||
The used database instance is a MongoDB instance running on the BIC, storing all application data. The admin database
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<h2>Documentation</h2>
|
||||
|
||||
<p>
|
||||
<a [href]="api.hostName + '/static/intro-presentation/index.html'">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<h2>Edit material</h2>
|
||||
<h2>{{material.name | exists}}</h2>
|
||||
|
||||
<form #materialForm="ngForm" *ngIf="!loading">
|
||||
<rb-form-input name="materialname" label="material name" appValidate="stringNin" [appValidateArgs]="[materialNames]"
|
||||
<rb-form-input name="materialname" label="product name" appValidate="stringNin" [appValidateArgs]="[materialNames]"
|
||||
required [(ngModel)]="material.name" #materialnameInput="ngModel">
|
||||
<ng-template rbFormValidationMessage="failure">{{materialnameInput.errors.failure}}</ng-template>
|
||||
</rb-form-input>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<div class="header-addnew">
|
||||
<h2>Materials</h2>
|
||||
<rb-icon-button *ngIf="sampleSelect" mode="secondary" icon="close" (click)="sampleSelect = false"
|
||||
class="validation-close" iconOnly></rb-icon-button>
|
||||
<rb-icon-button [icon]="sampleSelect ? 'checkmark' : 'clear-all'"
|
||||
|
|
|
|||
|
|
@ -40,8 +40,6 @@
|
|||
}
|
||||
|
||||
.header-addnew {
|
||||
margin-bottom: 40px;
|
||||
|
||||
& > * {
|
||||
display: inline;
|
||||
margin-bottom: 10px;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<h2>Models</h2>
|
||||
|
||||
<rb-icon-button icon="add" mode="primary" (click)="newModel = !newModel; oldModelGroup = ''" class="space-below">
|
||||
New model
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<h2>Prediction</h2>
|
||||
|
||||
<rb-tab-panel (tabChanged)="groupChange($event)">
|
||||
<ng-container *ngFor="let group of d.arr.modelGroups; index as i">
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<form #sampleForm="ngForm" *ngIf="view.base">
|
||||
<div class="sample">
|
||||
<div>
|
||||
<rb-form-input name="materialname" label="material name" [rbDebounceTime]="0" [rbInitialOpen]="true"
|
||||
<rb-form-input name="materialname" label="product name" [rbDebounceTime]="0" [rbInitialOpen]="true"
|
||||
[rbFormInputAutocomplete]="autocomplete.bind(this, materialNames)" appValidate="stringOf"
|
||||
(keydown)="preventDefault($event)" (ngModelChange)="findMaterial($event)" ngModel
|
||||
[appValidateArgs]="[materialNames]" required [(ngModel)]="material.name" [autofocus]="true"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<div class="header-addnew">
|
||||
<h2>Samples</h2>
|
||||
<a routerLink="/samples/new" *ngIf="login.isLevel.write">
|
||||
<rb-icon-button icon="add" mode="primary" class="space-left">New sample</rb-icon-button>
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
.header-addnew {
|
||||
margin-bottom: 40px;
|
||||
height: 42px;
|
||||
|
||||
& > * {
|
||||
display: inline;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import {Router} from '@angular/router';
|
|||
|
||||
// TODO: turn off sort field
|
||||
// TODO reset sort when field is excluded
|
||||
// TODO: material name to product
|
||||
// TODO: Eh DPT
|
||||
// TODO: filter button
|
||||
// TODO: check if connect-src to model works
|
||||
|
|
@ -55,7 +54,7 @@ export class SamplesComponent implements OnInit {
|
|||
sort: 'added-asc',
|
||||
filters: [
|
||||
{field: 'number', label: 'Number', active: false, autocomplete: [], mode: 'eq', values: ['']},
|
||||
{field: 'material.name', label: 'Material name', active: false, autocomplete: [], mode: 'eq', values: ['']},
|
||||
{field: 'material.name', label: 'Product name', active: false, autocomplete: [], mode: 'eq', values: ['']},
|
||||
{field: 'material.supplier', label: 'Supplier', active: false, autocomplete: [], mode: 'eq', values: ['']},
|
||||
{field: 'material.group', label: 'Material', active: false, autocomplete: [], mode: 'eq', values: ['']},
|
||||
{field: 'material.glass_fiber', label: 'GF', active: false, autocomplete: [], mode: 'eq', values: ['']},
|
||||
|
|
@ -74,7 +73,7 @@ export class SamplesComponent implements OnInit {
|
|||
keys: KeyInterface[] = [
|
||||
{id: 'number', label: 'Number', active: true, sortable: true},
|
||||
{id: 'material.numbers', label: 'Material numbers', active: false, sortable: false},
|
||||
{id: 'material.name', label: 'Material name', active: true, sortable: true},
|
||||
{id: 'material.name', label: 'Product name', active: true, sortable: true},
|
||||
{id: 'material.supplier', label: 'Supplier', active: false, sortable: true},
|
||||
{id: 'material.group', label: 'Material', active: true, sortable: true},
|
||||
{id: 'type', label: 'Type', active: true, sortable: true},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<h2>Settings</h2>
|
||||
|
||||
<form #userForm="ngForm">
|
||||
<rb-form-input name="name" label="user name" appValidate="username" required [(ngModel)]="user.name"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<h2>Templates</h2>
|
||||
|
||||
<rb-form-select name="collectionSelection" label="collection"
|
||||
[(ngModel)]="collection" (ngModelChange)="loadTemplates()">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
<h2>Users</h2>
|
||||
|
||||
<rb-icon-button icon="add" mode="primary" (click)="addNewUser()">New user</rb-icon-button>
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ export class UsersComponent implements OnInit {
|
|||
}
|
||||
|
||||
saveUser(user: UserModel) {
|
||||
user.models = user.models.filter(e => e !== '');
|
||||
this.api.put<UserModel>('/user/' + user.origName, user.sendFormat('admin'), data => {
|
||||
user.deserialize(data);
|
||||
user.edit = false;
|
||||
|
|
|
|||
|
|
@ -69,3 +69,7 @@ ul {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.nav-main a.active {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue