refractor(df/locale):savings module (#1301)

src/app/savings/common-resolvers/savings-transaction-reciept.resolver.ts

@@ -7,6 +7,7 @@ import { Observable } from 'rxjs';
 
 /** Custom Services */
 import { ReportsService } from 'app/reports/reports.service';
+import { SettingsService } from 'app/settings/settings.service';
 
 /**
  * Savings Transaction Reciept resolver.
@@ -16,8 +17,10 @@ export class SavingsTransactionRecieptResolver implements Resolve<Object> {
 
   /**
    * @param {ReportsService} reportsService Reports service.
+   * @param {SettingsService} settingsService Settings Service.
    */
-  constructor(private reportsService: ReportsService) { }
+  constructor(private reportsService: ReportsService,
+              private settingsService: SettingsService) { }
 
   /**
    * Returns the Savings Transaction Reciept
@@ -30,7 +33,7 @@ export class SavingsTransactionRecieptResolver implements Resolve<Object> {
       'output-type':	'PDF',
       R_transactionId:	transactionId
     };
-    return this.reportsService.getPentahoRunReportData('Savings Transaction Receipt', data, 'default', 'en', 'dd MMMM yyyy');
+    return this.reportsService.getPentahoRunReportData('Savings Transaction Receipt', data, 'default', this.settingsService.language.code, this.settingsService.dateFormat);
   }
 
 }

src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.ts

@@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common';
 
 /** Custom Services */
 import { SavingsService } from '../../savings.service';
+import { SettingsService } from 'app/settings/settings.service';
 
 /**
  * Add Savings Charge component.
@@ -37,14 +38,14 @@ export class AddChargeSavingsAccountComponent implements OnInit {
    * @param {Router} router Router
    * @param {DatePipe} datePipe Date Pipe
    * @param {SavingsService} savingsService Savings Service
+   * @param {SettingsService} settingsService Settings Service
    */
-  constructor(
+  constructor(private formBuilder: FormBuilder,
-    private formBuilder: FormBuilder,
+              private route: ActivatedRoute,
-    private route: ActivatedRoute,
+              private router: Router,
-    private router: Router,
+              private datePipe: DatePipe,
-    private datePipe: DatePipe,
+              private savingsService: SavingsService,
-    private savingsService: SavingsService
+              private settingsService: SettingsService) {
-  ) {
     this.route.data.subscribe((data: { savingsAccountActionData: any }) => {
       this.savingsChargeOptions = data.savingsAccountActionData.chargeOptions;
     });
@@ -111,7 +112,7 @@ export class AddChargeSavingsAccountComponent implements OnInit {
    */
   submit() {
     const savingsCharge = this.savingsChargeForm.value;
-    savingsCharge.locale = 'en';
+    savingsCharge.locale = this.settingsService.language.code;
     if (!savingsCharge.feeInterval) {
       savingsCharge.feeInterval = this.chargeDetails.feeInterval;
     }
@@ -124,7 +125,7 @@ export class AddChargeSavingsAccountComponent 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.savingsChargeForm.value.dueDate;

src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.ts

@@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common';
 
 /** Custom Services */
 import { SavingsService } from '../../savings.service';
+import { SettingsService } from 'app/settings/settings.service';
 
 /**
  * Create savings account transactions component.
@@ -47,12 +48,14 @@ export class SavingsAccountTransactionsComponent implements OnInit {
    * @param {ActivatedRoute} route Activated Route.
    * @param {DatePipe} datePipe DatePipe.
    * @param {Router} router Router for navigation.
+   * @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: { savingsAccountActionData: any }) => {
       this.paymentTypeOptions = data.savingsAccountActionData.paymentTypeOptions;
     });
@@ -106,12 +109,12 @@ export class SavingsAccountTransactionsComponent implements OnInit {
   submit() {
     const prevTransactionDate: Date = this.savingAccountTransactionForm.value.transactionDate;
     // TODO: Update once language and date settings are setup
-    const dateFormat = 'dd-MM-yyyy';
+    const dateFormat = this.settingsService.dateFormat;
     this.savingAccountTransactionForm.patchValue({
       transactionDate: this.datePipe.transform(prevTransactionDate, dateFormat)
     });
     const transactionData = this.savingAccountTransactionForm.value;
-    transactionData.locale = 'en';
+    transactionData.locale = this.settingsService.language.code;
     transactionData.dateFormat = dateFormat;
     this.savingsService.executeSavingsAccountTransactionsCommand(this.savingAccountId, this.transactionCommand, transactionData).subscribe(res => {
       this.router.navigate(['../../'], { relativeTo: this.route });

src/app/savings/savings-account-view/transactions-tab/export-transactions/export-transactions.component.ts

@@ -7,6 +7,7 @@ import { ActivatedRoute } from '@angular/router';
 
 /** Custom Services */
 import { ReportsService } from 'app/reports/reports.service';
+import { SettingsService } from 'app/settings/settings.service';
 
 /**
  * Export Client Savings Transactions Component
@@ -38,12 +39,14 @@ export class ExportTransactionsComponent implements OnInit {
    * @param {FormBuilder} formBuilder Form Builder
    * @param {DatePipe} datePipe Date Pipe
    * @param {ActivatedRoute} route Activated Route
+   * @param {SettingsService} settingsService Settings Service
    */
   constructor(private sanitizer: DomSanitizer,
               private reportsService: ReportsService,
               private formBuilder: FormBuilder,
               private datePipe: DatePipe,
-              private route: ActivatedRoute) {
+              private route: ActivatedRoute,
+              private settingsService: SettingsService) {
     this.route.parent.parent.data.subscribe((data: { savingsAccountData: any }) => {
       this.savingsAccountId = data.savingsAccountData.accountNo;
     });
@@ -70,11 +73,11 @@ export class ExportTransactionsComponent implements OnInit {
   generate() {
     const data = {
       'output-type':	'PDF',
-      R_startDate:	this.datePipe.transform(this.transactionsReportForm.value.fromDate, 'yyyy-MM-dd'),
+      R_startDate:	this.datePipe.transform(this.transactionsReportForm.value.fromDate, this.settingsService.dateFormat),
-      R_endDate:	this.datePipe.transform(this.transactionsReportForm.value.toDate, 'yyyy-MM-dd'),
+      R_endDate:	this.datePipe.transform(this.transactionsReportForm.value.toDate, this.settingsService.dateFormat),
       R_savingsAccountId:	this.savingsAccountId
     };
-    this.reportsService.getPentahoRunReportData('Client Saving Transactions', data, 'default', 'en', 'dd MMMM yyyy')
+    this.reportsService.getPentahoRunReportData('Client Saving Transactions', data, 'default', this.settingsService.language.code, this.settingsService.dateFormat)
       .subscribe( (res: any) => {
         const contentType = res.headers.get('Content-Type');
         const file = new Blob([res.body], {type: contentType});