From fa164b424c09e62ed49ff481eb1050be4c3d2ed5 Mon Sep 17 00:00:00 2001 From: "Ruben Hartenstein (PEA4-Fe)" Date: Thu, 7 Jan 2021 10:57:06 +0100 Subject: [PATCH 1/4] Seperate the fields into 3 categories --- src/app/home/home.component.html | 8 +- src/app/home/home.component.scss | 4 + src/app/home/home.component.ts | 3 +- src/app/samples/samples.component.html | 145 +++++++++++++------------ src/app/samples/samples.component.scss | 4 + src/app/samples/samples.component.ts | 137 +++++++++++++++-------- 6 files changed, 181 insertions(+), 120 deletions(-) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index f4d5282..0327feb 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -9,13 +9,7 @@ class="selection" (ngModelChange)="updateGroups($event)"> {{key.id}} - - - +
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss index 4ae35d4..c53dfa5 100644 --- a/src/app/home/home.component.scss +++ b/src/app/home/home.component.scss @@ -6,3 +6,7 @@ app-login { width: 70%; float: right; } + +rb-form-multi-select { + width: 20%; +} diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 792bf95..84117b1 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -120,7 +120,8 @@ export class HomeComponent implements OnInit { label: 'Number of samples per group', data: data.data, backgroundColor: fillPattern, - borderWidth: 2 + pointRadius: 4, + pointHoverRadius: 7 }] }, options: { diff --git a/src/app/samples/samples.component.html b/src/app/samples/samples.component.html index 61088e3..f1cfeb4 100644 --- a/src/app/samples/samples.component.html +++ b/src/app/samples/samples.component.html @@ -3,9 +3,9 @@ New sample - + class="validation-close" iconOnly> + {{sampleSelect === 2 ? 'Validate' : 'Validation'}}
@@ -19,23 +19,22 @@
+ [disabled]="!filters.status.new && !filters.status.deleted" (ngModelChange)="loadSamples({firstPage: true})"> validated + [disabled]="!filters.status.validated && !filters.status.deleted" + (ngModelChange)="loadSamples({firstPage: true})"> new + [disabled]="!filters.status.validated && !filters.status.new" (ngModelChange)="loadSamples({firstPage: true})" + *ngIf="login.isLevel.dev"> deleted
+ (ngModelChange)="loadSamples({firstPage: true})" #pageSizeSelection> @@ -45,10 +44,13 @@ - - {{item.label}} - +
+ + {{item.label}} + +
Reset to default @@ -59,7 +61,7 @@ + (ngModelChange)="updateFilterFields(filter.field)"> @@ -73,29 +75,25 @@
- + + [name]="'filter-' + filter.field + item.i" [index]="item.i" [label]="filter.label" + [(ngModel)]="item.value" [disabled]="filter.mode === 'null'"> + [name]="'filter-' + filter.field + item.i" [index]="item.i" [label]="filter.label" + [(ngModel)]="item.value" [disabled]="filter.mode === 'null'"> + [name]="'filter-' + filter.field + item.i" [index]="item.i" [label]="filter.label" + [(ngModel)]="item.value" [rbDebounceTime]="0" (keydown)="preventDefault($event, 'Enter')" + [rbFormInputAutocomplete]="autocomplete.bind(this, filter.autocomplete)" + [disabled]="filter.mode === 'null'" ngModel> + [name]="'filter-' + filter.field + item.i" [index]="item.i" [label]="filter.label" + [(ngModel)]="item.value"> @@ -119,7 +117,6 @@ -
@@ -137,7 +134,7 @@
+ (keydown)="preventDefault($event)"> add spectra @@ -161,7 +158,7 @@ - + @@ -184,39 +181,22 @@ - - + + (click)="restoreSample(sample._id, restoreConfirm, $event)"> - + + [(ngModel)]="sample.selected"> - {{sample.number}} - {{d.id.materials[sample.material_id].numbers}} - {{d.id.materials[sample.material_id].name}} - {{d.id.materials[sample.material_id].supplier}} - {{d.id.materials[sample.material_id].group}} - - {{d.id.materials[sample.material_id].properties[key[2]] | exists}} + + {{data[i].data[j]}} - {{sample.type}} - {{sample.color}} - {{sample.batch}} - - {{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}} - {{sample.added | date:'dd/MM/yy'}} @@ -245,13 +225,34 @@

{{sampleDetailsSample.number}}

- Material{{sampleDetailsSample.material.name}} - Supplier{{sampleDetailsSample.material.supplier}} - Group{{sampleDetailsSample.material.group}} - Type{{sampleDetailsSample.type}} - color{{sampleDetailsSample.color}} - Batch{{sampleDetailsSample.batch}} - Comment{{sampleDetailsSample.notes.comment | exists}} + + Material + {{sampleDetailsSample.material.name}} + + + Supplier + {{sampleDetailsSample.material.supplier}} + + + Group + {{sampleDetailsSample.material.group}} + + + Type + {{sampleDetailsSample.type}} + + + color + {{sampleDetailsSample.color}} + + + Batch + {{sampleDetailsSample.batch}} + + + Comment + {{sampleDetailsSample.notes.comment | exists}} + {{customField[0]}} {{customField[1]}} @@ -272,8 +273,14 @@ {{measurement.name}} {{measurement.value}} - User{{sampleDetailsSample.user}} - Status{{sampleDetailsSample.status}} + + User + {{sampleDetailsSample.user}} + + + Status + {{sampleDetailsSample.status}} + @@ -282,4 +289,4 @@ Do you really want to restore this sample? - + \ No newline at end of file diff --git a/src/app/samples/samples.component.scss b/src/app/samples/samples.component.scss index 7b92037..a710bcf 100644 --- a/src/app/samples/samples.component.scss +++ b/src/app/samples/samples.component.scss @@ -28,6 +28,10 @@ rb-table { } } +rb-form-multi-select{ + min-width: 9rem; +} + .status-selection { overflow: hidden; margin-bottom: 10px; diff --git a/src/app/samples/samples.component.ts b/src/app/samples/samples.component.ts index c8f598e..210e40b 100644 --- a/src/app/samples/samples.component.ts +++ b/src/app/samples/samples.component.ts @@ -10,6 +10,7 @@ import { ModalService } from '@inst-iot/bosch-angular-ui-components'; import { DataService } from '../services/data.service'; import { LocalStorageService } from 'angular-2-local-storage'; import { Router } from '@angular/router'; +import { KeyValue } from '@angular/common'; interface LoadSamplesOptions { toPage?: number; @@ -24,6 +25,11 @@ interface KeyInterface { sortable: boolean; } +interface Data { + id: string; + data: any[]; +} + @Component({ selector: 'app-samples', templateUrl: './samples.component.html', @@ -39,6 +45,7 @@ export class SamplesComponent implements OnInit { downloadCondition = false; downloadFlatten = true; samples: SampleModel[] = []; // all samples to display + data: Data[] = []; totalSamples = 0; // total number of samples csvUrl = ''; // store url separate so it only has to be generated when clicking the download button filters = { @@ -65,23 +72,33 @@ export class SamplesComponent implements OnInit { page = 1; // current page pages = 1; // total number of pages loadSamplesQueue = []; // arguments of queued up loadSamples() calls - keys: KeyInterface[] = [ + materialKeys: KeyInterface[] = [ { id: 'number', label: 'Number', active: true, sortable: true }, { id: 'material.numbers', label: 'Material numbers', active: false, sortable: false }, - { 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: 'material.group', label: 'Material', active: true, sortable: true}, { 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 } + ]; + conditionKeys: KeyInterface[] = [ { id: 'notes', label: 'Notes', active: false, sortable: false }, + ]; + measurementKeys: KeyInterface[] = [ + { id: 'material.name', label: 'Product name', active: true, sortable: true }, { id: 'status', label: 'Status', active: false, sortable: true }, { id: 'added', label: 'Added', active: true, sortable: true } ]; + + categories = { + material: this.materialKeys, + condition: this.conditionKeys, + measurement: this.measurementKeys + }; + isActiveKey: { [key: string]: boolean } = {}; // object to check if key is currently active activeKeys: KeyInterface[] = []; // list of active keys - activeTemplateKeys = { material: [], condition: [], measurements: [] }; sampleDetailsSample: any = null; // sample for the sample details dialog sampleSelect = 0; // modes: 0 - no selection, 1 - sample edit selection, 2 - validation selection loading = 0; // number of loading instances @@ -123,9 +140,9 @@ export class SamplesComponent implements OnInit { this.d.load('userKey', onLoad); this.d.load('conditionTemplates', onLoad); this.loadTemplateKeys('material', 'type', onLoad); - this.loadTemplateKeys('condition', 'notes.comment', onLoad); + this.loadTemplateKeys('condition', 'notes', onLoad); this.loadTemplateKeys('measurement', 'status', onLoad); - } + } loadTemplateKeys(collection, insertBefore, f) { this.d.load(collection + 'Templates', () => { @@ -157,29 +174,29 @@ 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.categories[collection].splice(this.categories[collection].findIndex(e => e.id === insertBefore), 0, ...templateKeys); + this.categories[collection] = [...this.categories[collection]]; // complete overwrite array to invoke update in rb-multiselect this.loadPreferences(); f(); }); } // set toPage to null to reload first page, queues calls - loadSamples(options: LoadSamplesOptions = {}, event = null) { + loadSamples(options: LoadSamplesOptions = {}, event = null, categorie?) { if (event) { // adjust active keys - console.log(event); - this.keys.forEach(key => { + this.categories[categorie].forEach(key => { if (event.hasOwnProperty(key.id)) { key.active = event[key.id]; } }); + //this.refreshMultiSelect(); 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(); } - if(options.firstPage){ + if (options.firstPage) { this.storage.set('currentPage', 1); } this.loadSamplesQueue.push(options); @@ -203,13 +220,14 @@ export class SamplesComponent implements OnInit { } this.pages = Math.ceil(this.totalSamples / this.filters.pageSize); this.samples = sData as any; + this.storeData(); this.loadSamplesQueue.shift(); if (this.loadSamplesQueue.length > 0) { // execute next queue item this.sampleLoader(this.loadSamplesQueue[0]); } } }); - if(this.storage.get('currentPage') !== this.page){ + if (this.storage.get('currentPage') !== this.page) { this.loadPage(Number(this.storage.get('currentPage')) - this.page); } } @@ -247,13 +265,14 @@ export class SamplesComponent implements OnInit { if (options.export) { // append API key on export query.push('key=' + this.d.d.userKey.key); } - this.keys.forEach(key => { - // do not load material properties for table - if (key.active && (options.export || (!options.export && key.id.indexOf('material.') < 0))) { - query.push('fields[]=' + key.id); - } - }); + for (let categorie in this.categories) { + this.categories[categorie].forEach(key => { + if (key.active && (options.export || (!options.export && key.id.indexOf('material.') < 0))) { + query.push('fields[]=' + key.id); + } + }); + } query.push(...cloneDeep(this.filters.filters) .map(e => { e.values = e.values.filter(el => el !== ''); // do not include empty values @@ -314,14 +333,20 @@ export class SamplesComponent implements OnInit { } storePreferences() { + let keys = []; + for (let categorie in this.categories) { + keys.push(...this.categories[categorie].map(e => pick(e, ['id', 'active']))); + } + 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'])) + keys: keys }; this.storage.set('samplesPreferences', store); + this.loadPreferences(); } loadPreferences() { @@ -334,10 +359,13 @@ export class SamplesComponent implements OnInit { 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; + for (let categorie in this.categories) { + const keyIndex = this.categories[categorie].findIndex(e => e.id === key.id); + if (keyIndex >= 0) { + this.categories[categorie][keyIndex].active = key.active; + } } }); } @@ -361,28 +389,23 @@ export class SamplesComponent implements OnInit { } updateActiveKeys() { // array with all activeKeys - this.activeKeys = this.keys.filter(e => e.active); - this.filters.filters.forEach(filter => { // disable filters of fields not displayed - if (!this.isActiveKey[filter.field]) { - filter.active = false; - } - }); - this.activeTemplateKeys.material = this.keys - .filter(e => e.id.indexOf('material.properties.') >= 0 && e.active) - .map(e => e.id.split('.') - .map(el => decodeURIComponent(el))); - this.activeTemplateKeys.condition = this.keys.filter(e => e.id.indexOf('condition.') >= 0 && e.active) - .map(e => e.id.split('.') - .map(el => decodeURIComponent(el))); - this.activeTemplateKeys.measurements = this.keys.filter(e => e.id.indexOf('measurements.') >= 0 && e.active) - .map(e => e.id.split('.') - .map(el => decodeURIComponent(el))); + this.activeKeys = []; + for (let categorie in this.categories) { + this.activeKeys.push(...this.categories[categorie].filter(e => e.active)); + this.filters.filters.forEach(filter => { // disable filters of fields not displayed + if (!this.isActiveKey[filter.field]) { + filter.active = false; + } + }); + } } calcFieldSelectKeys() { - this.keys.forEach(key => { - this.isActiveKey[key.id] = key.active; - }); + for (let categorie in this.categories) { + this.categories[categorie].forEach(key => { + this.isActiveKey[key.id] = key.active; + }); + } } sampleDetails(id: string, modal: TemplateRef) { // show sample details @@ -505,4 +528,32 @@ export class SamplesComponent implements OnInit { ucFirst(string) { // convert first character of string to uppercase return string[0].toUpperCase() + string.slice(1); } + + refreshMultiSelect(){ + for(let collection in this.categories){ + this.categories[collection] = [...this.categories[collection]]; + console.log(this.categories[collection]); + } + } + + // stores data in a unified way + storeData() { + this.data = []; + this.samples.forEach( sample =>{ + let value = []; + this.activeKeys.forEach( key =>{ + let id = key.id.split('material.')[1]; + if(id){ + value.push(this.d.id.materials[sample.material_id][id]); + }else{ + value.push(sample[key.id]); + } + }); + this.data.push({id: sample._id, data: value}); + }); + } + + originalOrder = (a: KeyValue, b: KeyValue): number => { + return 0; + } } From 84ccb4df913c032dc8036f3a9b1a4e6fd0187ef4 Mon Sep 17 00:00:00 2001 From: "Ruben Hartenstein (PEA4-Fe)" Date: Thu, 7 Jan 2021 14:35:18 +0100 Subject: [PATCH 2/4] Added value converter to correctly display values --- src/app/samples/samples.component.ts | 36 +++++++++++++++------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/app/samples/samples.component.ts b/src/app/samples/samples.component.ts index 210e40b..c19a9a7 100644 --- a/src/app/samples/samples.component.ts +++ b/src/app/samples/samples.component.ts @@ -76,7 +76,7 @@ export class SamplesComponent implements OnInit { { id: 'number', label: 'Number', active: true, sortable: true }, { id: 'material.numbers', label: 'Material numbers', active: false, sortable: false }, { id: 'material.supplier', label: 'Supplier', active: false, sortable: true }, - { id: 'material.group', label: 'Material', active: true, sortable: true}, + { id: 'material.group', label: 'Material', active: true, sortable: true }, { id: 'type', label: 'Type', active: true, sortable: true }, { id: 'color', label: 'Color', active: false, sortable: true }, { id: 'batch', label: 'Batch', active: true, sortable: true }, @@ -103,6 +103,11 @@ export class SamplesComponent implements OnInit { sampleSelect = 0; // modes: 0 - no selection, 1 - sample edit selection, 2 - validation selection loading = 0; // number of loading instances + valueConverters = { + added: (v: string, _sample) => new Date(v).toLocaleDateString(), + notes: v => v.sample_references.length > 0 ? Object.keys(v.sample_references).map(r => v.sample_references[r].relation).join(", ") : "", + 'notes.comment': (v: any, sample: any) => sample['notes']['comment'] + } constructor( private api: ApiService, @@ -114,6 +119,7 @@ export class SamplesComponent implements OnInit { private window: Window, private router: Router ) { + //this.valueConverters['notes.comment'] = v => console.log(v['comment']); } ngOnInit(): void { @@ -142,7 +148,7 @@ export class SamplesComponent implements OnInit { this.loadTemplateKeys('material', 'type', onLoad); this.loadTemplateKeys('condition', 'notes', onLoad); this.loadTemplateKeys('measurement', 'status', onLoad); - } + } loadTemplateKeys(collection, insertBefore, f) { this.d.load(collection + 'Templates', () => { @@ -440,7 +446,7 @@ export class SamplesComponent implements OnInit { .push(...Object.entries(measurement.values).filter(e => e[0] !== 'dpt') .map(e => ({ name: this.ucFirst(name) + ' ' + e[0], value: e[1] }))); }); - new Promise(resolve => { + new Promise(resolve => { if (data.notes.sample_references.length) { // load referenced samples if available let loadingCounter = data.notes.sample_references.length; this.sampleDetailsSample.notes.sample_references.forEach(reference => { @@ -529,27 +535,23 @@ export class SamplesComponent implements OnInit { return string[0].toUpperCase() + string.slice(1); } - refreshMultiSelect(){ - for(let collection in this.categories){ - this.categories[collection] = [...this.categories[collection]]; - console.log(this.categories[collection]); + refreshMultiSelect() { + for (let collection in this.categories) { + this.categories[collection] = [...this.categories[collection]]; } } // stores data in a unified way - storeData() { + storeData() { this.data = []; - this.samples.forEach( sample =>{ - let value = []; - this.activeKeys.forEach( key =>{ + this.samples.forEach(sample => { + let value = []; + this.activeKeys.forEach(key => { let id = key.id.split('material.')[1]; - if(id){ - value.push(this.d.id.materials[sample.material_id][id]); - }else{ - value.push(sample[key.id]); - } + let tmpValue = id ? this.d.id.materials[sample.material_id][id] : sample[key.id]; + value.push(this.valueConverters[key.id] ? this.valueConverters[key.id](tmpValue, sample) : tmpValue); }); - this.data.push({id: sample._id, data: value}); + this.data.push({ id: sample._id, data: value }); }); } From 8fd0ca1bd58272df4ddbb6d032d6a854efca9e19 Mon Sep 17 00:00:00 2001 From: "Ruben Hartenstein (PEA4-Fe)" Date: Fri, 8 Jan 2021 09:11:27 +0100 Subject: [PATCH 3/4] Performance updates --- src/app/samples/samples.component.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/app/samples/samples.component.ts b/src/app/samples/samples.component.ts index c19a9a7..40b45e6 100644 --- a/src/app/samples/samples.component.ts +++ b/src/app/samples/samples.component.ts @@ -91,6 +91,7 @@ export class SamplesComponent implements OnInit { { id: 'added', label: 'Added', active: true, sortable: true } ]; + // combines the 3 different categories categories = { material: this.materialKeys, condition: this.conditionKeys, @@ -103,9 +104,10 @@ export class SamplesComponent implements OnInit { sampleSelect = 0; // modes: 0 - no selection, 1 - sample edit selection, 2 - validation selection loading = 0; // number of loading instances + // change the way values are displayed valueConverters = { - added: (v: string, _sample) => new Date(v).toLocaleDateString(), - notes: v => v.sample_references.length > 0 ? Object.keys(v.sample_references).map(r => v.sample_references[r].relation).join(", ") : "", + 'added': (v: string, _sample) => new Date(v).toLocaleDateString(), + 'notes': (v: any, _sample: any) => v.sample_references.length > 0 ? Object.keys(v.sample_references).map(r => v.sample_references[r].relation).join(", ") : "", 'notes.comment': (v: any, sample: any) => sample['notes']['comment'] } @@ -118,9 +120,7 @@ export class SamplesComponent implements OnInit { private storage: LocalStorageService, private window: Window, private router: Router - ) { - //this.valueConverters['notes.comment'] = v => console.log(v['comment']); - } + ) {} ngOnInit(): void { this.loading = 8; @@ -195,7 +195,6 @@ export class SamplesComponent implements OnInit { key.active = event[key.id]; } }); - //this.refreshMultiSelect(); 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'); @@ -352,7 +351,7 @@ export class SamplesComponent implements OnInit { keys: keys }; this.storage.set('samplesPreferences', store); - this.loadPreferences(); + this.calcFieldSelectKeys(); } loadPreferences() { From 2aad393c0d6f4fa24df2c888ff9e81cac12d89b3 Mon Sep 17 00:00:00 2001 From: "Engelbart Kai Sven (PEA4-Fe)" Date: Fri, 8 Jan 2021 13:25:35 +0100 Subject: [PATCH 4/4] Fix a typo --- src/app/home/home.component.html | 2 +- src/app/samples/samples.component.ts | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 0327feb..240b573 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -9,7 +9,7 @@ class="selection" (ngModelChange)="updateGroups($event)"> {{key.id}} - +
diff --git a/src/app/samples/samples.component.ts b/src/app/samples/samples.component.ts index 40b45e6..c54d123 100644 --- a/src/app/samples/samples.component.ts +++ b/src/app/samples/samples.component.ts @@ -188,9 +188,9 @@ export class SamplesComponent implements OnInit { } // set toPage to null to reload first page, queues calls - loadSamples(options: LoadSamplesOptions = {}, event = null, categorie?) { + loadSamples(options: LoadSamplesOptions = {}, event = null, category?) { if (event) { // adjust active keys - this.categories[categorie].forEach(key => { + this.categories[category].forEach(key => { if (event.hasOwnProperty(key.id)) { key.active = event[key.id]; } @@ -271,8 +271,8 @@ export class SamplesComponent implements OnInit { query.push('key=' + this.d.d.userKey.key); } - for (let categorie in this.categories) { - this.categories[categorie].forEach(key => { + for (let category in this.categories) { + this.categories[category].forEach(key => { if (key.active && (options.export || (!options.export && key.id.indexOf('material.') < 0))) { query.push('fields[]=' + key.id); } @@ -339,8 +339,8 @@ export class SamplesComponent implements OnInit { storePreferences() { let keys = []; - for (let categorie in this.categories) { - keys.push(...this.categories[categorie].map(e => pick(e, ['id', 'active']))); + for (let category in this.categories) { + keys.push(...this.categories[category].map(e => pick(e, ['id', 'active']))); } const store = { @@ -366,10 +366,10 @@ export class SamplesComponent implements OnInit { }); store.keys.forEach(key => { - for (let categorie in this.categories) { - const keyIndex = this.categories[categorie].findIndex(e => e.id === key.id); + for (let category in this.categories) { + const keyIndex = this.categories[category].findIndex(e => e.id === key.id); if (keyIndex >= 0) { - this.categories[categorie][keyIndex].active = key.active; + this.categories[category][keyIndex].active = key.active; } } }); @@ -395,8 +395,8 @@ export class SamplesComponent implements OnInit { updateActiveKeys() { // array with all activeKeys this.activeKeys = []; - for (let categorie in this.categories) { - this.activeKeys.push(...this.categories[categorie].filter(e => e.active)); + for (let category in this.categories) { + this.activeKeys.push(...this.categories[category].filter(e => e.active)); this.filters.filters.forEach(filter => { // disable filters of fields not displayed if (!this.isActiveKey[filter.field]) { filter.active = false; @@ -406,8 +406,8 @@ export class SamplesComponent implements OnInit { } calcFieldSelectKeys() { - for (let categorie in this.categories) { - this.categories[categorie].forEach(key => { + for (let category in this.categories) { + this.categories[category].forEach(key => { this.isActiveKey[key.id] = key.active; }); }