taubem
/
ChangeCalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t

main
Manuel Tauber 2024-03-05 13:10:43 +01:00
parent d001d536cd
commit 56505bac08
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/data.service.ts
View File

@ -197,7 +197,7 @@ export class DataService {
} }
res.userPreferences = userPreferences; res.userPreferences = userPreferences;
response.presets.forEach(preset => { response.presets.forEach(preset => {
console.log(preset); // console.log(preset);
res.presets.push({ res.presets.push({
id: preset.id, id: preset.id,
name: preset.name, name: preset.name,

19
frontend/src/app/filter-dialog/filter-dialog.component.ts
View File

@ -105,7 +105,8 @@ export class FilterDialogComponent implements OnInit {
} }
if(filter.column == "State"){ if(filter.column == "State"){
//console.log(filter); console.log("\nStatesfilter prev")
console.log(filter);
if(this.languageService.language == "DE"){ if(this.languageService.language == "DE"){
for (const crit of filter.criteria) { for (const crit of filter.criteria) {
this.prevFiltersState.push(this.dataService.getStates().find((item)=> {return item.stateNameEN == crit;}).stateNameDE); 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)]; this.supportGroupsFilter = [...new Set(this.supportGroupsFilter)];
break; break;
case 'state': case 'state':
// console.log("\nEvent DATA")
// console.log(event);
this.statesFilter = [];
if(this.languageService.language == 'DE'){ if(this.languageService.language == 'DE'){
//console.log(event.data); // console.log(event.data);
for (const state of event.data) { for (const state of event.data) {
if(this.dataService.getStates().find((item)=> {return item.stateNameDE == state;})){ if(this.dataService.getStates().find((item)=> {return item.stateNameDE == state;})){
this.statesFilter.push(this.dataService.getStates().find((item)=> {return item.stateNameDE == state;}).stateNameEN); this.statesFilter.push(this.dataService.getStates().find((item)=> {return item.stateNameDE == state;}).stateNameEN);
} }
// //console.log(this.statesFilter); // console.log(this.statesFilter);
} }
}else{ }else{
//console.log(event.data); //console.log(event.data);
@ -207,11 +211,16 @@ export class FilterDialogComponent implements OnInit {
if(this.dataService.getStates().find((item)=> {return item.stateNameEN == state;})){ if(this.dataService.getStates().find((item)=> {return item.stateNameEN == state;})){
this.statesFilter.push(this.dataService.getStates().find((item)=> {return item.stateNameEN == state;}).stateNameEN); 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)]; 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; break;
case 'contract': case 'contract':
//this.contractsFilter = event.data; //this.contractsFilter = event.data;

1
frontend/src/app/ntt-gantt/ntt-gantt.component.ts
View File

@ -200,7 +200,6 @@ export class NttGanttComponent implements OnInit {
this.sliceEnd = 20; this.sliceEnd = 20;
this.dataService.getUser().then((res: any)=>{ this.dataService.getUser().then((res: any)=>{
console.log("##################");
console.log(res); console.log(res);
this.rssoInit = false; this.rssoInit = false;
this.userId = res.userId; this.userId = res.userId;