diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 31a4dce52..8a2f39863 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -66,11 +66,9 @@ export class DespachosPrPage implements OnInit { //Inicializar segment this.segment = "despachos"; - const location = window.location - const pathname = location.pathname + location.search - this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { + if (event instanceof NavigationEnd && + event.url.startsWith('/home/gabinete-digital?despachospr=true')) { this.LoadList(); } }); diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 30b9cff75..e00e8cb95 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -23,39 +23,40 @@
- - - -
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }} -
-
- {{task.Senders}} -
-
- {{task.activityInstanceName}} -
-
- - - - -
+ + + + +
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }}
-
- {{ task.Folio }} +
+ {{task.Senders}} +
+
+ {{task.activityInstanceName}} +
+
+ + + +
- - +
+ {{ task.Folio }} +
+
+ +
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index 0d05846d1..95a037e5f 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -65,15 +65,18 @@ ngOnInit() { //Inicializar segment this.segment = "despachos"; - // update list - const location = window.location - const pathname = location.pathname + location.search + setTimeout(()=>{ + // update list + const location = window.location + const pathname = location.pathname + location.search - this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { - this.LoadList(); - } - }); + this.router.events.forEach((event) => { + if (event instanceof NavigationEnd && + event.url.startsWith('/home/gabinete-digital?despachospr=true')) { + this.LoadList(); + } + }); + }, 10) } segmentChanged(ev: any) { diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index ce400c4cb..7ea45bf57 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -17,9 +17,12 @@ refreshingSpinner="circles" refreshingText="A actualizar..."> +
+ +
{ - if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { - console.log('update', pathname) + if (event instanceof NavigationEnd && + event.url.startsWith('/home/gabinete-digital?despachos=true')) { this.LoadList(); } }); diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 6f9816027..efa62032b 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -21,6 +21,8 @@
+ + diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 53d9c9dd6..caca59b35 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -33,14 +33,17 @@ skeletonLoader = true ngOnInit() { // update list - const location = window.location - const pathname = location.pathname + location.search + setTimeout(()=>{ + // update list + const location = window.location + const pathname = location.pathname + location.search - this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { - this.LoadList(); - } - }); + this.router.events.forEach((event) => { + if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { + this.LoadList(); + } + }); + }, 10) } diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index d77eb456a..f0f73fce5 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -20,6 +20,8 @@
+ +
{ - if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { - this.LoadList(); - } - }); + setTimeout(()=>{ + // update list + const location = window.location + const pathname = location.pathname + location.search + + this.router.events.forEach((event) => { + if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { + this.LoadList(); + } + }); + }, 10) + } segmentChanged(ev: any) { diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 375f7313e..030119e75 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -36,15 +36,10 @@ export class EventsToApprovePage implements OnInit { ngOnInit() { this.segment = this.loggeduser.Profile; - console.log(this.segment); - - - // update list - const location = window.location - const pathname = location.pathname + location.search this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { + if (event instanceof NavigationEnd && + event.url.startsWith('/home/gabinete-digital?eventos=true')) { this.LoadToApproveEvents(); } }); diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 7ea2b410b..98d124a53 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -11,6 +11,7 @@
+ = new EventEmitter(); @@ -39,12 +39,9 @@ export class ExpedientesPrPage implements OnInit { ngOnInit() { - // update list - const location = window.location - const pathname = location.pathname + location.search - this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { + if (event instanceof NavigationEnd && + event.url.startsWith('/home/gabinete-digital?expedientespr=true')) { this.LoadList(); } }); diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 76b9b1cc0..bd25fbd17 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -19,6 +19,8 @@
+ + { - if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { + if (event instanceof NavigationEnd && + event.url.startsWith('/home/gabinete-digital?pendentes=true')) { this.LoadList(); } }); + } segmentChanged(){ diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index b23b0dbd7..e656abea6 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -29,6 +29,7 @@
+
-
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }} -
-
- {{task.Senders}} -
-
- {{task.activityInstanceName}} -
-
- - -
+ + + + +
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }}
-
- {{ task.Folio }} +
+ {{task.Senders}} +
+
+ {{task.activityInstanceName}} +
+
+ +
- - +
+ {{ task.Folio }} +
+
+ +
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index c0b700bc9..e520a163e 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -42,11 +42,9 @@ export class PendentesPage implements OnInit { //Inicializar segment this.segment = "despachos"; // update list - const location = window.location - const pathname = location.pathname + location.search - this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && event.url.startsWith(pathname)) { + if (event instanceof NavigationEnd && + event.url.startsWith('/home/gabinete-digital?pendentes=true')) { this.LoadList(); } });