Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

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();
       }
     });

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();
       }
     });

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();
       }
     });

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();
       }
     });

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();
       }
     });

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -98,7 +98,6 @@ export class GabineteDigitalPage implements OnInit {
         }
       };
       this.checkRoutes();
-      this.checkUser();
       
   }
 
@@ -112,9 +111,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')
       }
     });
     
@@ -189,7 +194,7 @@ export class GabineteDigitalPage implements OnInit {
       this.selectedElement='DiplomasAssinar';
     }
     else{
-      this.checkRoutes();
+      this.checkUser();
     }
   }
 

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();
       }
     });