From df11afd09e891946734ec46c720c0c65cf292f44 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Wed, 10 Feb 2021 13:51:39 +0100
Subject: [PATCH] save

---
 src/app/home/home.page.ts                     | 24 ++++++++-----------
 src/app/pages/events/events.page.html         |  2 +-
 .../expediente-detail.page.ts                 |  4 ++--
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 9f1dd448b..cd4e235cf 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -35,15 +35,21 @@ export class HomePage implements OnInit {
 
   ngOnInit() {
     //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(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
+      this.eventService.getAllMdEvents(start, end).subscribe(res => {
         this.eventsList = res;
         this.totalEvent = this.eventsList.length;
       });
     }
     else {
-      this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
+      this.eventService.getAllPrEvents(start, end).subscribe(res => {
         this.eventsList = res;
         this.totalEvent = this.eventsList.length;
       });
@@ -203,7 +209,6 @@ export class HomePage implements OnInit {
     });
 
     await modal.present();
-
     modal.onDidDismiss();
   } 
 
@@ -219,12 +224,7 @@ export class HomePage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      if(res){
-        console.log(res);
-        //this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-      }
-    });
+    modal.onDidDismiss();
   }
 
   async viewExpedientDetail(serialNumber:any) {
@@ -240,11 +240,7 @@ export class HomePage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      if(res){
-        console.log(res);
-      }
-    });
+    modal.onDidDismiss();
   }
 
 
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index 211eb38ea..570bcdfb8 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -86,7 +86,7 @@
           <ul>
             <li *ngFor = "let task of taskslist"
             (click)="viewExpedientDetail(task.SerialNumber)">
-           <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+           <!--  [routerLink]="['/home/gabinete-digital/expediente']" -->
             >
             <div class="d-flex">
               <div class="schedule-date">
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 1fca509aa..96b1d03e4 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -36,8 +36,8 @@ export class ExpedienteDetailPage implements OnInit {
     private modalController: ModalController,
     private navParams: NavParams,
     private alertService: AlertService) { 
-      this,this.serialnumber = this.navParams.get('serialNumber');
-      this,this.profile = this.navParams.get('profile');
+      this.serialnumber = this.navParams.get('serialNumber');
+      this.profile = this.navParams.get('profile');
     }
 
   ngOnInit() {