CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 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/organization/holidays/create-holiday/create-holiday.component.ts
+18 -14
View File
@@ -2,7 +2,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { DatePipe } from '@angular/common';
import { Dates } from 'app/core/utils/dates';
/** Custom Services. */
import { OrganizationService } from 'app/organization/organization.service';
@@ -34,13 +34,13 @@ export class CreateHolidayComponent implements OnInit {
* Get offices and holiday template from `Resolver`.
* @param {FormBuilder} formBuilder Form Builder.
* @param {ActivatedRoute} route Activated Route.
* @param {DatePipe} datePipe Date Pipe.
* @param {Dates} dateUtils Date Utils.
* @param {OrganizationService} organizationService Organization Service.
* @param {Router} router Router.
*/
constructor(private formBuilder: FormBuilder,
private route: ActivatedRoute,
private datePipe: DatePipe,
private dateUtils: Dates,
private organizationService: OrganizationService,
private settings: SettingsService,
private router: Router ) {
@@ -86,23 +86,27 @@ export class CreateHolidayComponent implements OnInit {
* Submits the create holiday Form.
*/
submit() {
const holidayFormData = this.holidayForm.value;
const dateFormat = this.settings.dateFormat;
const locale = this.settings.language.code;
this.holidayForm.patchValue({
'fromDate': this.datePipe.transform(this.holidayForm.value.fromDate, dateFormat),
'toDate': this.datePipe.transform(this.holidayForm.value.toDate, dateFormat),
});
if (this.holidayForm.contains('repaymentsRescheduledTo')) {
this.holidayForm.patchValue({
'repaymentsRescheduledTo': this.datePipe.transform(this.holidayForm.value.repaymentsRescheduledTo, dateFormat)
});
const prevFromDate: Date = this.holidayForm.value.fromDate;
const prevToDate: Date = this.holidayForm.value.toDate;
if (holidayFormData.closureDate instanceof Date) {
holidayFormData.fromDate = this.dateUtils.formatDate(prevFromDate, dateFormat);
}
const holiday = {
...this.holidayForm.value,
if (holidayFormData.closureDate instanceof Date) {
holidayFormData.toDate = this.dateUtils.formatDate(prevToDate, dateFormat);
}
if (this.holidayForm.contains('repaymentsRescheduledTo')) {
const prevRepaymentsRescheduledTo: Date = this.holidayForm.value.repaymentsRescheduledTo;
holidayFormData.repaymentsRescheduledTo = this.dateUtils.formatDate(prevRepaymentsRescheduledTo, dateFormat);
}
const data = {
...holidayFormData,
dateFormat,
locale
};
this.organizationService.createHoliday(holiday).subscribe((response: any) => {
this.organizationService.createHoliday(data).subscribe((response: any) => {
this.router.navigate(['../', response.resourceId], { relativeTo: this.route });
});
}
src/app/organization/holidays/edit-holiday/edit-holiday.component.ts
+22 -18
View File
@@ -2,7 +2,7 @@
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { DatePipe } from '@angular/common';
import { Dates } from 'app/core/utils/dates';
/** Custom Services. */
import { OrganizationService } from 'app/organization/organization.service';
@@ -35,15 +35,15 @@ export class EditHolidayComponent implements OnInit {
* Get holiday and holiday template from `Resolver`.
* @param {FormBuilder} formBuilder Form Builder.
* @param {ActivatedRoute} route Activated Route.
* @param {DatePipe} datePipe Date Pipe.
* @param {Dates} dateUtils Date Utils.
* @param {OrganizationService} organizatioService Organization Service.
* @param {Router} router Router.
*/
constructor(private formBuilder: FormBuilder,
private route: ActivatedRoute,
private datePipe: DatePipe,
private dateUtils: Dates,
private organizatioService: OrganizationService,
private settings: SettingsService,
private settingsService: SettingsService,
private router: Router ) {
this.route.data.subscribe((data: { holiday: any, holidayTemplate: any }) => {
this.holidayData = data.holiday;
@@ -100,25 +100,29 @@ export class EditHolidayComponent implements OnInit {
* Submits Edit Holiday Form.
*/
submit() {
const dateFormat = this.settings.dateFormat;
const holidayFormData = this.holidayForm.value;
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
if (!this.isActiveHoliday) {
const fromDate: Date = this.holidayForm.value.fromDate;
const toDate: Date = this.holidayForm.value.toDate;
if (this.reSchedulingType === 2 ) {
const repaymentScheduledTo: Date = this.holidayForm.value.repaymentsRescheduledTo;
this.holidayForm.patchValue({
repaymentsRescheduledTo: this.datePipe.transform(repaymentScheduledTo, dateFormat)
});
holidayFormData.repaymentsRescheduledTo = this.dateUtils.formatDate(repaymentScheduledTo, dateFormat);
}
const prevFromDate: Date = this.holidayForm.value.fromDate;
const prevToDate: Date = this.holidayForm.value.toDate;
if (holidayFormData.closureDate instanceof Date) {
holidayFormData.fromDate = this.dateUtils.formatDate(prevFromDate, dateFormat);
}
if (holidayFormData.closureDate instanceof Date) {
holidayFormData.toDate = this.dateUtils.formatDate(prevToDate, dateFormat);
}
this.holidayForm.patchValue({
fromDate: this.datePipe.transform(fromDate, dateFormat),
toDate: this.datePipe.transform(toDate, dateFormat)
});
}
const holidayForm = this.holidayForm.value;
holidayForm.locale = this.settings.language.code;
holidayForm.dateFormat = dateFormat;
this.organizatioService.updateHoliday(this.holidayData.id, holidayForm).subscribe(response => {
const data = {
...holidayFormData,
dateFormat,
locale
};
this.organizatioService.updateHoliday(this.holidayData.id, data).subscribe(response => {
/** TODO Add Redirects to ViewMakerCheckerTask page. */
this.router.navigate(['../'], { relativeTo: this.route });
});