From 75f9d789fd562170f9cb15fd394019ca70441cf0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 6 May 2021 10:40:52 +0100 Subject: [PATCH] Improve agenda loadtime --- src/app/pages/agenda/agenda.page.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 9385a293e..3f01d43e2 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -776,8 +776,7 @@ export class AgendaPage implements OnInit { this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe( response => { - - this.TimelineMD = []; + if(this.segment == 'Oficial') { this.eventsList = response.filter(data => data.CalendarName == "Oficial"); @@ -803,6 +802,7 @@ export class AgendaPage implements OnInit { profile: 'md', id: element.EventId, }); + }); const MDEventList = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md'); @@ -826,8 +826,7 @@ export class AgendaPage implements OnInit { this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe( response => { - - this.TimelinePR = []; + if(this.segment == 'Oficial') { this.eventsList = response.filter(data => data.CalendarName == "Oficial"); @@ -881,7 +880,7 @@ export class AgendaPage implements OnInit { setTimeout(()=>{ - if(this.eventSelectedDate.toLocaleDateString('en-US') != (new Date()).toLocaleDateString('en-US')){ + if(this.eventSelectedDate.toLocaleDateString('en-US') != (new Date()).toLocaleDateString('en-US')) { let sortedDate = this.eventSource.sort((a,b) =>{ return (b.startTime) -(a.startTime); }); @@ -890,8 +889,12 @@ export class AgendaPage implements OnInit { let filterDate = sortedDate.filter((e) => { return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US'); }); - + + console.log('Event -- ',filterDate[filterDate.length - 1]); + const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours(); + + console.log('firstEventStartHours-- ', firstEventStartHours) const scrollContainer = document.querySelector('.timeline-wrapper');