0Zeno/multiple day happening (#2317)

echo-webkom · Oct 19, 2024 · 8b8ade2 · 8b8ade2
1 parent c6004ad
commit 8b8ade2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/apps/web/src/components/calendar/days-calendar.tsx b/apps/web/src/components/calendar/days-calendar.tsx
@@ -86,12 +86,17 @@ export const DaysCalendar = ({ events, isWeek, steps, setWeekText }: Props) => {
         >
           {days.map((day) => {
             const isToday = isSameDay(day, new Date());
-
-            const eventsThisDay = events.filter((event) => {
-              return event.endDate
-                ? isSameDay(event.date, day) || dateIsBetween(day, event.date, event.endDate)
-                : isSameDay(event.date, day);
-            });
+            const eventsThisDay = events
+              .filter((event) => {
+                return event.endDate
+                  ? isSameDay(event.date, day) || dateIsBetween(day, event.date, event.endDate)
+                  : isSameDay(event.date, day);
+              })
+              .sort((a, b) => {
+                if (a.endDate && !b.endDate) return -1;
+                if (!a.endDate && b.endDate) return 1;
+                return 0;
+              });
 
             return (
               <div key={day.toString()}>

diff --git a/apps/web/src/lib/calendar-event-helpers.ts b/apps/web/src/lib/calendar-event-helpers.ts
@@ -37,6 +37,7 @@ export const happeningsToCalendarEvent = (
       id: happening._id,
       title: happening.title,
       date: new Date(happening.date),
+      endDate: happening.endDate ? new Date(happening.endDate) : undefined,
       body: RemoveMarkdown(happening.body ?? ""),
       link: createHappeningLink(happening),
       type: mapHappeningToType(happening.happeningType),