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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/app/clients/clients-view/family-members-tab/add-family-member/add-family-member.component.ts
+6 -3
View File
@@ -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 });
src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts
+6 -3
View File
@@ -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 });