kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-29 12:39:45 +00:00
Code Issues Projects Releases Wiki Activity

All events from the beginning of today were fetched but we only want the ones that are ongoing or upcoming.

Browse Source
This commit is contained in:
Johan Alvinger 2020-11-24 23:06:41 +01:00
parent 056f3a6ccb
commit 2779d19d5c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/default/calendar/calendarfetcher.js
View File

@ -376,7 +376,17 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
return a.startDate - b.startDate; return a.startDate - b.startDate;
}); });
events = newEvents.slice(0, maximumEntries); if (includePastEvents) {
// Include all events
events = newEvents;
} else {
// All events from startOfToday are fetched but we only want the ones that haven't ended yet
const now = moment();
for (ne of newEvents) {
if (moment(ne.endDate, "x").isAfter(now)) events.push(ne);
}
}
events = events.slice(0, maximumEntries);
self.broadcastEvents(); self.broadcastEvents();
scheduleTimer(); scheduleTimer();