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/sms-campaigns/create-campaign/create-campaign.component.ts
+1 -1
View File
@@ -37,7 +37,7 @@ export class CreateCampaignComponent {
* @param {Router} router Router
* @param {OrganizationService} organizationService Organization Service
* @param {SettingsService} settingsService Settings Service
* @param {DatePipe} datePipe Date Pipe
* @param {DatePipe} datePipe Date Utils
*/
constructor(private route: ActivatedRoute,
private router: Router,
src/app/organization/sms-campaigns/edit-campaign/edit-campaign.component.ts
+1 -1
View File
@@ -34,7 +34,7 @@ export class EditCampaignComponent {
* Fetches campaign template from `resolve`
* @param {ActivatedRoute} route Activated Route
* @param {Router} router Router
* @param {DatePipe} datePipe Date Pipe
* @param {DatePipe} datePipe Date Utils
* @param {OrganizationService} organizationService Organiztion Service
* @param {SettingsService} settingsService Settings Service
*/
src/app/organization/sms-campaigns/sms-campaign-stepper/edit-sms-campaign-step/edit-business-rule-parameters/edit-business-rule-parameters.component.ts
+3 -3
View File
@@ -1,7 +1,6 @@
/** Angular Imports */
import { Component, OnChanges, Input, Output, EventEmitter } from '@angular/core';
import { Validators, FormGroup, FormControl } from '@angular/forms';
import { DatePipe } from '@angular/common';
/** Rxjs Imports */
import { distinctUntilChanged } from 'rxjs/operators';
@@ -13,6 +12,7 @@ import { SettingsService } from 'app/settings/settings.service';
/** Custom Models */
import { ReportParameter } from 'app/reports/common-models/report-parameter.model';
import { SelectOption } from 'app/reports/common-models/select-option.model';
import { Dates } from 'app/core/utils/dates';
/**
* Edit Business Rule Parameters.
@@ -47,7 +47,7 @@ export class EditBusinessRuleParametersComponent implements OnChanges {
*/
constructor(private reportsService: ReportsService,
private settingsService: SettingsService,
private datePipe: DatePipe) { }
private dateUtils: Dates) { }
ngOnChanges() {
if (this.paramData) {
@@ -78,7 +78,7 @@ export class EditBusinessRuleParametersComponent implements OnChanges {
break;
case 'date':
const dateFormat = this.settingsService.dateFormat;
const newControlValue = this.datePipe.transform(controlValue, dateFormat);
const newControlValue = this.dateUtils.formatDate(controlValue, dateFormat);
this.ReportForm.get(param.name).patchValue(newControlValue);
break;
}
src/app/organization/sms-campaigns/sms-campaign-stepper/sms-campaign-step/business-rule-parameters/business-rule-parameters.component.ts
+4 -4
View File
@@ -1,7 +1,6 @@
/** Angular Imports */
import { Component, OnChanges, Input, Output, EventEmitter } from '@angular/core';
import { Validators, FormGroup, FormControl } from '@angular/forms';
import { DatePipe } from '@angular/common';
/** Custom Services */
import { ReportsService } from 'app/reports/reports.service';
@@ -10,6 +9,7 @@ import { SettingsService } from 'app/settings/settings.service';
/** Custom Models */
import { ReportParameter } from 'app/reports/common-models/report-parameter.model';
import { SelectOption } from 'app/reports/common-models/select-option.model';
import { Dates } from 'app/core/utils/dates';
/**
* Business Rule Parameters Component.
@@ -41,11 +41,11 @@ export class BusinessRuleParametersComponent implements OnChanges {
/**
* @param {ReportsService} reportsService Reports Service.
* @param {SettingsService} settingsService Settings Service.
* @param {DatePipe} datePipe Date Pipe.
* @param {Dates} dateUtils Date Utils.
*/
constructor(private reportsService: ReportsService,
private settingsService: SettingsService,
private datePipe: DatePipe) { }
private dateUtils: Dates) { }
ngOnChanges() {
if (this.paramData) {
@@ -156,7 +156,7 @@ export class BusinessRuleParametersComponent implements OnChanges {
break;
case 'date':
const dateFormat = this.settingsService.dateFormat;
formattedResponse[newKey] = this.datePipe.transform(value, dateFormat);
formattedResponse[newKey] = this.dateUtils.formatDate(value, dateFormat);
break;
case 'none':
formattedResponse[newKey] = value;
src/app/organization/sms-campaigns/view-campaign/view-campaign.component.ts
+23 -18
View File
@@ -4,7 +4,6 @@ import { FormGroup, FormBuilder } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
import { MatTableDataSource, MatTable } from '@angular/material/table';
import { ActivatedRoute, Router } from '@angular/router';
import { DatePipe } from '@angular/common';
/** Custom Dialogs */
import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
@@ -17,6 +16,7 @@ import { DatepickerBase } from 'app/shared/form-dialog/formfield/model/datepicke
/** Custom Services */
import { OrganizationService } from '../../organization.service';
import { SettingsService } from 'app/settings/settings.service';
import { Dates } from 'app/core/utils/dates';
/**
* View SMS Campaign Component
@@ -76,7 +76,7 @@ export class ViewCampaignComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {MatDialog} dialog Mat Dialog
* @param {FormBuilder} formBuilder Form Builder
* @param {DatePipe} datePipe Date Pipe
* @param {Dates} dateUtils Date Utils
* @param {OrganizationService} organizationService Organization Service
* @param {SettingsService} settingsService Setting Service
*/
@@ -84,7 +84,7 @@ export class ViewCampaignComponent implements OnInit {
private route: ActivatedRoute,
public dialog: MatDialog,
private formBuilder: FormBuilder,
private datePipe: DatePipe,
private dateUtils: Dates,
private organizationService: OrganizationService,
private settingsService: SettingsService) {
this.route.data.subscribe((data: { smsCampaign: any }) => {
@@ -146,7 +146,7 @@ export class ViewCampaignComponent implements OnInit {
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
const dataObject = {
closureDate: this.datePipe.transform(response.data.value.closureDate, dateFormat),
closureDate: this.dateUtils.formatDate(response.data.value.closureDate, dateFormat),
dateFormat,
locale
};
@@ -181,7 +181,7 @@ export class ViewCampaignComponent implements OnInit {
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
const dataObject = {
activationDate: this.datePipe.transform(response.data.value.activationDate, dateFormat),
activationDate: this.dateUtils.formatDate(response.data.value.activationDate, dateFormat),
dateFormat,
locale
};
@@ -216,7 +216,7 @@ export class ViewCampaignComponent implements OnInit {
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
const dataObject = {
activationDate: this.datePipe.transform(response.data.value.activationDate, dateFormat),
activationDate: this.dateUtils.formatDate(response.data.value.activationDate, dateFormat),
dateFormat,
locale
};
@@ -257,20 +257,25 @@ export class ViewCampaignComponent implements OnInit {
* Retrives messages by status.
*/
search() {
const smsFormData = this.smsForm.value;
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
const prevFromDate: Date = this.smsForm.value.fromDate;
const prevToDate: Date = this.smsForm.value.toDate;
// TODO: Update once language and date settings are setup
const dateFormat = this.settingsService.dateFormat;
this.smsForm.patchValue({
fromDate: this.datePipe.transform(prevFromDate, dateFormat),
toDate: this.datePipe.transform(prevToDate, dateFormat)
});
const SMS = this.smsForm.value;
SMS.id = this.smsCampaignData.id;
SMS.locale = this.settingsService.language.code;
SMS.dateFormat = dateFormat;
SMS.status = this.status;
this.organizationService.getMessagebyStatus(SMS).subscribe((response: any) => {
if (smsFormData.fromDate instanceof Date) {
smsFormData.fromDate = this.dateUtils.formatDate(prevFromDate, dateFormat);
}
if (smsFormData.toDate instanceof Date) {
smsFormData.toDate = this.dateUtils.formatDate(prevToDate, dateFormat);
}
const data = {
...smsFormData,
id: this.smsCampaignData.id,
status: this.status,
dateFormat,
locale
};
this.organizationService.getMessagebyStatus(data).subscribe((response: any) => {
this.dataSource.data = response.pageItems;
this.messageTableRef.renderRows();
});