('/sample/' + sampleId, data => {
+ this.samples.push(new SampleModel().deserialize(data));
['type', 'color', 'batch', 'notes'].forEach((key) => {
- console.log(isEqual(sData[key], this.baseSample[key]));
- if (!isEqual(sData[key], this.baseSample[key])) {
+ console.log(isEqual(data[key], this.baseSample[key]));
+ if (!isEqual(data[key], this.baseSample[key])) {
this.baseSample[key] = undefined;
}
});
- if (!isEqual(sData.material.name, this.baseSample.material.name)) {
+ if (!isEqual(data.material.name, this.baseSample.material.name)) {
this.baseSample.material.name = undefined;
}
- }
- this.loading--;
+ this.loading--;
+ this.checkFormAfterInit = true;
+ });
});
});
}
@@ -531,7 +530,9 @@ export class SampleComponent implements OnInit, AfterContentChecked {
deleteConfirm(modal) {
this.modal.open(modal).then(result => {
if (result) {
- this.api.delete('/sample/' + this.baseSample._id);
+ this.samples.forEach(sample => {
+ this.api.delete('/sample/' + sample._id);
+ });
this.router.navigate(['/samples']);
}
});
diff --git a/src/app/samples/samples.component.html b/src/app/samples/samples.component.html
index ec9a033..52d0898 100644
--- a/src/app/samples/samples.component.html
+++ b/src/app/samples/samples.component.html
@@ -199,6 +199,7 @@
|
{{sample.condition ? sample.condition[key[1]] : '' | exists}}
|
+ {{sample.notes | exists: 'comment'}} |
{{sample.notes | object: ['_id', 'sample_references']}} |
{{sample[key[1]] | exists: key[2]}} |
{{sample.status}} |
diff --git a/src/app/samples/samples.component.ts b/src/app/samples/samples.component.ts
index 08f5b19..33ce4fd 100644
--- a/src/app/samples/samples.component.ts
+++ b/src/app/samples/samples.component.ts
@@ -64,7 +64,7 @@ export class SamplesComponent implements OnInit {
{field: 'type', label: 'Type', active: false, autocomplete: [], mode: 'eq', values: ['']},
{field: 'color', label: 'Color', active: false, autocomplete: [], mode: 'eq', values: ['']},
{field: 'batch', label: 'Batch', active: false, autocomplete: [], mode: 'eq', values: ['']},
- // {field: 'notes.comment', label: 'Comment', active: false, autocomplete: [], mode: 'eq', values: ['']},
+ {field: 'notes.comment', label: 'Comment', active: false, autocomplete: [], mode: 'eq', values: ['']},
{field: 'added', label: 'Added', active: false, autocomplete: [], mode: 'eq', values: ['']}
]
};
@@ -80,7 +80,7 @@ export class SamplesComponent implements OnInit {
{id: 'type', label: 'Type', active: true, sortable: true},
{id: 'color', label: 'Color', active: false, sortable: true},
{id: 'batch', label: 'Batch', active: true, sortable: true},
- // {id: 'notes.comment', label: 'Comment', active: false, sortable: false},
+ {id: 'notes.comment', label: 'Comment', active: false, sortable: false},
{id: 'notes', label: 'Notes', active: false, sortable: false},
{id: 'status', label: 'Status', active: false, sortable: true},
{id: 'added', label: 'Added', active: true, sortable: true}
@@ -129,7 +129,7 @@ export class SamplesComponent implements OnInit {
this.d.load('userKey', onLoad);
this.d.load('conditionTemplates', onLoad);
this.loadTemplateKeys('material', 'type', onLoad);
- this.loadTemplateKeys('condition', 'notes', onLoad);
+ this.loadTemplateKeys('condition', 'notes.comment', onLoad);
this.loadTemplateKeys('measurement', 'status', onLoad);
}
@@ -177,6 +177,10 @@ export class SamplesComponent implements OnInit {
key.active = event[key.id];
}
});
+ const sortId = this.filters.sort.replace(/(-asc|-desc)/, '');
+ if (event.hasOwnProperty(sortId) && !event[sortId]) { // reset sort if sort field was unselected
+ this.setSort('_id-asc');
+ }
this.updateActiveKeys();
}
this.loadSamplesQueue.push(options);
@@ -254,8 +258,8 @@ export class SamplesComponent implements OnInit {
e.values = e.values.map(el => new Date(new Date(el).getTime() - new Date(el).getTimezoneOffset() * 60000).toISOString());
}
if (e.mode === 'null') {
- e.mode = 'eq';
- e.values[0] = null;
+ e.mode = 'in';
+ e.values = [null, ''];
}
return e;
})
@@ -346,7 +350,7 @@ export class SamplesComponent implements OnInit {
updateActiveKeys() { // array with all activeKeys
this.activeKeys = this.keys.filter(e => e.active);
- this.filters.filters.forEach(filter => {
+ this.filters.filters.forEach(filter => { // disable filters of fields not displayed
if (!this.isActiveKey[filter.field]) {
filter.active = false;
}
diff --git a/src/app/services/login.service.ts b/src/app/services/login.service.ts
index 05b14f3..e8dd0db 100644
--- a/src/app/services/login.service.ts
+++ b/src/app/services/login.service.ts
@@ -80,6 +80,9 @@ export class LoginService implements CanActivate {
logout() {
this.storage.remove('basicAuth');
this.loggedIn = false;
+ this.levels.forEach(level => {
+ this.isLevel[level] = false;
+ });
}
canActivate(route: ActivatedRouteSnapshot = null, state: RouterStateSnapshot = null): Observable {
diff --git a/src/assets/imgs/key-visual.png b/src/assets/imgs/key-visual.png
new file mode 100644
index 0000000..a6e2633
Binary files /dev/null and b/src/assets/imgs/key-visual.png differ
diff --git a/src/styles.scss b/src/styles.scss
index fbc3cbc..339b355 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -42,3 +42,7 @@ button::-moz-focus-inner {
.space-left {
margin-left: $default-spacing;
}
+
+.supergraphic {
+ background-image: url("/assets/imgs/supergraphic.svg");
+}
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss
index e69de29..4ae35d4 100644
--- a/src/app/home/home.component.scss
+++ b/src/app/home/home.component.scss
@@ -0,0 +1,8 @@
+app-login {
+ float: left;
+}
+
+.key-visual {
+ width: 70%;
+ float: right;
+}
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index f56c8c1..1cb0ce7 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
+import {LoginService} from '../services/login.service';
@Component({
selector: 'app-home',
@@ -7,7 +8,9 @@ import { Component, OnInit } from '@angular/core';
})
export class HomeComponent implements OnInit {
- constructor() { }
+ constructor(
+ public login: LoginService
+ ) { }
ngOnInit() {
}
diff --git a/src/app/sample/sample.component.html b/src/app/sample/sample.component.html
index 61de958..cc94873 100644
--- a/src/app/sample/sample.component.html
+++ b/src/app/sample/sample.component.html
@@ -139,6 +139,10 @@
[disabled]="!sampleForm.form.valid">
Save sample
+