From 8828c319a4e8f59904c527a25993f23f45a2cf01 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 14 Apr 2021 12:02:43 +0100
Subject: [PATCH] Improve aganda

---
 src/app/pages/agenda/agenda.page.ts           | 39 ++++++++++---------
 .../agenda/view-event/view-event.page.ts      | 10 +----
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 35448c226..4bb685237 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -863,26 +863,29 @@ export class AgendaPage implements OnInit {
   selectFirstEventOfTheDay(){
     
     setTimeout(()=>{
+      
+      if(this.eventSelectedDate.toLocaleDateString('en-US') != (new Date()).toLocaleDateString('en-US')){
+        let sortedDate = this.eventSource.sort((a,b) =>{
+          return (b.startTime) -(a.startTime);
+        });
   
-      let sortedDate = this.eventSource.sort((a,b) =>{
-        return (b.startTime) -(a.startTime);
-      });
-
-
-      let filterDate =  sortedDate.filter((e) => {
-        return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US');
-      });
-
-      const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours();
-
-      const scrollContainer = document.querySelector('.timeline-wrapper');
-
-      scrollContainer.scroll({
-        top: firstEventStartHours*60,
-        left: 0, 
-        behavior: 'smooth' 
-      })
+  
+        let filterDate =  sortedDate.filter((e) => {
+          return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US');
+        });
+  
+        const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours();
+  
+        const scrollContainer = document.querySelector('.timeline-wrapper');
     
+        scrollContainer.scroll({
+          top: firstEventStartHours*60,
+          left: 0, 
+          behavior: 'smooth' 
+        })
+      
+      }
+      
     }, 500);
 
   }
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index 20af874a9..80039d53a 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -109,12 +109,6 @@ export class ViewEventPage implements OnInit {
 
   async editEventDetail() {
 
-    let classs;
-    if( window.innerWidth <= 800){
-      classs = 'modal'
-    } else  {
-      classs = 'modal modal-desktop'
-    }
 
     const modal = await this.modalController.create({
       component: EditEventPage,
@@ -122,7 +116,7 @@ export class ViewEventPage implements OnInit {
         eventId: this.loadedEvent.EventId,
         profile: this.profile,
       },
-      cssClass: classs,
+      cssClass: 'modal modal-desktop',
     });
 
   }
@@ -131,7 +125,7 @@ export class ViewEventPage implements OnInit {
 
     let classs;
     if( window.innerWidth <= 800){
-      classs = 'modal'
+      classs = 'modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
     }