From fc14431147dd1a2b3d87d2c0c762aa97efafdcc4 Mon Sep 17 00:00:00 2001 From: Sam Detweiler Date: Sun, 26 Dec 2021 16:40:17 +0100 Subject: [PATCH] fix date correction comparison for fulldate, just less than, not less or equal --- modules/default/calendar/calendarutils.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/default/calendar/calendarutils.js b/modules/default/calendar/calendarutils.js index 570a6e7e..a3bfaeab 100644 --- a/modules/default/calendar/calendarutils.js +++ b/modules/default/calendar/calendarutils.js @@ -332,15 +332,15 @@ const CalendarUtils = { Log.debug("Fullday"); // If the offset is negative (east of GMT), where the problem is if (dateoffset < 0) { - //if (dh <= Math.abs(dateoffset / 60)) { - // reduce the time by the offset - // Apply the correction to the date/time to get it UTC relative - 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 date1 is " + date); - //} + if (dh < Math.abs(dateoffset / 60)) { + // reduce the time by the offset + // Apply the correction to the date/time to get it UTC relative + 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 date1 fulldate is " + date); + } } else { // if the timezones are the same, correct date if needed //if (event.start.tz === moment.tz.guess()) { @@ -351,7 +351,7 @@ const CalendarUtils = { // 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); + Log.debug("new recurring date2 fulldate is " + date); } //} }