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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/app/organization/employees/create-employee/create-employee.component.ts
+5 -2
View File
@@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common';
/** Custom Services */
import { OrganizationService } from '../../organization.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Create employee component.
@@ -30,12 +31,14 @@ export class CreateEmployeeComponent implements OnInit {
* Retrieves the offices data from `resolve`.
* @param {FormBuilder} formBuilder Form Builder.
* @param {OrganizationService} organizationService Organization Service.
* @param {SettingsService} settingsService Settings Service.
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
* @param {DatePipe} datePipe Date Pipe to format date.
*/
constructor(private formBuilder: FormBuilder,
private organizationService: OrganizationService,
private settingsService: SettingsService,
private route: ActivatedRoute,
private router: Router,
private datePipe: DatePipe) {
@@ -72,12 +75,12 @@ export class CreateEmployeeComponent implements OnInit {
submit() {
const prevJoiningDate: Date = this.employeeForm.value.joiningDate;
// TODO: Update once language and date settings are setup
const dateFormat = 'yyyy-MM-dd';
const dateFormat = this.settingsService.dateFormat;
this.employeeForm.patchValue({
joiningDate: this.datePipe.transform(prevJoiningDate, dateFormat)
});
const employee = this.employeeForm.value;
employee.locale = 'en';
employee.locale = this.settingsService.language.code;
employee.dateFormat = dateFormat;
this.organizationService.createEmployee(employee).subscribe((response: any) => {
this.router.navigate(['../'], { relativeTo: this.route });
src/app/organization/employees/edit-employee/edit-employee.component.ts
+5 -2
View File
@@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common';
/** Custom Services */
import { OrganizationService } from '../../organization.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Edit Employee Component.
@@ -32,12 +33,14 @@ export class EditEmployeeComponent implements OnInit {
* Retrieves the offices data from `resolve`.
* @param {FormBuilder} formBuilder Form Builder.
* @param {OrganizationService} organizationService Organization Service.
* @param {SettingsService} settingsService Settings Service.
* @param {ActivatedRoute} route Activated Route.
* @param {Router} router Router for navigation.
* @param {DatePipe} datePipe Date Pipe to format date.
*/
constructor(private formBuilder: FormBuilder,
private organizationService: OrganizationService,
private settingsService: SettingsService,
private route: ActivatedRoute,
private router: Router,
private datePipe: DatePipe) {
@@ -76,12 +79,12 @@ export class EditEmployeeComponent implements OnInit {
submit() {
const prevJoiningDate: Date = this.editEmployeeForm.value.joiningDate;
// TODO: Update once language and date settings are setup
const dateFormat = 'yyyy-MM-dd';
const dateFormat = this.settingsService.dateFormat;
this.editEmployeeForm.patchValue({
joiningDate: this.datePipe.transform(prevJoiningDate, dateFormat)
});
const employee = this.editEmployeeForm.value;
employee.locale = 'en';
employee.locale = this.settingsService.language.code;
employee.dateFormat = dateFormat;
this.organizationService.updateEmployee(this.employeeData.id, employee).subscribe((response: any) => {
this.router.navigate(['../../', response.resourceId], { relativeTo: this.route });