From 1de59f3794464f3a4927bff78c36f5873f21ffde Mon Sep 17 00:00:00 2001 From: Camille Moussu <66134347+Eriikah@users.noreply.github.com> Date: Fri, 12 Dec 2025 17:58:48 +0100 Subject: [PATCH] [#408] added ordering priority to personnal event (#413) Co-authored-by: Camille Moussu --- src/components/Calendar/Calendar.tsx | 3 +++ src/components/Calendar/utils/calendarUtils.ts | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/Calendar/Calendar.tsx b/src/components/Calendar/Calendar.tsx index 3dac1b1..e3bf03a 100644 --- a/src/components/Calendar/Calendar.tsx +++ b/src/components/Calendar/Calendar.tsx @@ -685,6 +685,9 @@ export default function CalendarApp({ filteredTempEvents, userId )} + eventOrder={(a: any, b: any) => + a.extendedProps.priority - b.extendedProps.priority + } weekNumbers={ currentView === "timeGridWeek" || currentView === "timeGridDay" } diff --git a/src/components/Calendar/utils/calendarUtils.ts b/src/components/Calendar/utils/calendarUtils.ts index b66ecde..0c0877a 100644 --- a/src/components/Calendar/utils/calendarUtils.ts +++ b/src/components/Calendar/utils/calendarUtils.ts @@ -102,12 +102,14 @@ export const eventToFullCalendarFormat = ( .map((e) => { const eventTimezone = e.timezone || "Etc/UTC"; const isAllDay = e.allday ?? false; + const isPersonnalEvent = e.calId.split("/")[0] === userId; const convertedEvent: any = { ...e, title: formatEventChipTitle(e, t), colors: e.color, - editable: e.calId.split("/")[0] === userId, + editable: isPersonnalEvent, + priority: isPersonnalEvent ? 1 : 0, }; if (!isAllDay && e.start && eventTimezone) {