From c70b172b089a8087c6fc76494f540330681dc97e Mon Sep 17 00:00:00 2001 From: flfeders Date: Sat, 14 Sep 2024 17:09:29 +0200 Subject: [PATCH] Changes --- components/HistoryDisplay.vue | 38 +++++++++++------------- composables/usePDFGenerator.js | 2 +- composables/useSearch.js | 7 ----- package-lock.json | 51 ++++++++++++++++++++++++++++++++ package.json | 1 + pages/contacts/[mode]/[[id]].vue | 1 + pages/employees/timetracking.vue | 1 + 7 files changed, 73 insertions(+), 28 deletions(-) diff --git a/components/HistoryDisplay.vue b/components/HistoryDisplay.vue index 29432cf..ef0cec9 100644 --- a/components/HistoryDisplay.vue +++ b/components/HistoryDisplay.vue @@ -27,37 +27,37 @@ const items = ref([]) const setup = async () => { if(type === "customer") { - items.value = (await supabase.from("historyitems").select().eq("customer",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("customer",elementId)).data || [] } else if(type === "vendor") { - items.value = (await supabase.from("historyitems").select().eq("vendor",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("vendor",elementId)).data || [] } else if(type === "project") { - items.value = (await supabase.from("historyitems").select().eq("project",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("project",elementId)).data || [] } else if(type === "plant") { - items.value = (await supabase.from("historyitems").select().eq("plant",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("plant",elementId)).data || [] } else if(type === "incomingInvoice") { - items.value = (await supabase.from("historyitems").select().eq("incomingInvoice",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("incomingInvoice",elementId)).data || [] } else if(type === "document") { - items.value = (await supabase.from("historyitems").select().eq("document",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("document",elementId)).data || [] } else if(type === "contact") { - items.value = (await supabase.from("historyitems").select().eq("contact",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("contact",elementId)).data || [] } else if(type === "contract") { - items.value = (await supabase.from("historyitems").select().eq("contract",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("contract",elementId)).data || [] } else if(type === "inventoryitem") { - items.value = (await supabase.from("historyitems").select().eq("inventoryitem",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("inventoryitem",elementId)).data || [] } else if(type === "product") { - items.value = (await supabase.from("historyitems").select().eq("product",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("product",elementId)).data || [] } else if(type === "profile") { - items.value = (await supabase.from("historyitems").select().eq("profile",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("profile",elementId)).data || [] } else if(type === "absencerequest") { - items.value = (await supabase.from("historyitems").select().eq("absenceRequest",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("absenceRequest",elementId)).data || [] } else if(type === "event") { - items.value = (await supabase.from("historyitems").select().eq("event",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("event",elementId)).data || [] } else if(type === "task") { - items.value = (await supabase.from("historyitems").select().eq("task",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("task",elementId)).data || [] } else if(type === "vehicle") { - items.value = (await supabase.from("historyitems").select().eq("vehicle",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("vehicle",elementId)).data || [] } else if(type === "space") { - items.value = (await supabase.from("historyitems").select().eq("space",elementId)).data + items.value = (await supabase.from("historyitems").select().eq("space",elementId)).data || [] } } @@ -159,7 +159,7 @@ const addHistoryItem = async () => { addHistoryItemData.value = {} toast.add({title: "Eintrag erfolgreich erstellt"}) showAddHistoryItemModal.value = false - await dataStore.fetchHistoryItems() + await setup() } } @@ -213,7 +213,7 @@ const renderText = (text) => {
-

Logbuch

+

Logbuch {{items.length}}

@@ -222,8 +222,6 @@ const renderText = (text) => {
- -
{ color:rgb(0,0,0), lineHeight:12, opacity: 1, - maxWidth: 240, + maxWidth: 500, font: fontBold }) diff --git a/composables/useSearch.js b/composables/useSearch.js index bca0adc..cd15d5a 100644 --- a/composables/useSearch.js +++ b/composables/useSearch.js @@ -1,14 +1,7 @@ - - export const useSearch = (searchString,items) => { - if(!searchString) { return items } return items.filter(i => JSON.stringify(i).toLowerCase().includes(searchString.toLowerCase())) - - - - } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 456009a..9b5f2d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,6 +55,7 @@ }, "devDependencies": { "@nuxt/devtools": "latest", + "@nuxtjs/leaflet": "^1.2.2", "@nuxtjs/supabase": "^1.1.4", "@vite-pwa/nuxt": "^0.3.3", "nuxt": "^3.8.0", @@ -3749,6 +3750,17 @@ "pathe": "^1.1.2" } }, + "node_modules/@nuxtjs/leaflet": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@nuxtjs/leaflet/-/leaflet-1.2.2.tgz", + "integrity": "sha512-EAO582L2AQ3YASmj1wOomeLQmgT5xylQEOXkK0J0RKz1kDjSDCiRB12IXHCGEYRQ1stzmJ2UxRJNkyXncF3MxQ==", + "dev": true, + "dependencies": { + "@types/leaflet": "^1.9.12", + "@vue-leaflet/vue-leaflet": "^0.10.1", + "leaflet": "^1.9.4" + } + }, "node_modules/@nuxtjs/mdc": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/@nuxtjs/mdc/-/mdc-0.6.1.tgz", @@ -5310,6 +5322,12 @@ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==" }, + "node_modules/@types/geojson": { + "version": "7946.0.14", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", + "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==", + "dev": true + }, "node_modules/@types/hast": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz", @@ -5326,6 +5344,15 @@ "@types/node": "*" } }, + "node_modules/@types/leaflet": { + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.12.tgz", + "integrity": "sha512-BK7XS+NyRI291HIo0HCfE18Lp8oA30H1gpi1tf0mF3TgiCEzanQjOqNZ4x126SXzzi2oNSZhZ5axJp1k0iM6jg==", + "dev": true, + "dependencies": { + "@types/geojson": "*" + } + }, "node_modules/@types/lodash": { "version": "4.17.0", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz", @@ -5961,6 +5988,24 @@ "vue": "^3.0.0" } }, + "node_modules/@vue-leaflet/vue-leaflet": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@vue-leaflet/vue-leaflet/-/vue-leaflet-0.10.1.tgz", + "integrity": "sha512-RNEDk8TbnwrJl8ujdbKgZRFygLCxd0aBcWLQ05q/pGv4+d0jamE3KXQgQBqGAteE1mbQsk3xoNcqqUgaIGfWVg==", + "dev": true, + "dependencies": { + "vue": "^3.2.25" + }, + "peerDependencies": { + "@types/leaflet": "^1.5.7", + "leaflet": "^1.6.0" + }, + "peerDependenciesMeta": { + "@types/leaflet": { + "optional": true + } + } + }, "node_modules/@vue-macros/common": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vue-macros/common/-/common-1.10.2.tgz", @@ -11249,6 +11294,12 @@ "safe-buffer": "~5.1.0" } }, + "node_modules/leaflet": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz", + "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==", + "dev": true + }, "node_modules/legacy-swc-helpers": { "name": "@swc/helpers", "version": "0.4.14", diff --git a/package.json b/package.json index 4534567..2b92253 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "devDependencies": { "@nuxt/devtools": "latest", + "@nuxtjs/leaflet": "^1.2.2", "@nuxtjs/supabase": "^1.1.4", "@vite-pwa/nuxt": "^0.3.3", "nuxt": "^3.8.0", diff --git a/pages/contacts/[mode]/[[id]].vue b/pages/contacts/[mode]/[[id]].vue index bdd0fc3..f1695ef 100644 --- a/pages/contacts/[mode]/[[id]].vue +++ b/pages/contacts/[mode]/[[id]].vue @@ -128,6 +128,7 @@ setupPage() --> + { + {{itemInfo}}