Co-authored-by: Camille Moussu <cmoussu@linagora.com>
This commit is contained in:
@@ -685,6 +685,9 @@ export default function CalendarApp({
|
|||||||
filteredTempEvents,
|
filteredTempEvents,
|
||||||
userId
|
userId
|
||||||
)}
|
)}
|
||||||
|
eventOrder={(a: any, b: any) =>
|
||||||
|
a.extendedProps.priority - b.extendedProps.priority
|
||||||
|
}
|
||||||
weekNumbers={
|
weekNumbers={
|
||||||
currentView === "timeGridWeek" || currentView === "timeGridDay"
|
currentView === "timeGridWeek" || currentView === "timeGridDay"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -102,12 +102,14 @@ export const eventToFullCalendarFormat = (
|
|||||||
.map((e) => {
|
.map((e) => {
|
||||||
const eventTimezone = e.timezone || "Etc/UTC";
|
const eventTimezone = e.timezone || "Etc/UTC";
|
||||||
const isAllDay = e.allday ?? false;
|
const isAllDay = e.allday ?? false;
|
||||||
|
const isPersonnalEvent = e.calId.split("/")[0] === userId;
|
||||||
|
|
||||||
const convertedEvent: any = {
|
const convertedEvent: any = {
|
||||||
...e,
|
...e,
|
||||||
title: formatEventChipTitle(e, t),
|
title: formatEventChipTitle(e, t),
|
||||||
colors: e.color,
|
colors: e.color,
|
||||||
editable: e.calId.split("/")[0] === userId,
|
editable: isPersonnalEvent,
|
||||||
|
priority: isPersonnalEvent ? 1 : 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!isAllDay && e.start && eventTimezone) {
|
if (!isAllDay && e.start && eventTimezone) {
|
||||||
|
|||||||
Reference in New Issue
Block a user