diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts index 726c2c1..7feb6bd 100644 --- a/frontend/src/app/data.service.ts +++ b/frontend/src/app/data.service.ts @@ -58,10 +58,10 @@ export class DataService { this.fetchContracts().then((res: any [])=>{ this.contracts = res; }); - this.fetchPaketTypes().then((res: any [])=>{ - this.paketTypes = res; - // console.log(res); - }); + // this.fetchPaketTypes().then((res: any [])=>{ + // this.paketTypes = res; + // // console.log(res); + // }); this.fetchUserSupportGroup().then((res: any)=>{ this.userSupportGroup = res.name; console.log(this.userSupportGroup); @@ -431,23 +431,23 @@ export class DataService { return promise; } - /** - * The function fetchPaketTypes fetches an array of all paketTypes - * @returns promise for the fetched paketTypes array - */ - public async fetchPaketTypes(){ - const promise = new Promise(resolve=>{ - let res : any[] = []; - this.http.get('http://localhost:8080/api/getPackageTypes') - .subscribe((response: any)=>{ - response.forEach(paketType => { - res.push(paketType) - }); - resolve(res); - }) - }) - return promise; - } + // /** + // * The function fetchPaketTypes fetches an array of all paketTypes + // * @returns promise for the fetched paketTypes array + // */ + // public async fetchPaketTypes(){ + // const promise = new Promise(resolve=>{ + // let res : any[] = []; + // this.http.get('http://localhost:8080/api/getPackageTypes') + // .subscribe((response: any)=>{ + // response.forEach(paketType => { + // res.push(paketType) + // }); + // resolve(res); + // }) + // }) + // return promise; + // } /** * The function fetchPaketTypes fetches the supportGroup of the current user diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.css b/frontend/src/app/filter-dialog/filter-dialog.component.css index ac15a37..a7a0b39 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.css +++ b/frontend/src/app/filter-dialog/filter-dialog.component.css @@ -18,3 +18,11 @@ font-family: Roboto; flex-direction: row; justify-content: flex-end; } + +.dot-badge { + background-color: #00a79d; + color: #00a79d; + width: 10px; /* Breite des Punkts */ + height: 10px; /* Höhe des Punkts */ + border-radius: 50%; /* Rundung des Punkts */ +} diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.html b/frontend/src/app/filter-dialog/filter-dialog.component.html index dc474ee..f8937b4 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.html +++ b/frontend/src/app/filter-dialog/filter-dialog.component.html @@ -4,18 +4,19 @@ - {{this.languageService.lMap.get('filterDialogShortDesc')}} + + {{this.languageService.lMap.get('filterDialogShortDesc')}} {{this.languageService.lMap.get('filterDialogShortDescText')}} {{this.languageService.lMap.get('filterDilogSearchText')}} - + - {{this.languageService.lMap.get('filterDilogSg')}} + {{this.languageService.lMap.get('filterDilogSg')}} {{this.languageService.lMap.get('filterDilogSgText')}} - {{this.languageService.lMap.get('filterDilogState')}} + {{this.languageService.lMap.get('filterDilogState')}} {{this.languageService.lMap.get('filterDilogStateText')}} - {{this.languageService.lMap.get('filterDilogContract')}} + {{this.languageService.lMap.get('filterDilogContract')}} {{this.languageService.lMap.get('filterDilogContractText')}} - {{this.languageService.lMap.get('filterDilogDate')}} + {{this.languageService.lMap.get('filterDilogDate')}} {{this.languageService.lMap.get('filterDilogDateText')}} {{this.languageService.lMap.get('filterDilogSearchFrom')}} - + MM/DD/YYYY @@ -84,7 +85,7 @@ - {{this.languageService.lMap.get('filterDilogSearchTo')}} - + MM/DD/YYYY @@ -93,11 +94,11 @@ - Intervall + Intervall Pakete mit Intervall > ein Jahr - Zeige nur Pakete mit Intervall > 1 Jahr! + Zeige nur Pakete mit Intervall > 1 Jahr! diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.ts b/frontend/src/app/filter-dialog/filter-dialog.component.ts index 13feb1e..8898f19 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.ts +++ b/frontend/src/app/filter-dialog/filter-dialog.component.ts @@ -64,8 +64,19 @@ export class FilterDialogComponent implements OnInit { public prevFilterDateTo: Date; public prevIntervallFilter: boolean; + + public TextEnabled: boolean = false; + public SgEnabled: boolean = false; + public StateEnabled: boolean = false; + public ContractEnabled: boolean = false; + public FiltersSgEnabled: boolean = false; + public PaketTypeEnabled: boolean = false; + public DateEnabled: boolean = false; + public IntervallEnabled: boolean = false; + public filterObj; + /** * The constructor injects required Dependencies and sets default values for logic and ui * @param languageService representation of the LanguageService @@ -102,9 +113,11 @@ export class FilterDialogComponent implements OnInit { console.log("\nPREVSUPPORTGROUPSFILTER") console.log(filter); this.prevFiltersSg = filter.criteria; + this.FiltersSgEnabled = false; } if(filter.column == "State"){ + this.StateEnabled = true; console.log("\nStatesfilter prev") console.log(filter); if(this.languageService.language == "DE"){ @@ -117,6 +130,7 @@ export class FilterDialogComponent implements OnInit { } if(filter.column == "Contract"){ + this.ContractEnabled = true; //console.log(filter); for (const crit of filter.criteria) { this.prevFiltersContract.push(this.dataService.getContractName(crit)); @@ -124,27 +138,30 @@ export class FilterDialogComponent implements OnInit { //this.prevFiltersContract = filter.criteria; } - if(filter.column == "PackageType"){ - //console.log("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"); - //console.log(this.dataService.getPaketTypes()); - for (const crit of filter.criteria) { - //console.log(crit); - this.prevFiltersPaketType.push(this.dataService.getPaketTypeNameByID(crit)); - } - //console.log(this.prevFiltersPaketType); - //this.prevFiltersPaketType = filter.criteria; - } + // if(filter.column == "PackageType"){ + // //console.log("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"); + // //console.log(this.dataService.getPaketTypes()); + // for (const crit of filter.criteria) { + // //console.log(crit); + // this.prevFiltersPaketType.push(this.dataService.getPaketTypeNameByID(crit)); + // } + // //console.log(this.prevFiltersPaketType); + // //this.prevFiltersPaketType = filter.criteria; + // } if(filter.column == "D2"){ + this.DateEnabled = true; this.filterStartDate = filter.criteria[0]; this.filterEndDate = filter.criteria[1]; } if(filter.column == "ResourceName"){ + this.TextEnabled = true; this.criteria = filter.criteria[0]; } if(filter.column == "ASF_WI_HighestIntervall"){ + this.IntervallEnabled = true; this.intervallFilter = true; } } @@ -194,8 +211,12 @@ export class FilterDialogComponent implements OnInit { this.supportGroupsFilter = [...new Set(this.supportGroupsFilter)]; break; case 'state': - // console.log("\nEvent DATA") - // console.log(event); + if(event.data[0]){ + this.StateEnabled = true; + }else{ + this.StateEnabled = false; + } + this.statesFilter = []; if(this.languageService.language == 'DE'){ // console.log(event.data); @@ -215,14 +236,17 @@ export class FilterDialogComponent implements OnInit { } } this.statesFilter = [...new Set(this.statesFilter)]; - // if(event.data.length() == 0){ - // this.statesFilter = []; - // } + // console.log("\nRESULT Statesfilter"); // console.log(this.statesFilter); break; case 'contract': + if(event.data[0]){ + this.ContractEnabled = true; + }else{ + this.ContractEnabled = false; + } //this.contractsFilter = event.data; this.contractsFilter = []; //console.log(event.data); @@ -235,24 +259,35 @@ export class FilterDialogComponent implements OnInit { //this.contractsFilter = [...new Set(this.contractsFilter)]; //console.log(this.contractsFilter); break; - case 'paketType': - //this.paketTypesFilter = event.data; - this.paketTypesFilter = []; - //console.log(event.data); - for (const paketType of event.data) { - if(this.dataService.getPaketTypeIdByName(paketType)){ - this.paketTypesFilter.push(this.dataService.getPaketTypeIdByName(paketType)); - } + // case 'paketType': + // //this.paketTypesFilter = event.data; + // this.paketTypesFilter = []; + // //console.log(event.data); + // for (const paketType of event.data) { + // if(this.dataService.getPaketTypeIdByName(paketType)){ + // this.paketTypesFilter.push(this.dataService.getPaketTypeIdByName(paketType)); + // } - } - // this.paketTypesFilter = [...new Set(this.paketTypesFilter)]; - //console.log(this.paketTypesFilter); - break; + // } + // // this.paketTypesFilter = [...new Set(this.paketTypesFilter)]; + // //console.log(this.paketTypesFilter); + // break; default: break; } } + public onDateSelect(){ + console.log("################################") + if(this.filterStartDate && this.filterEndDate){ + this.DateEnabled = true; + }else{ + this.DateEnabled = false; + } + } + + + /** * The function mapFilter builds a filterElement out of all the selected filters, delivers it back and closes the dialog */ diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css index 4801ff6..fad4302 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.css +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.css @@ -136,6 +136,13 @@ background-color: #ef6c00; } +.dot-badge { + background-color: #00a79d; + color: #00a79d; + width: 15px; /* Breite des Punkts */ + height: 15px; /* Höhe des Punkts */ + border-radius: 50%; /* Rundung des Punkts */ +} /* ::ng-deep .mat-calendar{ background: white; diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 008bb4e..47532dc 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -61,9 +61,11 @@
- + +