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 35dc124fa..7d7fc1a75 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 @@ -382,19 +382,17 @@ export class ExpedienteDetailPage implements OnInit { }); await modal.present(); modal.onDidDismiss().then( async(res)=>{ + alert('AQUI') let body = res['data']; if(res['data']) { - - //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() + this.goBack(); + } catch (error) { + this.toastService.badRequest('Processo não descartado') + } finally { + loader.remove() } } else{ diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index aefca0253..8cea8c836 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -87,7 +87,7 @@ export class OptsExpedientePage implements OnInit { } else { this.location.back() - + /* this.activatedRoute.paramMap.subscribe(params => { console.log('YES'); @@ -166,7 +166,7 @@ export class OptsExpedientePage implements OnInit { }); }); - + this.popoverController.dismiss() } @@ -325,12 +325,9 @@ export class OptsExpedientePage implements OnInit { console.log(res['data']); let body = res['data']; if(res['data']){ - console.log('open discart') - //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')