Fixed Calendar Display
This commit is contained in:
@@ -130,7 +130,7 @@ const calendarOptionsTimeline = ref({
|
|||||||
const loaded = ref(false)
|
const loaded = ref(false)
|
||||||
const setupPage = async () => {
|
const setupPage = async () => {
|
||||||
let tempData = await useSupabaseSelect("events", "*, vehicles(*), inventoryitems(*)")
|
let tempData = await useSupabaseSelect("events", "*, vehicles(*), inventoryitems(*)")
|
||||||
let absencerequests = await useSupabaseSelect("absencerequests", "*")
|
let absencerequests = await useSupabaseSelect("absencerequests", "*, profile(*)")
|
||||||
let projects = await useSupabaseSelect("projects", "*")
|
let projects = await useSupabaseSelect("projects", "*")
|
||||||
let inventoryitems = await useSupabaseSelect("inventoryitems", "*")
|
let inventoryitems = await useSupabaseSelect("inventoryitems", "*")
|
||||||
let profiles = await useSupabaseSelect("profiles", "*")
|
let profiles = await useSupabaseSelect("profiles", "*")
|
||||||
@@ -198,9 +198,9 @@ const setupPage = async () => {
|
|||||||
id: absence.id,
|
id: absence.id,
|
||||||
resourceId: absence.user,
|
resourceId: absence.user,
|
||||||
resourceType: "person",
|
resourceType: "person",
|
||||||
title: `${absence.reason} - ${absence.name}`,
|
title: `${absence.reason} - ${absence.profile.fullName}`,
|
||||||
start: dayjs(absence.start).toDate(),
|
start: dayjs(absence.startDate).toDate(),
|
||||||
end: dayjs(absence.end).add(1, 'day').toDate(),
|
end: dayjs(absence.endDate).add(1, 'day').toDate(),
|
||||||
allDay: true,
|
allDay: true,
|
||||||
absencerequestId: absence.id,
|
absencerequestId: absence.id,
|
||||||
entrytype: "absencerequest",
|
entrytype: "absencerequest",
|
||||||
@@ -316,11 +316,11 @@ const setupPage = async () => {
|
|||||||
|
|
||||||
absencerequests.forEach(absencerequest => {
|
absencerequests.forEach(absencerequest => {
|
||||||
let returnData = {
|
let returnData = {
|
||||||
title: `${absencerequest.reason} - ${absencerequest.name}`,
|
title: `${absencerequest.reason}`,
|
||||||
backgroundColor: "black",
|
backgroundColor: "black",
|
||||||
start: absencerequest.startDate,
|
start: absencerequest.startDate,
|
||||||
end: absencerequest.endDate,
|
end: absencerequest.endDate,
|
||||||
resourceIds: [absencerequest.profile],
|
resourceIds: [absencerequest.profile.id],
|
||||||
entrytype: "absencerequest",
|
entrytype: "absencerequest",
|
||||||
allDay: true,
|
allDay: true,
|
||||||
absencerequestId: absencerequest.id
|
absencerequestId: absencerequest.id
|
||||||
|
|||||||
Reference in New Issue
Block a user