fixe merge

src/app/home/home-routing.module.ts

@@ -89,6 +89,10 @@ const routes: Routes = [
             path: 'emend-message-modal',
             loadChildren: () => import('../pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
           },
+          {
+            path: 'view-event',
+            loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
+          },
         ]
       },
       {

src/app/home/home.page.ts

@@ -75,31 +75,31 @@ export class HomePage implements OnInit {
 
     //Add a test
     //this.pushCordova();
-        //Initialize profile as mdgpr
+    //Initialize profile as mdgpr
+
+    let date = new Date();
+    date.setMonth(date.getMonth() + 1);
+    let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+    let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59";
+
+    this.profile = "mdgpr";
+    if (this.profile == "mdgpr") {
+      this.eventService.getAllMdEvents(start, end).subscribe(res => {
+        this.eventsList = res;
+        this.totalEvent = this.eventsList.length;
+      });
+    }
+    else {
+      this.eventService.getAllPrEvents(start, end).subscribe(res => {
+        this.eventsList = res;
+        this.totalEvent = this.eventsList.length;
+      });
+
+    }
+    this.processesbackend.GetTasksList("Expediente", true).subscribe(result => {
+      this.totalExpediente = result;
+    });
     
-        let date = new Date();
-        date.setMonth(date.getMonth() + 1);
-        let start = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-        let end = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" 23:59:59";
-    
-        this.profile = "mdgpr";
-        if (this.profile == "mdgpr") {
-          this.eventService.getAllMdEvents(start, end).subscribe(res => {
-            this.eventsList = res;
-            this.totalEvent = this.eventsList.length;
-          });
-        }
-        else {
-          this.eventService.getAllPrEvents(start, end).subscribe(res => {
-            this.eventsList = res;
-            this.totalEvent = this.eventsList.length;
-          });
-    
-        }
-        this.processesbackend.GetTasksList("Expediente", true).subscribe(result => {
-          this.totalExpediente = result;
-        });
-        
        
   }
 

src/app/pages/agenda/edit-event/edit-event.page.ts

@@ -71,6 +71,7 @@ export class EditEventPage implements OnInit {
 
   ngOnInit() {
     
+    
     window.onresize = (event) => {
       // if not mobile remove all component
       if( window.innerWidth >= 800){