diff --git a/src/app/deposits/fixed-deposits/create-fixed-deposit-account/create-fixed-deposit-account.component.ts b/src/app/deposits/fixed-deposits/create-fixed-deposit-account/create-fixed-deposit-account.component.ts index 72ceee9b2..5f105da1e 100644 --- a/src/app/deposits/fixed-deposits/create-fixed-deposit-account/create-fixed-deposit-account.component.ts +++ b/src/app/deposits/fixed-deposits/create-fixed-deposit-account/create-fixed-deposit-account.component.ts @@ -5,6 +5,7 @@ import { DatePipe } from '@angular/common'; /** Custom Services */ import { FixedDepositsService } from '../fixed-deposits.service'; +import { SettingsService } from 'app/settings/settings.service'; /** Custom Components */ import { FixedDepositAccountDetailsStepComponent } from '../fixed-deposit-account-stepper/fixed-deposit-account-details-step/fixed-deposit-account-details-step.component'; @@ -45,11 +46,13 @@ export class CreateFixedDepositAccountComponent { * @param {Router} router Router * @param {DatePipe} datePipe Date Pipe * @param {FixedDepositsService} fixedDepositsService Fixed Deposits Service + * @param {SettingsService} settingsService Settings Service */ constructor(private route: ActivatedRoute, private router: Router, private datePipe: DatePipe, - private fixedDepositsService: FixedDepositsService) { + private fixedDepositsService: FixedDepositsService, + private settingsService: SettingsService) { this.route.data.subscribe((data: { fixedDepositsAccountTemplate: any }) => { this.fixedDepositsAccountTemplate = data.fixedDepositsAccountTemplate; }); @@ -118,8 +121,8 @@ export class CreateFixedDepositAccountComponent { * Submits the fixed deposit form and creates a new fixed deposit account */ submit() { - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const monthDayFormat = 'dd MMMM'; const fixedDepositAccount = { ...this.fixedDepositAccount, diff --git a/src/app/deposits/fixed-deposits/edit-fixed-deposit-account/edit-fixed-deposit-account.component.ts b/src/app/deposits/fixed-deposits/edit-fixed-deposit-account/edit-fixed-deposit-account.component.ts index 74f402d56..5c0389e10 100644 --- a/src/app/deposits/fixed-deposits/edit-fixed-deposit-account/edit-fixed-deposit-account.component.ts +++ b/src/app/deposits/fixed-deposits/edit-fixed-deposit-account/edit-fixed-deposit-account.component.ts @@ -5,6 +5,7 @@ import { DatePipe } from '@angular/common'; /** Custom Services */ import { FixedDepositsService } from '../fixed-deposits.service'; +import { SettingsService } from 'app/settings/settings.service'; /** Custom Components */ import { FixedDepositAccountDetailsStepComponent } from '../fixed-deposit-account-stepper/fixed-deposit-account-details-step/fixed-deposit-account-details-step.component'; @@ -45,11 +46,13 @@ export class EditFixedDepositAccountComponent { * @param {Router} router Router * @param {DatePipe} datePipe Date Pipe * @param {FixedDepositsService} fixedDepositsService Fixed Deposits Service + * @param {SettingsService} settingsService Settings Service */ constructor(private route: ActivatedRoute, private router: Router, private datePipe: DatePipe, - private fixedDepositsService: FixedDepositsService) { + private fixedDepositsService: FixedDepositsService, + private settingsService: SettingsService) { this.route.data.subscribe((data: { fixedDepositsAccountAndTemplate: any }) => { this.fixedDepositsAccountAndTemplate = data.fixedDepositsAccountAndTemplate; }); @@ -124,8 +127,8 @@ export class EditFixedDepositAccountComponent { * Submits the fixed deposit form and creates a new fixed deposit account */ submit() { - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const monthDayFormat = 'dd MMMM'; const fixedDepositAccount = { ...this.fixedDepositAccount, diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-charges-step/fixed-deposit-account-charges-step.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-charges-step/fixed-deposit-account-charges-step.component.ts index 24ae65eaa..32d81f0bf 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-charges-step/fixed-deposit-account-charges-step.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-charges-step/fixed-deposit-account-charges-step.component.ts @@ -5,6 +5,7 @@ import { MatDialog } from '@angular/material/dialog'; /** Dialog Components */ import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component'; +import { SettingsService } from 'app/settings/settings.service'; /** Custom Services */ import { DatePipe } from '@angular/common'; @@ -45,9 +46,11 @@ export class FixedDepositAccountChargesStepComponent implements OnInit, OnChange /** * @param {MatDialog} dialog Mat Dialog * @param {DatePipe} datePipe Date Pipe + * @param {SettingsService} settingsService Settings Service */ constructor(public dialog: MatDialog, - private datePipe: DatePipe) { } + private datePipe: DatePipe, + private settingsService: SettingsService) { } ngOnInit() { this.currencyCode.valueChanges.subscribe(() => { @@ -128,7 +131,7 @@ export class FixedDepositAccountChargesStepComponent implements OnInit, OnChange editChargeDateDialogRef.afterClosed().subscribe((response: any) => { if (response.data) { let newCharge: any; - const dateFormat = 'dd MMMM yyyy'; + const dateFormat = this.settingsService.dateFormat; const date = this.datePipe.transform(response.data.value.date, dateFormat); switch (charge.chargeTimeType.value) { case 'Specified due date': diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.ts index 1da5f646d..d3a418094 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.ts @@ -7,6 +7,7 @@ import { DatePipe } from '@angular/common'; /** Custom Services */ import { SavingsService } from 'app/savings/savings.service'; +import { SettingsService } from 'app/settings/settings.service'; /** Custom Dialogs */ import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component'; @@ -63,12 +64,14 @@ export class ChargesTabComponent implements OnInit { * @param {Router} router Router for navigation. * @param {MatDialog} dialog Dialog reference. * @param {DatePipe} datePipe DatePipe. + * @param {SettingsService} settingsService Settings Service. */ constructor(private savingsService: SavingsService, private route: ActivatedRoute, private datePipe: DatePipe, private router: Router, - public dialog: MatDialog) { + public dialog: MatDialog, + private settingsService: SettingsService) { this.route.parent.data.subscribe((data: { fixedDepositsAccountData: any }) => { this.fixedDepositsAccountData = data.fixedDepositsAccountData; this.chargesData = this.fixedDepositsAccountData.charges; @@ -124,8 +127,8 @@ export class ChargesTabComponent implements OnInit { const payChargeDialogRef = this.dialog.open(FormDialogComponent, { data }); payChargeDialogRef.afterClosed().subscribe((response: any) => { if (response.data) { - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const dataObject = { ...response.data.value, dueDate: this.datePipe.transform(response.data.value.dueDate, dateFormat), @@ -194,8 +197,8 @@ export class ChargesTabComponent implements OnInit { const editChargeDialogRef = this.dialog.open(FormDialogComponent, { data }); editChargeDialogRef.afterClosed().subscribe((response: any) => { if (response.data) { - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; const dataObject = { ...response.data.value, dateFormat, diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/datatable-tabs/multi-row/multi-row.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/datatable-tabs/multi-row/multi-row.component.ts index 10a412cec..3b7844d0a 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/datatable-tabs/multi-row/multi-row.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/datatable-tabs/multi-row/multi-row.component.ts @@ -18,6 +18,7 @@ import { DatepickerBase } from 'app/shared/form-dialog/formfield/model/datepicke /** Custom Services */ import { SavingsService } from 'app/savings/savings.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Savings Account Multi Row Data Tables @@ -52,11 +53,13 @@ export class MultiRowComponent implements OnInit, OnChanges { * @param {DatePipe} datePipe Date Pipe. * @param {SavingsService} savingsService Savingss Service. * @param {MatDialog} dialog Mat Dialog. + * @param {SettingsService} settingsService Settings Service. */ constructor(private route: ActivatedRoute, private datePipe: DatePipe, private savingsService: SavingsService, - private dialog: MatDialog) { + private dialog: MatDialog, + private settingsService: SettingsService) { this.accountId = this.route.parent.parent.snapshot.paramMap.get('fixedDepositAccountId'); } @@ -85,7 +88,7 @@ export class MultiRowComponent implements OnInit, OnChanges { * Adds a new row to the given multi row data table. */ add() { - let dataTableEntryObject: any = { locale: 'en' }; + let dataTableEntryObject: any = { locale: this.settingsService.language.code }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { return ((column.columnName !== 'id') && (column.columnName !== 'savings_account_id')); @@ -118,7 +121,7 @@ export class MultiRowComponent implements OnInit, OnChanges { }); case 'DATE': { dateTransformColumns.push(column.columnName); - dataTableEntryObject.dateFormat = 'yyyy-MM-dd'; + dataTableEntryObject.dateFormat = this.settingsService.dateFormat; return new DatepickerBase({ controlName: column.columnName, label: column.columnName, diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/datatable-tabs/single-row/single-row.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/datatable-tabs/single-row/single-row.component.ts index d4dc247f4..1412b78a8 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/datatable-tabs/single-row/single-row.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/datatable-tabs/single-row/single-row.component.ts @@ -17,6 +17,7 @@ import { CheckboxBase } from 'app/shared/form-dialog/formfield/model/checkbox-ba /** Custom Services */ import { SavingsService } from 'app/savings/savings.service'; +import { SettingsService } from 'app/settings/settings.service'; /** @@ -43,11 +44,13 @@ export class SingleRowComponent implements OnInit { * @param {DatePipe} datePipe Date Pipe. * @param {SavingsService} savingsService Savingss Service. * @param {MatDialog} dialog Mat Dialog. + * @param {SettingsService} settingsService Settings Service. */ constructor(private route: ActivatedRoute, private datePipe: DatePipe, private dialog: MatDialog, - private savingsService: SavingsService) { + private savingsService: SavingsService, + private settingsService: SettingsService) { this.accountId = this.route.parent.parent.snapshot.paramMap.get('fixedDepositAccountId'); } @@ -65,7 +68,7 @@ export class SingleRowComponent implements OnInit { * Creates a new instance of the given single row data table. */ add() { - let dataTableEntryObject: any = { locale: 'en' }; + let dataTableEntryObject: any = { locale: this.settingsService.language.code }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { return ((column.columnName !== 'id') && (column.columnName !== 'savings_account_id')); @@ -95,7 +98,7 @@ export class SingleRowComponent implements OnInit { * Edits the current instance of single row data table. */ edit() { - let dataTableEntryObject: any = { locale: 'en' }; + let dataTableEntryObject: any = { locale: this.settingsService.language.code }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { return ((column.columnName !== 'id') && (column.columnName !== 'savings_account_id')); @@ -180,7 +183,7 @@ export class SingleRowComponent implements OnInit { }); case 'DATE': { dateTransformColumns.push(column.columnName); - dataTableEntryObject.dateFormat = 'yyyy-MM-dd'; + dataTableEntryObject.dateFormat = this.settingsService.dateFormat; return new DatepickerBase({ controlName: column.columnName, label: column.columnName, diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/standing-instructions-tab/standing-instructions-tab.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/standing-instructions-tab/standing-instructions-tab.component.ts index b985397cc..e791785c3 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/standing-instructions-tab/standing-instructions-tab.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/standing-instructions-tab/standing-instructions-tab.component.ts @@ -7,6 +7,7 @@ import { ActivatedRoute } from '@angular/router'; /** Custom Services */ import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service'; import { AccountTransfersService } from 'app/account-transfers/account-transfers.service'; +import { SettingsService } from 'app/settings/settings.service'; /** Dialog Components */ import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; @@ -47,11 +48,13 @@ export class StandingInstructionsTabComponent implements OnInit { * @param {FixedDepositsService} fixedDepositsService FixedDepositsService * @param {MatDialog} dialog Mat Dialog * @param {AccountTransfersService} accountTransfersService Accounts Transfer Service + * @param {SettingsService} settingsService Settings Service */ constructor(private route: ActivatedRoute, private fixedDepositsService: FixedDepositsService, private dialog: MatDialog, - private accountTransfersService: AccountTransfersService) { + private accountTransfersService: AccountTransfersService, + private settingsService: SettingsService) { this.route.parent.data.subscribe((data: { fixedDepositsAccountData: any }) => { this.fixedDepositsData = data.fixedDepositsAccountData; }); @@ -68,8 +71,8 @@ export class StandingInstructionsTabComponent implements OnInit { const clientId = this.fixedDepositsData.clientId; const clientName = this.fixedDepositsData.clientName; const accountId = this.fixedDepositsData.id; - const locale = 'en'; - const dateFormat = 'dd MMMM yyyy'; + const locale = this.settingsService.language.code; + const dateFormat = this.settingsService.dateFormat; this.fixedDepositsService.getStandingInstructions(clientId, clientName, accountId, locale, dateFormat).subscribe((response: any) => { this.instructionsData = response.pageItems; this.dataSource.data = this.instructionsData; diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/activate-fixed-deposits-account/activate-fixed-deposits-account.component.ts b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/activate-fixed-deposits-account/activate-fixed-deposits-account.component.ts index 265f41854..20d95af04 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/activate-fixed-deposits-account/activate-fixed-deposits-account.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/activate-fixed-deposits-account/activate-fixed-deposits-account.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { SavingsService } from 'app/savings/savings.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Activate Fixed Deposits Account Component @@ -33,12 +34,14 @@ export class ActivateFixedDepositsAccountComponent 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 savingsService: SavingsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.accountId = this.route.parent.snapshot.params['fixedDepositAccountId']; } @@ -64,8 +67,8 @@ export class ActivateFixedDepositsAccountComponent 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 prevActivatedOnDate: Date = this.activateFixedDepositsAccountForm.value.activatedOnDate; this.activateFixedDepositsAccountForm.patchValue({ activatedOnDate: this.datePipe.transform(prevActivatedOnDate, dateFormat), diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/add-charge-fixed-deposits-account/add-charge-fixed-deposits-account.component.ts b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/add-charge-fixed-deposits-account/add-charge-fixed-deposits-account.component.ts index ecc148620..04574e356 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/add-charge-fixed-deposits-account/add-charge-fixed-deposits-account.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/add-charge-fixed-deposits-account/add-charge-fixed-deposits-account.component.ts @@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common'; /** Custom Services */ import { SavingsService } from 'app/savings/savings.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Add Fixed Deposits Charge component. @@ -38,13 +39,15 @@ export class AddChargeFixedDepositsAccountComponent implements OnInit { * @param {Router} router Router * @param {DatePipe} datePipe Date Pipe * @param {SavingsService} savingsService Savings Service + * @param {SettingsService} settingsService Settings Service */ constructor( private formBuilder: FormBuilder, private route: ActivatedRoute, private router: Router, private datePipe: DatePipe, - private savingsService: SavingsService + private savingsService: SavingsService, + private settingsService: SettingsService ) { this.route.data.subscribe((data: { fixedDepositsAccountActionData: any }) => { this.savingsChargeOptions = data.fixedDepositsAccountActionData.chargeOptions; @@ -112,7 +115,7 @@ export class AddChargeFixedDepositsAccountComponent implements OnInit { */ submit() { const savingsCharge = this.fixedDepositsChargeForm.value; - savingsCharge.locale = 'en'; + savingsCharge.locale = this.settingsService.language.code; if (!savingsCharge.feeInterval) { savingsCharge.feeInterval = this.chargeDetails.feeInterval; } @@ -125,7 +128,7 @@ export class AddChargeFixedDepositsAccountComponent implements OnInit { savingsCharge.feeOnMonthDay = this.datePipe.transform(prevDate, monthDayFormat); } } else { - const dateFormat = 'yyyy-MM-dd'; + const dateFormat = this.settingsService.dateFormat; savingsCharge.dateFormat = dateFormat; if (savingsCharge.dueDate) { const prevDate = this.fixedDepositsChargeForm.value.dueDate; diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/approve-fixed-deposits-account/approve-fixed-deposits-account.component.ts b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/approve-fixed-deposits-account/approve-fixed-deposits-account.component.ts index 397626a74..87aeabfa7 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/approve-fixed-deposits-account/approve-fixed-deposits-account.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/approve-fixed-deposits-account/approve-fixed-deposits-account.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Approve Fixed Deposits Account Component @@ -32,12 +33,14 @@ export class ApproveFixedDepositsAccountComponent 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 fixedDepositsService: FixedDepositsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.accountId = this.route.parent.snapshot.params['fixedDepositAccountId']; } @@ -63,9 +66,8 @@ export class ApproveFixedDepositsAccountComponent implements OnInit { * if successful redirects to the fixed deposit account. */ 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 prevApprovedOnDate: Date = this.approveFixedDepositsAccountForm.value.approvedOnDate; this.approveFixedDepositsAccountForm.patchValue({ approvedOnDate: this.datePipe.transform(prevApprovedOnDate, dateFormat), diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/close-fixed-deposits-account/close-fixed-deposits-account.component.ts b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/close-fixed-deposits-account/close-fixed-deposits-account.component.ts index 40bbde526..c898aa970 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/close-fixed-deposits-account/close-fixed-deposits-account.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/close-fixed-deposits-account/close-fixed-deposits-account.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { FixedDepositsService } from '../../fixed-deposits.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Close On Maturity Fixed Deposits Account Component @@ -39,12 +40,14 @@ export class CloseFixedDepositsAccountComponent 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 fixedDepositsService: FixedDepositsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.route.data.subscribe((data: { fixedDepositsAccountActionData: any }) => { this.savingsAccountsData = data.fixedDepositsAccountActionData.savingsAccounts; this.onAccountClosureOptions = data.fixedDepositsAccountActionData.onAccountClosureOptions; @@ -93,9 +96,8 @@ export class CloseFixedDepositsAccountComponent implements OnInit { * if successful redirects to the fd account. */ 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.closeOnMaturityAccountForm.value.closedOnDate; this.closeOnMaturityAccountForm.patchValue({ closedOnDate: this.datePipe.transform(prevClosedDate, dateFormat), diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/premature-close-fixed-deposits-account/premature-close-fixed-deposits-account.component.ts b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/premature-close-fixed-deposits-account/premature-close-fixed-deposits-account.component.ts index 8bf427d3c..6df4430fb 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/premature-close-fixed-deposits-account/premature-close-fixed-deposits-account.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/premature-close-fixed-deposits-account/premature-close-fixed-deposits-account.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { FixedDepositsService } from '../../fixed-deposits.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Premature Close Fixed Deposits Account Component @@ -39,12 +40,14 @@ export class PrematureCloseFixedDepositsAccountComponent 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 fixedDepositsService: FixedDepositsService, - private datePipe: DatePipe, - private route: ActivatedRoute, - private router: Router) { + private fixedDepositsService: FixedDepositsService, + private datePipe: DatePipe, + private route: ActivatedRoute, + private router: Router, + private settingsService: SettingsService) { this.accountId = this.route.parent.snapshot.params['fixedDepositAccountId']; } @@ -81,9 +84,8 @@ export class PrematureCloseFixedDepositsAccountComponent implements OnInit { * @param {Date} date Premature Close Date */ calculatePrematureAmount(date: Date) { - // 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 data = { closedOnDate: this.datePipe.transform(date, dateFormat), dateFormat, @@ -93,7 +95,7 @@ export class PrematureCloseFixedDepositsAccountComponent implements OnInit { .subscribe((response: any) => { this.savingsAccountsData = response.savingsAccounts; this.onAccountClosureOptions = response.onAccountClosureOptions; - this.prematureCloseAccountForm.addControl('maturityAmount', new FormControl({value: '', disabled: true})); + this.prematureCloseAccountForm.addControl('maturityAmount', new FormControl({ value: '', disabled: true })); this.prematureCloseAccountForm.addControl('onAccountClosureId', new FormControl('', Validators.required)); this.prematureCloseAccountForm.addControl('note', new FormControl('')); this.prematureCloseAccountForm.get('maturityAmount').patchValue(response.maturityAmount); @@ -123,9 +125,8 @@ export class PrematureCloseFixedDepositsAccountComponent implements OnInit { */ submit() { this.isSubmitted = true; - // 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.prematureCloseAccountForm.value.closedOnDate; this.prematureCloseAccountForm.patchValue({ closedOnDate: this.datePipe.transform(prevClosedDate, dateFormat), diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/reject-fixed-deposits-account/reject-fixed-deposits-account.component.ts b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/reject-fixed-deposits-account/reject-fixed-deposits-account.component.ts index ea0c887a5..83c0c5710 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/reject-fixed-deposits-account/reject-fixed-deposits-account.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/reject-fixed-deposits-account/reject-fixed-deposits-account.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Reject Fixed Deposits Account Component @@ -32,12 +33,14 @@ export class RejectFixedDepositsAccountComponent 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 fixedDepositsService: FixedDepositsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.accountId = this.route.parent.snapshot.params['fixedDepositAccountId']; } @@ -63,9 +66,8 @@ export class RejectFixedDepositsAccountComponent implements OnInit { * if successful redirects to the fixed deposit account. */ 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 prevRejectedOnDate: Date = this.rejectFixedDepositsAccountForm.value.rejectedOnDate; this.rejectFixedDepositsAccountForm.patchValue({ rejectedOnDate: this.datePipe.transform(prevRejectedOnDate, dateFormat), diff --git a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.ts b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.ts index 30caf1d92..73e25b63a 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.ts @@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service'; +import { SettingsService } from 'app/settings/settings.service'; /** * Withdraw By Client Fixed Deposits Account Component @@ -32,12 +33,14 @@ export class WithdrawByClientFixedDepositsAccountComponent 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 fixedDepositsService: FixedDepositsService, private datePipe: DatePipe, private route: ActivatedRoute, - private router: Router) { + private router: Router, + private settingsService: SettingsService) { this.accountId = this.route.parent.snapshot.params['fixedDepositAccountId']; } @@ -63,9 +66,8 @@ export class WithdrawByClientFixedDepositsAccountComponent implements OnInit { * if successful redirects to the fixed deposit account. */ 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 prevWithdrawnOnDate: Date = this.withdrawFixedDepositsAccountForm.value.withdrawnOnDate; this.withdrawFixedDepositsAccountForm.patchValue({ withdrawnOnDate: this.datePipe.transform(prevWithdrawnOnDate, dateFormat),