diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 8061f5af1..3c43f7b28 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -224,7 +224,18 @@ export class ExpedienteDetailPage implements OnInit { modal.onDidDismiss().then( async(res)=>{ let body = res['data']; if(res['data']) { - await this.distartExpedientModal(body); + + //await this.distartExpedientModal(body); + const loader = this.toastService.loading() + try { + await this.processes.CompleteTask(body).toPromise(); + //this.toastService.successMessage('Processo descartado'); + this.goBack(); + } catch (error) { + this.toastService.badRequest('Processo não descartado') + } finally { + loader.remove() + } } else{ this.close(); @@ -275,6 +286,7 @@ export class ExpedienteDetailPage implements OnInit { } else{ if(res['data']== 'Yes'){ + const loader = this.toastService.loading() try { await this.processes.CompleteTask(body).toPromise(); diff --git a/src/app/shared/popover/messages-options/messages-options.page.html b/src/app/shared/popover/messages-options/messages-options.page.html index 62e6265a2..98acbea72 100644 --- a/src/app/shared/popover/messages-options/messages-options.page.html +++ b/src/app/shared/popover/messages-options/messages-options.page.html @@ -7,6 +7,6 @@
- +