refactor (df/locale): centers module (#1269)

See: #1213
This commit is contained in:
Devendra Kharolia
2020-11-12 19:34:38 +05:30
committed by GitHub
parent d191d11c10
commit dbd34aaf42
9 changed files with 46 additions and 20 deletions
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { CentersService } from 'app/centers/centers.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Activate Center Component
@@ -29,12 +30,14 @@ export class ActivateCenterComponent implements OnInit {
/**
* @param {FormBuilder} formBuilder Form Builder
* @param {centersService} CentersService Shares Service
* @param {SettingsService} settingsService Settings Service.
* @param {DatePipe} datePipe Date Pipe
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
constructor(private formBuilder: FormBuilder,
private centersService: CentersService,
private settingsService: SettingsService,
private datePipe: DatePipe,
private route: ActivatedRoute,
private router: Router) {
@@ -63,8 +66,8 @@ export class ActivateCenterComponent implements OnInit {
*/
submit() {
// TODO: Update once language and date settings are setup
const locale = 'en';
const dateFormat = 'dd MMMM yyyy';
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
const prevactivationDate: Date = this.activateCenterForm.value.activationDate;
this.activateCenterForm.patchValue({
activationDate: this.datePipe.transform(prevactivationDate, dateFormat),
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { CentersService } from 'app/centers/centers.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Center Meetings Component
@@ -38,12 +39,14 @@ export class AttachCenterMeetingComponent implements OnInit {
* Fetches Calendar Template from `resolve`
* @param {FormBuilder} formBuilder Form Builder
* @param {CentersService} centersService Shares Service
* @param {SettingsService} settingsService Settings Service.
* @param {DatePipe} datePipe Date Pipe
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
constructor(private formBuilder: FormBuilder,
private centersService: CentersService,
private settingsService: SettingsService,
private datePipe: DatePipe,
private route: ActivatedRoute,
private router: Router) {
@@ -112,8 +115,8 @@ export class AttachCenterMeetingComponent implements OnInit {
*/
submit() {
// TODO: Update once language and date settings are setup
const locale = 'en';
const dateFormat = 'dd MMMM yyyy';
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
const title = `centers_${this.centerId}_CollectionMeeting`;
const typeId = '1';
const prevStartDate: Date = this.centerMeetingForm.value.startDate;
@@ -7,6 +7,7 @@ import { FormControl } from '@angular/forms';
/** Custom Services */
import { CentersService } from 'app/centers/centers.service';
import { SettingsService } from 'app/settings/settings.service';
/** Custom Dialogs */
import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
@@ -50,12 +51,14 @@ export class CenterAttendanceComponent implements OnInit {
* @param {DatePipe} datePipe Date Pipe
* @param {Router} router Router
* @param {CentersService} centersService Centers Service
* @param {SettingsService} settingsService Settings Service.
* @param {MatDialog} dialog Mat Dialog
*/
constructor(private route: ActivatedRoute,
private datePipe: DatePipe,
private router: Router,
private centersService: CentersService,
private settingsService: SettingsService,
public dialog: MatDialog) {
this.route.data.subscribe(( data: { centersActionData: any }) => {
this.centerData = data.centersActionData;
@@ -119,8 +122,8 @@ export class CenterAttendanceComponent implements OnInit {
*/
submit() {
// TODO: Update once language and date settings are setup
const locale = 'en';
const dateFormat = 'dd MMMM yyyy';
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
const prevMeetingDate: Date = new Date(this.meetingDate.value);
this.meetingDate.patchValue(this.datePipe.transform(prevMeetingDate, dateFormat));
const data = {
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { CentersService } from 'app/centers/centers.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Close Center Component
@@ -31,12 +32,14 @@ export class CloseCenterComponent implements OnInit {
/**
* @param {FormBuilder} formBuilder Form Builder
* @param {CentersService} centersService Shares Service
* @param {SettingsService} settingsService Settings Service.
* @param {DatePipe} datePipe Date Pipe
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
constructor(private formBuilder: FormBuilder,
private centersService: CentersService,
private settingsService: SettingsService,
private datePipe: DatePipe,
private route: ActivatedRoute,
private router: Router) {
@@ -65,8 +68,8 @@ export class CloseCenterComponent implements OnInit {
*/
submit() {
// TODO: Update once language and date settings are setup
const locale = 'en';
const dateFormat = 'dd MMMM yyyy';
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
const prevClosedDate: Date = this.closeCenterForm.value.closureDate;
this.closeCenterForm.patchValue({
closureDate: this.datePipe.transform(prevClosedDate, dateFormat),
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { CentersService } from 'app/centers/centers.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Edit Center Meetings Schedule Component
@@ -36,12 +37,14 @@ export class EditCenterMeetingScheduleComponent implements OnInit {
* Fetches Calendar Template from `resolve`
* @param {FormBuilder} formBuilder Form Builder
* @param {CentersService} centersService Shares Service
* @param {SettingsService} settingsService Settings Service.
* @param {DatePipe} datePipe Date Pipe
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
constructor(private formBuilder: FormBuilder,
private centersService: CentersService,
private settingsService: SettingsService,
private datePipe: DatePipe,
private route: ActivatedRoute,
private router: Router) {
@@ -72,8 +75,8 @@ export class EditCenterMeetingScheduleComponent implements OnInit {
*/
submit() {
// TODO: Update once language and date settings are setup
const locale = 'en';
const dateFormat = 'dd MMMM yyyy';
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
const reschedulebasedOnMeetingDates = true;
const prevOldDate: Date = new Date(this.centerEditMeetingScheduleForm.value.presentMeetingDate);
const prevNewDate: Date = this.centerEditMeetingScheduleForm.value.newMeetingDate;
@@ -6,6 +6,7 @@ import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
import { CentersService } from 'app/centers/centers.service';
import { SettingsService } from 'app/settings/settings.service';
/**
* Edit Center Meetings Component
@@ -40,12 +41,14 @@ export class EditCenterMeetingComponent implements OnInit {
* Fetches Calendar Template from `resolve`
* @param {FormBuilder} formBuilder Form Builder
* @param {CentersService} centersService Shares Service
* @param {SettingsService} settingsService Settings Service.
* @param {DatePipe} datePipe Date Pipe
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
*/
constructor(private formBuilder: FormBuilder,
private centersService: CentersService,
private settingsService: SettingsService,
private datePipe: DatePipe,
private route: ActivatedRoute,
private router: Router) {
@@ -117,8 +120,8 @@ export class EditCenterMeetingComponent implements OnInit {
*/
submit() {
// TODO: Update once language and date settings are setup
const locale = 'en';
const dateFormat = 'dd MMMM yyyy';
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
const title = `centers_${this.centerId}_CollectionMeeting`;
const typeId = '1';
const prevStartDate: Date = this.centerEditMeetingForm.value.startDate;