From fa147774deabba00645f62e593de22a4fd51fb6e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 29 Nov 2021 14:50:57 +0100 Subject: [PATCH 1/2] DFi --- src/app/Rules/despacho.service.ts | 2 +- src/app/home/home.page.ts | 2 ++ .../despachos-pr/despacho-pr/despacho-pr.page.ts | 1 + .../popover/despachos-pr-options/despachos-pr-options.page.ts | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts index 43dc35115..ae89903af 100644 --- a/src/app/Rules/despacho.service.ts +++ b/src/app/Rules/despacho.service.ts @@ -232,7 +232,7 @@ export class DespachoService { } - async getList({updateStore = false}): Promise | null { + async getList({updateStore = false}) { if (this.LoaderService.loading) { return this.despachoStore.list diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index b020696f7..c01d67d48 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -96,6 +96,7 @@ export class HomePage implements OnInit { }); window['platform'] = platform + window['inactivity/function'] = () => { if (window.location.pathname != '/inactivity') { @@ -110,6 +111,7 @@ export class HomePage implements OnInit { } + } goto(url) { diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 8cd38b474..d295e2e60 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -448,6 +448,7 @@ export class DespachoPrPage implements OnInit { else if (actionName == 'Reexecução') { await this.reexecutar(res.data.note, docs); } + this.goBack(); } }); diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index d132333af..070c98772 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -263,6 +263,7 @@ export class DespachosPrOptionsPage implements OnInit { else if(actionName == 'Concluido') { await this.concluir(res.data.note, docs); } + this.goBack(); } }); From f2e086300ae0ab61348f4758015398454acd39b9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 29 Nov 2021 16:21:29 +0100 Subject: [PATCH 2/2] Fix --- src/app/home/home.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 3ed1100d4..36ac32e4e 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -103,7 +103,7 @@ export class HomePage implements OnInit { if (window.location.pathname != '/inactivity') { document.querySelectorAll('ion-modal').forEach((e: any) => e.remove()) - document.querySelectorAll('popover-viewport').forEach((e: any) => e.remove()) + document.querySelectorAll('.popover-viewport').forEach((e: any) => e.remove()) const pathname = window.location.pathname SessionStore.setUrlBeforeInactivity(pathname)