diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 104d97e7e..f87b02ab0 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -87,8 +87,8 @@ export class DespachoPage implements OnInit { else { let navigationExtras: NavigationExtras = { queryParams: { - "pendentes": true, - } + "pendentes": true, + } } this.router.navigate(['/home/gabinete-digital'], navigationExtras); } diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 831fc425e..df97e3941 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -157,6 +157,7 @@ export class PedidoPage implements OnInit { try { this.toastService.badRequest('Processo não encontrado') this.goBack() + this.close() } catch (e) { window.history.back(); } @@ -495,7 +496,7 @@ export class PedidoPage implements OnInit { } else { if (window.innerWidth <= 800) { - this.router.navigate(['/home/gabinete-digital/pedidos']); + this.router.navigate(['/home/gabinete-digital/pedidos']); } else { diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index ed252445b..3240caad3 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { NavigationEnd, Router } from '@angular/router'; +import { NavigationEnd, NavigationStart, Router } from '@angular/router'; import { CalendarComponent } from 'ionic2-calendar'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { DailyWorkTask } from '../../../models/dailyworktask.model'; @@ -44,14 +44,17 @@ export class PendentesPage implements OnInit { this.LoadList(); this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && + if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?pendentes=true')) { + if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { this.doRefresh() } else { this.LoadList() } + } + }); }