diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index c608229e9..2c3a5143f 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -43,6 +43,7 @@ export class ExpedientesPrPage implements OnInit { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { this.LoadList(); + console.log('not run'); } }); } diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 739b318dc..66d8df8af 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -182,7 +182,7 @@ export class OptsExpedientePrPage implements OnInit { this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.toastService.badRequest('Processo não descartado') + this.toastService.badRequest('Processo não descartado'); } this.goBack(); } @@ -193,7 +193,7 @@ export class OptsExpedientePrPage implements OnInit { this.toastService.successMessage(); this.goBack(); } catch (error) { - this.toastService.badRequest() + this.toastService.badRequest(); } } } @@ -213,7 +213,7 @@ export class OptsExpedientePrPage implements OnInit { } try { - await this.processes.CompleteTask(body); + await this.processes.CompleteTask(body).toPromise(); this.close(); this.toastService.successMessage() } catch(error) { @@ -285,15 +285,15 @@ export class OptsExpedientePrPage implements OnInit { } goBack() { - let navigationExtras: NavigationExtras = { - queryParams: { - "expedientes-pr": true, - } - }; - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - - // window.history.back(); - + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/expedientes-pr']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes-pr": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } } - }