| type |
diff --git a/src/app/sample/sample.component.ts b/src/app/sample/sample.component.ts
index 67c2b85..57cf409 100644
--- a/src/app/sample/sample.component.ts
+++ b/src/app/sample/sample.component.ts
@@ -22,10 +22,6 @@ import {Observable} from 'rxjs';
import {ModalService} from '@inst-iot/bosch-angular-ui-components';
import {DataService} from '../services/data.service';
-// TODO: clean up this mess !!!
-
-// TODO: only show condition (if not set) and measurements in edit sample dialog at first
-// TODO: multiple samples for base data, extend multiple measurements, conditions
@Component({
selector: 'app-sample',
diff --git a/src/app/samples/samples.component.ts b/src/app/samples/samples.component.ts
index 51f3fbb..cf0aa27 100644
--- a/src/app/samples/samples.component.ts
+++ b/src/app/samples/samples.component.ts
@@ -8,6 +8,7 @@ import {SampleModel} from '../models/sample.model';
import {LoginService} from '../services/login.service';
import {ModalService} from '@inst-iot/bosch-angular-ui-components';
import {DataService} from '../services/data.service';
+import {LocalStorageService} from 'angular-2-local-storage';
interface LoadSamplesOptions {
@@ -28,8 +29,6 @@ interface KeyInterface {
styleUrls: ['./samples.component.scss']
})
-// TODO: save last settings
-
export class SamplesComponent implements OnInit {
@ViewChild('pageSizeSelection') pageSizeSelection: ElementRef;
@@ -89,29 +88,39 @@ export class SamplesComponent implements OnInit {
public autocomplete: AutocompleteService,
public login: LoginService,
private modalService: ModalService,
- public d: DataService
+ public d: DataService,
+ private storage: LocalStorageService
) {
}
ngOnInit(): void {
+ let loading = 7;
+ const onLoad = () => {
+ if ((--loading) <= 0) {
+ this.loadSamples();
+ }
+ };
+
this.calcFieldSelectKeys();
this.d.load('materials', () => {
this.filters.filters.find(e => e.field === 'material.name').autocomplete = this.d.arr.materials.map(e => e.name);
- this.loadSamples();
+ onLoad();
});
this.d.load('materialSuppliers', () => {
this.filters.filters.find(e => e.field === 'material.supplier').autocomplete = this.d.arr.materialSuppliers;
+ onLoad();
});
this.d.load('materialGroups', () => {
this.filters.filters.find(e => e.field === 'material.group').autocomplete = this.d.arr.materialGroups;
+ onLoad();
});
- this.d.load('userKey');
- this.d.load('conditionTemplates');
- this.loadTemplateKeys('material', 'type');
- this.loadTemplateKeys('measurement', 'status');
+ this.d.load('userKey', onLoad);
+ this.d.load('conditionTemplates', onLoad);
+ this.loadTemplateKeys('material', 'type', onLoad);
+ this.loadTemplateKeys('measurement', 'status', onLoad);
}
- loadTemplateKeys(collection, insertBefore) {
+ loadTemplateKeys(collection, insertBefore, f) {
this.d.load(collection + 'Templates', () => {
const templateKeys = [];
this.d.arr[collection + 'Templates'].forEach(item => {
@@ -138,8 +147,8 @@ export class SamplesComponent implements OnInit {
});
this.keys.splice(this.keys.findIndex(e => e.id === insertBefore), 0, ...templateKeys);
this.keys = [...this.keys]; // complete overwrite array to invoke update in rb-multiselect
- this.updateActiveKeys();
- this.calcFieldSelectKeys();
+ this.loadPreferences();
+ f();
});
}
@@ -156,6 +165,7 @@ export class SamplesComponent implements OnInit {
if (this.loadSamplesQueue.length <= 1) { // nothing queued up
this.sampleLoader(this.loadSamplesQueue[0]);
}
+ this.storePreferences();
}
private sampleLoader(options: LoadSamplesOptions) { // actual loading of the sample, do not call directly
@@ -256,6 +266,38 @@ export class SamplesComponent implements OnInit {
this.loadSamples({toPage: delta});
}
+ storePreferences() {
+ const store = {
+ filters: {
+ ...pick(this.filters, ['status', 'pageSize', 'toPage', 'sort']),
+ filters: this.filters.filters.map(e => pick(e, ['field', 'active', 'mode', 'values']))
+ },
+ keys: this.keys.map(e => pick(e, ['id', 'active']))
+ };
+ this.storage.set('samplesPreferences', store);
+ }
+
+ loadPreferences() {
+ const store: any = this.storage.get('samplesPreferences');
+ if (store) {
+ this.filters = {...this.filters, ...pick(store.filters, ['status', 'pageSize', 'toPage', 'sort'])};
+ store.filters.filters.forEach(filter => {
+ const filterIndex = this.filters.filters.findIndex(e => e.field === filter.field);
+ if (filterIndex >= 0) {
+ this.filters.filters[filterIndex] = {...this.filters.filters[filterIndex], ...filter};
+ }
+ });
+ store.keys.forEach(key => {
+ const keyIndex = this.keys.findIndex(e => e.id === key.id);
+ if (keyIndex >= 0) {
+ this.keys[keyIndex].active = key.active;
+ }
+ });
+ this.calcFieldSelectKeys();
+ this.updateActiveKeys();
+ }
+ }
+
updateFilterFields(field) {
const filter = this.filters.filters.find(e => e.field === field);
filter.active = true;
@@ -390,4 +432,6 @@ export class SamplesComponent implements OnInit {
ucFirst(string) {
return string[0].toUpperCase() + string.slice(1);
}
+
+
}
diff --git a/src/assets/icons/icon-128x128.png b/src/assets/icons/icon-128x128.png
new file mode 100644
index 0000000..01e3730
Binary files /dev/null and b/src/assets/icons/icon-128x128.png differ
diff --git a/src/assets/icons/icon-144x144.png b/src/assets/icons/icon-144x144.png
new file mode 100644
index 0000000..25da7aa
Binary files /dev/null and b/src/assets/icons/icon-144x144.png differ
diff --git a/src/assets/icons/icon-152x152.png b/src/assets/icons/icon-152x152.png
new file mode 100644
index 0000000..65b360e
Binary files /dev/null and b/src/assets/icons/icon-152x152.png differ
diff --git a/src/assets/icons/icon-192x192.png b/src/assets/icons/icon-192x192.png
new file mode 100644
index 0000000..10f939c
Binary files /dev/null and b/src/assets/icons/icon-192x192.png differ
diff --git a/src/assets/icons/icon-384x384.png b/src/assets/icons/icon-384x384.png
new file mode 100644
index 0000000..6f4c7bb
Binary files /dev/null and b/src/assets/icons/icon-384x384.png differ
diff --git a/src/assets/icons/icon-512x512.png b/src/assets/icons/icon-512x512.png
new file mode 100644
index 0000000..45bd462
Binary files /dev/null and b/src/assets/icons/icon-512x512.png differ
diff --git a/src/assets/icons/icon-72x72.png b/src/assets/icons/icon-72x72.png
new file mode 100644
index 0000000..d504761
Binary files /dev/null and b/src/assets/icons/icon-72x72.png differ
diff --git a/src/assets/icons/icon-96x96.png b/src/assets/icons/icon-96x96.png
new file mode 100644
index 0000000..28f4640
Binary files /dev/null and b/src/assets/icons/icon-96x96.png differ
diff --git a/src/index.html b/src/index.html
index bc0c164..173237a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -6,8 +6,11 @@
+
+
+
|