CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor (df/locale): recurring deposit module (#1260)

Browse Source 
See: #1213
This commit is contained in:
stableapple
2020-10-16 20:22:23 +05:30
committed by GitHub
parent 777da45b63
commit 6372656c98
16 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.ts
+6 -3
View File
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { RecurringDepositsService } from '../../recurring-deposits.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Activate Recurring Deposits Account Component
@@ -32,12 +33,14 @@ export class ActivateRecurringDepositsAccountComponent implements OnInit {
* @param {DatePipe} datePipe Date Pipe
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
* @param {SavingsService} savingsService Savings Service
*/
constructor(private formBuilder: FormBuilder,
private recurringDepositsService: RecurringDepositsService,
private datePipe: DatePipe,
private route: ActivatedRoute,
private router: Router) {
private router: Router,
private settingsService: SettingsService) {
this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId'];
}
@@ -63,8 +66,8 @@ export class ActivateRecurringDepositsAccountComponent 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.activateRecurringDepositsAccountForm.value.activatedOnDate;
this.activateRecurringDepositsAccountForm.patchValue({
activatedOnDate: this.datePipe.transform(prevActivatedOnDate, dateFormat),
src/app/deposits/recurring-deposits/recurring-deposits-account-actions/add-charge-recurring-deposits-account/add-charge-recurring-deposits-account.component.ts
+5 -3
View File
@@ -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 Recurring Deposits Charge component.
@@ -44,7 +45,8 @@ export class AddChargeRecurringDepositsAccountComponent implements OnInit {
private route: ActivatedRoute,
private router: Router,
private datePipe: DatePipe,
private savingsService: SavingsService
private savingsService: SavingsService,
private settingsService: SettingsService
) {
this.route.data.subscribe((data: { recurringDepositsAccountActionData: any }) => {
this.savingsChargeOptions = data.recurringDepositsAccountActionData.chargeOptions;
@@ -112,7 +114,7 @@ export class AddChargeRecurringDepositsAccountComponent implements OnInit {
*/
submit() {
const savingsCharge = this.recurringDepositsChargeForm.value;
savingsCharge.locale = 'en';
savingsCharge.locale = this.settingsService.language.code;
if (!savingsCharge.feeInterval) {
savingsCharge.feeInterval = this.chargeDetails.feeInterval;
}
@@ -125,7 +127,7 @@ export class AddChargeRecurringDepositsAccountComponent 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.recurringDepositsChargeForm.value.dueDate;
src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.ts
+6 -3
View File
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { RecurringDepositsService } from '../../recurring-deposits.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Approve Recurring Deposits Account Component
@@ -32,12 +33,14 @@ export class ApproveRecurringDepositsAccountComponent 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 recurringDepositsService: RecurringDepositsService,
private datePipe: DatePipe,
private route: ActivatedRoute,
private router: Router) {
private router: Router,
private settingsService: SettingsService) {
this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId'];
}
@@ -64,8 +67,8 @@ export class ApproveRecurringDepositsAccountComponent 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 prevApprovedOnDate: Date = this.approveRecurringDepositsAccountForm.value.approvedOnDate;
this.approveRecurringDepositsAccountForm.patchValue({
approvedOnDate: this.datePipe.transform(prevApprovedOnDate, dateFormat),
src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.ts
+6 -3
View File
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { RecurringDepositsService } from '../../recurring-deposits.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Close Recurring Deposits Account Component
@@ -42,13 +43,15 @@ export class CloseRecurringDepositsAccountComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
* @param {DatePipe} datePipe Date Pipe
* @param {SettingsService} settingsService Settings Service
*/
constructor(
private formBuilder: FormBuilder,
private route: ActivatedRoute,
private router: Router,
private datePipe: DatePipe,
private recurringDepositsService: RecurringDepositsService
private recurringDepositsService: RecurringDepositsService,
private settingsService: SettingsService
) {
this.route.data.subscribe((data: { recurringDepositsAccountActionData: any }) => {
this.maturityAmount = data.recurringDepositsAccountActionData.maturityAmount;
@@ -97,8 +100,8 @@ export class CloseRecurringDepositsAccountComponent implements OnInit {
*/
submit() {
const closedOnDate = this.closeRecurringDepositForm.value.closedOnDate;
const dateFormat = 'yyyy-MM-dd';
const locale = 'en';
const dateFormat = this.settingsService.dateFormat;
const locale = this.settingsService.language.code;
this.closeRecurringDepositForm.patchValue({
closedOnDate: this.datePipe.transform(closedOnDate, dateFormat)
});
src/app/deposits/recurring-deposits/recurring-deposits-account-actions/deposit-recurring-deposits-account/deposit-recurring-deposits-account.component.ts
+6 -3
View File
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { RecurringDepositsService } from '../../recurring-deposits.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Deposits Recurring Deposits Account Component
@@ -40,13 +41,15 @@ export class DepositRecurringDepositsAccountComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
* @param {DatePipe} datePipe Date Pipe
* @param {SettingsService} settingsService Settings Service
*/
constructor(
private formBuilder: FormBuilder,
private route: ActivatedRoute,
private router: Router,
private datePipe: DatePipe,
private recurringDepositsService: RecurringDepositsService
private recurringDepositsService: RecurringDepositsService,
private settingsService: SettingsService
) {
this.route.data.subscribe((data: { recurringDepositsAccountActionData: any }) => {
this.transactionAmount = data.recurringDepositsAccountActionData.amount;
@@ -92,8 +95,8 @@ export class DepositRecurringDepositsAccountComponent implements OnInit {
*/
submit() {
const transactionDate = this.depositRecurringDepositForm.value.transactionDate;
const dateFormat = 'yyyy-MM-dd';
const locale = 'en';
const dateFormat = this.settingsService.dateFormat;
const locale = this.settingsService.language.code;
this.depositRecurringDepositForm.patchValue({
transactionDate: this.datePipe.transform(transactionDate, dateFormat)
});
src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.ts
+6 -3
View File
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { RecurringDepositsService } from '../../recurring-deposits.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Premature Close Recurring Deposits Account Component
@@ -33,12 +34,14 @@ export class PrematureCloseRecurringDepositAccountComponent 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 recurringDepositsService: RecurringDepositsService,
private datePipe: DatePipe,
private route: ActivatedRoute,
private router: Router) {
private router: Router,
private settingsService: SettingsService, ) {
this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId'];
}
@@ -64,8 +67,8 @@ export class PrematureCloseRecurringDepositAccountComponent 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 prevClosedOnDate: Date = this.prematureCloseRecurringDepositsAccountForm.value.closedOnDate;
this.prematureCloseRecurringDepositsAccountForm.patchValue({
closedOnDate: this.datePipe.transform(prevClosedOnDate, dateFormat),
src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.ts
+6 -3
View File
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { RecurringDepositsService } from '../../recurring-deposits.service';
import { SettingsService } from 'app/settings/settings.service';
/**
@@ -33,12 +34,14 @@ export class RejectRecurringDepositsAccountComponent 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 recurringDepositsService: RecurringDepositsService,
private datePipe: DatePipe,
private route: ActivatedRoute,
private router: Router) {
private router: Router,
private settingsService: SettingsService) {
this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId'];
}
@@ -65,8 +68,8 @@ export class RejectRecurringDepositsAccountComponent 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 prevRejectedOnDate: Date = this.rejectRecurringDepositsAccountForm.value.rejectedOnDate;
this.rejectRecurringDepositsAccountForm.patchValue({
rejectedOnDate: this.datePipe.transform(prevRejectedOnDate, dateFormat),
src/app/deposits/recurring-deposits/recurring-deposits-account-actions/withdraw-by-client-recurring-deposits-account/withdraw-by-client-recurring-deposits-account.component.ts
+6 -4
View File
@@ -6,7 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { RecurringDepositsService } from 'app/deposits/recurring-deposits/recurring-deposits.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Withdraw By Client Recurring Deposits Account Component
*/
@@ -32,12 +32,14 @@ export class WithdrawByClientRecurringDepositsAccountComponent 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 recurringDepositsService: RecurringDepositsService,
private datePipe: DatePipe,
private route: ActivatedRoute,
private router: Router) {
private router: Router,
private settingsService: SettingsService, ) {
this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId'];
}
@@ -64,8 +66,8 @@ export class WithdrawByClientRecurringDepositsAccountComponent 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 prevWithdrawnOnDate: Date = this.withdrawRecurringDepositsAccountForm.value.withdrawnOnDate;
this.withdrawRecurringDepositsAccountForm.patchValue({
withdrawnOnDate: this.datePipe.transform(prevWithdrawnOnDate, dateFormat),