Fixed Archived

pages/calendar/[mode].vue

@@ -6,7 +6,6 @@ import timeGridPlugin from "@fullcalendar/timegrid"
 import resourceTimelinePlugin from "@fullcalendar/resource-timeline";
 import interactionPlugin from "@fullcalendar/interaction";
 import dayjs from "dayjs";
-import profiles from "~/components/columnRenderings/profiles.vue";
 
 definePageMeta({
   middleware: "auth"
@@ -18,8 +17,6 @@ const router = useRouter()
 const mode = ref(route.params.mode || "grid")
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
-//const resources = dataStore.getResources
-//const eventTypes = dataStore.getEventTypes
 
 const profileStore = useProfileStore()
 
@@ -129,46 +126,12 @@ const calendarOptionsTimeline = ref({
 
 const loaded = ref(false)
 const setupPage = async () => {
-  let tempData = await useSupabaseSelect("events", "*, vehicles(*), inventoryitems(*)")
-  let absencerequests = await useSupabaseSelect("absencerequests", "*, profile(*)")
-  let projects = await useSupabaseSelect("projects", "*")
-  let inventoryitems = await useSupabaseSelect("inventoryitems", "*")
-  let profiles = await useSupabaseSelect("profiles", "*")
-  let vehicles = await useSupabaseSelect("vehicles", "*")
-
-  /*events.value = [
-    ...tempData.map(event => {
-      let eventColor = profileStore.ownTenant.calendarConfig.eventTypes.find(type => type.label === event.eventtype).color
-
-      let title = ""
-      if (event.name) {
-        title = event.name
-      } else if (event.project) {
-        projects.find(i => i.id === event.project) ? projects.find(i => i.id === event.project).name : ""
-      }
-
-      return {
-        ...event,
-        start: event.startDate,
-        end: event.endDate,
-        title: title,
-        borderColor: eventColor,
-        textColor: eventColor,
-        backgroundColor: "black"
-      }
-    }),
-    ...absencerequests.map(absence => {
-      return {
-        id: absence.id,
-        resourceId: absence.user,
-        resourceType: "person",
-        title: `Abw.: ${absence.reason}`,
-        start: dayjs(absence.start).toDate(),
-        end: dayjs(absence.end).add(1, 'day').toDate(),
-        allDay: true,
-      }
-    })
-  ]*/
+  let tempData = (await useSupabaseSelect("events", "*, vehicles(*), inventoryitems(*)")).filter(i => !i.archived)
+  let absencerequests = (await useSupabaseSelect("absencerequests", "*, profile(*)")).filter(i => !i.archived)
+  let projects = (await useSupabaseSelect("projects", "*")).filter(i => !i.archived)
+  let inventoryitems = (await useSupabaseSelect("inventoryitems", "*")).filter(i => !i.archived)
+  let profiles = (await useSupabaseSelect("profiles", "*")).filter(i => !i.archived)
+  let vehicles = (await useSupabaseSelect("vehicles", "*")).filter(i => !i.archived)
 
   calendarOptionsGrid.value.initialEvents = [
     ...tempData.map(event => {