refactor (df/locale): organization module (#1268)

See: #1213
This commit is contained in:
Benura Abeywardena
2020-11-12 19:36:37 +05:30
committed by GitHub
parent dbd34aaf42
commit 5f90bc00bd
26 changed files with 139 additions and 62 deletions
@@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common';
/** Custom Services. */
import { OrganizationService } from 'app/organization/organization.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Create Holiday component.
@@ -41,6 +42,7 @@ export class CreateHolidayComponent implements OnInit {
private route: ActivatedRoute,
private datePipe: DatePipe,
private organizationService: OrganizationService,
private settings: SettingsService,
private router: Router ) {
this.route.data.subscribe((data: { offices: any, holidayTemplate: any }) => {
this.officesData = data.offices;
@@ -84,8 +86,8 @@ export class CreateHolidayComponent implements OnInit {
* Submits the create holiday Form.
*/
submit() {
const dateFormat = 'yyyy-MM-dd';
const locale = 'en';
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),
@@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common';
/** Custom Services. */
import { OrganizationService } from 'app/organization/organization.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Edit Holiday component.
@@ -42,6 +43,7 @@ export class EditHolidayComponent implements OnInit {
private route: ActivatedRoute,
private datePipe: DatePipe,
private organizatioService: OrganizationService,
private settings: SettingsService,
private router: Router ) {
this.route.data.subscribe((data: { holiday: any, holidayTemplate: any }) => {
this.holidayData = data.holiday;
@@ -98,7 +100,7 @@ export class EditHolidayComponent implements OnInit {
* Submits Edit Holiday Form.
*/
submit() {
const dateFormat = 'yyyy-MM-dd';
const dateFormat = this.settings.dateFormat;
if (!this.isActiveHoliday) {
const fromDate: Date = this.holidayForm.value.fromDate;
const toDate: Date = this.holidayForm.value.toDate;
@@ -114,7 +116,7 @@ export class EditHolidayComponent implements OnInit {
});
}
const holidayForm = this.holidayForm.value;
holidayForm.locale = 'en';
holidayForm.locale = this.settings.language.code;
holidayForm.dateFormat = dateFormat;
this.organizatioService.updateHoliday(this.holidayData.id, holidayForm).subscribe(response => {
/** TODO Add Redirects to ViewMakerCheckerTask page. */