diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 4d5d56e..24c7b6a 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -11,7 +11,7 @@ import { SortService } from '@syncfusion/ej2-angular-gantt'; import { FilterService } from '@syncfusion/ej2-angular-gantt'; import {MatFormFieldModule} from '@angular/material/form-field'; import {MatSelectModule} from '@angular/material/select'; -import { NttGanttComponent } from '../ntt-gantt/ntt-gantt.component'; +import { NttGanttComponent } from './ntt-gantt/ntt-gantt.component'; import {MatDatepickerModule} from '@angular/material/datepicker'; import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { MatNativeDateModule } from '@angular/material/core'; diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.html b/frontend/src/app/filter-dialog/filter-dialog.component.html index 40a8427..a91de1e 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.html +++ b/frontend/src/app/filter-dialog/filter-dialog.component.html @@ -1,10 +1,10 @@ -

{{filterLabels[0]}}

+

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

- {{filterLabels[6]}} + {{this.languageService.lMap.get('filterDilogSearchText')}} -

{{filterLabels[1]}}

+

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

-

{{filterLabels[2]}}

+

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

-

{{filterLabels[3]}}

+

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

-

{{filterLabels[4]}}

+

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

-

{{filterLabels[5]}}

+

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

- {{this.filterLabels[11]}} + {{this.languageService.lMap.get('filterDilogSearchFrom')}} MM/DD/YYYY @@ -46,11 +46,11 @@ - - {{this.filterLabels[12]}} + {{this.languageService.lMap.get('filterDilogSearchTo')}} MM/DD/YYYY

- + diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.ts b/frontend/src/app/filter-dialog/filter-dialog.component.ts index ad8ccc6..3615265 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.ts +++ b/frontend/src/app/filter-dialog/filter-dialog.component.ts @@ -62,38 +62,6 @@ export class FilterDialogComponent implements OnInit { constructor(public languageService: LanguageService, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any, private dataService: DataService, private _snackBar: MatSnackBar) { //dialogRef.beforeClosed().subscribe(() => dialogRef.close(this.dataToReturn)); - this.filterLabels = []; - if(this.languageService.language == "DE"){ - this.filterLabels.push("Kurzbeschreibung* (Eingabe eines Textteiles filtert alle passenden Pakete)"); - this.filterLabels.push("Gewählte Supportgruppe in der Rolle Planender IH oder Kostenverantwortlicher (eine)"); - this.filterLabels.push("Status (einer oder mehrere) des Pakets"); - this.filterLabels.push("Vertrag / Provider-Cluster (einen oder mehrere)"); - this.filterLabels.push("Paket-Typ (einen oder mehrere, exakte Eingabe)"); - this.filterLabels.push("Geplantes Start-Datum: Von / Bis"); - - this.filterLabels.push("Text durchsuchen"); - this.filterLabels.push("Supportgruppe suchen & auswählen"); - this.filterLabels.push("Status suchen & auswählen"); - this.filterLabels.push("Vertrag suchen & auswählen"); - this.filterLabels.push("Paket-Typ suchen & auswählen"); - this.filterLabels.push("Von"); - this.filterLabels.push("Bis"); - }else{ - this.filterLabels.push("Short description* (entering a text part filters all matching packages)"); - this.filterLabels.push("Selected support group in the role of planning IH or cost manager (one)"); - this.filterLabels.push("State (one or more) of the package"); - this.filterLabels.push("Contract / Provider cluster (one or more)"); - this.filterLabels.push("Package type (one or more, exact input)"); - this.filterLabels.push("Planned start date: From / To"); - - this.filterLabels.push("Text search"); - this.filterLabels.push("Search & select support group"); - this.filterLabels.push("Search & select status"); - this.filterLabels.push("Search & select contract"); - this.filterLabels.push("Search & select package type"); - this.filterLabels.push("From"); - this.filterLabels.push("Until"); - } } ngOnInit(): void { diff --git a/frontend/src/app/implementer-dialog/implementer-dialog.component.html b/frontend/src/app/implementer-dialog/implementer-dialog.component.html index 59a08c4..58c1db5 100644 --- a/frontend/src/app/implementer-dialog/implementer-dialog.component.html +++ b/frontend/src/app/implementer-dialog/implementer-dialog.component.html @@ -1,6 +1,6 @@ -

{{this.labels[0]}}

+

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

- {{this.labels[1]}} + {{this.languageService.lMap.get('implementerDialogLabel')}} {{implementer.viewValue}} @@ -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 9e0c515..84153c2 100644 --- a/frontend/src/app/implementer-dialog/implementer-dialog.component.ts +++ b/frontend/src/app/implementer-dialog/implementer-dialog.component.ts @@ -42,18 +42,6 @@ export class ImplementerDialogComponent implements OnInit { this.diasbled = false; this.selectedValue = -1; this.possibleImplementers = []; - this.labels = []; - if(this.languageService.language == 'DE'){ - this.labels.push("Implementer Eintragen"); - this.labels.push("Implementer auswählen"); - this.labels.push("Abbrechen"); - this.labels.push("Bestätigen"); - }else{ - this.labels.push("Enter Implementer"); - this.labels.push("Select Implementer"); - this.labels.push("Cancel"); - this.labels.push("Confirm"); - } } /** diff --git a/frontend/src/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css similarity index 100% rename from frontend/src/ntt-gantt/ntt-gantt.component.css rename to frontend/src/app/ntt-gantt/ntt-gantt.component.css diff --git a/frontend/src/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html similarity index 100% rename from frontend/src/ntt-gantt/ntt-gantt.component.html rename to frontend/src/app/ntt-gantt/ntt-gantt.component.html diff --git a/frontend/src/ntt-gantt/ntt-gantt.component.spec.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.spec.ts similarity index 100% rename from frontend/src/ntt-gantt/ntt-gantt.component.spec.ts rename to frontend/src/app/ntt-gantt/ntt-gantt.component.spec.ts diff --git a/frontend/src/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts similarity index 98% rename from frontend/src/ntt-gantt/ntt-gantt.component.ts rename to frontend/src/app/ntt-gantt/ntt-gantt.component.ts index d8b1b9b..b05075b 100644 --- a/frontend/src/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -1,8 +1,8 @@ -import { LanguageService } from './../app/language.service'; -import { PlanTimeBarComponent } from './../app/plan-time-bar/plan-time-bar.component'; -import { FilterDialogComponent } from './../app/filter-dialog/filter-dialog.component'; -import { filteredData, editingData } from './../data'; -import { ImplementerDialogComponent } from './../app/implementer-dialog/implementer-dialog.component'; +import { LanguageService } from '../language.service'; +import { PlanTimeBarComponent } from '../plan-time-bar/plan-time-bar.component'; +import { FilterDialogComponent } from '../filter-dialog/filter-dialog.component'; +import { filteredData, editingData } from '../../data'; +import { ImplementerDialogComponent } from '../implementer-dialog/implementer-dialog.component'; import { Component, Inject, OnInit, ViewChild } from '@angular/core'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { GanttComponent } from '@syncfusion/ej2-angular-gantt'; @@ -318,6 +318,7 @@ export class NttGanttComponent implements OnInit { public languageChange(args: any){ this.languageService.languageChange(args.value), this.initLanguge(); + this.plantimeComponent.changeLanguage(); } /** diff --git a/frontend/src/app/plan-time-bar/plan-time-bar.component.ts b/frontend/src/app/plan-time-bar/plan-time-bar.component.ts index 3976cbe..bd98c9b 100644 --- a/frontend/src/app/plan-time-bar/plan-time-bar.component.ts +++ b/frontend/src/app/plan-time-bar/plan-time-bar.component.ts @@ -3,6 +3,7 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { GanttComponent } from '@syncfusion/ej2-angular-gantt'; import { MAT_DATE_FORMATS } from '@angular/material/core'; import * as moment from 'moment'; +import { LanguageService } from '../language.service'; export const MY_DATE_FORMATS = { parse: { @@ -45,16 +46,16 @@ export class PlanTimeBarComponent implements OnInit { public renderTimeGantt: boolean = false; public filterObj: any; - constructor(public dataService: DataService) {} + constructor(public languageService: LanguageService, public dataService: DataService) {} ngOnInit(): void { this.splitterSettings = this.inputData[0]; this.projectStartDate = this.inputData[1]; this.projectEndDate = this.inputData[2]; this.labelSettings = {taskLabel: '${taskData.planzeit}'}; - this.resources = [{resourceId: 1, resourceName: 'Planzeit Summen pro Woche'}]; + this.resources = [{resourceId: 1, resourceName: this.languageService.lMap.get('planTimesResource')}]; this.resourceFields = {id: 'resourceId', name: 'resourceName'}; - this.columns = [{ field: 'TaskName', headerText: 'Planzeit pro Woche', width: 250 }]; + this.columns = [{ field: 'TaskName', headerText: this.languageService.lMap.get('planTimesHeading'), width: 250 }]; this.fetchPlanTimes(); this.timelineSettings = { bottomTier: { @@ -124,5 +125,16 @@ export class PlanTimeBarComponent implements OnInit { } catch (error) {} } } + + public changeLanguage(){ + if(this.languageService.language == 'DE'){ + this.resources = [{resourceId: 1, resourceName: 'Planzeit Summen pro Woche'}]; + this.columns = [{ field: 'TaskName', headerText: 'Planzeiten pro Woche', width: 250 }];; + }else{ + this.resources = [{resourceId: 1, resourceName: 'Plantime Sum per Week'}]; + this.columns = [{ field: 'TaskName', headerText: 'Planzeit pro Woche', width: 250 }]; + } + this.fetchPlanTimes(); + } } diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 93f6f62..7c635a3 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -3,7 +3,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import {registerLicense} from '@syncfusion/ej2-base' import { AppModule } from './app/app.module'; import { environment } from './environments/environment'; -registerLicense("Mgo+DSMBaFt+QHJqVk1nQ1BBaV1CX2BZeVl1TWlceE4BCV5EYF5SRHBdQl1mSn5XcEVkXH0=;Mgo+DSMBPh8sVXJ1S0R+X1pDaV5HQmFJfFBmQmlad1R1c0U3HVdTRHRcQlthSX5WdUVnX39Xc3Y=;ORg4AjUWIQA/Gnt2VFhiQlJPcUBDWHxLflF1VWRTfFZ6cVJWESFaRnZdQV1lS35Tc0ZjXXlfcXVX;MjQ3MjE3NEAzMjMxMmUzMDJlMzBFaEtQQXlZRHpObnNVVWpaRXFlcmpVV1VxeTJsR1Eva2tKeE9KUUhjWjhJPQ==;MjQ3MjE3NUAzMjMxMmUzMDJlMzBialU5SlJFbDRnMHNnYitHSE5JNkQzNFdYdXluUXl6OXBoRk5uVTZRTnBRPQ==;NRAiBiAaIQQuGjN/V0d+Xk9HfVhdXGZWfFN0RnNedV14flBBcC0sT3RfQF5jT3xTdkBgWXtYcXNTRA==;MjQ3MjE3N0AzMjMxMmUzMDJlMzBXdnU5YjR3cHNpQlkrMHZNaWNKaE9VOUY0RkVMYjhQTGx5WVp6bGhVYUxRPQ==;MjQ3MjE3OEAzMjMxMmUzMDJlMzBhV09DN3NabFRmSWtkWGFmUDNmaXU1WGYyanhuRUJZci9pZ0VoTytBTkdrPQ==;Mgo+DSMBMAY9C3t2VFhiQlJPcUBDWHxLflF1VWRTfFZ6cVJWESFaRnZdQV1lS35Tc0ZjXXlceHRX;MjQ3MjE4MEAzMjMxMmUzMDJlMzBqcFdzc1ZRMFNQTVVZRms0eVZOejBvTUpnOG9tbXdlVUdlTFlUSjhFNTFZPQ==;MjQ3MjE4MUAzMjMxMmUzMDJlMzBPMHBQNW5ieGsyV21SVDNySktEbjdkWHhUYUJZN0xHdUZmWGhROTRJeWY0PQ==;MjQ3MjE4MkAzMjMxMmUzMDJlMzBXdnU5YjR3cHNpQlkrMHZNaWNKaE9VOUY0RkVMYjhQTGx5WVp6bGhVYUxRPQ=="); +registerLicense("Ngo9BigBOggjHTQxAR8/V1NGaF5cXmdCf1FpRmJGdld5fUVHYVZUTXxaS00DNHVRdkdgWXhcdHRQQmVdWEJ1X0s="); if (environment.production) { enableProdMode(); }