Update improve agenda

src/app/pages/agenda/agenda.page.html

@@ -83,11 +83,12 @@
       
               <!-- Adding a customized ng-template -->
               <ng-template #template let-view="view" let-row="row" let-col="col">
-                <div [className]="currentDayEventDisplayBorder(view.dates, row*7+col)" [class.with-event]="view.dates[row*7+col].events.length">
-                  {{ view.dates[row*7+col].label }} 
-                  <div class="indicator-container">
-                    <!-- <div class="event-indicator" *ngFor="let e of view.dates[row*7+col].events"></div> -->
-                  </div>
+                <div [className]="currentDayEventDisplayBorder(view.dates, row*7+col)" class="d-flex justify-center align-center" [class.with-event]="view.dates[row*7+col].events.length">
+                   
+                  <div class="day">
+                    {{ view.dates[row*7+col].label }}
+                  </div>  
+                   
                 </div>
               </ng-template>
             </div>

src/app/pages/agenda/agenda.page.ts

@@ -280,28 +280,27 @@ export class AgendaPage implements OnInit {
 
   // for calendar
   currentDayEventDisplayBorder(day: any, id: any){
-
+    
     const events = day[id].events;
 
     if (events.length == 0) {
-      return "";
-    } else if (events.length >= 1) {
       
-      /** @description store all event type */
-      let eventType = {};
-      let eventTypeNum: number;
+      return "";
+
+    } else if (events.length >= 1) {
+    
+      let classs = [];
 
       events.forEach(element => {
-        eventType[element.calendarName] = 1;
+
+        const profile_ = element.profile == 'md'? 'mdgpr': 'pr';
+        const eventtype = element.event.CalendarName;
+
+        classs.push(`calendar-event-border calendar-${profile_}-event-type-${eventtype}`);
+
       });
 
-      eventTypeNum = (Object.keys(eventType)).length
-
-      if (eventTypeNum == 2) { 
-        return ` calendar-event-border calendar-${this.profile}-event-type-both`;
-      } else {
-        return ` calendar-event-border calendar-${this.profile}-event-type-`+(Object.keys(eventType))[0];
-      }
+      return classs.join(' ');
     }
 
     return "";
@@ -419,6 +418,8 @@ export class AgendaPage implements OnInit {
 
     console.log(eventsList);
 
+    this.showTimelineFilterState = false;
+    
     eventsList.forEach((element, eventIndex) => {
       
       // timeline start
@@ -442,8 +443,6 @@ export class AgendaPage implements OnInit {
     });
 
     this.onCurrentChanged(this.eventSelectedDate);
-    //
-    this.showTimelineFilterState = false;
 
     return events;
   }