correction of dates in the event-to-aprove

This commit is contained in:
EQUILIBRIUM\hirondino.van-dunem
2022-06-17 16:00:39 +01:00
parent fa81f75221
commit e665ca70c3
2 changed files with 10 additions and 10 deletions
@@ -159,7 +159,7 @@
<mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block"> <mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
<input matInput [ngxMatDatetimePicker]="picker1" <input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date" placeholder="Choose a date"
[formControl]="dateControlStart" [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
[min]="minDate" [max]="maxDate" [min]="minDate" [max]="maxDate"
[disabled]="disabled" [disabled]="disabled"
> >
@@ -197,8 +197,8 @@
<mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block"> <mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
<input matInput [ngxMatDatetimePicker]="fim" <input matInput [ngxMatDatetimePicker]="fim"
placeholder="Choose a date" placeholder="Choose a date"
[formControl]="dateControlEnd" [(ngModel)]="eventProcess.workflowInstanceDataFields.EndDate"
[min]="minDate" [max]="maxDate" [min]="endMinDate" [max]="maxDate"
[disabled]="disabled" [disabled]="disabled"
> >
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle> <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
@@ -41,7 +41,7 @@ export class EditEventToApprovePage implements OnInit {
public showSeconds = false; public showSeconds = false;
public touchUi = false; public touchUi = false;
public enableMeridian = false; public enableMeridian = false;
public minDate = new Date().toISOString().slice(0,10) public minDate = new Date()
public endMinDate = new Date(new Date().getTime() + 15 * 60000); public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public maxDate: any; public maxDate: any;
public stepHour = 1; public stepHour = 1;
@@ -192,7 +192,6 @@ export class EditEventToApprovePage implements OnInit {
} }
calculetedLastOccurrence(type:number){ calculetedLastOccurrence(type:number){
console.log(type);
var valor; var valor;
var opcao: boolean; var opcao: boolean;
if (type == 0) { if (type == 0) {
@@ -318,7 +317,10 @@ export class EditEventToApprovePage implements OnInit {
if(this.Form.invalid) return false if(this.Form.invalid) return false
// set dates to eventProcess object // set dates to eventProcess object
this.getDatepickerData() this.dateControlStart = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.StartDate)).add(1, 'hours'));
this.dateControlEnd = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.EndDate)).add(1, 'hours'));
// this.restoreDatepickerData()
// this.getDatepickerData()
this.taskParticipantsCc.forEach( e => { this.taskParticipantsCc.forEach( e => {
e.IsRequired = false e.IsRequired = false
@@ -333,15 +335,14 @@ export class EditEventToApprovePage implements OnInit {
} }
}) })
console.log(this.eventProcess);
const event: EventToApproveEdit = { const event: EventToApproveEdit = {
SerialNumber: this.eventProcess.serialNumber, SerialNumber: this.eventProcess.serialNumber,
Body: this.eventProcess.workflowInstanceDataFields.Body, Body: this.eventProcess.workflowInstanceDataFields.Body,
Location: this.eventProcess.workflowInstanceDataFields.Location, Location: this.eventProcess.workflowInstanceDataFields.Location,
Subject: this.eventProcess.workflowInstanceDataFields.Subject, Subject: this.eventProcess.workflowInstanceDataFields.Subject,
StartDate: this.eventProcess.workflowInstanceDataFields.StartDate, StartDate: this.dateControlStart.value,
EndDate: this.eventProcess.workflowInstanceDataFields.EndDate, EndDate: this.dateControlEnd.value,
ReviewUserComment: '', ReviewUserComment: '',
Agenda: this.eventProcess.workflowInstanceDataFields.Agenda, Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
MDName: this.eventProcess.workflowInstanceDataFields.MDName, MDName: this.eventProcess.workflowInstanceDataFields.MDName,
@@ -516,7 +517,6 @@ export class EditEventToApprovePage implements OnInit {
} }
getDatepickerData() { getDatepickerData() {
this.eventProcess.workflowInstanceDataFields.StartDate = this.dateStart this.eventProcess.workflowInstanceDataFields.StartDate = this.dateStart
this.eventProcess.workflowInstanceDataFields.EndDate = this.dateEnd this.eventProcess.workflowInstanceDataFields.EndDate = this.dateEnd