From c75e97252c28488e155ad75abec3b943a5ce2e1b Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Thu, 13 Feb 2025 17:55:28 +0100 Subject: [PATCH] Fixed Calendar Display --- pages/calendar/[mode].vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pages/calendar/[mode].vue b/pages/calendar/[mode].vue index c0c2dd4..097cec1 100644 --- a/pages/calendar/[mode].vue +++ b/pages/calendar/[mode].vue @@ -130,7 +130,7 @@ const calendarOptionsTimeline = ref({ const loaded = ref(false) const setupPage = async () => { let tempData = await useSupabaseSelect("events", "*, vehicles(*), inventoryitems(*)") - let absencerequests = await useSupabaseSelect("absencerequests", "*") + let absencerequests = await useSupabaseSelect("absencerequests", "*, profile(*)") let projects = await useSupabaseSelect("projects", "*") let inventoryitems = await useSupabaseSelect("inventoryitems", "*") let profiles = await useSupabaseSelect("profiles", "*") @@ -198,9 +198,9 @@ const setupPage = async () => { id: absence.id, resourceId: absence.user, resourceType: "person", - title: `${absence.reason} - ${absence.name}`, - start: dayjs(absence.start).toDate(), - end: dayjs(absence.end).add(1, 'day').toDate(), + title: `${absence.reason} - ${absence.profile.fullName}`, + start: dayjs(absence.startDate).toDate(), + end: dayjs(absence.endDate).add(1, 'day').toDate(), allDay: true, absencerequestId: absence.id, entrytype: "absencerequest", @@ -316,11 +316,11 @@ const setupPage = async () => { absencerequests.forEach(absencerequest => { let returnData = { - title: `${absencerequest.reason} - ${absencerequest.name}`, + title: `${absencerequest.reason}`, backgroundColor: "black", start: absencerequest.startDate, end: absencerequest.endDate, - resourceIds: [absencerequest.profile], + resourceIds: [absencerequest.profile.id], entrytype: "absencerequest", allDay: true, absencerequestId: absencerequest.id