From b3caff5a3ae7a0f2f45079ad322b3683a96f4b96 Mon Sep 17 00:00:00 2001 From: "J. Kenzal Hunter" Date: Fri, 1 Sep 2023 01:14:54 -0400 Subject: [PATCH 1/3] Update calendarfetcherutils.js to force recurrence date time to be the same as event datetime --- modules/default/calendar/calendarfetcherutils.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/default/calendar/calendarfetcherutils.js b/modules/default/calendar/calendarfetcherutils.js index d425f0a478..8337f427e1 100644 --- a/modules/default/calendar/calendarfetcherutils.js +++ b/modules/default/calendar/calendarfetcherutils.js @@ -313,6 +313,12 @@ const CalendarFetcherUtils = { let curEvent = event; let showRecurrence = true; + // set the time information in the date to equal the time information in the event + date.setUTCHours(curEvent.start.getUTCHours(), + curEvent.start.getUTCMinutes(), + curEvent.start.getUTCSeconds(), + curEvent.start.getUTCMilliseconds()); + // Get the offset of today where we are processing // This will be the correction, we need to apply. let nowOffset = new Date().getTimezoneOffset(); From 5a751b2094df9c8d244248c29a77d556b5fcdca9 Mon Sep 17 00:00:00 2001 From: Kenzal Hunter Date: Fri, 1 Sep 2023 01:37:02 -0400 Subject: [PATCH 2/3] Formatting Update --- modules/default/calendar/calendarfetcherutils.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/default/calendar/calendarfetcherutils.js b/modules/default/calendar/calendarfetcherutils.js index 8337f427e1..34cc2578c6 100644 --- a/modules/default/calendar/calendarfetcherutils.js +++ b/modules/default/calendar/calendarfetcherutils.js @@ -314,10 +314,7 @@ const CalendarFetcherUtils = { let showRecurrence = true; // set the time information in the date to equal the time information in the event - date.setUTCHours(curEvent.start.getUTCHours(), - curEvent.start.getUTCMinutes(), - curEvent.start.getUTCSeconds(), - curEvent.start.getUTCMilliseconds()); + date.setUTCHours(curEvent.start.getUTCHours(), curEvent.start.getUTCMinutes(), curEvent.start.getUTCSeconds(), curEvent.start.getUTCMilliseconds()); // Get the offset of today where we are processing // This will be the correction, we need to apply. From 94aa7d953780583677cc1b136f9c1aa52f3dcc74 Mon Sep 17 00:00:00 2001 From: "J. Kenzal Hunter" Date: Fri, 1 Sep 2023 02:10:53 -0400 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f859dd48c5..5d45f74da0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ _This release is scheduled to be released on 2023-10-01._ - Fix undefined formatTime method in clock module (#3143) - Fix clientonly startup fails after async added (#3151) - Fix electron width/heigth when using xrandr under bullseye +- Fix time issue with certain recurring events in calendar module ## [2.24.0] - 2023-07-01