diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts index 29f7de084..e46534965 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts @@ -78,7 +78,7 @@ export class ApproveEventModalPage implements OnInit { } try { - await this.processes.PostTaskAction(body); + await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); this.modalController.dismiss(null); this.successMessage() @@ -106,7 +106,7 @@ export class ApproveEventModalPage implements OnInit { let body = { "serialNumber": serialNumber, "action": "Rejeitar" } try { - await this.processes.PostTaskAction(body); + await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); this.modalController.dismiss(null); this.successMessage() @@ -150,15 +150,22 @@ export class ApproveEventModalPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res => { - if(res.data !== ''){ + if(res.data !== '') { let body = { "serialNumber": serialNumber, - "action": "Emendar", - "dataFields": { - "ReviewerUseComment": res.data, + "action": "Emendar", + "dataFields": { + "ReviewerUseComment": res.data, + } } + + try { + this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.successMessage() + } catch (error) { + this.badRequest() } - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); + } else{ //this.alertService.presentAlert('Operação cancelada!'); diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index 64fa7c06d..70e16386e 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -3,6 +3,8 @@ import { Router } from '@angular/router'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { ProcessesService } from 'src/app/services/processes.service'; import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page'; +import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; +import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; @Component({ selector: 'app-event-actions-popover', @@ -36,17 +38,34 @@ export class EventActionsPopoverPage implements OnInit { approveTask(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Aprovar" } console.log(body); - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); + + + try { + this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.modalController.dismiss(null); + this.successMessage() + } catch (error) { + this.badRequest() + } + } emendarTask(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Rejeitar" } console.log(body); - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); + + + try { + this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.modalController.dismiss(null); + this.successMessage() + } catch (error) { + this.badRequest() + } + + } deleteTask(){ @@ -72,4 +91,39 @@ export class EventActionsPopoverPage implements OnInit { } + async successMessage(message?: string) { + + const modal = await this.modalController.create({ + component: SuccessMessageComponent, + componentProps: { + message: message || 'Processo efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + + } + + async badRequest(message?: string) { + const modal = await this.modalController.create({ + component: BadRequestComponent, + componentProps: { + message: message || 'Processo não efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + } + + } diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index 599ad5203..e0f5be392 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -97,9 +97,16 @@ export class ApproveEventModalPage implements OnInit { console.log('approveTask SERIALNUMBER: ', serialNumber) let body = { "serialNumber": serialNumber, "action": "Aprovar" } console.log(body); - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); + try { + this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.modalController.dismiss(null); + this.successMessage() + } catch (error) { + this.badRequest() + } + + } emendTask(serialNumber:string){ @@ -116,7 +123,7 @@ export class ApproveEventModalPage implements OnInit { // console.log(body); try { - await this.processes.PostTaskAction(body); + await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); this.successMessage() @@ -171,7 +178,7 @@ export class ApproveEventModalPage implements OnInit { //console.log(body); try { - await this.processes.PostTaskAction(body); + await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); this.successMessage() } catch (error) { diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 279a101c3..a7e0454d1 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -9,6 +9,8 @@ import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/ import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page'; +import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; +import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; @Component({ selector: 'app-approve-event', @@ -93,8 +95,16 @@ export class ApproveEventPage implements OnInit { approveTask(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Aprovar" } console.log(body); - this.processes.PostTaskAction(body); - this.modalController.dismiss(serialNumber); + + try { + this.processes.PostTaskAction(body).toPromise() + this.modalController.dismiss(serialNumber); + this.successMessage() + } catch (error) { + this.badRequest() + } + + /* this.approveEventDismiss.emit({ "serialNumber": serialNumber, "action": "Aprovar", @@ -117,9 +127,18 @@ export class ApproveEventPage implements OnInit { let body = { "serialNumber": serialNumber, "action": "Rejeitar" } console.log(body); - this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); + + try { + this.processes.PostTaskAction(body).toPromise() + this.router.navigate(['/home/gabinete-digital/event-list']); + this.modalController.dismiss(null); + this.successMessage() + } catch (error) { + this.badRequest() + } + + + } async getAttachments(instanceId:string){ @@ -175,9 +194,17 @@ export class ApproveEventPage implements OnInit { } } console.log(body); - this.processes.PostTaskAction(body); - //this.router.navigate(['/home/gabinete-digital/event-list']); - this.goToEventsToApprove(); + + try { + this.processes.PostTaskAction(body).toPromise() + //this.router.navigate(['/home/gabinete-digital/event-list']); + this.goToEventsToApprove(); + this.successMessage() + } catch (error) { + this.badRequest() + } + + } else{ //this.alertService.presentAlert('Operação cancelada!'); @@ -216,4 +243,40 @@ export class ApproveEventPage implements OnInit { } + + + async successMessage(message?: string) { + + const modal = await this.modalController.create({ + component: SuccessMessageComponent, + componentProps: { + message: message || 'Processo efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + + } + + async badRequest(message?: string) { + const modal = await this.modalController.create({ + component: BadRequestComponent, + componentProps: { + message: message || 'Processo não efetuado' , + }, + cssClass: 'modal modal-desktop' + }); + + modal.present() + + setTimeout(()=>{ + modal.dismiss() + },3000) + } + } diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index c83674154..1fc42cece 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -137,7 +137,7 @@ export class ProcessesService { let options = { headers: this.headers, }; - return this.http.post(`${geturl}`, body, options).toPromise() + return this.http.post(`${geturl}`, body, options) } CompleteTask(body:any){ const geturl = environment.apiURL + 'Tasks/CompleteTask'; diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.component.ts index 904349ec8..10a90504d 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.component.ts @@ -84,7 +84,7 @@ export class ApproveEventComponent implements OnInit { console.log(body); try { - this.processes.PostTaskAction(body); + this.processes.PostTaskAction(body).toPromise() this.modalController.dismiss(serialNumber); this.successMessage() } catch (error) { @@ -121,7 +121,7 @@ export class ApproveEventComponent implements OnInit { console.log(body); try { - await this.processes.PostTaskAction(body); + await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); this.modalController.dismiss(null); this.successMessage() @@ -182,7 +182,7 @@ export class ApproveEventComponent implements OnInit { } } console.log(body); - this.processes.PostTaskAction(body); + this.processes.PostTaskAction(body).toPromise() //this.router.navigate(['/home/gabinete-digital/event-list']); this.goToEventsToApprove(); }