From 55ccbfe1cc024291e2ee7b5dad44125d389c58ff Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sun, 16 Mar 2025 20:16:52 +0200
Subject: [PATCH] fix(calendar): handling of start time/end time

---
 .../widgets/view_widgets/calendar_view.spec.ts   |  2 +-
 .../app/widgets/view_widgets/calendar_view.ts    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/public/app/widgets/view_widgets/calendar_view.spec.ts b/src/public/app/widgets/view_widgets/calendar_view.spec.ts
index df6c8338c..a8273239c 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.spec.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.spec.ts
@@ -169,7 +169,7 @@ describe("Promoted attributes", () => {
         const events = await CalendarView.buildEvents(noteIds);
 
         expect(events).toHaveLength(2);
-        expect(events[0]).toMatchObject({ title: "Note 1", start: "2025-05-05T13:30:00", end: "2025-05-05T13:30:00" });
+        expect(events[0]).toMatchObject({ title: "Note 1", start: "2025-05-05T13:30:00" });
         expect(events[1]).toMatchObject({ title: "Note 2", start: "2025-05-07T13:36:00", end: "2025-05-08" });
     });
 
diff --git a/src/public/app/widgets/view_widgets/calendar_view.ts b/src/public/app/widgets/view_widgets/calendar_view.ts
index 2403523c5..3c513d996 100644
--- a/src/public/app/widgets/view_widgets/calendar_view.ts
+++ b/src/public/app/widgets/view_widgets/calendar_view.ts
@@ -384,15 +384,15 @@ export default class CalendarView extends ViewMode {
         }
 
         for (const title of titles) {
+            if (endTime && !endDate) {
+                endDate = startDate;
+            }
+
             startDate = (startTime ? `${startDate}T${startTime}:00` : startDate);
-            if (!endDate) {
-                if (!endTime) {
-                    endDate = startDate;
-                } else {
-                    const endDateOffset = CalendarView.#offsetDate(endDate ?? startDate, 1);
-                    if (endDateOffset) {
-                        endDate = CalendarView.#formatDateToLocalISO(endDateOffset);
-                    }
+            if (!endDate && !startTime) {
+                const endDateOffset = CalendarView.#offsetDate(endDate ?? startDate, 1);
+                if (endDateOffset) {
+                    endDate = CalendarView.#formatDateToLocalISO(endDateOffset);
                 }
             }