From f9909a87aae20f464e386d8921372dcbbd4a44a6 Mon Sep 17 00:00:00 2001 From: flfeders Date: Wed, 10 Jul 2024 21:10:39 +0200 Subject: [PATCH] Changes in Events Changes in Times --- pages/employees/timetracking.vue | 4 ++-- pages/events/[mode]/[[id]].vue | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/pages/employees/timetracking.vue b/pages/employees/timetracking.vue index b3163e5..257356d 100644 --- a/pages/employees/timetracking.vue +++ b/pages/employees/timetracking.vue @@ -111,6 +111,7 @@ const startTime = async () => { console.log("started") timeInfo.value.user = user.value.id timeInfo.value.start = new Date().toISOString() + timeInfo.value.tenant = dataStore.currentTenant const {data,error} = await supabase .from("times") @@ -251,7 +252,7 @@ const setState = async (newState) => { -
+
Start: {{dayjs(runningTimeInfo.start).format("DD.MM.YY HH:mm")}} @@ -318,7 +319,6 @@ const setState = async (newState) => { :disabled="configTimeMode === 'create' ? false : itemInfo.state !== 'Entwurf'" /> - {{itemInfo.state === 'Entwurf'}}{{itemInfo.state}} diff --git a/pages/events/[mode]/[[id]].vue b/pages/events/[mode]/[[id]].vue index 5164aaf..7862575 100644 --- a/pages/events/[mode]/[[id]].vue +++ b/pages/events/[mode]/[[id]].vue @@ -26,10 +26,12 @@ const resourceToAdd = ref(dataStore.activeProfile.id) }*/ -const setupPage = () => { +const setupPage = async () => { + if(mode.value === "show"){ + itemInfo.value = await useSupabaseSelectSingle("events",useRoute().params.id,"*, project(id,name)") + } else if(mode.value === "edit") { + itemInfo.value = await useSupabaseSelectSingle("events",useRoute().params.id,"*") - if(mode.value === "show" || mode.value === "edit"){ - itemInfo.value = dataStore.getEventById(Number(useRoute().params.id)) || {resources: [], start: new Date(), end: new Date(), type: dataStore.getEventTypes[0].label} } if(route.query.start) itemInfo.value.start = new Date(route.query.start.replace(" ", "+")) @@ -91,7 +93,17 @@ setupPage()