diff --git a/src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.ts b/src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.ts index da4fbe82a..60740bb4d 100644 --- a/src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.ts +++ b/src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.ts @@ -4,6 +4,9 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { DatePipe } from '@angular/common'; +/** Custom Services */ +import { SettingsService } from 'app/settings/settings.service'; + /** * Client Family Members Dialog */ @@ -27,11 +30,13 @@ export class ClientFamilyMemberDialogComponent implements OnInit { * @param {FormBuilder} formBuilder Form Builder * @param {DatePipe} datePipe Date Pipe * @param {any} data Dialog Data + * @param {SettingsService} settingsService Setting service */ constructor(public dialogRef: MatDialogRef, private formBuilder: FormBuilder, private datePipe: DatePipe, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any, + private settingsService: SettingsService) { } ngOnInit() { this.createFamilyMemberForm(); @@ -75,8 +80,8 @@ export class ClientFamilyMemberDialogComponent implements OnInit { * Returns Formatted Family Member */ get familyMember() { - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; // TODO: Update once language and date settings are setup const familyMember = { ...this.familyMemberForm.value, diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts b/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts index 006ea8602..b2acd4514 100644 --- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts +++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.ts @@ -3,6 +3,9 @@ import { Component, OnInit, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms'; import { DatePipe } from '@angular/common'; +/** Custom Services */ +import { SettingsService } from 'app/settings/settings.service'; + /** * Create Client Component */ @@ -45,9 +48,11 @@ export class ClientGeneralStepComponent implements OnInit { /** * @param {FormBuilder} formBuilder Form Builder * @param {DatePipe} datePipe Date Pipe + * @param {SettingsService} settingsService Setting service */ constructor(private formBuilder: FormBuilder, - private datePipe: DatePipe) { + private datePipe: DatePipe, + private settingsService: SettingsService) { this.setClientForm(); } @@ -140,8 +145,8 @@ export class ClientGeneralStepComponent implements OnInit { */ get clientGeneralDetails() { const generalDetails = this.createClientForm.value; - const dateFormat = 'dd MMMM yyyy'; - const locale = 'en'; + const dateFormat = this.settingsService.dateFormat; + const locale = this.settingsService.language.code; // TODO: Update once language and date settings are setup for (const key in generalDetails) { if (generalDetails[key] === '' || key === 'addSavings') { diff --git a/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.ts b/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.ts index 337cb3889..c80f37b5d 100644 --- a/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.ts +++ b/src/app/clients/clients-view/charges/client-pay-charges/client-pay-charges.component.ts @@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common'; /** Custom Services. */ import { ClientsService } from 'app/clients/clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Client Pay Charge component. @@ -30,13 +31,15 @@ export class ClientPayChargesComponent implements OnInit { * @param {FormBuilder} formBuilder Form Builder. * @param {ActivatedRoute} route Activated Route. * @param {Router} router Router for navigation. + * @param {SettingsService} settingsService Setting service */ constructor( private clientsService: ClientsService, private formBuilder: FormBuilder, private route: ActivatedRoute, private router: Router, - private datePipe: DatePipe + private datePipe: DatePipe, + private settingsService: SettingsService ) { this.route.data.subscribe((data: { transactionData: any }) => { this.transactionData = data.transactionData; @@ -67,7 +70,7 @@ export class ClientPayChargesComponent implements OnInit { transactionDate: this.datePipe.transform(transactionDate, dateFormat) }); const transactions = this.transactionForm.value; - transactions.locale = 'en'; + transactions.locale = this.settingsService.language.code; transactions.dateFormat = dateFormat; this.clientsService.payClientCharge(this.transactionData.clientId, this.transactionData.id, transactions).subscribe(() => { this.router.navigate(['../', 'general']); diff --git a/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts b/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts index 0f42a484e..f0111394d 100644 --- a/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts +++ b/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { ClientsService } from 'app/clients/clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Activate Client Component @@ -32,12 +33,14 @@ export class ActivateClientComponent implements OnInit { * @param {DatePipe} datePipe Date Pipe * @param {ActivatedRoute} route Activated Route * @param {Router} router Router + * @param {SettingsService} settingsService Settings Service */ constructor(private formBuilder: FormBuilder, private clientsService: ClientsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.clientId = this.route.parent.snapshot.params['clientId']; } @@ -63,8 +66,8 @@ export class ActivateClientComponent implements OnInit { */ submit() { // TODO: Update once language and date settings are setup - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const prevActivationDate: Date = this.activateClientForm.value.activationDate; this.activateClientForm.patchValue({ activationDate: this.datePipe.transform(prevActivationDate, dateFormat), diff --git a/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.ts b/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.ts index e5c8772da..33b294165 100644 --- a/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.ts +++ b/src/app/clients/clients-view/client-actions/add-client-charge/add-client-charge.component.ts @@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common'; /** Custom Services */ import { ClientsService } from 'app/clients/clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Add Clients Charge component. @@ -37,13 +38,15 @@ export class AddClientChargeComponent implements OnInit { * @param {Router} router Router * @param {DatePipe} datePipe Date Pipe * @param {ClientsService} clientsService Clients Service + * @param {SettingsService} settingsService Setting service */ constructor( private formBuilder: FormBuilder, private route: ActivatedRoute, private router: Router, private datePipe: DatePipe, - private clientsService: ClientsService + private clientsService: ClientsService, + private settingsService: SettingsService ) { this.route.data.subscribe((data: { clientActionData: any }) => { this.clientChargeOptions = data.clientActionData.chargeOptions; @@ -111,7 +114,7 @@ export class AddClientChargeComponent implements OnInit { */ submit() { const clientCharge = this.clientChargeForm.value; - clientCharge.locale = 'en'; + clientCharge.locale = this.settingsService.language.code; if (!clientCharge.feeInterval) { clientCharge.feeInterval = this.chargeDetails.feeInterval; } @@ -124,7 +127,7 @@ export class AddClientChargeComponent implements OnInit { clientCharge.feeOnMonthDay = this.datePipe.transform(prevDate, monthDayFormat); } } else { - const dateFormat = 'yyyy-MM-dd'; + const dateFormat = this.settingsService.dateFormat; clientCharge.dateFormat = dateFormat; if (clientCharge.dueDate) { const prevDate = this.clientChargeForm.value.dueDate; diff --git a/src/app/clients/clients-view/client-actions/close-client/close-client.component.ts b/src/app/clients/clients-view/client-actions/close-client/close-client.component.ts index 826d4bde1..10fe2b300 100644 --- a/src/app/clients/clients-view/client-actions/close-client/close-client.component.ts +++ b/src/app/clients/clients-view/client-actions/close-client/close-client.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { ClientsService } from 'app/clients/clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Close Client Component @@ -34,12 +35,14 @@ export class CloseClientComponent implements OnInit { * @param {DatePipe} datePipe Date Pipe * @param {ActivatedRoute} route Activated Route * @param {Router} router Router + * @param {SettingsService} settingsService Setting service */ constructor(private formBuilder: FormBuilder, private clientsService: ClientsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.route.data.subscribe((data: { clientActionData: any }) => { this.closureData = data.clientActionData.narrations; }); @@ -65,8 +68,8 @@ export class CloseClientComponent implements OnInit { */ submit() { // TODO: Update once language and date settings are setup - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const prevClosedDate: Date = this.closeClientForm.value.closureDate; this.closeClientForm.patchValue({ closureDate: this.datePipe.transform(prevClosedDate, dateFormat), diff --git a/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.ts b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.ts index 6f9abd0ff..f9e8c7289 100644 --- a/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.ts +++ b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { ClientsService } from 'app/clients/clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Reactivate Client Component @@ -32,12 +33,14 @@ export class ReactivateClientComponent implements OnInit { * @param {DatePipe} datePipe Date Pipe * @param {ActivatedRoute} route Activated Route * @param {Router} router Router + * @param {SettingsService} settingsService Setting service */ constructor(private formBuilder: FormBuilder, private clientsService: ClientsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.clientId = this.route.parent.snapshot.params['clientId']; } @@ -63,8 +66,8 @@ export class ReactivateClientComponent implements OnInit { */ submit() { // TODO: Update once language and date settings are setup - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const prevReactivationDate: Date = this.reactivateClientForm.value.reactivationDate; this.reactivateClientForm.patchValue({ reactivationDate: this.datePipe.transform(prevReactivationDate, dateFormat), diff --git a/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.ts b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.ts index e5d40dd92..e8fc6279c 100644 --- a/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.ts +++ b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { ClientsService } from 'app/clients/clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Reject Client Component @@ -34,12 +35,14 @@ export class RejectClientComponent implements OnInit { * @param {DatePipe} datePipe Date Pipe * @param {ActivatedRoute} route Activated Route * @param {Router} router Router + * @param {SettingsService} settingsService Setting service */ constructor(private formBuilder: FormBuilder, private clientsService: ClientsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.route.data.subscribe((data: { clientActionData: any }) => { this.rejectionData = data.clientActionData.narrations; }); @@ -65,8 +68,8 @@ export class RejectClientComponent implements OnInit { */ submit() { // TODO: Update once language and date settings are setup - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const prevRejectedDate: Date = this.rejectClientForm.value.rejectionDate; this.rejectClientForm.patchValue({ rejectionDate: this.datePipe.transform(prevRejectedDate, dateFormat), diff --git a/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.ts b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.ts index d6f7b6558..e26efd0b8 100644 --- a/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.ts +++ b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { ClientsService } from 'app/clients/clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Transfer Client Component @@ -34,12 +35,14 @@ export class TransferClientComponent implements OnInit { * @param {DatePipe} datePipe Date Pipe * @param {ActivatedRoute} route Activated Route * @param {Router} router Router + * @param {SettingsService} settingsService Setting service */ constructor(private formBuilder: FormBuilder, private clientsService: ClientsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.route.data.subscribe((data: { clientActionData: any }) => { this.officeData = data.clientActionData; }); @@ -66,8 +69,8 @@ export class TransferClientComponent implements OnInit { */ submit() { // TODO: Update once language and date settings are setup - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const prevClosedDate: Date = this.transferClientForm.value.transferDate; this.transferClientForm.patchValue({ transferDate: this.datePipe.transform(prevClosedDate, dateFormat), diff --git a/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.ts b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.ts index a54031437..9448413f7 100644 --- a/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.ts +++ b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { ClientsService } from 'app/clients/clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Undo Client Rejection Component @@ -37,7 +38,8 @@ export class UndoClientRejectionComponent implements OnInit { private clientsService: ClientsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.clientId = this.route.parent.snapshot.params['clientId']; } @@ -63,8 +65,8 @@ export class UndoClientRejectionComponent implements OnInit { */ submit() { // TODO: Update once language and date settings are setup - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const prevReopenedDate: Date = this.undoClientRejectionForm.value.reopenedDate; this.undoClientRejectionForm.patchValue({ reopenedDate: this.datePipe.transform(prevReopenedDate, dateFormat), diff --git a/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.ts b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.ts index e85167db2..ab5819189 100644 --- a/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.ts +++ b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { ClientsService } from 'app/clients/clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Withdraw Client Component @@ -34,12 +35,14 @@ export class WithdrawClientComponent implements OnInit { * @param {DatePipe} datePipe Date Pipe * @param {ActivatedRoute} route Activated Route * @param {Router} router Router + * @param {SettingsService} settingsService Setting service */ constructor(private formBuilder: FormBuilder, private clientsService: ClientsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.route.data.subscribe((data: { clientActionData: any }) => { this.withdrawalData = data.clientActionData.narrations; }); @@ -65,8 +68,8 @@ export class WithdrawClientComponent implements OnInit { */ submit() { // TODO: Update once language and date settings are setup - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const prevWithdrawalDate: Date = this.withdrawClientForm.value.withdrawalDate; this.withdrawClientForm.patchValue({ withdrawalDate: this.datePipe.transform(prevWithdrawalDate, dateFormat), diff --git a/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.ts b/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.ts index a72d5c56c..d1d1ede2b 100644 --- a/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.ts +++ b/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.ts @@ -14,6 +14,7 @@ import { DeleteDialogComponent } from '../../../../shared/delete-dialog/delete-d /** Custom Services */ import { ClientsService } from '../../../clients.service'; +import { SettingsService } from 'app/settings/settings.service'; @Component({ selector: 'mifosx-multi-row', @@ -32,7 +33,8 @@ export class MultiRowComponent implements OnInit, OnChanges { constructor(private route: ActivatedRoute, private datePipe: DatePipe, private clientsService: ClientsService, - private dialog: MatDialog) { + private dialog: MatDialog, + private settingsService: SettingsService) { this.clientId = this.route.parent.parent.snapshot.paramMap.get('clientId'); } @@ -51,7 +53,7 @@ export class MultiRowComponent implements OnInit, OnChanges { add() { let dataTableEntryObject: any = { - locale: 'en' + locale: this.settingsService.language.code }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { diff --git a/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.ts b/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.ts index e49849851..6bc9ea376 100644 --- a/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.ts +++ b/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.ts @@ -13,7 +13,7 @@ import { DeleteDialogComponent } from '../../../../shared/delete-dialog/delete-d /** Custom Services */ import { ClientsService } from '../../../clients.service'; - +import { SettingsService } from 'app/settings/settings.service'; @Component({ @@ -30,7 +30,8 @@ export class SingleRowComponent implements OnInit { constructor(private route: ActivatedRoute, private datePipe: DatePipe, private dialog: MatDialog, - private clientsService: ClientsService) { + private clientsService: ClientsService, + private settingsService: SettingsService) { this.clientId = this.route.parent.parent.snapshot.paramMap.get('clientId'); } @@ -42,7 +43,7 @@ export class SingleRowComponent implements OnInit { add() { let dataTableEntryObject: any = { - locale: 'en' + locale: this.settingsService.language.code }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { @@ -72,7 +73,7 @@ export class SingleRowComponent implements OnInit { edit() { let dataTableEntryObject: any = { - locale: 'en' + locale: this.settingsService.language.code }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { diff --git a/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts b/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts index 9e3c51b6e..9d1bee81c 100644 --- a/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts +++ b/src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts @@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common'; /** Custom Services */ import { ClientsService } from '../../../clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Add Family Member Component @@ -34,12 +35,14 @@ export class AddFamilyMemberComponent implements OnInit { * @param {Router} router Router * @param {Route} route Route * @param {ClientsService} clientsService Clients Service + * @param {SettingsService} settingsService Setting service */ constructor(private formBuilder: FormBuilder, private datePipe: DatePipe, private router: Router, private route: ActivatedRoute, - private clientsService: ClientsService) { + private clientsService: ClientsService, + private settingsService: SettingsService) { this.route.data.subscribe((data: { clientTemplate: any }) => { this.addFamilyMemberTemplate = data.clientTemplate.familyMemberOptions; }); @@ -76,12 +79,12 @@ export class AddFamilyMemberComponent implements OnInit { submit() { const prevDateOfBirth: Date = this.addFamilyMemberForm.value.dateOfBirth; // TODO: Update once language and date settings are setup - const dateFormat = 'yyyy-MM-dd'; + const dateFormat = this.settingsService.dateFormat; this.addFamilyMemberForm.patchValue({ dateOfBirth: this.datePipe.transform(prevDateOfBirth, dateFormat) }); const familyMemberData = this.addFamilyMemberForm.value; - familyMemberData.locale = 'en'; + familyMemberData.locale = this.settingsService.language.code; familyMemberData.dateFormat = dateFormat; this.clientsService.addFamilyMember(this.clientId, familyMemberData).subscribe(res => { this.router.navigate(['../'], { relativeTo: this.route }); diff --git a/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts b/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts index 3adb73122..652513806 100644 --- a/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts +++ b/src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts @@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common'; /** Custom Services */ import { ClientsService } from '../../../clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Edit Family Member Component @@ -34,12 +35,14 @@ export class EditFamilyMemberComponent implements OnInit { * @param {Router} router Router * @param {ActivatedRoute} route Route * @param {ClientsService} clientsService Clients Service + * @param {SettingsService} settingsService Setting service */ constructor(private formBuilder: FormBuilder, private datePipe: DatePipe, private router: Router, private route: ActivatedRoute, - private clientsService: ClientsService) { + private clientsService: ClientsService, + private settingsService: SettingsService) { this.route.data.subscribe((data: { clientTemplate: any, editFamilyMember: any }) => { this.addFamilyMemberTemplate = data.clientTemplate.familyMemberOptions; this.familyMemberDetails = data.editFamilyMember; @@ -76,12 +79,12 @@ export class EditFamilyMemberComponent implements OnInit { submit() { const prevDateOfBirth: Date = this.editFamilyMemberForm.value.dateOfBirth; // TODO: Update once language and date settings are setup - const dateFormat = 'yyyy-MM-dd'; + const dateFormat = this.settingsService.dateFormat; this.editFamilyMemberForm.patchValue({ dateOfBirth: this.datePipe.transform(prevDateOfBirth, dateFormat) }); const familyMemberData = this.editFamilyMemberForm.value; - familyMemberData.locale = 'en'; + familyMemberData.locale = this.settingsService.language.code; familyMemberData.dateFormat = dateFormat; this.clientsService.editFamilyMember(this.familyMemberDetails.clientId, this.familyMemberDetails.id, familyMemberData).subscribe(res => { this.router.navigate(['../../'], { relativeTo: this.route }); diff --git a/src/app/clients/create-client/create-client.component.ts b/src/app/clients/create-client/create-client.component.ts index f6030d861..e934d6b76 100644 --- a/src/app/clients/create-client/create-client.component.ts +++ b/src/app/clients/create-client/create-client.component.ts @@ -10,6 +10,10 @@ import { ClientGeneralStepComponent } from '../client-stepper/client-general-ste import { ClientFamilyMembersStepComponent } from '../client-stepper/client-family-members-step/client-family-members-step.component'; import { ClientAddressStepComponent } from '../client-stepper/client-address-step/client-address-step.component'; +/** Custom Services */ +import { SettingsService } from 'app/settings/settings.service'; + + /** * Create Client Component. */ @@ -37,10 +41,12 @@ export class CreateClientComponent { * @param {ActivatedRoute} route Activated Route * @param {Router} router Router * @param {ClientsService} clientsService Clients Service + * @param {SettingsService} settingsService Setting service */ constructor(private route: ActivatedRoute, private router: Router, - private clientsService: ClientsService) { + private clientsService: ClientsService, + private settingsService: SettingsService) { this.route.data.subscribe((data: { clientTemplate: any, clientAddressFieldConfig: any }) => { this.clientTemplate = data.clientTemplate; this.clientAddressFieldConfig = data.clientAddressFieldConfig; @@ -68,8 +74,8 @@ export class CreateClientComponent { * Submits the create client form. */ submit() { - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; // TODO: Update once language and date settings are setup const clientData = { ...this.client, diff --git a/src/app/clients/edit-client/edit-client.component.ts b/src/app/clients/edit-client/edit-client.component.ts index 409c20223..647f33c29 100644 --- a/src/app/clients/edit-client/edit-client.component.ts +++ b/src/app/clients/edit-client/edit-client.component.ts @@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common'; /** Custom Services */ import { ClientsService } from '../clients.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Edit Client Component @@ -51,12 +52,14 @@ export class EditClientComponent implements OnInit { * @param {Router} router Router * @param {ClientsService} clientsService Clients Service * @param {DatePipe} datePipe Date Pipe + * @param {SettingsService} settingsService Settings Service */ constructor(private formBuilder: FormBuilder, private route: ActivatedRoute, private router: Router, private clientsService: ClientsService, - private datePipe: DatePipe) { + private datePipe: DatePipe, + private settingsService: SettingsService) { this.route.data.subscribe((data: { clientDataAndTemplate: any }) => { this.clientDataAndTemplate = data.clientDataAndTemplate; }); @@ -151,8 +154,8 @@ export class EditClientComponent implements OnInit { * Submits the edit client form. */ submit() { - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; // TODO: Update once language and date settings are setup const editClientFormValue: any = this.editClientForm.getRawValue(); const clientData = {