refactor(df/locale): clients module (#1257)

See: #1213
This commit is contained in:
Abhirup Pal
2020-10-16 20:17:59 +05:30
committed by GitHub
parent ee2f53e503
commit aeeb2cc5f1
17 changed files with 104 additions and 50 deletions
@@ -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<ClientFamilyMemberDialogComponent>,
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,
@@ -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') {