From 08520b8ed9ef0c97fc607d3c0a293ceae106f3f3 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Fri, 28 Jun 2024 10:11:02 +0200 Subject: [PATCH 1/4] language service legende --- frontend/src/app/language.service.ts | 55 +++++++++++-------- .../app/ntt-gantt/ntt-gantt.component.html | 20 +++---- 2 files changed, 43 insertions(+), 32 deletions(-) diff --git a/frontend/src/app/language.service.ts b/frontend/src/app/language.service.ts index 1c80910..b2de367 100644 --- a/frontend/src/app/language.service.ts +++ b/frontend/src/app/language.service.ts @@ -13,9 +13,9 @@ export class LanguageService { public language: string = 'DE'; public languages: string[] = ['DE', 'EN']; - public deMap : Map = new Map(); - public enMap : Map = new Map(); - public lMap : Map = new Map(); + public deMap: Map = new Map(); + public enMap: Map = new Map(); + public lMap: Map = new Map(); public deColumns: any[]; public enColumns: any[]; public dePlanTimeColumns: any[]; @@ -27,6 +27,17 @@ export class LanguageService { * The constructor sets all the language values and does the default mapping */ constructor() { + this.deMap.set('routeDraft', "Entwurf"); this.enMap.set('routeDraft', 'Draft'); + this.deMap.set('routeRFA', "Atorisierungsanforderung"); this.enMap.set('routeRFA', 'Request for Authorization'); + this.deMap.set('routePIP', "Planung in Bearbeitung"); this.enMap.set('routePIP', 'Planning in Progress'); + this.deMap.set('routeScheduled', "Geplant"); this.enMap.set('routeScheduled', 'Scheduled'); + this.deMap.set('routeCancelled', "Storniert"); this.enMap.set('routeCancelled', 'Cancelled'); + this.deMap.set('routeCFRR', "Fertiggestellt (Endüberprüfung Erforderlich)"); this.enMap.set('routeCFRR', 'Completed (final review required)'); + this.deMap.set('routeFRF', "Fertiggestellt (Endüberprüfung Abgeschlossen)"); this.enMap.set('routeFRF', 'Cimpleted (final review finished)'); + this.deMap.set('routeClosed', "Abgeschlossen"); this.enMap.set('routeClosed', 'Closed'); + this.deMap.set('routeRB', "Abgelehnt (Beginn)"); this.enMap.set('routeRB', 'Rejected (begin)'); + this.deMap.set('routeRE', "Abgelehnt (Ende)"); this.enMap.set('routeRE', 'Rejected (end)'); + this.deMap.set('detailButton', 'Details anzeigen'); this.enMap.set('detailButton', 'Show Details'); this.deMap.set('filterButton', 'Filter anwenden'); @@ -187,49 +198,49 @@ export class LanguageService { this.deMap.set('D4N', 'End Datum'); this.enMap.set('D4N', 'End Date'); - this.dePlanTimeResources = [{resourceId: 1, resourceName: 'Planzeit Summen pro Woche'}]; - this.dePlanTimeColumns = [{ field: 'TaskName', headerText: 'Planzeiten pro Woche', width: 250 }]; + this.dePlanTimeResources = [{ resourceId: 1, resourceName: 'Planzeit Summen pro Woche' }]; + this.dePlanTimeColumns = [{ field: 'TaskName', headerText: 'Planzeiten pro Woche', width: 250 }]; - this.enPlanTimeResources = [{resourceId: 1, resourceName: 'Plantime Sum per Week'}]; - this.enPlanTimeColumns = [{ field: 'TaskName', headerText: 'Planzeit pro Woche', width: 250 }]; + this.enPlanTimeResources = [{ resourceId: 1, resourceName: 'Plantime Sum per Week' }]; + this.enPlanTimeColumns = [{ field: 'TaskName', headerText: 'Planzeit pro Woche', width: 250 }]; this.deColumns = [ { field: 'TaskName', headerText: 'Kurzbeschreibung', width: 230 }, - { field: 'stateName', headerText: 'Status', width: 250}, + { field: 'stateName', headerText: 'Status', width: 250 }, { field: 'vertragName', headerText: 'Vertrag / Provider Cluster', width: 150 }, { field: 'supportGroup', headerText: 'Gewählte Support Gruppe' }, - { field: 'StartDate', headerText: 'Geplantes Start-Datum', format : {type:'date', format:'dd.MM.yyyy'}}, + { field: 'StartDate', headerText: 'Geplantes Start-Datum', format: { type: 'date', format: 'dd.MM.yyyy' } }, { field: 'plantime', headerText: 'Planzeit in H', width: 100 }, { field: 'changeNr', headerText: 'Change Nummer', width: 140 } ]; this.enColumns = [ { field: 'TaskName', headerText: 'Summary', width: 230 }, - { field: 'stateName', headerText: 'State', width: 250}, + { field: 'stateName', headerText: 'State', width: 250 }, { field: 'vertragName', headerText: 'Contract / Provider Cluster', width: 150 }, { field: 'supportGroup', headerText: 'Selected Support Group' }, - { field: 'StartDate', headerText: 'Planned Start-Date', format : {type:'date', format:'dd.MM.yyyy'}}, + { field: 'StartDate', headerText: 'Planned Start-Date', format: { type: 'date', format: 'dd.MM.yyyy' } }, { field: 'plantime', headerText: 'Plantime in h', width: 100 }, { field: 'changeNr', headerText: 'Change Number', width: 140 } - ]; + ]; - if(navigator.language == 'de-DE'){ + if (navigator.language == 'de-DE') { this.language = 'DE'; this.lMap = this.deMap; - }else{ + } else { this.language = 'EN'; this.lMap = this.enMap; } - } + } /** * The function languageChange set the language map to the german or english map depending on the selected language * it is triggered by an language change from the NttGanttComponent * @param args args with the selected language */ - public languageChange(args: any){ - if(this.language == 'DE'){ + public languageChange(args: any) { + if (this.language == 'DE') { this.lMap = this.deMap; - }else{ + } else { this.language = 'EN'; this.lMap = this.enMap; } @@ -239,12 +250,12 @@ export class LanguageService { * The function getColumns delivers the gannt chart columns for the NttGanttComponent in the selected language * it is triggered by an language change from the NttGanttComponent */ - public getColumns(){ - if(this.language == 'DE'){ + public getColumns() { + if (this.language == 'DE') { return this.deColumns; - }else{ + } else { this.language = 'EN'; - return this.enColumns; + return this.enColumns; } } } diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 5ae9a0d..58c391e 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -60,43 +60,43 @@
- Draft + {{languageService.lMap.get('routeDraft')}}
- Request for Authorization + {{languageService.lMap.get('routeRFA')}}
- Planning in Progress + {{languageService.lMap.get('routePIP')}}
- Scheduled + {{languageService.lMap.get('routeScheduled')}}
- Cancelled + {{languageService.lMap.get('routeCancelled')}}
- Completed (final review required) + {{languageService.lMap.get('routeCFRR')}}
- Completed (final review finished) + {{languageService.lMap.get('routeFRF')}}
- Closed + {{languageService.lMap.get('routeClosed')}}
- Rejected (begin) + {{languageService.lMap.get('routeRB')}}
- Rejected (end) + {{languageService.lMap.get('routeRE')}}
From 3c9d1ae3ab91252ab84b04f271ada2fcec4cae25 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Mon, 1 Jul 2024 09:31:44 +0200 Subject: [PATCH 2/4] css styling --- frontend/src/app/language.service.ts | 2 +- .../src/app/ntt-gantt/ntt-gantt.component.css | 8 +- .../app/ntt-gantt/ntt-gantt.component.html | 86 ++++++++++--------- 3 files changed, 51 insertions(+), 45 deletions(-) diff --git a/frontend/src/app/language.service.ts b/frontend/src/app/language.service.ts index b2de367..8f4715b 100644 --- a/frontend/src/app/language.service.ts +++ b/frontend/src/app/language.service.ts @@ -33,7 +33,7 @@ export class LanguageService { this.deMap.set('routeScheduled', "Geplant"); this.enMap.set('routeScheduled', 'Scheduled'); this.deMap.set('routeCancelled', "Storniert"); this.enMap.set('routeCancelled', 'Cancelled'); this.deMap.set('routeCFRR', "Fertiggestellt (Endüberprüfung Erforderlich)"); this.enMap.set('routeCFRR', 'Completed (final review required)'); - this.deMap.set('routeFRF', "Fertiggestellt (Endüberprüfung Abgeschlossen)"); this.enMap.set('routeFRF', 'Cimpleted (final review finished)'); + this.deMap.set('routeFRF', "Fertiggestellt (Endüberprüfung Abgeschlossen)"); this.enMap.set('routeFRF', 'Completed (final review finished)'); this.deMap.set('routeClosed', "Abgeschlossen"); this.enMap.set('routeClosed', 'Closed'); this.deMap.set('routeRB', "Abgelehnt (Beginn)"); this.enMap.set('routeRB', 'Rejected (begin)'); this.deMap.set('routeRE', "Abgelehnt (Ende)"); this.enMap.set('routeRE', 'Rejected (end)'); diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css index 0377c30..70e9d1c 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.css +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.css @@ -458,11 +458,12 @@ width: 100%; font-family: Arial, sans-serif; font-size: 13px; - display: flex; - flex-direction: column; gap: 4px; background-color: rgb(210, 217, 224); padding: 10px; + display: flex; + flex-wrap: wrap; + justify-content: center; } .inner-legend { @@ -473,10 +474,13 @@ border-radius: 50px; background-color: aliceblue; width: fit-content; + white-space: nowrap; } .route { height: 12px; width: 12px; + min-width: 12px; + min-height: 12px; transform: rotate(45deg); } \ No newline at end of file diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 58c391e..90d2991 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -57,48 +57,7 @@ -
-
-
- {{languageService.lMap.get('routeDraft')}} -
-
-
- {{languageService.lMap.get('routeRFA')}} -
-
-
- {{languageService.lMap.get('routePIP')}} -
-
-
- {{languageService.lMap.get('routeScheduled')}} -
-
-
- {{languageService.lMap.get('routeCancelled')}} -
-
-
- {{languageService.lMap.get('routeCFRR')}} -
-
-
- {{languageService.lMap.get('routeFRF')}} -
-
-
- {{languageService.lMap.get('routeClosed')}} -
-
-
- {{languageService.lMap.get('routeRB')}} -
-
-
- {{languageService.lMap.get('routeRE')}} -
-
+ @@ -274,6 +233,49 @@ [pageIndex]="0" aria-label="Seite auswählen"> +
+
+
+ {{languageService.lMap.get('routeDraft')}} +
+
+
+ {{languageService.lMap.get('routeRFA')}} +
+
+
+ {{languageService.lMap.get('routePIP')}} +
+
+
+ {{languageService.lMap.get('routeScheduled')}} +
+
+
+ {{languageService.lMap.get('routeCancelled')}} +
+
+
+ {{languageService.lMap.get('routeCFRR')}} +
+
+
+ {{languageService.lMap.get('routeFRF')}} +
+
+
+ {{languageService.lMap.get('routeClosed')}} +
+
+
+ {{languageService.lMap.get('routeRB')}} +
+
+
+ {{languageService.lMap.get('routeRE')}} +
+
+ error From 08c308ed63072855df4707ac90d684a87139b109 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Mon, 1 Jul 2024 09:37:29 +0200 Subject: [PATCH 3/4] decreased border-radius --- frontend/src/app/ntt-gantt/ntt-gantt.component.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css index 70e9d1c..3681d4f 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.css +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.css @@ -262,7 +262,7 @@ /* Semi-transparent background */ border: solid rgba(0, 0, 0, 0.1) 1px; border-bottom: none; - border-radius: 10px 10px 0px 0px; + border-radius: 5px 5px 0px 0px; height: 60px; padding-left: 10px; padding-right: 15px; From af1535c3544c094a0557152cb9a53a6f2a3e9827 Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Mon, 22 Jul 2024 15:47:05 +0200 Subject: [PATCH 4/4] color changes --- frontend/src/app/ntt-gantt/ntt-gantt.component.html | 6 +++--- frontend/src/app/ntt-gantt/ntt-gantt.component.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 90d2991..620e5bd 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -243,7 +243,7 @@ {{languageService.lMap.get('routeRFA')}}
-
+
{{languageService.lMap.get('routePIP')}}
@@ -251,7 +251,7 @@ {{languageService.lMap.get('routeScheduled')}}
-
+
{{languageService.lMap.get('routeCancelled')}}
@@ -263,7 +263,7 @@ {{languageService.lMap.get('routeFRF')}}
-
+
{{languageService.lMap.get('routeClosed')}}
diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index 141f8ad..c14dc4f 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -900,11 +900,11 @@ export class NttGanttComponent implements OnInit { // console.log("orange"); } if (args.data.taskData.resources[0].state == 3) { - args.milestoneColor = "#ff9248"; //light orange + args.milestoneColor = "#ffc006"; //light orange // console.log("light orange"); } if (args.data.taskData.resources[0].state >= 6) { - args.milestoneColor = "#ffff00"; //yellow + args.milestoneColor = "#000000"; //yellow // console.log("yellow"); } if (args.data.taskData.resources[0].state == 7) {