From f79c56938318c04375994af00886d7eee6369fe1 Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Fri, 19 Sep 2025 15:26:05 +0200 Subject: [PATCH 1/4] Added Archived Showing, Fixed Archived Filtering --- components/EntityList.vue | 7 ++++++- pages/standardEntity/[type]/[[mode]]/[[id]].vue | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/components/EntityList.vue b/components/EntityList.vue index 602f4d7..ebee1b0 100644 --- a/components/EntityList.vue +++ b/components/EntityList.vue @@ -85,7 +85,12 @@ const selectedFilters = ref(dataType.filters.filter(i => i.default).map(i => i.n const filteredRows = computed(() => { - let tempItems = props.items + let tempItems = props.items.map(i => { + return { + ...i, + class: i.archived ? 'bg-red-500/50 dark:bg-red-400/50' : null + } + }) if(selectedFilters.value.length > 0) { selectedFilters.value.forEach(filterName => { diff --git a/pages/standardEntity/[type]/[[mode]]/[[id]].vue b/pages/standardEntity/[type]/[[mode]]/[[id]].vue index 76ebd91..cd1a7d7 100644 --- a/pages/standardEntity/[type]/[[mode]]/[[id]].vue +++ b/pages/standardEntity/[type]/[[mode]]/[[id]].vue @@ -47,7 +47,7 @@ const setupPage = async (sort_column = null, sort_direction = null) => { console.log(item.value) } else if (mode.value === "list") { //Load Data for List - items.value = await useEntities(type).select(dataType.supabaseSelectWithInformation, sort_column || dataType.supabaseSortColumn, sort_direction === "asc") + items.value = await useEntities(type).select(dataType.supabaseSelectWithInformation, sort_column || dataType.supabaseSortColumn, sort_direction === "asc", true) } loaded.value = true From 168ebead92f7e67fe8a63fa2d195e5cf8b02143e Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Fri, 19 Sep 2025 15:30:33 +0200 Subject: [PATCH 2/4] Added Archived Showing, Fixed Archived Filtering --- pages/createDocument/serialInvoice.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pages/createDocument/serialInvoice.vue b/pages/createDocument/serialInvoice.vue index 9d794ad..affb0eb 100644 --- a/pages/createDocument/serialInvoice.vue +++ b/pages/createDocument/serialInvoice.vue @@ -126,13 +126,20 @@ const items = ref([]) const selectedItem = ref(0) const setupPage = async () => { - items.value = await useEntities("createddocuments").select("*, customer(id,name)","documentDate") + items.value = await useEntities("createddocuments").select("*, customer(id,name)","documentDate",undefined,true) } const searchString = ref("") const filteredRows = computed(() => { - let temp = items.value.filter(i => i.type === "serialInvoices") + + + let temp = items.value.filter(i => i.type === "serialInvoices").map(i => { + return { + ...i, + class: i.archived ? 'bg-red-500/50 dark:bg-red-400/50' : null + } + }) /*if(showDrafts.value === true) { temp = temp.filter(i => i.state === "Entwurf") From cc9f7e58ec469f9ee0dfc96099731cd883e93f00 Mon Sep 17 00:00:00 2001 From: florianfederspiel Date: Fri, 19 Sep 2025 15:30:53 +0200 Subject: [PATCH 3/4] Removed Type Filtering, reduntant to tabs --- pages/createDocument/index.vue | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue index 820256b..412ce26 100644 --- a/pages/createDocument/index.vue +++ b/pages/createDocument/index.vue @@ -30,26 +30,7 @@ - + - {{sort}}