From 8774e1a01400fdef5a3cdf14230a311bf9c0ac8a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 19 Jul 2021 06:28:07 +0100 Subject: [PATCH] Fix --- src/app/pages/agenda/agenda.page.ts | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index cce2a5573..8b25f01d7 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -221,10 +221,14 @@ export class AgendaPage implements OnInit { //Go to the next view of the calendar month/week/day next() { this.myCal.slideNext(); + this.myCal.loadEvents(); + this.myCal.update(); } //Go to the previous view of the calendar back(){ this.myCal.slidePrev(); + this.myCal.loadEvents(); + this.myCal.update(); } //Shows the title of your view onViewTitleChanged(title){ @@ -429,6 +433,8 @@ export class AgendaPage implements OnInit { loadRangeEvents(startTime: Date, endTime: Date) { + + this.eventSelectedDate = new Date(startTime); this.showLoader = true; @@ -477,7 +483,7 @@ export class AgendaPage implements OnInit { const list = this.timelineFilter(this.timelineFilterState, eventsList, 'mdgpr'); - this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'md', startTime, endTime, 'date') + this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, 'date') this.events = list; // optional @@ -532,7 +538,7 @@ export class AgendaPage implements OnInit { }); - this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'pr', startTime, endTime, 'date') + this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date') this.myCal.update(); this.myCal.loadEvents(); @@ -580,7 +586,7 @@ export class AgendaPage implements OnInit { }); - this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'pr', startTime, endTime, 'date') + this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date') this.myCal.update(); this.myCal.loadEvents(); @@ -628,7 +634,7 @@ export class AgendaPage implements OnInit { }); - this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'md', startTime, endTime, 'date') + this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, 'date') this.myCal.update(); this.myCal.loadEvents(); @@ -666,7 +672,7 @@ export class AgendaPage implements OnInit { }); }); - this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'pr', startTime, endTime, 'date') + this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date') this.myCal.update(); @@ -715,7 +721,7 @@ export class AgendaPage implements OnInit { }); }); - this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'md', startTime, endTime, 'date') + this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, 'date') this.myCal.update(); this.myCal.loadEvents(); @@ -754,7 +760,7 @@ export class AgendaPage implements OnInit { }); - this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'pr', startTime, endTime, 'date') + this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date') this.myCal.update(); this.myCal.loadEvents(); @@ -809,7 +815,7 @@ export class AgendaPage implements OnInit { }); - this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'md', startTime, endTime, 'date') + this.TimelineMDList = this.eventListBoxComponent.list(this.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, 'date') this.myCal.update(); this.myCal.loadEvents(); @@ -856,7 +862,7 @@ export class AgendaPage implements OnInit { }); - this.TimelinePRList = this.eventListBoxComponent.list(this.eventSource, 'pr', startTime, endTime, 'date') + this.TimelinePRList = this.eventListBoxComponent.list(this.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date') this.myCal.update(); this.myCal.loadEvents(); @@ -919,7 +925,7 @@ export class AgendaPage implements OnInit { this.TimelinePR = this.timelineFilter(this.timelineFilterState, eventsList, 'pr'); - this.TimelinePRList = this.eventListBoxComponent.list(this.eventSource, 'pr', startTime, endTime, 'date') + this.TimelinePRList = this.eventListBoxComponent.list(this.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date') this.myCal.update(); this.myCal.loadEvents();