diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 9aba6682d..01dfd4946 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -159,7 +159,7 @@ @@ -197,8 +197,8 @@ diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index c1f5bffcd..248230c96 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -41,7 +41,7 @@ export class EditEventToApprovePage implements OnInit { public showSeconds = false; public touchUi = 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 maxDate: any; public stepHour = 1; @@ -192,7 +192,6 @@ export class EditEventToApprovePage implements OnInit { } calculetedLastOccurrence(type:number){ - console.log(type); var valor; var opcao: boolean; if (type == 0) { @@ -318,7 +317,10 @@ export class EditEventToApprovePage implements OnInit { if(this.Form.invalid) return false // 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 => { e.IsRequired = false @@ -333,15 +335,14 @@ export class EditEventToApprovePage implements OnInit { } }) - console.log(this.eventProcess); const event: EventToApproveEdit = { SerialNumber: this.eventProcess.serialNumber, Body: this.eventProcess.workflowInstanceDataFields.Body, Location: this.eventProcess.workflowInstanceDataFields.Location, Subject: this.eventProcess.workflowInstanceDataFields.Subject, - StartDate: this.eventProcess.workflowInstanceDataFields.StartDate, - EndDate: this.eventProcess.workflowInstanceDataFields.EndDate, + StartDate: this.dateControlStart.value, + EndDate: this.dateControlEnd.value, ReviewUserComment: '', Agenda: this.eventProcess.workflowInstanceDataFields.Agenda, MDName: this.eventProcess.workflowInstanceDataFields.MDName, @@ -516,7 +517,6 @@ export class EditEventToApprovePage implements OnInit { } getDatepickerData() { - this.eventProcess.workflowInstanceDataFields.StartDate = this.dateStart this.eventProcess.workflowInstanceDataFields.EndDate = this.dateEnd