From bd1914e81eb2646562e0ba603315d5a2fddde578 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sat, 17 Jul 2021 22:17:50 +0100
Subject: [PATCH] Fix date comparation

---
 .../agenda/event-list/event-list.page.html    |   8 +-
 .../agenda/event-list/event-list.page.ts      | 106 +++++++++---------
 .../events-to-approve.page.html               |   8 +-
 .../events-to-approve.page.ts                 |   5 +
 4 files changed, 68 insertions(+), 59 deletions(-)

diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index 6d1fa64c0..ee9afca00 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -38,8 +38,8 @@
               <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
             </div>
             <div class="approve-event-detail">
-              <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
-              <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
+              <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
+              <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
               <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
             </div>
         </div>
@@ -58,8 +58,8 @@
                 <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
               </div>
               <div class="approve-event-detail">
-                <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
-                <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
+                <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
                 <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
               </div>
               </div>
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 ed2b8f2a3..8109cdc85 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -38,68 +38,72 @@ export class EventListPage implements OnInit {
     private userAuth: AuthService,
     ) {
       this.loggeduser = userAuth.ValidatedUser;
-    }
+  }
 
-    ngOnInit() {
+  ngOnInit() {
 
-      this.segment = this.loggeduser.Profile;
+    this.segment = this.loggeduser.Profile;
 
-      //this.LoadToApproveEvents();
+    //this.LoadToApproveEvents();
 
-      const pathname = window.location.pathname
+    const pathname = window.location.pathname
 
-      this.router.events.forEach((event) => {
-        if(event instanceof NavigationEnd && event.url == pathname) {
-          this.LoadToApproveEvents();
-        }
-      });
-    }
-
-    segmentChanged(ev: any) {
-      this.LoadToApproveEvents();
-    }
-
-    async LoadToApproveEvents() {
-      this.showLoader = true;
-      console.log(this.segment);
-      if(this.segment == 'MDGPR'){
-        let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-        let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-        this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == pathname) {
+        this.LoadToApproveEvents();
       }
-      else if(this.segment == 'PR'){
-        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-        let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
-        this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
-      }
-      this.showLoader = false;
-    }
+    });
+  }
 
-    async openApproveModal(eventSerialNumber, data) {
+  segmentChanged(ev: any) {
+    this.LoadToApproveEvents();
+  }
 
-      let a =this.eventsMDGPRList.filter((elem)=>{
-        console.log(eventSerialNumber," ",elem.serialNumber)
-        return eventSerialNumber == elem.serialNumber
-      });
+  toDateString(e) {
+    return new Date(e).toDateString()
+  }
 
-      this.approveEventDismiss.emit({
-        "serialNumber": eventSerialNumber,
-        "action": "Aprovar",
-        "saveData": data
-      });
+  async LoadToApproveEvents() {
+    this.showLoader = true;
+    console.log(this.segment);
+    if(this.segment == 'MDGPR'){
+      let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
+      let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
+      this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
     }
+    else if(this.segment == 'PR'){
+      let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
+      let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
+      this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
+    }
+    this.showLoader = false;
+  }
 
-    doRefresh(event) {
-      this.LoadToApproveEvents();
-      console.log('refresh');
-      setTimeout(() => {
-         event.target.complete();
-       }, 2000);
-    }
-    close(){
-      console.log('close')
-      this.cloneAllmobileComponent.emit();
-    }
+  async openApproveModal(eventSerialNumber, data) {
+
+    let a =this.eventsMDGPRList.filter((elem)=>{
+      console.log(eventSerialNumber," ",elem.serialNumber)
+      return eventSerialNumber == elem.serialNumber
+    });
+
+    this.approveEventDismiss.emit({
+      "serialNumber": eventSerialNumber,
+      "action": "Aprovar",
+      "saveData": data
+    });
+  }
+
+  doRefresh(event) {
+    this.LoadToApproveEvents();
+    console.log('refresh');
+    setTimeout(() => {
+        event.target.complete();
+      }, 2000);
+  }
+  close(){
+    console.log('close')
+    this.cloneAllmobileComponent.emit();
+  }
 
 
 }
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index c797e2124..21b9cce76 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -40,8 +40,8 @@
             <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
           </div>
           <div class="approve-event-detail">
-            <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
-            <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
+            <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
+            <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
             <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
           </div>
         </div>
@@ -60,8 +60,8 @@
               <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
             </div>
             <div class="approve-event-detail">
-              <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
-              <p *ngIf="event.workflowInstanceDataFields.StartDate == event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
+              <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
+              <p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }}  |  {{event.workflowInstanceDataFields.Location}}</p>
               <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
             </div>
           </div>
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 e4fe68e78..3af8d002c 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
@@ -72,6 +72,11 @@ export class EventsToApprovePage implements OnInit {
     this.showLoader = false;
   }
 
+
+  toDateString(e) {
+    return new Date(e).toDateString()
+  }
+
   goToEventDetail(event){
     this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
   }