diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index ff4cbef00..bde1071bf 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -409,6 +409,9 @@ (closeComponent)="approveEventDismissGoBack()" (setIntervenient)="setIntervenient($event)" (setIntervenientCC)="setIntervenientCC($event)" + + + (closeEventToApprove)="closeEventToApproveGoBack()" > { - this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); - }, 1000) + this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); + } realoadCounter++; } @@ -339,15 +338,7 @@ export class AgendaPage implements OnInit { let classs = []; events.forEach(element => { - - const startTimeSamp = new Date(element.startTime).toLocaleDateString() - const endTimeSamp = new Date(element.endTime).toLocaleDateString() - - const endMinutes = new Date(element.endTime).getMinutes() - const endHours = new Date(element.endTime).getHours() - const endDay: number = new Date(element.endTime).getDate() - const startDay = new Date(element.startTime).getDate() - + const profile_ = element.profile == 'md'? 'mdgpr': 'pr'; const eventtype = element.event.CalendarName; diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 79884958d..4752d3ad9 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -20,7 +20,7 @@
- +
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 156a4698d..e62ca8002 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 @@ -109,6 +109,7 @@ export class EditEventToApprovePage implements OnInit { @Output() setIntervenient = new EventEmitter(); @Output() setIntervenientCC = new EventEmitter(); @Output() closeComponent = new EventEmitter(); + @Output() closeEventToApprove = new EventEmitter(); @Input() saveData: any; @Input() serialNumber: string @@ -210,7 +211,10 @@ export class EditEventToApprovePage implements OnInit { window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {} - this.closeComponent.emit(); + // this.closeComponent.emit(); + + this.closeEventToApprove.emit(); + /* this.setIntervenient.emit([]); this.setIntervenientCC.emit([]); this.clearContact.emit(); */ @@ -254,8 +258,6 @@ export class EditEventToApprovePage implements OnInit { } async save() { - - this.close() this.injectValidation() this.runValidation() @@ -303,8 +305,9 @@ export class EditEventToApprovePage implements OnInit { try { await this.eventsService.postEventToApproveEdit(event).toPromise() + this.close() + this.toastService.successMessage('Evento editado'); - } catch(e) { this.toastService.badRequest('Evento não editado');