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

added support for showing end of events through config parameters showEnd and dateEndFormat

Browse Source
This commit is contained in:
vlb
2018-08-28 17:35:53 +02:00
parent c755c823fa
commit 7c579cf7b7
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,9 @@ Module.register("calendar", {
urgency: 7, urgency: 7,
timeFormat: "relative", timeFormat: "relative",
dateFormat: "MMM Do", dateFormat: "MMM Do",
dateEndFormat: "HH:mm",
fullDayEventDateFormat: "MMM Do", fullDayEventDateFormat: "MMM Do",
showEnd: true,
getRelative: 6, getRelative: 6,
fadePoint: 0.25, // Start on 1/4th of the list. fadePoint: 0.25, // Start on 1/4th of the list.
hidePrivate: false, hidePrivate: false,
@@ -287,6 +289,10 @@ Module.register("calendar", {
timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow()); timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
} }
} }
if(this.config.showEnd){
timeWrapper.innerHTML += "-" ;
timeWrapper.innerHTML += this.capFirst(moment(event.endDate , "x").format(this.config.fullDayEventDateFormat));
}
} else { } else {
if (event.startDate >= new Date()) { if (event.startDate >= new Date()) {
if (event.startDate - now < 2 * oneDay) { if (event.startDate - now < 2 * oneDay) {
@@ -325,6 +331,11 @@ Module.register("calendar", {
}) })
); );
} }
if (this.config.showEnd) {
timeWrapper.innerHTML += "-";
timeWrapper.innerHTML += this.capFirst(moment(event.endDate, "x").format(this.config.dateEndFormat));
}
} }
//timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll'); //timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll');
//console.log(event); //console.log(event);