From 2e6e86887b786d08de5580c66e218ffa4dc4c079 Mon Sep 17 00:00:00 2001 From: Marc Landis Date: Wed, 25 Sep 2024 21:16:43 +0200 Subject: [PATCH] fix calendar showing previous day when using sliceMultiDayEvents (#3555) This bug is caused by #3543. The calculation for midnight adds a day but for endDate we want the day to be subtracted again. --- CHANGELOG.md | 1 + modules/default/calendar/calendar.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c16a7613..7d53acf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ _This release is scheduled to be released on 2024-10-01._ - [tests] Fixes calendar test by moving it from e2e to electron with fixed date (#3532) - [calendar] fixed sliceMultiDayEvents getting wrong count and displaying incorrect entries, Europe/Berlin (#3542) - [tests] ignore `js/positions.js` when linting (this file is created at runtime) +- [calendar] fixed sliceMultiDayEvents showing previous day without config enabled ## [2.28.0] - 2024-07-01 diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index f952bc59..31b863eb 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -651,7 +651,7 @@ Module.register("calendar", { const thisEvent = JSON.parse(JSON.stringify(event)); // clone object thisEvent.today = thisEvent.startDate >= today && thisEvent.startDate < today + ONE_DAY; thisEvent.tomorrow = !thisEvent.today && thisEvent.startDate >= today + ONE_DAY && thisEvent.startDate < today + 2 * ONE_DAY; - thisEvent.endDate = midnight; + thisEvent.endDate = moment(midnight, "x").clone().subtract(1, "day").format("x"); thisEvent.title += ` (${count}/${maxCount})`; splitEvents.push(thisEvent);