From 56505bac08a4b71c64008561ba9e1bd909603b51 Mon Sep 17 00:00:00 2001 From: Manuel Tauber Date: Tue, 5 Mar 2024 13:10:43 +0100 Subject: [PATCH] t --- frontend/src/app/data.service.ts | 2 +- .../filter-dialog/filter-dialog.component.ts | 19 ++++++++++++++----- .../src/app/ntt-gantt/ntt-gantt.component.ts | 1 - 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts index 30880cc..cadbdab 100644 --- a/frontend/src/app/data.service.ts +++ b/frontend/src/app/data.service.ts @@ -197,7 +197,7 @@ export class DataService { } res.userPreferences = userPreferences; response.presets.forEach(preset => { - console.log(preset); + // console.log(preset); res.presets.push({ id: preset.id, name: preset.name, diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.ts b/frontend/src/app/filter-dialog/filter-dialog.component.ts index 5439b8d..13feb1e 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.ts +++ b/frontend/src/app/filter-dialog/filter-dialog.component.ts @@ -105,7 +105,8 @@ export class FilterDialogComponent implements OnInit { } if(filter.column == "State"){ - //console.log(filter); + console.log("\nStatesfilter prev") + console.log(filter); if(this.languageService.language == "DE"){ for (const crit of filter.criteria) { this.prevFiltersState.push(this.dataService.getStates().find((item)=> {return item.stateNameEN == crit;}).stateNameDE); @@ -193,13 +194,16 @@ export class FilterDialogComponent implements OnInit { this.supportGroupsFilter = [...new Set(this.supportGroupsFilter)]; break; case 'state': + // console.log("\nEvent DATA") + // console.log(event); + this.statesFilter = []; if(this.languageService.language == 'DE'){ - //console.log(event.data); + // console.log(event.data); for (const state of event.data) { if(this.dataService.getStates().find((item)=> {return item.stateNameDE == state;})){ this.statesFilter.push(this.dataService.getStates().find((item)=> {return item.stateNameDE == state;}).stateNameEN); } - // //console.log(this.statesFilter); + // console.log(this.statesFilter); } }else{ //console.log(event.data); @@ -207,11 +211,16 @@ export class FilterDialogComponent implements OnInit { if(this.dataService.getStates().find((item)=> {return item.stateNameEN == state;})){ this.statesFilter.push(this.dataService.getStates().find((item)=> {return item.stateNameEN == state;}).stateNameEN); } - console.log(this.statesFilter); + // console.log(this.statesFilter); } } this.statesFilter = [...new Set(this.statesFilter)]; - //console.log(this.statesFilter); + // if(event.data.length() == 0){ + // this.statesFilter = []; + // } + // console.log("\nRESULT Statesfilter"); + // console.log(this.statesFilter); + break; case 'contract': //this.contractsFilter = event.data; diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index e10d4ac..b2c98ae 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -200,7 +200,6 @@ export class NttGanttComponent implements OnInit { this.sliceEnd = 20; this.dataService.getUser().then((res: any)=>{ - console.log("##################"); console.log(res); this.rssoInit = false; this.userId = res.userId;