diff --git a/src/app/changelog/changelog.component.html b/src/app/changelog/changelog.component.html index 8954f31..e237f9a 100644 --- a/src/app/changelog/changelog.component.html +++ b/src/app/changelog/changelog.component.html @@ -1,4 +1,3 @@ -

Changelog

Architecture architecture diff --git a/src/app/documentation/documentation-database/documentation-database.component.html b/src/app/documentation/documentation-database/documentation-database.component.html index 0f324f9..4977ed6 100644 --- a/src/app/documentation/documentation-database/documentation-database.component.html +++ b/src/app/documentation/documentation-database/documentation-database.component.html @@ -1,4 +1,3 @@ -

Database

The used database instance is a MongoDB instance running on the BIC, storing all application data. The admin database diff --git a/src/app/documentation/documentation.component.html b/src/app/documentation/documentation.component.html index 0596bb3..1eb1257 100644 --- a/src/app/documentation/documentation.component.html +++ b/src/app/documentation/documentation.component.html @@ -1,4 +1,3 @@ -

Documentation

diff --git a/src/app/material/material.component.html b/src/app/material/material.component.html index 9c195ff..6338780 100644 --- a/src/app/material/material.component.html +++ b/src/app/material/material.component.html @@ -1,7 +1,7 @@ -

Edit material

+

{{material.name | exists}}

- {{materialnameInput.errors.failure}} diff --git a/src/app/materials/materials.component.html b/src/app/materials/materials.component.html index d4ee65e..0ef6e63 100644 --- a/src/app/materials/materials.component.html +++ b/src/app/materials/materials.component.html @@ -1,5 +1,4 @@
-

Materials

* { display: inline; margin-bottom: 10px; diff --git a/src/app/model-templates/model-templates.component.html b/src/app/model-templates/model-templates.component.html index 6fb2fac..fd62fcf 100644 --- a/src/app/model-templates/model-templates.component.html +++ b/src/app/model-templates/model-templates.component.html @@ -1,4 +1,3 @@ -

Models

New model diff --git a/src/app/prediction/prediction.component.html b/src/app/prediction/prediction.component.html index b8bd37b..b503af5 100644 --- a/src/app/prediction/prediction.component.html +++ b/src/app/prediction/prediction.component.html @@ -1,4 +1,3 @@ -

Prediction

diff --git a/src/app/sample/sample.component.html b/src/app/sample/sample.component.html index 119f1f2..3f25923 100644 --- a/src/app/sample/sample.component.html +++ b/src/app/sample/sample.component.html @@ -9,7 +9,7 @@
- -

Samples

 New sample diff --git a/src/app/samples/samples.component.scss b/src/app/samples/samples.component.scss index 2505628..8f7e06d 100644 --- a/src/app/samples/samples.component.scss +++ b/src/app/samples/samples.component.scss @@ -2,6 +2,7 @@ .header-addnew { margin-bottom: 40px; + height: 42px; & > * { display: inline; diff --git a/src/app/samples/samples.component.ts b/src/app/samples/samples.component.ts index 4cdf0f3..1569347 100644 --- a/src/app/samples/samples.component.ts +++ b/src/app/samples/samples.component.ts @@ -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}, diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html index 2b5b9b4..4c3ae5e 100644 --- a/src/app/settings/settings.component.html +++ b/src/app/settings/settings.component.html @@ -1,4 +1,3 @@ -

Settings

Templates diff --git a/src/app/users/users.component.html b/src/app/users/users.component.html index 16c5fb9..6c297ec 100644 --- a/src/app/users/users.component.html +++ b/src/app/users/users.component.html @@ -1,4 +1,3 @@ -

Users

New user diff --git a/src/app/users/users.component.ts b/src/app/users/users.component.ts index fad50dd..7d9954f 100644 --- a/src/app/users/users.component.ts +++ b/src/app/users/users.component.ts @@ -41,6 +41,7 @@ export class UsersComponent implements OnInit { } saveUser(user: UserModel) { + user.models = user.models.filter(e => e !== ''); this.api.put('/user/' + user.origName, user.sendFormat('admin'), data => { user.deserialize(data); user.edit = false; diff --git a/src/styles.scss b/src/styles.scss index b3fd216..b57aeff 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -69,3 +69,7 @@ ul { } } } + +.nav-main a.active { + font-weight: bold; +}