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

Format date fields without patch form

Browse Source
This commit is contained in:
Jose Alberto Hernandez
2022-06-10 10:34:19 +02:00
committed by Arnold Gálovics
parent 9d43181cea
commit 6ea3d97538
191 changed files with 1408 additions and 1173 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
+15 -12
View File
@@ -2,11 +2,11 @@
import { Component, OnInit } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { Router, ActivatedRoute } from '@angular/router';
import { DatePipe } from '@angular/common';
/** Custom Services */
import { ClientsService } from '../../../clients.service';
import { SettingsService } from 'app/settings/settings.service';
import { Dates } from 'app/core/utils/dates';
/**
* Add Family Member Component
@@ -31,14 +31,14 @@ export class AddFamilyMemberComponent implements OnInit {
/**
* @param {FormBuilder} formBuilder FormBuilder
* @param {DatePipe} datePipe Date Pipe
* @param {DatePipe} datePipe Date Utils
* @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 dateUtils: Dates,
private router: Router,
private route: ActivatedRoute,
private clientsService: ClientsService,
@@ -77,16 +77,19 @@ export class AddFamilyMemberComponent implements OnInit {
* Submits the form and adds the family member
*/
submit() {
const prevDateOfBirth: Date = this.addFamilyMemberForm.value.dateOfBirth;
// TODO: Update once language and date settings are setup
const addFamilyMemberFormData = this.addFamilyMemberForm.value;
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
this.addFamilyMemberForm.patchValue({
dateOfBirth: this.datePipe.transform(prevDateOfBirth, dateFormat)
});
const familyMemberData = this.addFamilyMemberForm.value;
familyMemberData.locale = this.settingsService.language.code;
familyMemberData.dateFormat = dateFormat;
this.clientsService.addFamilyMember(this.clientId, familyMemberData).subscribe(res => {
const prevDateOfBirth: Date = this.addFamilyMemberForm.value.dateOfBirth;
if (addFamilyMemberFormData.dateOfBirth instanceof Date) {
addFamilyMemberFormData.dateOfBirth = this.dateUtils.formatDate(prevDateOfBirth, dateFormat);
}
const data = {
...addFamilyMemberFormData,
dateFormat,
locale
};
this.clientsService.addFamilyMember(this.clientId, data).subscribe(res => {
this.router.navigate(['../'], { relativeTo: this.route });
});
}
src/app/clients/clients-view/family-members-tab/edit-family-member/edit-family-member.component.ts
+16 -13
View File
@@ -2,11 +2,11 @@
import { Component, OnInit } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { Router, ActivatedRoute } from '@angular/router';
import { DatePipe } from '@angular/common';
/** Custom Services */
import { ClientsService } from '../../../clients.service';
import { SettingsService } from 'app/settings/settings.service';
import { Dates } from 'app/core/utils/dates';
/**
* Edit Family Member Component
@@ -31,14 +31,14 @@ export class EditFamilyMemberComponent implements OnInit {
/**
* @param {FormBuilder} formBuilder Form Builder
* @param {DatePipe} datePipe DatePipe
* @param {Dates} dateUtils DatePipe
* @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 dateUtils: Dates,
private router: Router,
private route: ActivatedRoute,
private clientsService: ClientsService,
@@ -69,7 +69,7 @@ export class EditFamilyMemberComponent implements OnInit {
'genderId': [familyMember.genderId, Validators.required],
'professionId': [familyMember.professionId],
'maritalStatusId': [familyMember.maritalStatusId],
'dateOfBirth': [this.datePipe.transform(familyMember.dateOfBirth, 'yyyy-MM-dd'), Validators.required]
'dateOfBirth': [this.dateUtils.formatDate(familyMember.dateOfBirth, 'yyyy-MM-dd'), Validators.required]
});
}
@@ -77,16 +77,19 @@ export class EditFamilyMemberComponent implements OnInit {
* Submits the form and updates the client family member.
*/
submit() {
const prevDateOfBirth: Date = this.editFamilyMemberForm.value.dateOfBirth;
// TODO: Update once language and date settings are setup
const editFamilyMemberFormData = this.editFamilyMemberForm.value;
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
this.editFamilyMemberForm.patchValue({
dateOfBirth: this.datePipe.transform(prevDateOfBirth, dateFormat)
});
const familyMemberData = this.editFamilyMemberForm.value;
familyMemberData.locale = this.settingsService.language.code;
familyMemberData.dateFormat = dateFormat;
this.clientsService.editFamilyMember(this.familyMemberDetails.clientId, this.familyMemberDetails.id, familyMemberData).subscribe(res => {
const prevDateOfBirth: Date = this.editFamilyMemberForm.value.dateOfBirth;
if (editFamilyMemberFormData.dateOfBirth instanceof Date) {
editFamilyMemberFormData.dateOfBirth = this.dateUtils.formatDate(prevDateOfBirth, dateFormat);
}
const data = {
...editFamilyMemberFormData,
dateFormat,
locale
};
this.clientsService.editFamilyMember(this.familyMemberDetails.clientId, this.familyMemberDetails.id, data).subscribe(res => {
this.router.navigate(['../../'], { relativeTo: this.route });
});
}