diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index d03ca0d63..a355a9a67 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -183,7 +183,10 @@ export class AgendaPage implements OnInit { ngOnInit() { this.profile = "mdgpr"; + const pathname = window.location.pathname + this.router.events.forEach((event) => { + if(event instanceof NavigationEnd && event.url == "/home/agenda") { if (this.segment == null){ this.segment = "Combinado"; diff --git a/src/app/pages/events/edit-event/edit-event.page.ts b/src/app/pages/events/edit-event/edit-event.page.ts index 22b43307b..b6c51d26a 100644 --- a/src/app/pages/events/edit-event/edit-event.page.ts +++ b/src/app/pages/events/edit-event/edit-event.page.ts @@ -14,14 +14,13 @@ import { FormGroup, FormBuilder, Validators } from "@angular/forms"; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { AttachmentsPage } from '../attachments/attachments.page'; - @Component({ selector: 'app-edit-event', templateUrl: './edit-event.page.html', styleUrls: ['./edit-event.page.scss'], }) -export class EditEventPage implements OnInit { +export class EditEventPage implements OnInit { loadedEvent: Event; loadedEventAttachments: Attachment[]; diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 2f9eca264..cb673824c 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -97,8 +97,10 @@ export class EventsPage implements OnInit { this.showGreeting(); + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.RefreshEvents(); this.LoadList(); } 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 d74ecaaa5..9ab6445c5 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 @@ -64,8 +64,11 @@ export class DespachosPrPage implements OnInit { ngOnInit() { //Inicializar segment this.segment = "despachos"; + + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.LoadList(); } }); diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index 9d3208a45..d81479cbd 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -39,8 +39,11 @@ constructor( } ngOnInit() { + + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.refreshing(); } }); diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 900815593..3a2bef146 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -36,8 +36,10 @@ export class EventListPage implements OnInit { this.LoadToApproveEvents(); + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.LoadToApproveEvents(); } }); diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 8379d6e98..7913c0bea 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -40,8 +40,11 @@ export class ExpedientePage implements OnInit { ngOnInit() { this.LoadList(); + + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.LoadList(); } }); 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 07975558d..d8995453f 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 @@ -40,8 +40,11 @@ export class ExpedientesPrPage implements OnInit { } ngOnInit() { + + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.refreshing(); } }); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 3e3e06a8c..014efec3e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -112,10 +112,15 @@ export class GabineteDigitalPage implements OnInit { ngOnInit() { - this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + const pathname = window.location.pathname + + this.router.events.forEach((event) => { + if(event instanceof NavigationEnd && event.url == pathname) { this.checkRoutes(); this.LoadCounts(); + console.log('yes', pathname) + } else { + console.log('not') } }); diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 3d9309608..363602e0e 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -38,8 +38,10 @@ export class PendentesPage implements OnInit { ngOnInit() { //Inicializar segment this.segment = "despachos"; + + const pathname = window.location.pathname this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.refreshing(); } }); diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index f73261083..b060456b9 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -67,8 +67,11 @@ export class PublicationsPage implements OnInit { } ngOnInit() { + + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.getActions(); } }); diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index 91fe48d1c..19f64b4a7 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -44,9 +44,11 @@ export class EventListPage implements OnInit { } this.LoadToApproveEvents(); - + + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.LoadToApproveEvents(); } }); 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 ed8b1de8b..2bc78b563 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,8 +65,11 @@ ngOnInit() { //Inicializar segment this.segment = "despachos"; this.LoadList(); + + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.doRefresh(); } }); diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index bfbbb6d2f..4e48b64d2 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -65,8 +65,10 @@ export class DespachosPage implements OnInit { //Inicializar segment this.segment = "despachos"; this.LoadList(); + + const pathname = window.location.pathname this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.doRefresh(); } }); 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 437e27e36..6de5efb3c 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 @@ -32,8 +32,10 @@ serialNumber:string; ngOnInit() { this.LoadList(); + + const pathname = window.location.pathname this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.doRefresh(); } }); diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index dddaae1d8..5631af3d0 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -30,8 +30,11 @@ constructor( } ngOnInit() { + + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.refreshing(); } }); 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 b10b79e00..cd21180ff 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 @@ -40,8 +40,10 @@ export class EventsToApprovePage implements OnInit { this.LoadToApproveEvents(); + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.LoadToApproveEvents(); } }); diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index e945a551d..5e01214e2 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -39,8 +39,11 @@ export class ExpedientesPrPage implements OnInit { } ngOnInit() { + + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.refreshing(); } }); diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 5508efaef..e34d2bec4 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -42,8 +42,10 @@ export class ExpedientsPage implements OnInit { //Inicializar segment this.segment = "expedientes"; this.LoadList(); + + const pathname = window.location.pathname this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.LoadList(); } }); diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 67c88265e..49aa193b6 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -49,8 +49,10 @@ export class PedidosPage implements OnInit { ngOnInit() { this.LoadList(); + + const pathname = window.location.pathname this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.doRefresh(); } }); diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index 66c9cb530..e43b725c5 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -46,8 +46,10 @@ export class PendentesPage implements OnInit { this.segment = "despachos"; this.LoadList(); + const pathname = window.location.pathname + this.router.events.forEach((event) => { - if(event instanceof NavigationEnd && event.url == this.router.url) { + if(event instanceof NavigationEnd && event.url == pathname) { this.LoadList(); } });