kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 04:45:17 +00:00
Code Issues Projects Releases Wiki Activity

Add includePastEvents global and calendar-specific settings

Browse Source
This commit is contained in:
Jon Kolb
2019-04-01 15:39:25 -04:00
parent 6170b0d059
commit 806be39a6d
6 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,8 @@ Module.register("calendar", {
},
broadcastEvents: true,
excludedEvents: [],
sliceMultiDayEvents: false
sliceMultiDayEvents: false,
includePastEvents: false,
},
// Define required scripts.
@@ -83,7 +84,8 @@ Module.register("calendar", {
var calendarConfig = {
maximumEntries: calendar.maximumEntries,
maximumNumberOfDays: calendar.maximumNumberOfDays
maximumNumberOfDays: calendar.maximumNumberOfDays,
includePastEvents: calendar.includePastEvents,
};
if (calendar.symbolClass === "undefined" || calendar.symbolClass === null) {
calendarConfig.symbolClass = "";
@@ -467,6 +469,9 @@ Module.register("calendar", {
var calendar = this.calendarData[c];
for (var e in calendar) {
var event = JSON.parse(JSON.stringify(calendar[e])); // clone object
if(event.endDate < now) {
continue;
}
if(this.config.hidePrivate) {
if(event.class === "PRIVATE") {
// do not add the current event, skip it
@@ -550,7 +555,8 @@ Module.register("calendar", {
symbolClass: calendarConfig.symbolClass,
titleClass: calendarConfig.titleClass,
timeClass: calendarConfig.timeClass,
auth: auth
auth: auth,
includePastEvents: calendarConfig.includePastEvents || this.config.includePastEvents,
});
},