diff --git a/frontend/angular.json b/frontend/angular.json index a377bf2..152aaf5 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -27,7 +27,7 @@ ], "styles": [ "src/styles.css", - "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", + "src/theme.scss", "./node_modules/@syncfusion/ej2-material-theme/styles/material.css" ], "scripts" :["./node_modules/jquery/dist/jquery.min.js"] diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts index 119d113..44d32e8 100644 --- a/frontend/src/app/data.service.ts +++ b/frontend/src/app/data.service.ts @@ -281,7 +281,6 @@ export class DataService { public async updateStatePerChange(change: any){ const promise = new Promise(resolve=>{ let obj = {changeNr : change.changeNr, currentState : change.currentState, nextState : change.nextState}; - console.log("###############"+change.changeNr); let stringyfiedData = JSON.stringify(obj); let dataJson = JSON.parse(stringyfiedData) as typeof stringyfiedData; // console.log(dataJson); diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.html b/frontend/src/app/filter-dialog/filter-dialog.component.html index 39e2eef..52eab30 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.html +++ b/frontend/src/app/filter-dialog/filter-dialog.component.html @@ -1,7 +1,94 @@
-

{{this.languageService.lMap.get('filterDialogShortDesc')}}

- +

{{this.languageService.lMap.get('filterDialogHeading')}}

+ + + + {{this.languageService.lMap.get('filterDialogShortDesc')}} + {{this.languageService.lMap.get('filterDialogShortDescText')}} + + + {{this.languageService.lMap.get('filterDilogSearchText')}} + + + + + + + {{this.languageService.lMap.get('filterDilogSg')}} + {{this.languageService.lMap.get('filterDilogSgText')}} + + + + + + + + {{this.languageService.lMap.get('filterDilogState')}} + {{this.languageService.lMap.get('filterDilogStateText')}} + + + + + + + + {{this.languageService.lMap.get('filterDilogContract')}} + {{this.languageService.lMap.get('filterDilogContractText')}} + + + + + + + + {{this.languageService.lMap.get('filterDilogPaketType')}} + {{this.languageService.lMap.get('filterDilogPaketTypeText')}} + + + + + + + + {{this.languageService.lMap.get('filterDilogDate')}} + {{this.languageService.lMap.get('filterDilogDateText')}} + + + {{this.languageService.lMap.get('filterDilogSearchFrom')}} + + MM/DD/YYYY + + + + - + + {{this.languageService.lMap.get('filterDilogSearchTo')}} + + MM/DD/YYYY + + + + + + + +
- +
diff --git a/frontend/src/app/implementer-dialog/implementer-dialog.component.html b/frontend/src/app/implementer-dialog/implementer-dialog.component.html index 58c1db5..f2ccd70 100644 --- a/frontend/src/app/implementer-dialog/implementer-dialog.component.html +++ b/frontend/src/app/implementer-dialog/implementer-dialog.component.html @@ -11,7 +11,7 @@ - + diff --git a/frontend/src/app/implementer-dialog/implementer-dialog.component.ts b/frontend/src/app/implementer-dialog/implementer-dialog.component.ts index 06c9c7f..71f3df7 100644 --- a/frontend/src/app/implementer-dialog/implementer-dialog.component.ts +++ b/frontend/src/app/implementer-dialog/implementer-dialog.component.ts @@ -104,7 +104,7 @@ export class ImplementerDialogComponent implements OnInit { this._snackBar.open(msg+" : "+res.error.message, action, { horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, - panelClass: ['mat-primary'] + panelClass: ['red-snackbar'] }).onAction().subscribe(() => { console.log('The snackbar action was triggered!'); }); @@ -130,6 +130,7 @@ export class ImplementerDialogComponent implements OnInit { horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, duration: 5000, + panelClass: ['green-snackbar'] }); this.dialogRef.close(); } diff --git a/frontend/src/app/language.service.ts b/frontend/src/app/language.service.ts index bac1f1b..53292e4 100644 --- a/frontend/src/app/language.service.ts +++ b/frontend/src/app/language.service.ts @@ -98,12 +98,21 @@ export class LanguageService { this.deMap.set('stateDialogConfirm', 'Bestätigen'); this.enMap.set('stateDialogConfirm', 'Confirm'); - this.deMap.set('filterDialogShortDesc', 'Kurzbeschreibung* (Eingabe eines Textteiles filtert alle passenden Pakete)'); - this.deMap.set('filterDilogSg', 'Gewählte Supportgruppe in der Rolle Planender IH oder Kostenverantwortlicher (eine)'); - this.deMap.set('filterDilogState', 'Status (einer oder mehrere) des Pakets'); - this.deMap.set('filterDilogContract', 'Vertrag / Provider-Cluster (einen oder mehrere)'); - this.deMap.set('filterDilogPaketType', 'Paket-Typ (einen oder mehrere, exakte Eingabe)'); - this.deMap.set('filterDilogDate', 'Geplantes Start-Datum: Von / Bis'); + this.deMap.set('filterDialogHeading', 'Changes Filtern'); + this.enMap.set('filterDialogHeading', 'Filter Changes'); + + this.deMap.set('filterDialogShortDesc', 'Kurzbeschreibung'); + this.deMap.set('filterDialogShortDescText', 'Eingabe eines Textteiles filtert alle passenden Pakete'); + this.deMap.set('filterDilogSg', 'Support Gruppe'); + this.deMap.set('filterDilogSgText', 'In der Rolle Planender IH oder Kostenverantwortlicher (eine)'); + this.deMap.set('filterDilogState', 'Status'); + this.deMap.set('filterDilogStateText', '(einer oder mehrere) des Pakets'); + this.deMap.set('filterDilogContract', 'Vertrag'); + this.deMap.set('filterDilogContractText', 'Vertrag / Provider-Cluster (einen oder mehrere)'); + this.deMap.set('filterDilogPaketType', 'Paket-Typ'); + this.deMap.set('filterDilogPaketTypeText', 'einen oder mehrere, exakte Eingabe'); + this.deMap.set('filterDilogDate', 'Datum'); + this.deMap.set('filterDilogDateText', 'Geplantes Start-Datum: Von / Bis'); this.deMap.set('filterDilogSearchText', 'Text durchsuchen'); this.deMap.set('filterDialogSearchSg', 'Supportgruppe suchen & auswählen'); @@ -113,12 +122,18 @@ export class LanguageService { this.deMap.set('filterDilogSearchFrom', 'Von'); this.deMap.set('filterDilogSearchTo', 'Bis'); - this.enMap.set('filterDialogShortDesc', 'Short description* (entering a text part filters all matching packages)'); - this.enMap.set('filterDilogSg', 'Selected support group in the role of planning IH or cost manager (one)'); - this.enMap.set('filterDilogState', 'State (one or more) of the package'); - this.enMap.set('filterDilogContract', 'Contract / Provider cluster (one or more)'); - this.enMap.set('filterDilogPaketType', 'Package type (one or more, exact input)'); - this.enMap.set('filterDilogDate', 'Planned start date: From / To'); + this.enMap.set('filterDialogShortDesc', 'Short description'); + this.enMap.set('filterDialogShortDescText', 'entering a text part filters all matching packages'); + this.enMap.set('filterDilogSg', 'Support group'); + this.enMap.set('filterDilogSgText', 'in the role of planning IH or cost manager (one)'); + this.enMap.set('filterDilogState', 'State'); + this.enMap.set('filterDilogStateText', '(one or more) of the package'); + this.enMap.set('filterDilogContract', 'Contract'); + this.enMap.set('filterDilogContractText', 'Contract / provider cluster (one or more)'); + this.enMap.set('filterDilogPaketType', 'Package type'); + this.enMap.set('filterDilogPaketTypeText', 'one or more, exact input'); + this.enMap.set('filterDilogDate', 'Date'); + this.enMap.set('filterDilogDateText', 'Planned start date: from / to'); this.enMap.set('filterDilogSearchText', 'Text search'); this.enMap.set('filterDialogSearchSg', 'Search & select support group'); diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css index 9ade8bc..9c11cf7 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.css +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.css @@ -46,14 +46,15 @@ .filterButton{ margin-right: 0.5%; -} + } + /* ::ng-deep .mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-bar { background-color: #d56100; } ::ng-deep .mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-thumb { background-color: #d56100; -} +} */ /* .mat-button-toggle{ background-color: #306cee; @@ -66,18 +67,18 @@ } */ .mat-button-toggle-checked { - background-color: #d56100; + background-color: #ef6c00; } -::ng-deep .mat-calendar{ +/* ::ng-deep .mat-calendar{ background: white; -} +} */ -::ng-deep .mat-calendar-body-label{ +/* ::ng-deep .mat-calendar-body-label{ */ /* color: white; */ -} +/* } ::ng-deep .mat-calendar-cell-content{ color: #d56100; -} +} */ diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 6885c59..58febe6 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -59,7 +59,7 @@ -
diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index 19aab3c..c9704f1 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -441,9 +441,9 @@ export class NttGanttComponent implements OnInit { if(change.resourceId == selectedRescourceId){ this.dataService.updateApproval(change, 1).then((res: any)=>{ if(res.status == 200){ - this._snackBar.open("Genehmigung erfolgreich", 'Schließen', { horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition,panelClass: ['mat-primary']}); + this._snackBar.open("Genehmigung erfolgreich", 'Schließen', { horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, panelClass: ['green-snackbar']}); }else{ - this._snackBar.open(res.HttpErrorResponse.message, 'Schließen', {horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, panelClass: ['mat-primary']}); + this._snackBar.open(res.HttpErrorResponse.message, 'Schließen', {horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, panelClass: ['red-snackbar']}); } this.refreshData(); }); @@ -475,10 +475,10 @@ export class NttGanttComponent implements OnInit { if(change.resourceId == selectedRescourceId){ this.dataService.updateApproval(change, 2).then((res: any)=>{ if(res.status == 200){ - this._snackBar.open("Ablehnen erfolgreich", 'Schließen', {horizontalPosition: this.horizontalPosition,verticalPosition: this.verticalPosition,panelClass: ['mat-primary']}); + this._snackBar.open("Ablehnen erfolgreich", 'Schließen', {horizontalPosition: this.horizontalPosition,verticalPosition: this.verticalPosition, panelClass: ['green-snackbar']}); this.refreshData(); }else{ - this._snackBar.open(res.HttpErrorResponse.message, 'Schließen', {horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, panelClass: ['mat-primary']}); + this._snackBar.open(res.HttpErrorResponse.message, 'Schließen', {horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, panelClass: ['red-snackbar']}); } }); } diff --git a/frontend/src/app/state-dialog/state-dialog.component.html b/frontend/src/app/state-dialog/state-dialog.component.html index a7055dd..a9c7473 100644 --- a/frontend/src/app/state-dialog/state-dialog.component.html +++ b/frontend/src/app/state-dialog/state-dialog.component.html @@ -11,6 +11,6 @@ - + diff --git a/frontend/src/app/state-dialog/state-dialog.component.ts b/frontend/src/app/state-dialog/state-dialog.component.ts index f118a9d..2434e68 100644 --- a/frontend/src/app/state-dialog/state-dialog.component.ts +++ b/frontend/src/app/state-dialog/state-dialog.component.ts @@ -99,9 +99,13 @@ export class StateDialogComponent implements OnInit { this._snackBar.open(this.languageService.lMap.get('stateDialogSnackBarMessageFailiure') + res.error.message, this.languageService.lMap.get('stateDialogSnackBarActionFailiure'), { horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, - panelClass: ['mat-primary'] + panelClass: ['red-snackbar'], }); this.dialogRef.close("Failiure"); + // console.log(change + "----"+this.data.changes.get(this.data.changes.length); + // if(change == this.data.changes[this.data.changes.length]){ + // this.dialogRef.close("Failiure"); + // } } if(this.progress == 100){ @@ -113,6 +117,7 @@ export class StateDialogComponent implements OnInit { horizontalPosition: this.horizontalPosition, verticalPosition: this.verticalPosition, duration: 5000, + panelClass: ['green-snackbar'] }); this.dialogRef.close("Success"); } diff --git a/frontend/src/styles.css b/frontend/src/styles.css index 9fa0e4e..cb0d05a 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -14,3 +14,21 @@ @import '../node_modules/@syncfusion/ej2-treegrid/styles/material.css'; @import '../node_modules/@syncfusion/ej2-gantt/styles/material.css'; +.green-snackbar { + background: green!important; + color: white; +} +.green-snackbar button { + background-color: green!important; + color: white; + border: none; +} +.red-snackbar { + background: #F44336!important; + color: white!important; +} +.red-snackbar button { + background-color: #F44336; + color: white !important; + border: none; +} diff --git a/frontend/src/theme.scss b/frontend/src/theme.scss new file mode 100644 index 0000000..b918d61 --- /dev/null +++ b/frontend/src/theme.scss @@ -0,0 +1,10 @@ +@import "../node_modules/@angular/material/theming"; +@include mat-core(); + +$my-primary: mat-palette($mat-orange, 800); +$my-accent: mat-palette($mat-orange, 500); +$my-warn: mat-palette($mat-red, 600); + +$my-theme: mat-light-theme($my-primary, $my-accent, $my-warn); + +@include angular-material-theme($my-theme);