diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 7fd64aed3..0734864c6 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -701,7 +701,7 @@ export class SearchPage implements OnInit { const modal = await this.modalCtrl.create({ component: ViewEventPage, - componentProps:{ + componentProps: { eventId: Id, CalendarId: CalendarId, isModal: true, 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..b145d349d 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 @@ -9,7 +9,7 @@ - Editar evento por aprovar + Editar evento por aprovar @@ -372,6 +372,6 @@ Cancelar - Gravar + Gravar 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 7fa166360..90226899d 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 @@ -223,14 +223,12 @@ export class EditEventToApprovePage implements OnInit { this.setIntervenientCC.emit([]); this.clearContact.emit(); - this.approveEventDismiss.emit({ - "serialNumber": this.eventProcess.serialNumber, - "action": "Aprovar", - "saveData": this.eventProcess + serialNumber: this.eventProcess.serialNumber, + action: "Aprovar", + saveData: this.eventProcess }); - } @@ -330,14 +328,14 @@ export class EditEventToApprovePage implements OnInit { if(document['action'] == 'add') { delete document.action this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{ - // this.toastService.successMessage(); + }, error =>{ this.toastService.badRequest(); }); } else if(document['action'] == 'delete') { delete document.action this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{ - // this.toastService.successMessage() + }, error =>{ this.toastService.badRequest() }) @@ -347,6 +345,32 @@ export class EditEventToApprovePage implements OnInit { } + async reenviar() { + let body = { + serialNumber: this.eventProcess.serialNumber, + action: "Reenviar", + dataFields: { + ReviewUserComment: "", + } + } + + const loader = this.toastService.loading(); + + try { + await this.processes.PostTaskAction(body).toPromise(); + this.toastService._successMessage(); + this.goToApproveEventList(); + } catch (error) { + this.toastService._badRequest(); + } finally { + loader.remove() + } + } + + goToApproveEventList() { + this.closeEventToApprove.emit(); + this.modalController.dismiss(); + } dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) { this.taskParticipants = removeDuplicate(taskParticipants) ;