diff --git a/pages/calendar/[mode].vue b/pages/calendar/[mode].vue index af6f71e..fc671df 100644 --- a/pages/calendar/[mode].vue +++ b/pages/calendar/[mode].vue @@ -92,10 +92,11 @@ const calendarOptionsTimeline = ref({ router.push(`/events/edit/?start=${info.startStr}&end=${info.endStr}&resources=${JSON.stringify([info.resource.id])}&source=timeline`) }, eventClick: function (info){ - if(info.event.title.startsWith("Abw.:")){ - router.push(`/absencerequests/show/${info.event.id}`) + console.log(info.event) + if(info.event.extendedProps.entrytype === "absencerequest"){ + router.push(`/standardEntity/absencerequests/show/${info.event.extendedProps.absencerequestId}`) } else { - router.push(`/standardEntity/events/show/${info.event.id}`) + router.push(`/standardEntity/events/show/${info.event.extendedProps.eventId}`) } }, resourceGroupField: "type", @@ -279,7 +280,8 @@ const setupPage = async () => { start: event.startDate, end: event.endDate, resourceIds: [], - entrytype: "event" + entrytype: "event", + eventId: event.id } @@ -310,13 +312,14 @@ const setupPage = async () => { absencerequests.forEach(absencerequest => { let returnData = { - title: absencerequest.name, + title: `${absencerequest.reason} - ${absencerequest.name}`, backgroundColor: "black", start: absencerequest.startDate, end: absencerequest.endDate, resourceIds: [absencerequest.profile], entrytype: "absencerequest", allDay: true, + absencerequestId: absencerequest.id } tempEvents.push(returnData)