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

fix 2488, west of UTC day shift

Browse Source
This commit is contained in:
Sam Detweiler 2021-03-19 10:32:04 -05:00
parent 4f9fc032e5
commit b6f4737ecc
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -60,6 +60,7 @@ _This release is scheduled to be released on 2021-04-01._
- Fix updatenotification creating zombie processes by setting a timeout for the git process - Fix updatenotification creating zombie processes by setting a timeout for the git process
- Fix weather module openweathermap not loading if lat and lon set without onecall. - Fix weather module openweathermap not loading if lat and lon set without onecall.
- Fix calendar daylight savings offset calculation if recurring start date before 2007 - Fix calendar daylight savings offset calculation if recurring start date before 2007
- Fix calendar time/date adjustment when time with GMT offset is different day (#2488)
## [2.14.0] - 2021-01-01 ## [2.14.0] - 2021-01-01

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

@ -296,14 +296,14 @@ const CalendarUtils = {
let curEvent = event; let curEvent = event;
let showRecurrence = true; let showRecurrence = true;
// get the offset of today where we are processing
// this will be the correction we need to apply
let nowOffset = new Date().getTimezoneOffset();
// for full day events, the time might be off from RRULE/Luxon problem // for full day events, the time might be off from RRULE/Luxon problem
if (CalendarUtils.isFullDayEvent(event)) { if (CalendarUtils.isFullDayEvent(event)) {
Log.debug("fullday"); Log.debug("fullday");
// if the offset is negative, east of GMT where the problem is // if the offset is negative, east of GMT where the problem is
if (date.getTimezoneOffset() < 0) { if (date.getTimezoneOffset() < 0) {
// get the offset of today where we are processing
// this will be the correction we need to apply
let nowOffset = new Date().getTimezoneOffset();
Log.debug("now offset is " + nowOffset); Log.debug("now offset is " + nowOffset);
// reduce the time by the offset // reduce the time by the offset
Log.debug(" recurring date is " + date + " offset is " + date.getTimezoneOffset()); Log.debug(" recurring date is " + date + " offset is " + date.getTimezoneOffset());
@ -314,6 +314,38 @@ 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
// get time zone offset of the rule calculated event
let dateoffset = date.getTimezoneOffset()
// reduce the time by the offset
Log.debug(" recurring date is " + date + " offset is " + dateoffset);
let dh = moment(date).format("HH")
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
if(dateoffset <0){
// if the date hour is less than the offset
if( (dh) < Math.abs(dateoffset/60)){
// reduce the time by the offset
Log.debug(" recurring date is " + date + " offset is " + dateoffset);
// apply the correction to the date/time to get it UTC relative
date = new Date(date.getTime() - Math.abs(nowOffset) * 60000);
// the duration was calculated way back at the top before we could correct the start time..
// fix it for this event entry
//duration = 24 * 60 * 60 * 1000;
Log.debug("new recurring date1 is " + date);
}
} else {
// if the date hour is less than the offset
if( (24-dh) < Math.abs(dateoffset/60)){
// apply the correction to the date/time back to right day
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..
// fix it for this event entry
//duration = 24 * 60 * 60 * 1000;
Log.debug("new recurring date2 is " + date);
}
}
} }
startDate = moment(date); startDate = moment(date);