- + -
. - +
+
@@ -72,8 +72,8 @@
-
Lista vazia From 6847d2c74affb8c8f969ad13e9ba324c2d98c8ee Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 27 Jul 2021 10:07:55 +0100 Subject: [PATCH 4/6] save --- .../expediente-detail/expediente-detail.page.ts | 14 +++++++++++++- .../messages-options/messages-options.page.html | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) 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 @@
- +
From a80ec050b53b82f7691ab0a0d2b61fa090906508 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 27 Jul 2021 10:09:04 +0100 Subject: [PATCH 5/6] save --- .../expediente/expediente-detail/expediente-detail.page.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 3c43f7b28..ad6a55936 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 @@ -229,7 +229,7 @@ export class ExpedienteDetailPage implements OnInit { const loader = this.toastService.loading() try { await this.processes.CompleteTask(body).toPromise(); - //this.toastService.successMessage('Processo descartado'); + this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { this.toastService.badRequest('Processo não descartado') @@ -271,7 +271,7 @@ export class ExpedienteDetailPage implements OnInit { try { await this.processes.CompleteTask(otherbody).toPromise() - //this.toastService.successMessage('Processo descartado'); + this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { this.toastService.badRequest('Processo não descartado') From 731e4472430e0c123bbc8615d8f9c9824581538a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 27 Jul 2021 10:17:26 +0100 Subject: [PATCH 6/6] save --- .../opts-expediente/opts-expediente.page.ts | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) 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 d1284d828..47bd03dd9 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -28,7 +28,7 @@ export class OptsExpedientePage implements OnInit { private toastService: ToastService, private router: Router, private activatedRoute: ActivatedRoute, - ) { + ) { this.task = this.navParams.get('task'); this.fulltask = this.navParams.get('fulltask'); @@ -58,7 +58,7 @@ export class OptsExpedientePage implements OnInit { if(this.task.Status == "Pending" && this.caller != 'events'){ if (window.innerWidth <= 800) { this.router.navigate(['/home/gabinete-digital/pendentes']); - } + } else { let navigationExtras: NavigationExtras = { queryParams: { @@ -70,19 +70,19 @@ export class OptsExpedientePage implements OnInit { } else{ window.history.back(); - + /* this.activatedRoute.paramMap.subscribe(params => { console.log('YES'); console.log(params); - - + + switch (params["params"].caller) { case 'events': console.log('here-1'); - + this.router.navigate(['/home',params["params"].caller]); break; - + case 'gabinete-digital': console.log('here0'); let navigationExtras: NavigationExtras = { @@ -93,12 +93,12 @@ export class OptsExpedientePage implements OnInit { if( window.innerWidth < 801) { this.router.navigate(['/home/gabinete-digital/expediente']); console.log('here'); - + } else { this.router.navigate(['/home/gabinete-digital'], navigationExtras); } break; - + } }); */ } @@ -152,12 +152,22 @@ export class OptsExpedientePage implements OnInit { cssClass: classs, }); await modal.present(); - modal.onDidDismiss().then(res=>{ + modal.onDidDismiss().then(async res=>{ console.log(res['data']); let body = res['data']; if(res['data']){ console.log('open discart') - this.distartExpedientModal(body); + //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{ console.log('Not open'); @@ -174,7 +184,7 @@ export class OptsExpedientePage implements OnInit { cssClass: 'discart-expedient-modal', backdropDismiss: false }); - + await modal.present(); modal.onDidDismiss().then( async (res)=>{ console.log(res['data']); @@ -192,7 +202,7 @@ export class OptsExpedientePage implements OnInit { const loader = this.toastService.loading() - try { + try { await this.processes.CompleteTask(otherbody).toPromise() this.toastService.successMessage('Processo descartado'); this.goBack(); @@ -201,7 +211,7 @@ export class OptsExpedientePage implements OnInit { } finally { loader.remove() } - + } else if(res['data'] == 'No'){ @@ -212,7 +222,7 @@ export class OptsExpedientePage implements OnInit { if(res['data']== 'Yes'){ const loader = this.toastService.loading() - try { + try { await this.processes.CompleteTask(body).toPromise(); this.toastService.successMessage('Processo descartado'); this.goBack();