kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

fix formatting

Browse Source
This commit is contained in:
Sam Detweiler 2021-03-19 10:42:14 -05:00
parent b6f4737ecc
commit 2b940c9cfb
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/default/calendar/calendarutils.js
View File

@ -314,18 +314,19 @@ const CalendarUtils = {
duration = 24 * 60 * 60 * 1000; duration = 24 * 60 * 60 * 1000;
Log.debug("new recurring date is " + date); Log.debug("new recurring date is " + date);
} }
} else { // not full day, but luxon can still screw up the date on the rule processing } else {
// not full day, but luxon can still screw up the date on the rule processing
// get time zone offset of the rule calculated event // get time zone offset of the rule calculated event
let dateoffset = date.getTimezoneOffset() let dateoffset = date.getTimezoneOffset();
// reduce the time by the offset // reduce the time by the offset
Log.debug(" recurring date is " + date + " offset is " + dateoffset); Log.debug(" recurring date is " + date + " offset is " + dateoffset);
let dh = moment(date).format("HH") let dh = moment(date).format("HH");
Log.debug(" recurring date is " + date + " offset is " + dateoffset/60 +" Hour is "+dh); Log.debug(" recurring date is " + date + " offset is " + dateoffset / 60 + " Hour is " + dh);
// we need to correct the date to get back to the right event for // we need to correct the date to get back to the right event for
if(dateoffset <0){ if (dateoffset < 0) {
// if the date hour is less than the offset // if the date hour is less than the offset
if( (dh) < Math.abs(dateoffset/60)){ if (dh < Math.abs(dateoffset / 60)) {
// reduce the time by the offset // reduce the time by the offset
Log.debug(" recurring date is " + date + " offset is " + dateoffset); Log.debug(" recurring date is " + date + " offset is " + dateoffset);
// apply the correction to the date/time to get it UTC relative // apply the correction to the date/time to get it UTC relative
@ -336,14 +337,14 @@ const CalendarUtils = {
Log.debug("new recurring date1 is " + date); Log.debug("new recurring date1 is " + date);
} }
} else { } else {
// if the date hour is less than the offset // if the date hour is less than the offset
if( (24-dh) < Math.abs(dateoffset/60)){ if (24 - dh < Math.abs(dateoffset / 60)) {
// apply the correction to the date/time back to right day // apply the correction to the date/time back to right day
date = new Date(date.getTime() + Math.abs(24*60) * 60000); date = new Date(date.getTime() + Math.abs(24 * 60) * 60000);
// the duration was calculated way back at the top before we could correct the start time.. // the duration was calculated way back at the top before we could correct the start time..
// fix it for this event entry // fix it for this event entry
//duration = 24 * 60 * 60 * 1000; //duration = 24 * 60 * 60 * 1000;
Log.debug("new recurring date2 is " + date); Log.debug("new recurring date2 is " + date);
} }
} }
} }