diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue index 3e831b1..1237225 100644 --- a/pages/createDocument/edit/[[id]].vue +++ b/pages/createDocument/edit/[[id]].vue @@ -952,10 +952,12 @@ setupPage() row.description = dataStore.getProductById(row.product).description" > + { 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,"*") + itemInfo.value = await useSupabaseSelectSingle("events",route.params.id,"*, project(id,name)") + } else if(mode.value === "edit" && route.params.id) { + itemInfo.value = await useSupabaseSelectSingle("events",route.params.id,"*") } diff --git a/pages/index.vue b/pages/index.vue index 77b5b05..7118afe 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -14,11 +14,6 @@ - - Test - { events.value.forEach(event => { console.log(event) event.resources.forEach(resource => { + console.log(resource) let eventColor = ownTenant.value.calendarConfig.eventTypes.find(type => type.label === event.type).color let title = "" if(event.title) { title = event.title - } else if(event.project) { + } /*else if(event.project) { projects.value.find(i => i.id === event.project) ? projects.value.find(i => i.id === event.project).name : "" - } + }*/ @@ -1451,7 +1452,7 @@ export const useDataStore = defineStore('data', () => { //Get Item By Id - const getProductById = computed(() => async (itemId) => { + const getProductById = computed(() => (itemId) => { return products.value.find(item => item.id === itemId) })