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

android/app/src/main/assets/capacitor.config.json

@@ -16,5 +16,8 @@
 				"sound"
 			]
 		}
+	},
+	"server": {
+		"url": "http://192.168.137.1:8100"
 	}
 }

package-lock.json

@@ -11990,6 +11990,11 @@
         "ms": "^2.0.0"
       }
     },
+    "i": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/i/-/i-0.3.7.tgz",
+      "integrity": "sha512-FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q=="
+    },
     "iconv-lite": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",

package.json

@@ -134,6 +134,7 @@
     "global": "^4.4.0",
     "hammerjs": "^2.0.8",
     "http-server": "^0.12.3",
+    "i": "^0.3.7",
     "ionic-angular": "^3.9.10",
     "ionic-image-loader": "^6.3.3",
     "ionic-image-loader-v5": "^1.0.2",

src/app/pages/agenda/agenda.page.ts

@@ -252,31 +252,32 @@ export class AgendaPage implements OnInit {
 
     //this.getFromDB();
 
-    const pathname = window.location.pathname
-    let realoadCounter = 0
-    this.router.events.forEach((event) => {
-      if (event instanceof NavigationEnd && event.url == pathname) {
-        if (this.segment == null) {
-          this.segment = "Combinado";
+    setTimeout(() =>{
+      const pathname = window.location.pathname
+      let realoadCounter = 0
+      this.router.events.forEach((event) => {
+        if (event instanceof NavigationEnd && event.url == pathname) {
+          if (this.segment == null) {
+            this.segment = "Combinado";
+          }
+          if (realoadCounter != 0) {
+            this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+          }
+          realoadCounter++;
         }
-        if (realoadCounter != 0) {
-          this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+      });
+  
+      this.backgroundservice.registerBackService('Online', () => {
+        //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+      });
+  
+      window.onresize = (event) => {
+        // if not table remove all component
+        if (window.innerWidth <= 1024) {
+          this.cloneAllmobileComponent();
         }
-        realoadCounter++;
-      }
-    });
-
-    this.backgroundservice.registerBackService('Online', () => {
-      //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-    });
-
-    window.onresize = (event) => {
-      // if not table remove all component
-      if (window.innerWidth <= 1024) {
-        this.cloneAllmobileComponent();
-      }
-    };
-
+      };
+    }, 1000)
   }
 
   //Go to the next view of the calendar month/week/day

src/app/shared/header/header.page.ts

@@ -67,9 +67,9 @@ export class HeaderPage implements OnInit {
   }
 
   update() {
-    setInterval(() => {
+    /* setInterval(() => {
       this.notificationLengthData();
-    }, 5000)
+    }, 5000) */
 
   }