From af09ce650c59203a3505891a738313823f287cc6 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 25 Jun 2021 09:43:24 +0100
Subject: [PATCH 1/3] Improge agenda

---
 src/app/pages/agenda/agenda.page.html |  6 ++++--
 src/app/pages/agenda/agenda.page.ts   | 21 +++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 4973e22ce..d8f18de3c 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -226,7 +226,8 @@
                   <div *ngFor="let event of events.value" class="EventListBox">
 
                     <div class="d-flex content-{{event.profile}}-{{event.event.CalendarName}} mt-10 cursor-pointer width-100 " (click)="eventClicked(event)" 
-                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
+                      *ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)">
+
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
 
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
@@ -265,8 +266,9 @@
                     {{ TimelineDayEvent(events.key)}}
                   </div>
                   <div *ngFor="let event of events.value" class="EventListBox" >
+                    
                     <div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
+                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado'  && viewEventMonth <= dateMonth(event)">
                   
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index cf150eef7..0c983fb32 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -1309,19 +1309,16 @@ export class AgendaPage implements OnInit {
       this.timelineFilterState = segments
     }
     this.showTimelineFilterState = false;
-
-
-
-    setTimeout(()=>{
-      document.querySelectorAll('.EventListBox-container .EventListBox').forEach((e)=>{
-        if(e.childElementCount == 0) {
-          e.parentElement.style.display = 'none'
-        } else {
-          e.parentElement.style.display = 'block'
-        }
-      })
-    }, 10)
     
   }
 
+  async showEventBox(event) {
+    
+    if ( event.event.CalendarName == this.segment || this.segment == 'Combinado') {
+      return true
+    }
+
+    return false
+  }
+
 }
\ No newline at end of file

From 6c46661682cbb1a253cf4eabdbd38648a112c20c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 25 Jun 2021 09:44:51 +0100
Subject: [PATCH 2/3] Improge agenda

---
 src/app/pages/agenda/agenda.page.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index d8f18de3c..0e9d7dc5a 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -268,7 +268,7 @@
                   <div *ngFor="let event of events.value" class="EventListBox" >
                     
                     <div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado'  && viewEventMonth <= dateMonth(event)">
+                      *ngIf="viewEventMonth <= dateMonth(event) && && showEventBox(event)">
                   
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>

From 294fce471d2bd14a6d5af8388a4ba241f23a91e3 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 25 Jun 2021 09:46:09 +0100
Subject: [PATCH 3/3] Improve

---
 src/app/pages/agenda/agenda.page.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 0e9d7dc5a..89de06000 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -268,7 +268,7 @@
                   <div *ngFor="let event of events.value" class="EventListBox" >
                     
                     <div class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event) && && showEventBox(event)">
+                      *ngIf="viewEventMonth <= dateMonth(event) && showEventBox(event)">
                   
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
@@ -310,7 +310,7 @@
                   <div *ngFor="let event of events.value" class="EventListBox">
 
                     <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer" (click)="eventClicked(event)"
-                      *ngIf="viewEventMonth <= dateMonth(event) && event.event.CalendarName == segment || segment == 'Combinado' ">
+                      *ngIf="viewEventMonth <= dateMonth(event) &&  showEventBox(event) ">
                     
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>