From 0d849f5fcba0bce32a242196a8bdeb697a9ba09c Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 20 Dec 2024 20:00:08 +0100
Subject: [PATCH 001/104] Reffractored
 vendors,vehicles,services,servicecategories,products,productcategories,
 projects, plants, customers, contracts, contacts

---
 components/EntityList.vue                    |  31 ++-
 components/MainNav.vue                       |   7 +-
 components/columnRenderings/active.vue       |  13 ++
 components/columnRenderings/sellingPrice.vue |  13 ++
 components/columnRenderings/unit.vue         |  13 ++
 components/columnRenderings/vendor.vue       |  13 ++
 composables/useCurrency.js                   |   3 +
 composables/useRole.js                       |  23 --
 pages/contacts/index.vue                     |  89 +------
 pages/contracts/index.vue                    | 116 +---------
 pages/customers/index.vue                    | 154 +------------
 pages/plants/index.vue                       | 123 +---------
 pages/productcategories/index.vue            | 123 +---------
 pages/products/index.vue                     | 117 +---------
 pages/projects/index.vue                     |   6 -
 pages/servicecategories/index.vue            | 123 +---------
 pages/services/index.vue                     | 138 +----------
 pages/vehicles/index.vue                     | 125 +---------
 pages/vendors/index.vue                      |  62 +----
 stores/data.js                               | 230 ++++++++++++++++++-
 20 files changed, 361 insertions(+), 1161 deletions(-)
 create mode 100644 components/columnRenderings/active.vue
 create mode 100644 components/columnRenderings/sellingPrice.vue
 create mode 100644 components/columnRenderings/unit.vue
 create mode 100644 components/columnRenderings/vendor.vue
 create mode 100644 composables/useCurrency.js

diff --git a/components/EntityList.vue b/components/EntityList.vue
index fbf0108..f2050be 100644
--- a/components/EntityList.vue
+++ b/components/EntityList.vue
@@ -122,6 +122,7 @@ const filteredRows = computed(() => {
         </template>
       </USelectMenu>
       <USelectMenu
+          v-if="selectableFilters.length > 0"
           icon="i-heroicons-adjustments-horizontal-solid"
           multiple
           v-model="selectedFilters"
@@ -133,7 +134,6 @@ const filteredRows = computed(() => {
       </USelectMenu>
     </template>
   </UDashboardToolbar>
-
   <UTable
       :rows="filteredRows"
       :columns="columns"
@@ -142,8 +142,35 @@ const filteredRows = computed(() => {
       @select="(i) => router.push(`/projects/show/${i.id}`) "
       :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: `Keine ${dataType.label} anzuzeigen` }"
   >
+    <template #name-data="{row}">
+      <span
+          v-if="row.id === filteredRows[selectedItem].id"
+          class="text-primary-500 font-bold">{{row.name}}
+      </span>
+      <span v-else>
+        {{row.name}}
+      </span>
+    </template>
+    <template #fullName-data="{row}">
+      <span
+          v-if="row.id === filteredRows[selectedItem].id"
+          class="text-primary-500 font-bold">{{row.fullName}}
+      </span>
+      <span v-else>
+        {{row.fullName}}
+      </span>
+    </template>
+    <template #licensePlate-data="{row}">
+      <span
+          v-if="row.id === filteredRows[selectedItem].id"
+          class="text-primary-500 font-bold">{{row.licensePlate}}
+      </span>
+      <span v-else>
+        {{row.licensePlate}}
+      </span>
+    </template>
     <template
-        v-for="column in dataType.templateColumns"
+        v-for="column in dataType.templateColumns.filter(i => i.key !== 'name' && i.key !== 'fullName' && i.key !== 'licensePlate')"
         v-slot:[`${column.key}-data`]="{row}">
       <component v-if="column.component" :is="column.component" :row="row"></component>
       <span v-else>{{row[column.key]}}</span>
diff --git a/components/MainNav.vue b/components/MainNav.vue
index e8f84bb..4863277 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -68,11 +68,6 @@ const links = computed(() => {
         }
       ]
     },
-    /*{
-      label: "E-Mail",
-      to: "/email",
-      icon: "i-heroicons-envelope"
-    },*/
     ... dataStore.ownTenant.features.contacts ? [{
       label: "Kontakte",
       defaultOpen: false,
@@ -223,7 +218,7 @@ const links = computed(() => {
       to: "/contracts",
       icon: "i-heroicons-clipboard-document"
     }] : [],
-    ... (role.checkRight("objects") && dataStore.ownTenant.features.objects) ? [{
+    ... (role.checkRight("plants") && dataStore.ownTenant.features.objects) ? [{
       label: "Objekte",
       to: "/plants",
       icon: "i-heroicons-clipboard-document"
diff --git a/components/columnRenderings/active.vue b/components/columnRenderings/active.vue
new file mode 100644
index 0000000..67d544f
--- /dev/null
+++ b/components/columnRenderings/active.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span>{{props.row.active ? 'Ja' : 'Nein'}}</span>
+</template>
diff --git a/components/columnRenderings/sellingPrice.vue b/components/columnRenderings/sellingPrice.vue
new file mode 100644
index 0000000..6bfeeb1
--- /dev/null
+++ b/components/columnRenderings/sellingPrice.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span>{{props.row.sellingPrice ? useCurrency(props.row.sellingPrice) : ''}}</span>
+</template>
diff --git a/components/columnRenderings/unit.vue b/components/columnRenderings/unit.vue
new file mode 100644
index 0000000..d101920
--- /dev/null
+++ b/components/columnRenderings/unit.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span>{{props.row.unit ? props.row.unit.name : ''}}</span>
+</template>
diff --git a/components/columnRenderings/vendor.vue b/components/columnRenderings/vendor.vue
new file mode 100644
index 0000000..92601dc
--- /dev/null
+++ b/components/columnRenderings/vendor.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span>{{props.row.vendor ? props.row.vendor.name : ''}}</span>
+</template>
diff --git a/composables/useCurrency.js b/composables/useCurrency.js
new file mode 100644
index 0000000..864e5a8
--- /dev/null
+++ b/composables/useCurrency.js
@@ -0,0 +1,3 @@
+export const useCurrency = (value,currencyString = " €") => {
+    return `${Number(value).toFixed(2).replace(".",",")} ${currencyString}`
+}
\ No newline at end of file
diff --git a/composables/useRole.js b/composables/useRole.js
index f7940c6..8b67f72 100644
--- a/composables/useRole.js
+++ b/composables/useRole.js
@@ -1,28 +1,5 @@
 
 
-/*const rights2 = ref({
-    projects: {
-        label: "Projekte",
-        children: {
-            viewOwnProjects: {label: "Eigene Projekte sehen"},
-            viewAllProjects: {label: "Alle Projekte sehen"},
-        }
-    },
-    createUser: {label: "Benutzer erstellen"},
-    modifyUser: {label: "Benutzer bearbeiten"},
-    deactivateUser: {label: "Benutzer sperren"},
-    createProject: {label: "Projekt erstellen"},
-
-    createTask: {label: "Aufgabe erstellen"},
-    viewOwnTasks: {label:"Eigene Aufgaben sehen"},
-    viewAllTasks: {label: "Alle Aufgaben sehen"},
-    trackOwnTime: {label:"Eigene Zeite erfassen"},
-    createOwnTime: {label:"Eigene Zeiten erstellen"},
-    createTime: {label:"Zeiten erstellen"},
-    viewOwnTimes: {label:"Eigene Zeiten anzeigen"},
-    viewTimes: {label:"Zeiten anzeigen"},
-})*/
-
 
 
 
diff --git a/pages/contacts/index.vue b/pages/contacts/index.vue
index ebebdee..917e553 100644
--- a/pages/contacts/index.vue
+++ b/pages/contacts/index.vue
@@ -1,5 +1,10 @@
 <template>
-  <UDashboardNavbar title="Ansprechpartner" :badge="filteredRows.length">
+  <EntityList
+      type="contacts"
+      :items="items"
+  ></EntityList>
+
+  <!--  <UDashboardNavbar title="Ansprechpartner" :badge="filteredRows.length">
     <template #right>
       <UInput
           id="searchinput"
@@ -58,53 +63,17 @@
     <template #vendor-data="{row}">
       {{row.vendor ? row.vendor.name : ""}}
     </template>
-  </UTable>
+  </UTable>-->
 </template>
 
 <script setup>
-
-import {useSearch} from "~/composables/useSearch.js";
+import EntityList from "~/components/EntityList.vue";
 
 definePageMeta({
   middleware: "auth"
 })
 
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/contacts/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/contacts/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if(selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-
 const items = ref([])
-const selectedItem = ref(0)
 
 const setupPage = async () => {
   items.value = await useSupabaseSelect("contacts","*, customer(name), vendor(name)")
@@ -112,49 +81,9 @@ const setupPage = async () => {
 
 setupPage()
 
-
-
 const templateColumns = [
 
-  {
-    key: "fullName",
-    label: "Name",
-    sortable: true
-  },
-  {
-    key: "customer",
-    label: "Kunde",
-    sortable: true
-  },
-  {
-    key: "vendor",
-    label: "Lieferant",
-    sortable: true
-  },
-  {
-    key: "role",
-    label: "Rolle",
-  },
-  {
-    key: "email",
-    label: "E-Mail",
-  },
-  {
-    key: "phoneMobile",
-    label: "Mobil",
-  },
-  {
-    key: "phoneHome",
-    label: "Festnetz",
-  },
-  {
-    key: "active",
-    label: "Aktiv",
-  },
-  {
-    key: "birtday",
-    label: "Geburtstag",
-  }
+
 ]
 const selectedColumns = ref(templateColumns)
 const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
diff --git a/pages/contracts/index.vue b/pages/contracts/index.vue
index 7351676..467108d 100644
--- a/pages/contracts/index.vue
+++ b/pages/contracts/index.vue
@@ -1,54 +1,8 @@
 <template>
-  <UDashboardNavbar title="Verträge" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/contracts/create`)">+ Vertrag</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/contracts/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Verträge anzuzeigen' }"
-  >
-    <template #customer-data="{row}">
-      <span v-if="row === filteredRows[selectedItem]" class="text-primary-500 font-bold">{{row.customer ? row.customer.name : ""}}</span>
-      <span v-else>{{row.customer ? row.customer.name : ""}}</span>
-    </template>
-  </UTable>
+  <EntityList
+    :items="items"
+    type="contracts"
+  />
 </template>
 
 <script setup>
@@ -56,74 +10,12 @@ definePageMeta({
   middleware: "auth"
 })
 
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/contracts/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/contracts/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if(selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-
 const items = ref([])
-const selectedItem = ref(0)
-
 const setupPage = async () => {
   items.value = await useSupabaseSelect("contracts","*, customer(id,name)")
 }
 
 setupPage()
-
-const templateColumns = [
-  {
-    key: 'customer',
-    label: "Kunde",
-    sortable: true
-  },
-  {
-    key: "name",
-    label: "Name",
-    sortable: true
-  },
-  {
-    key: "notes",
-    label: "Notizen"
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-
-const searchString = ref('')
-const filteredRows = computed(() => {
-  return useSearch(searchString.value, items.value)
-
-})
 </script>
 
 <style scoped>
diff --git a/pages/customers/index.vue b/pages/customers/index.vue
index f7e3011..05190da 100644
--- a/pages/customers/index.vue
+++ b/pages/customers/index.vue
@@ -1,166 +1,24 @@
 <template>
-  <UDashboardNavbar title="Kunden" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          name="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/customers/create/`)">+ Kunde</UButton>
-
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/customers/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Kunden anzuzeigen' }"
-  >
-    <template #name-data="{row}">
-      <span v-if="row === filteredRows[selectedItem]" class="text-primary-500 font-bold">{{row.name}}</span>
-      <span v-else>{{row.name}}</span>
-    </template>
-    <template #isCompany-data="{row}">
-      <span v-if="row.isCompany">Firmenkunden</span>
-      <span v-else>Privatkunde</span>
-    </template>
-    <template #active-data="{row}">
-      <span v-if="row.active" class="text-primary-500">Aktiv</span>
-      <span v-else class="text-rose-500">Gesperrt</span>
-    </template>
-    <template #address-data="{row}">
-      {{row.infoData.street ? `${row.infoData.street}, ` : ''}}{{row.infoData.special ? `${row.infoData.special},` : ''}} {{row.infoData.zip ? row.infoData.zip : ""}} {{row.infoData.city ? `${row.infoData.city}, ` : ''}} {{row.infoData.country}}
-    </template>
-  </UTable>
+  <EntityList
+      type="customers"
+      :items="items"
+  ></EntityList>
 </template>
 
 <script setup>
+import EntityList from "~/components/EntityList.vue";
+
 definePageMeta({
   middleware: "auth"
 })
 
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/customers/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/customers/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if(selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-
-
-
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-const supabase = useSupabaseClient()
-
 const items = ref([])
-const selectedItem = ref(0)
 
 const setupPage = async () => {
   items.value = await useSupabaseSelect("customers",null,"customerNumber")
 }
 
 setupPage()
-
-
-
-const templateColumns = [
-  {
-    key: 'customerNumber',
-    label: "Kundennr.",
-    sortable: true
-  },
-  {
-    key: "name",
-    label: "Name",
-    sortable: true
-  },
-  {
-    key: "isCompany",
-    label: "Typ",
-    sortable: true
-  },
-  {
-    key: "notes",
-    label: "Notizen",
-    sortable: true
-  },
-  {
-    key: "active",
-    label: "Aktiv",
-    sortable: true
-  },
-  {
-    key: "address",
-    label: "Adresse",
-    sortable: true
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-
-const searchString = ref('')
-
-const filteredRows = computed(() => {
-  return useSearch(searchString.value, items.value)
-
-
-})
 </script>
 
 <style scoped>
diff --git a/pages/plants/index.vue b/pages/plants/index.vue
index ab21068..2bdfb71 100644
--- a/pages/plants/index.vue
+++ b/pages/plants/index.vue
@@ -1,137 +1,22 @@
 <template>
-  <UDashboardNavbar title="Objekte" :badge="filteredRows.length" >
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/plants/create`)">+ Objekt</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #left>
-
-
-      <UCheckbox
-          label="Erledigte Anzeigen"
-          v-model="showDone"
-      />
-    </template>
-
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/plants/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Objekte anzuzeigen' }"
-  >
-    <template #customer-data="{row}">
-      {{row.customer ? row.customer.name : ""}}
-    </template>
-  </UTable>
-
+  <EntityList
+    :items="items"
+    type="plants"
+  />
 </template>
 
 <script setup>
-
-import {useListFilter} from "~/composables/useSearch.js";
-
 definePageMeta({
   middleware: "auth"
 })
 
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/plants/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/plants/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if(selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-
 const items = ref([])
-const selectedItem = ref(0)
-
 const setupPage = async () => {
   items.value = await useSupabaseSelect("plants","*, customer(id,name)")
 }
 
 setupPage()
 
-const templateColumns = [
-  {
-    key: "name",
-    label: "Name",
-    sortable: true
-  },{
-    key: "customer",
-    label: "Kunde",
-    sortable: true
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-
-const searchString = ref('')
-
-const filteredRows = computed(() => {
-  return useListFilter(searchString.value, items.value)
-})
-
 </script>
 
 <style scoped>
diff --git a/pages/productcategories/index.vue b/pages/productcategories/index.vue
index fa50efc..2f863e0 100644
--- a/pages/productcategories/index.vue
+++ b/pages/productcategories/index.vue
@@ -1,58 +1,8 @@
 <template>
-  <UDashboardNavbar title="Artikelkategorien" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/productcategories/create`)">+ Artikelkategorie</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/productcategories/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikelkategorien anzuzeigen' }"
-  >
-    <template #name-data="{row}">
-      <span
-          v-if="row === filteredRows[selectedItem]"
-          class="text-primary-500 font-bold">{{row.name}}</span>
-      <span v-else>
-        {{row.name}}
-      </span>
-    </template>
-  </UTable>
-
+  <EntityList
+    :items="items"
+    type="productcategories"
+  />
 </template>
 
 <script setup>
@@ -61,77 +11,12 @@ definePageMeta({
   middleware: "auth"
 })
 
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/productscategories/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/productscategories/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if(selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-
 const items = ref([])
-const selectedItem = ref(0)
-
 const setupPage = async () => {
   items.value = await useSupabaseSelect("productcategories","*")
 }
 
 setupPage()
-
-
-const templateColumns = [
-  {
-    key: "name",
-    label: "Name",
-    sortable: true
-  },
-  {
-    key: "description",
-    label: "Beschreibung",
-    sortable: true
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-
-
-const searchString = ref('')
-
-const filteredRows = computed(() => {
-
-  return useSearch(searchString.value, items.value)
-
-})
-
-
-
 </script>
 
 <style scoped>
diff --git a/pages/products/index.vue b/pages/products/index.vue
index a36a8c8..97862b8 100644
--- a/pages/products/index.vue
+++ b/pages/products/index.vue
@@ -1,5 +1,9 @@
 <template>
-  <UDashboardNavbar title="Artikel" :badge="filteredRows.length">
+  <EntityList
+    :items="items"
+    type="products"
+  />
+<!--  <UDashboardNavbar title="Artikel" :badge="filteredRows.length">
     <template #right>
       <UInput
           id="searchinput"
@@ -87,7 +91,7 @@
     <template #productcategories-data="{row}">
       {{row.productcategories.map(i => productcategories.find(x => x.id === i).name).join(", ")}}
     </template>
-  </UTable>
+  </UTable>-->
 
 </template>
 
@@ -97,122 +101,15 @@ definePageMeta({
   middleware: "auth"
 })
 
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/products/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/products/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if(selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-
 const items = ref([])
 const productcategories = ref([])
-const selectedItem = ref(0)
 
 const setupPage = async () => {
-  items.value = await useSupabaseSelect("products","*")
+  items.value = await useSupabaseSelect("products","*, unit(name)")
   productcategories.value = await useSupabaseSelect("productcategories", "*")
 }
 
 setupPage()
-
-
-const templateColumns = [
-  {
-    key: "stock",
-    label: "Bestand"
-  },
-  {
-    key: "name",
-    label: "Name",
-    sortable: true
-  },
-  {
-    key: "description",
-    label: "Beschreibung",
-    sortable: true
-  },
-  {
-    key: "manufacturer",
-    label: "Hersteller",
-    sortable: true
-  },
-  {
-    key: "unit",
-    label: "Einheit",
-    sortable: true
-  },
-  {
-    key: "sellingPrice",
-    label: "Verkaufpreispreis",
-    sortable: true
-  },
-  {
-    key: "tags",
-    label: "Tags",
-    sortable: true
-  },
-  {
-    key: "productcategories",
-    label: "Artikelkategorien",
-    sortable: true
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-const templateTags = computed(() => {
-  let temp = []
-
-  dataStore.products.forEach(row => {
-    row.tags.forEach(tag => {
-      if(!temp.includes(tag)) temp.push(tag)
-    })
-  })
-
-  return temp
-
-})
-const selectedTags = ref(templateTags.value)
-
-
-const searchString = ref('')
-
-const filteredRows = computed(() => {
-  let temp = items.value.filter(i => i.tags.some(x => selectedTags.value.includes(x)) || i.tags.length === 0)
-
-  return useSearch(searchString.value, temp)
-
-})
-
-
-
 </script>
 
 <style scoped>
diff --git a/pages/projects/index.vue b/pages/projects/index.vue
index 09f3284..31462c0 100644
--- a/pages/projects/index.vue
+++ b/pages/projects/index.vue
@@ -2,7 +2,6 @@
   <EntityList
       type="projects"
       :items="items"
-      :filters="filters"
   ></EntityList>
 </template>
 
@@ -13,11 +12,6 @@ definePageMeta({
   middleware: "auth"
 })
 
-
-
-const dataStore = useDataStore()
-const router = useRouter()
-
 const items = ref([])
 
 const setupPage = async () => {
diff --git a/pages/servicecategories/index.vue b/pages/servicecategories/index.vue
index 6ab2eac..9fd03ea 100644
--- a/pages/servicecategories/index.vue
+++ b/pages/servicecategories/index.vue
@@ -1,58 +1,8 @@
 <template>
-  <UDashboardNavbar title="Leistungskategorien" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/servicecategories/create`)">+ Leistungskategorie</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/servicecategories/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Leistungskategorien anzuzeigen' }"
-  >
-    <template #name-data="{row}">
-      <span
-          v-if="row === filteredRows[selectedItem]"
-          class="text-primary-500 font-bold">{{row.name}}</span>
-      <span v-else>
-        {{row.name}}
-      </span>
-    </template>
-  </UTable>
-
+  <EntityList
+    :items="items"
+    type="servicecategories"
+  />
 </template>
 
 <script setup>
@@ -61,77 +11,12 @@ definePageMeta({
   middleware: "auth"
 })
 
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/servicecategories/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/servicecategories/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if(selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-
 const items = ref([])
-const selectedItem = ref(0)
-
 const setupPage = async () => {
   items.value = await useSupabaseSelect("servicecategories","*")
 }
 
 setupPage()
-
-
-const templateColumns = [
-  {
-    key: "name",
-    label: "Name",
-    sortable: true
-  },
-  {
-    key: "description",
-    label: "Beschreibung",
-    sortable: true
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-
-
-const searchString = ref('')
-
-const filteredRows = computed(() => {
-
-  return useSearch(searchString.value, items.value)
-
-})
-
-
-
 </script>
 
 <style scoped>
diff --git a/pages/services/index.vue b/pages/services/index.vue
index 6942c6b..14a8099 100644
--- a/pages/services/index.vue
+++ b/pages/services/index.vue
@@ -1,66 +1,8 @@
 <template>
-  <UDashboardNavbar title="Leistungen" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/services/create`)">+ Leistung</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-
-
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/services/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Leistungen anzuzeigen' }"
-  >
-    <template #name-data="{row}">
-      <span
-          v-if="row === filteredRows[selectedItem]"
-          class="text-primary-500 font-bold">{{row.name}}</span>
-      <span v-else>
-        {{row.name}}
-      </span>
-
-    </template>
-    <template #sellingPrice-data="{row}">
-      {{row.sellingPrice ? Number(row.sellingPrice).toFixed(2) + " €" : ""}}
-    </template>
-    <template #unit-data="{row}">
-      {{dataStore.units.find(unit => unit.id === row.unit) ? dataStore.units.find(unit => unit.id === row.unit).name : row.unit}}
-    </template>
-  </UTable>
+  <EntityList
+    :items="items"
+    type="services"
+  />
 
 </template>
 
@@ -69,83 +11,13 @@ definePageMeta({
   middleware: "auth"
 })
 
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/services/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/services/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if (selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-})
-
-const dataStore = useDataStore()
-const supabase = useSupabaseClient()
-const router = useRouter()
-
 const items = ref([])
-const selectedItem = ref(0)
-
 const setupPage = async () => {
-  items.value = await useSupabaseSelect("services","*")
+  items.value = await useSupabaseSelect("services","*, unit(name)")
 }
 
 setupPage()
 
-
-const templateColumns = [
-  {
-    key: "name",
-    label: "Name",
-    sortable: true
-  },
-  {
-    key: "unit",
-    label: "Einheit",
-    sortable: true
-  },
-  {
-    key: "sellingPrice",
-    label: "Verkaufspreis",
-    sortable: true
-  }/*,
-  {
-    key: "tags",
-    label: "Tags",
-    sortable: true
-  }*/
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-const searchString = ref('')
-
-const filteredRows = computed(() => {
-
-  return useSearch(searchString.value, items.value)
-
-})
 </script>
 
 <style scoped>
diff --git a/pages/vehicles/index.vue b/pages/vehicles/index.vue
index 5e06860..486aedd 100644
--- a/pages/vehicles/index.vue
+++ b/pages/vehicles/index.vue
@@ -1,60 +1,8 @@
 <template>
-  <UDashboardNavbar title="Fahrzeuge" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/vehicles/create`)">+ Fahrzeug</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/vehicles/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Fahrzeuge anzuzeigen' }"
-  >
-    <template #active-data="{row}">
-      <UIcon
-          :name="row.active ? 'i-heroicons-check' : 'i-heroicons-x-mark'"
-          :class="['w-5', 'h-5', ... row.active ? ['text-primary-500'] : ['text-rose-600'] ]"
-      />
-
-    </template>
-    <template #licensePlate-data="{row}">
-      <span v-if="row === filteredRows[selectedItem]" class="font-bold text-primary-500">{{row.licensePlate}}</span>
-      <span v-else>{{row.licensePlate}}</span>
-    </template>
-  </UTable>
+  <EntityList
+    :items="items"
+    type="vehicles"
+  />
 </template>
 
 <script setup>
@@ -63,77 +11,12 @@ definePageMeta({
   middleware: "auth"
 })
 
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/vehicles/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/vehicles/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if(selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-
 const items = ref([])
-const selectedItem = ref(0)
-
 const setupPage = async () => {
   items.value = await useSupabaseSelect("vehicles","*")
 }
 
 setupPage()
-
-const templateColumns = [
-  {
-    key: 'active',
-    label: "Aktiv:",
-    sortable: true
-  },{
-    key: 'licensePlate',
-    label: "Kennzeichen:",
-    sortable: true
-  },{
-    key: 'vin',
-    label: "Identifikationnr.:",
-    sortable: true
-  },
-  {
-    key: "type",
-    label: "Typ:",
-    sortable: true
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-const searchString = ref('')
-
-const filteredRows = computed(() => {
-  return useListFilter(searchString.value, items.value)
-})
 </script>
 
 <style scoped>
diff --git a/pages/vendors/index.vue b/pages/vendors/index.vue
index 613ca0e..6069dc9 100644
--- a/pages/vendors/index.vue
+++ b/pages/vendors/index.vue
@@ -1,5 +1,11 @@
 <template>
-  <UDashboardNavbar title="Lieferanten" :badge="filteredRows.length">
+  <EntityList
+    :items="items"
+    type="vendors"
+  />
+
+
+  <!--  <UDashboardNavbar title="Lieferanten" :badge="filteredRows.length">
     <template #right>
       <UInput
           id="searchinput"
@@ -53,7 +59,7 @@
     <template #address-data="{row}">
       {{row.infoData.street ? `${row.infoData.street}, ` : ''}}{{row.infoData.special ? `${row.infoData.special},` : ''}} {{(row.infoData.zip || row.infoData.city) ? `${row.infoData.zip} ${row.infoData.city}, ` : ''}} {{row.infoData.country}}
     </template>
-  </UTable>
+  </UTable>-->
 
 </template>
 
@@ -62,35 +68,7 @@ definePageMeta({
   middleware: "auth"
 })
 
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/vendors/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/vendors/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    selectedItem.value += 1
-  },
-  'arrowup': () => {
-    selectedItem.value -= 1
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-const mode = ref("show")
-
 const items = ref([])
-const selectedItem = ref(0)
 
 const setupPage = async () => {
   items.value = await useSupabaseSelect("vendors","*","vendorNumber")
@@ -100,30 +78,8 @@ setupPage()
 
 
 const templateColumns = [
-  {
-    key: 'vendorNumber',
-    label: "Lieferantennr.",
-    sortable: true
-  },
-  {
-    key: "name",
-    label: "Name",
-    sortable: true
-  },
-  {
-    key: "address",
-    label: "Adresse",
-    sortable: true
-  }
+
 ]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-const searchString = ref('')
-
-const filteredRows = computed(() => {
-  return useSearch(searchString.value, items.value)
-})
 </script>
 
 <style scoped>
diff --git a/stores/data.js b/stores/data.js
index 97e3a77..3fe0753 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -8,6 +8,11 @@ import {useNumberRange} from "~/composables/useNumberRange.js";
 import projecttype from "~/components/columnRenderings/projecttype.vue"
 import customer from "~/components/columnRenderings/customer.vue"
 import plant from "~/components/columnRenderings/plant.vue"
+import vendor from "~/components/columnRenderings/vendor.vue"
+import active from "~/components/columnRenderings/active.vue"
+import sellingPrice from "~/components/columnRenderings/sellingPrice.vue";
+import unit from "~/components/columnRenderings/unit.vue";
+
 
 // @ts-ignore
 export const useDataStore = defineStore('data', () => {
@@ -29,18 +34,102 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Kunde",
             redirect:true,
             numberRangeHolder: "customerNumber",
-            historyItemHolder: "customer"
+            historyItemHolder: "customer",
+            filters: [],
+            templateColumns: [
+                {
+                    key: 'customerNumber',
+                    label: "Kundennummer",
+                },
+                {
+                    key: "name",
+                    label: "Name"
+                },
+                {
+                    key: "isCompany",
+                    label: "Typ"
+                },
+                {
+                    key: "notes",
+                    label: "Notizen"
+                },
+                {
+                    key: "active",
+                    label: "Aktiv",
+                    component: active
+                },
+                {
+                    key: "address",
+                    label: "Adresse",
+                }
+            ]
         },
         contacts: {
             label: "Kontakte",
             labelSingle: "Kontakt",
             redirect:true,
-            historyItemHolder: "contact"
+            historyItemHolder: "contact",
+            filters: [],
+            templateColumns: [
+                {
+                    key: "fullName",
+                    label: "Name",
+                },
+                {
+                    key: "customer",
+                    label: "Kunde",
+                    component: customer
+                },
+                {
+                    key: "vendor",
+                    label: "Lieferant",
+                    component: vendor
+                },
+                {
+                    key: "role",
+                    label: "Rolle",
+                },
+                {
+                    key: "email",
+                    label: "E-Mail",
+                },
+                {
+                    key: "phoneMobile",
+                    label: "Mobil",
+                },
+                {
+                    key: "phoneHome",
+                    label: "Festnetz",
+                },
+                {
+                    key: "active",
+                    label: "Aktiv",
+                    component: active
+                },
+                {
+                    key: "birtday",
+                    label: "Geburtstag",
+                }
+            ]
         },
         contracts: {
             label: "Verträge",
             labelSingle: "Vertrag",
-            redirect:true
+            redirect:true,
+            filters:[],
+            templateColumns: [
+                {
+                    key: "name",
+                    label: "Name"
+                },{
+                    key: 'customer',
+                    label: "Kunde",
+                    component: customer
+                },{
+                    key: "notes",
+                    label: "Notizen"
+                }
+            ]
         },
         absencerequests: {
             label: "Abwesenheitsanträge",
@@ -51,12 +140,57 @@ export const useDataStore = defineStore('data', () => {
             label: "Objekte",
             labelSingle: "Objekt",
             redirect:true,
-            historyItemHolder: "plant"
+            historyItemHolder: "plant",
+            filters: [],
+            templateColumns: [
+                {
+                    key: "name",
+                    label: "Name"
+                },
+                {
+                    key: "customer",
+                    label: "Kunde",
+                    component: customer
+                }
+            ]
         },
         products: {
             label: "Artikel",
             labelSingle: "Artikel",
-            redirect:true
+            redirect:true,
+            filters: [],
+            templateColumns: [
+                {
+                    key: "name",
+                    label:"Name"
+                },
+                {
+                    key: "description",
+                    label: "Beschreibung"
+                },
+                {
+                    key: "manufacturer",
+                    label: "Hersteller"
+                },
+                {
+                    key: "unit",
+                    label: "Einheit",
+                    component: unit
+                },
+                {
+                    key: "sellingPrice",
+                    label: "Verkaufpreispreis",
+                    component: sellingPrice
+                },
+                {
+                    key: "tags",
+                    label: "Tags"
+                },
+                {
+                    key: "productcategories",
+                    label: "Artikelkategorien"
+                }
+            ]
         },
         projects: {
             label: "Projekte",
@@ -117,14 +251,51 @@ export const useDataStore = defineStore('data', () => {
             label: "Fahrzeuge",
             labelSingle: "Fahrzeug",
             redirect:true,
-            historyItemHolder: "vehicle"
+            historyItemHolder: "vehicle",
+            filters:[],
+            templateColumns:[
+                {
+                    key: 'active',
+                    label: "Aktiv",
+                    component: active
+                },{
+                    key: 'licensePlate',
+                    label: "Kennzeichen"
+                },{
+                    key: 'vin',
+                    label: "Identifikationnummer"
+                },
+                {
+                    key: "type",
+                    label: "Typ",
+                }
+            ]
         },
         vendors: {
             label: "Lieferanten",
             labelSingle: "Lieferant",
             redirect:true,
             numberRangeHolder: "vendorNumber",
-            historyItemHolder: "vendor"
+            historyItemHolder: "vendor",
+            filters: [],
+            templateColumns: [
+                {
+                    key: 'vendorNumber',
+                    label: "Lieferantennummer",
+                },
+                {
+                    key: "name",
+                    label: "Name"
+                },
+                {
+                    key: "address",
+                    label: "Adresse"
+                },
+                {
+                    key: "notes",
+                    label: "Notizen"
+                }
+            ]
         },
         messages: {
             label: "Nachrichten",
@@ -159,7 +330,24 @@ export const useDataStore = defineStore('data', () => {
         services: {
             label: "Leistungen",
             labelSingle: "Leistung",
-            redirect: true
+            redirect: true,
+            filters: [],
+            templateColumns: [
+                {
+                    key: "name",
+                    label: "Name"
+                },
+                {
+                    key: "unit",
+                    label: "Einheit",
+                    component: unit
+                },
+                {
+                    key: "sellingPrice",
+                    label: "Verkaufspreis",
+                    component: sellingPrice
+                }
+            ]
         },
         events: {
             label: "Termine",
@@ -195,12 +383,34 @@ export const useDataStore = defineStore('data', () => {
         productcategories: {
             label: "Artikelkategorien",
             labelSingle: "Artikelkategorie",
-            redirect: true
+            redirect: true,
+            filters: [],
+            templateColumns: [
+                {
+                    key: "name",
+                    label: "Name",
+                },
+                {
+                    key: "description",
+                    label: "Beschreibung",
+                }
+            ]
         },
         servicecategories: {
             label: "Leistungskategorie",
             labelSingle: "Leistungskategorien",
-            redirect: true
+            redirect: true,
+            filters: [],
+            templateColumns: [
+                {
+                    key: "name",
+                    label: "Name",
+                },
+                {
+                    key: "description",
+                    label: "Beschreibung",
+                }
+            ]
         },
         trackingtrips: {
             label: "Fahrten",

From c8521ad1f6f6a20299fe8dfbccc19f6c78b3768b Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 20 Dec 2024 20:00:23 +0100
Subject: [PATCH 002/104] Reparied Cancel Button

---
 pages/contacts/[mode]/[[id]].vue  | 14 ++------------
 pages/customers/[mode]/[[id]].vue |  4 ++--
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pages/contacts/[mode]/[[id]].vue b/pages/contacts/[mode]/[[id]].vue
index 8163dbe..e4fc1d1 100644
--- a/pages/contacts/[mode]/[[id]].vue
+++ b/pages/contacts/[mode]/[[id]].vue
@@ -54,21 +54,11 @@ const setupPage = async () => {
   if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
 }
 
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/contacts/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/contacts`)
-  }
-
-}
-
 setupPage()
 </script>
 
 <template>
   <UDashboardNavbar
-      :title="itemInfo ? itemInfo.fullName : (mode === 'create' ? 'Ansprechpartner erstellen' : 'Ansprechpartner bearbeiten')"
       :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
   >
     <template #left>
@@ -84,7 +74,7 @@ setupPage()
       <h1
           v-if="itemInfo"
           :class="['text-xl','font-medium', ... itemInfo.active ? ['text-primary'] : ['text-rose-500']]"
-      >{{itemInfo ? `Ansprechpartner: ${itemInfo.fullName}` : (mode === 'create' ? 'Ansprechpartner erstellen' : 'Ansprechpartner bearbeiten')}}</h1>
+      >{{itemInfo.id ? `Ansprechpartner: ${itemInfo.fullName}` : (mode === 'create' ? 'Ansprechpartner erstellen' : 'Ansprechpartner bearbeiten')}}</h1>
     </template>
     <template #right>
       <UButton
@@ -100,7 +90,7 @@ setupPage()
         Erstellen
       </UButton>
       <UButton
-          @click="cancelEditorCreate"
+          @click="router.push(itemInfo.id ? `/contacts/show/${itemInfo.value.id}` : `/contacts/`)"
           color="red"
           class="ml-2"
           v-if="mode === 'edit' || mode === 'create'"
diff --git a/pages/customers/[mode]/[[id]].vue b/pages/customers/[mode]/[[id]].vue
index d646946..fbe2abb 100644
--- a/pages/customers/[mode]/[[id]].vue
+++ b/pages/customers/[mode]/[[id]].vue
@@ -83,7 +83,7 @@ setupPage()
       <h1
           v-if="itemInfo"
           :class="['text-xl','font-medium', ... itemInfo.active ? ['text-primary'] : ['text-rose-500']]"
-      >{{itemInfo ? `Kunde: ${itemInfo.name}` : (mode === 'create' ? 'Kunde erstellen' : 'Kunde bearbeiten')}}</h1>
+      >{{itemInfo.id ? `Kunde: ${itemInfo.name}` : (mode === 'create' ? 'Kunde erstellen' : 'Kunde bearbeiten')}}</h1>
     </template>
     <template #right>
       <UButton
@@ -99,7 +99,7 @@ setupPage()
         Erstellen
       </UButton>
       <UButton
-          @click="itemInfo ? router.push(`/customers/show/${itemInfo.id}`) : router.push(`/customers`)"
+          @click="itemInfo.id ? router.push(`/customers/show/${itemInfo.id}`) : router.push(`/customers`)"
           color="red"
           class="ml-2"
           v-if="mode === 'edit' || mode === 'create'"

From 813944fc23d88f54c0060997ac0fac4d158f2afc Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 21 Dec 2024 18:53:53 +0100
Subject: [PATCH 003/104] Changes in Rights and Roles

---
 components/EntityList.vue     |  43 +++----
 components/MainNav.vue        |  53 +++++----
 composables/useRole.js        | 188 +++++++++++++++++++++++++------
 pages/contacts/index.vue      |  87 ---------------
 pages/products/index.vue      |  90 ---------------
 pages/projects/index.vue      |   2 +-
 pages/roles/[mode]/[[id]].vue | 203 ++++++++++++++++++++++++++++++++++
 pages/roles/index.vue         |  24 ++++
 pages/vendors/index.vue       |  63 -----------
 stores/data.js                |  18 ++-
 10 files changed, 447 insertions(+), 324 deletions(-)
 create mode 100644 pages/roles/[mode]/[[id]].vue
 create mode 100644 pages/roles/index.vue

diff --git a/components/EntityList.vue b/components/EntityList.vue
index f2050be..b5ba3c7 100644
--- a/components/EntityList.vue
+++ b/components/EntityList.vue
@@ -71,12 +71,26 @@ const filteredRows = computed(() => {
   if(selectedFilters.value.length > 0) {
     selectedFilters.value.forEach(filterName => {
       let filter = dataType.filters.find(i => i.name === filterName)
-
       tempItems = tempItems.filter(filter.filterFunction)
-
     })
   }
 
+  if(!useRole().generalAvailableRights.value[type].showToAllUsers) {
+    if(useRole().checkRight(`${type}-viewAll`)){
+      console.log("Right to Show All")
+    } else if(useRole().checkRight(type)){
+      console.log("Only Righty to show Own")
+      console.log(tempItems)
+      tempItems = tempItems.filter(item => item.profiles.includes(dataStore.activeProfile.id))
+    } else {
+      console.log("No Right to Show")
+      tempItems = []
+    }
+  }
+
+
+
+
 
   return useSearch(searchString.value, tempItems)
 })
@@ -139,7 +153,7 @@ const filteredRows = computed(() => {
       :columns="columns"
       class="w-full"
       :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/projects/show/${i.id}`) "
+      @select="(i) => router.push(`/${type}/show/${i.id}`) "
       :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: `Keine ${dataType.label} anzuzeigen` }"
   >
     <template #name-data="{row}">
@@ -175,29 +189,6 @@ const filteredRows = computed(() => {
       <component v-if="column.component" :is="column.component" :row="row"></component>
       <span v-else>{{row[column.key]}}</span>
     </template>
-
-
-
-
-<!--    <template #name-data="{row}">
-      <span class="text-primary-500 font-bold" v-if="row === filteredRows[selectedItem]">{{row.name}}</span>
-      <span v-else>{{row.name}}</span>
-    </template>
-    <template #projecttype-data="{row}">
-      {{row.projecttype ? row.projecttype.name : ""}}
-    </template>
-    <template #phase-data="{row}">
-      {{getActivePhaseLabel(row)}}
-    </template>
-    <template #customer-data="{row}">
-      {{row.customer ? row.customer.name : ""}}
-    </template>
-    <template #plant-data="{row}">
-      {{row.plant ? row.plant.name : ""}}
-    </template>
-    <template #users-data="{row}">
-      {{row.users.map(i => dataStore.getProfileById(i).fullName).join(", ")}}
-    </template>-->
   </UTable>
 </template>
 
diff --git a/components/MainNav.vue b/components/MainNav.vue
index 4863277..8a4c3c3 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -73,21 +73,21 @@ const links = computed(() => {
       defaultOpen: false,
       icon: "i-heroicons-user-group",
       children: [
-        {
+        ... role.checkRight("customers") ? [{
           label: "Kunden",
           to: "/customers",
           icon: "i-heroicons-user-group"
-        },
-        {
+        }] : [],
+        ... role.checkRight("vendors") ? [{
           label: "Lieferanten",
           to: "/vendors",
           icon: "i-heroicons-truck"
-        },
-        {
+        }] : [],
+        ... role.checkRight("contacts") ? [{
           label: "Ansprechpartner",
           to: "/contacts",
           icon: "i-heroicons-user-group"
-        },
+        }] : [],
       ]
     },] : [],
     {
@@ -95,7 +95,7 @@ const links = computed(() => {
       defaultOpen:false,
       icon: "i-heroicons-user-group",
       children: [
-        ... dataStore.ownTenant.features.timeTracking ? [{
+          ... dataStore.ownTenant.features.timeTracking ? [{
           label: "Zeiterfassung",
           to: "/employees/timetracking",
           icon: "i-heroicons-clock"
@@ -137,7 +137,7 @@ const links = computed(() => {
         },
       ]
     },] : [],
-    ... dataStore.ownTenant.features.inventory ? [{
+    ... role.checkRight("inventory") ? [{
       label: "Lager",
       icon: "i-heroicons-puzzle-piece",
       defaultOpen: false,
@@ -151,28 +151,28 @@ const links = computed(() => {
           to: "/inventory/stocks",
           icon: "i-heroicons-square-3-stack-3d"
         },
-        {
+        ... role.checkRight("spaces") ? [{
           label: "Lagerplätze",
           to: "/spaces",
           icon: "i-heroicons-square-3-stack-3d"
-        },
-        {
+        }] : [],
+        ... role.checkRight("inventoryitems") ? [{
           label: "Inventar",
           to: "/inventoryitems",
           icon: "i-heroicons-puzzle-piece"
-        },
+        }] : [],
       ]
     },] : [],
-    ... dataStore.ownTenant.features.vehicles ? [{
+    ... role.checkRight("vehicles") ? [{
       label: "Fuhrpark",
       defaultOpen: false,
       icon: "i-heroicons-truck",
       children: [
-        {
+        ... role.checkRight("vehicles") ? [{
           label: "Fahrzeuge",
           to: "/vehicles",
           icon: "i-heroicons-truck"
-        },{
+        }] : [],{
           label: "Fahrten",
           to: "/trackingTrips",
           icon: "i-heroicons-map"
@@ -184,23 +184,26 @@ const links = computed(() => {
       defaultOpen: false,
       icon: "i-heroicons-clipboard-document",
       children: [
-        {
+        ... role.checkRight("products") ? [{
           label: "Artikel",
           to: "/products",
           icon: "i-heroicons-puzzle-piece"
-        },{
+        }] : [],
+        ... role.checkRight("productcategories") ? [{
           label: "Artikelkategorien",
           to: "/productcategories",
           icon: "i-heroicons-puzzle-piece"
-        },{
+        }] : [],
+        ... role.checkRight("services") ? [{
           label: "Leistungen",
           to: "/services",
           icon: "i-heroicons-puzzle-piece"
-        },{
+        }] : [],
+        ... role.checkRight("servicecategories") ? [{
           label: "Leistungskategorien",
           to: "/servicecategories",
           icon: "i-heroicons-puzzle-piece"
-        },
+        }] : [],
       ]
     },
     ... role.checkRight("checks") ? [{
@@ -208,17 +211,17 @@ const links = computed(() => {
       to: "/checks",
       icon: "i-heroicons-magnifying-glass"
     },] : [],
-    ... (role.checkRight("projects") && dataStore.ownTenant.features.projects) ? [{
+    ... role.checkRight("projects") ? [{
       label: "Projekte",
       to: "/projects",
       icon: "i-heroicons-clipboard-document-check"
     },] : [],
-    ... (role.checkRight("contracts") && dataStore.ownTenant.features.contracts) ? [{
+    ... role.checkRight("contracts") ? [{
       label: "Verträge",
       to: "/contracts",
       icon: "i-heroicons-clipboard-document"
     }] : [],
-    ... (role.checkRight("plants") && dataStore.ownTenant.features.objects) ? [{
+    ... role.checkRight("plants") ? [{
       label: "Objekte",
       to: "/plants",
       icon: "i-heroicons-clipboard-document"
@@ -237,6 +240,10 @@ const links = computed(() => {
           label: "Mitarbeiter",
           to: "/profiles",
           icon: "i-heroicons-clipboard-document-list"
+        },{
+          label: "Rollen",
+          to: "/roles",
+          icon: "i-heroicons-clipboard-document-list"
         },{
           label: "E-Mail Konten",
           to: "/settings/emailAccounts",
diff --git a/composables/useRole.js b/composables/useRole.js
index 8b67f72..e30a876 100644
--- a/composables/useRole.js
+++ b/composables/useRole.js
@@ -4,63 +4,186 @@
 
 
 export const useRole = () => {
-    const supabase = useSupabaseClient()
     const dataStore = useDataStore()
 
 
-    const rights = ref({
+    const generalAvailableRights = ref({
         projects: {
-            label: "Projekte"
+            label: "Projekte",
+            showToAllUsers: false
         },
         "projects-viewAll": {
             label: "Alle Projekte einsehen",
             parent: "projects"
         },
-        "projects-viewOwn": {
-            label: "Eigene Projekte einsehen",
-            parent: "projects"
-        },
         "projects-create": {
             label: "Projekte erstellen",
             parent: "projects"
         },
         contracts: {
-            label: "Verträge"
+            label: "Verträge",
+            showToAllUsers: false
         },
-        objects: {
-            label: "Objekte"
+        "contracts-viewAll": {
+            label: "Alle Verträge einsehen",
+            parent: "contracts"
+        },
+        "contracts-create": {
+            label: "Verträge erstellen",
+            parent: "contracts"
+        },
+        plants: {
+            label: "Objekte",
+            showToAllUsers: false
+        },
+        "plants-viewAll": {
+            label: "Alle Objekte einsehen",
+            parent: "plants"
+        },
+        "plants-create": {
+            label: "Objekte erstellen",
+            parent: "plants"
+        },
+        products: {
+            label: "Artikel",
+            showToAllUsers: true
+        },
+        "products-create": {
+            label: "Artikel erstellen",
+            parent: "products"
+        },
+        productcategories: {
+            label: "Artikelkategorie",
+            showToAllUsers: true
+        },
+        "productcategories-create": {
+            label: "Artikelkategorie erstellen",
+            parent: "productcategories"
+        },
+        services: {
+            label: "Leistungen",
+            showToAllUsers: true
+        },
+        "services-create": {
+            label: "Leistungen erstellen",
+            parent: "services"
+        },
+        servicecategories: {
+            label: "Leistungskategorien",
+            showToAllUsers: true
+        },
+        "servicecategories-create": {
+            label: "Leistungskategorien erstellen",
+            parent: "servicecategories"
+        },
+        customers: {
+            label: "Kunden",
+            showToAllUsers: false
+        },
+        "customers-viewAll": {
+            label: "Alle Kunden einsehen",
+            parent: "customers"
+        },
+        "customers-create": {
+            label: "Kunden erstellen",
+            parent: "customers"
+        },
+        contacts: {
+            label: "Kontakte",
+            showToAllUsers: false
+        },
+        "contacts-viewAll": {
+            label: "Alle Kontakte einsehen",
+            parent: "contacts"
+        },
+        "contacts-create": {
+            label: "Kontakte erstellen",
+            parent: "contacts"
+        },
+        vendors: {
+            label: "Lieferanten",
+            showToAllUsers: false
+        },
+        "vendors-viewAll": {
+            label: "Alle Lieferanten einsehen",
+            parent: "vendors"
+        },
+        "vendors-create": {
+            label: "Lieferanten erstellen",
+            parent: "vendors"
         },
         checks: {
-            label: "Überprüfungen"
+            label: "Überprüfungen",
+            showToAllUsers: false
+        },
+        "checks-viewAll": {
+            label: "Alle Überprüfungen einsehen",
+            parent: "checks"
+        },
+        "checks-create": {
+            label: "Überprüfungen erstellen",
+            parent: "checks"
+        },
+        vehicles: {
+            label: "Fahrzeuge",
+            showToAllUsers: false
+        },
+        "vehicles-viewAll": {
+            label: "Alle Fahrzeuge einsehen",
+            parent: "vehicles"
+        },
+        "vehicles-create": {
+            label: "Fahrzeuge erstellen",
+            parent: "vehicles"
+        },
+        inventoryitems: {
+            label: "Inventarartikel",
+            showToAllUsers: false
+        },
+        "inventoryitems-viewAll": {
+            label: "Alle Inventarartikel einsehen",
+            parent: "inventoryitems"
+        },
+        "inventoryitems-create": {
+            label: "Inventarartikel erstellen",
+            parent: "inventoryitems"
+        },
+        spaces: {
+            label: "Lagerplätze",
+            showToAllUsers: false
+        },
+        "spaces-viewAll": {
+            label: "Alle Lagerplätze einsehen",
+            parent: "spaces"
+        },
+        "spaces-create": {
+            label: "Lagerplätze erstellen",
+            parent: "spaces"
+        },
+        roles: {
+            label: "Rollen",
+            showToAllUsers: false
+        },
+        "roles-viewAll": {
+            label: "Alle Rollen einsehen",
+            parent: "roles"
+        },
+        "roles-create": {
+            label: "Rollen erstellen",
+            parent: "roles"
+        },
+        "inventory": {
+            label: "Lager",
         },
     })
 
 
     let role = dataStore.activeProfile.role
 
-    /*const checkRight = (right) => {
-        let rightsToCheck = [right]
-
-        if(rights.value[right].parent) {
-            rightsToCheck.push(rights.value[right].parent)
-        }
-
-        let hasAllNeccessaryRights = false
-
-        rightsToCheck.forEach(i => {
-            if(role.rights.includes(i)){
-                hasAllNeccessaryRights = true
-            } else {
-                hasAllNeccessaryRights = false
-            }
-        })
-
-        return hasAllNeccessaryRights
-    }*/
-
     const checkRight = (right) => {
         let rightsToCheck = [right]
 
+
         //console.log(right.split("-"))
 
         if(right.split("-").length > 1) {
@@ -78,13 +201,12 @@ export const useRole = () => {
             }
         })
 
-        //console.log(hasAllNeccessaryRights)
-
         return hasAllNeccessaryRights
     }
 
     return {
         role,
+        generalAvailableRights,
         checkRight
     }
 
diff --git a/pages/contacts/index.vue b/pages/contacts/index.vue
index 917e553..a1cf1aa 100644
--- a/pages/contacts/index.vue
+++ b/pages/contacts/index.vue
@@ -3,67 +3,6 @@
       type="contacts"
       :items="items"
   ></EntityList>
-
-  <!--  <UDashboardNavbar title="Ansprechpartner" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/contacts/create`)">+ Kontakt</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/contacts/show/${i.id}`)"
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Ansprechpartner anzuzeigen' }"
-  >
-    <template #fullName-data="{row}">
-      <span v-if="row === filteredRows[selectedItem]" class="text-primary-500 font-bold">{{row.fullName}}</span>
-      <span v-else>{{row.fullName}}</span>
-    </template>
-    <template #active-data="{row}">
-      <span v-if="row.active" class="text-primary-500">Aktiv</span>
-      <span v-else class="text-rose">Gesperrt</span>
-    </template>
-    <template #customer-data="{row}">
-      {{row.customer ? row.customer.name : ""}}
-    </template>
-    <template #vendor-data="{row}">
-      {{row.vendor ? row.vendor.name : ""}}
-    </template>
-  </UTable>-->
 </template>
 
 <script setup>
@@ -80,32 +19,6 @@ const setupPage = async () => {
 }
 
 setupPage()
-
-const templateColumns = [
-
-
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-const searchString = ref('')
-
-/*const filteredRows = computed(() => {
-  if(!searchString.value) {
-    return dataStore.contacts
-  }
-
-  return dataStore.contacts.filter(item => {
-    return Object.values(item).some((value) => {
-      return String(value).toLowerCase().includes(searchString.value.toLowerCase())
-    })
-  })
-})*/
-
-const filteredRows = computed(() => {
-  return useSearch(searchString.value, items.value)
-})
-
 </script>
 
 <style scoped>
diff --git a/pages/products/index.vue b/pages/products/index.vue
index 97862b8..05f0d4f 100644
--- a/pages/products/index.vue
+++ b/pages/products/index.vue
@@ -3,96 +3,6 @@
     :items="items"
     type="products"
   />
-<!--  <UDashboardNavbar title="Artikel" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/products/create`)">+ Artikel</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #left>
-      <USelectMenu
-          v-model="selectedTags"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateTags"
-          multiple
-          class="hidden lg:block"
-      >
-        <template #label>
-          Tags
-        </template>
-      </USelectMenu>
-    </template>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/products/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
-  >
-    <template #name-data="{row}">
-      <span
-          v-if="row === filteredRows[selectedItem]"
-          class="text-primary-500 font-bold">{{row.name}}</span>
-      <span v-else>
-        {{row.name}}
-      </span>
-
-    </template>
-    <template #stock-data="{row}">
-      {{`${dataStore.getStockByProductId(row.id)} ${(dataStore.units.find(unit => unit.id === row.unit) ? dataStore.units.find(unit => unit.id === row.unit).name : "")}`}}
-    </template>
-    <template #sellingPrice-data="{row}">
-      {{row.sellingPrice ? (Number(row.sellingPrice).toFixed(2) + " €").replace(".",",") : ""}}
-    </template>
-    <template #tags-data="{row}">
-      <UBadge
-          v-if="row.tags.length > 0"
-          v-for="tag in row.tags"
-          class="mr-2"
-      >
-        {{tag}}
-      </UBadge>
-      <span v-else>-</span>
-    </template>
-    <template #unit-data="{row}">
-      {{dataStore.units.find(unit => unit.id === row.unit) ? dataStore.units.find(unit => unit.id === row.unit).name : row.unit}}
-    </template>
-    <template #productcategories-data="{row}">
-      {{row.productcategories.map(i => productcategories.find(x => x.id === i).name).join(", ")}}
-    </template>
-  </UTable>-->
-
 </template>
 
 <script setup>
diff --git a/pages/projects/index.vue b/pages/projects/index.vue
index 31462c0..bbd665d 100644
--- a/pages/projects/index.vue
+++ b/pages/projects/index.vue
@@ -19,7 +19,7 @@ const setupPage = async () => {
   items.value = (await useSupabaseSelect("projects","*, customer (name), plant(name), projecttype(name, id)","projectNumber")).map(project => {
     return {
       ...project,
-      profiles: project.profiles.map(x => profiles.find(z => z.id === x).fullName).join(", "),
+      //profiles: project.profiles.map(x => profiles.find(z => z.id === x).fullName).join(", "),
       phase: getActivePhaseLabel(project)
     }
   })
diff --git a/pages/roles/[mode]/[[id]].vue b/pages/roles/[mode]/[[id]].vue
new file mode 100644
index 0000000..73f836d
--- /dev/null
+++ b/pages/roles/[mode]/[[id]].vue
@@ -0,0 +1,203 @@
+<script setup>
+import HistoryDisplay from "~/components/HistoryDisplay.vue";
+import DocumentList from "~/components/DocumentList.vue";
+import DocumentUpload from "~/components/DocumentUpload.vue";
+import {useSupabaseSelect} from "~/composables/useSupabase.js";
+
+definePageMeta({
+  middleware: "auth"
+})
+
+defineShortcuts({
+  'backspace': () => {
+    router.push("/roles")
+  },
+  'arrowleft': () => {
+    if(openTab.value > 0){
+      openTab.value -= 1
+    }
+  },
+  'arrowright': () => {
+    if(openTab.value < 3) {
+      openTab.value += 1
+    }
+  },
+})
+
+const dataStore = useDataStore()
+const supabase = useSupabaseClient()
+const route = useRoute()
+const router = useRouter()
+const toast = useToast()
+const id = ref(route.params.id ? route.params.id : null )
+
+const role = useRole()
+
+//Working
+const mode = ref(route.params.mode || "show")
+const itemInfo = ref({
+    rights: []
+})
+const openTab = ref(0)
+
+//Functions
+const setupPage = async () => {
+  if(mode.value === "show" || mode.value === "edit"){
+    itemInfo.value = await useSupabaseSelectSingle("roles",route.params.id,"*")
+  }
+}
+
+const rightOptions = computed(() => {
+  console.log(Object.keys(useRole().generalAvailableRights.value))
+  return Object.keys(useRole().generalAvailableRights.value).map(i => {
+    return {
+      key: i,
+      label: role.generalAvailableRights.value[i].label
+    }
+  })
+})
+
+const rightList = computed(() => {
+  console.log(rightOptions.value)
+
+  return itemInfo.value.rights.map(i => {
+    if(rightOptions.value.find(x => x.key === i)) {
+      return rightOptions.value.find(x => x.key === i).label
+    } else {
+      return i
+    }
+  }).join(", ")
+})
+
+setupPage()
+</script>
+
+<template>
+  <UDashboardNavbar
+      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
+  >
+    <template #left>
+      <UButton
+          icon="i-heroicons-chevron-left"
+          variant="outline"
+          @click="router.push(`/roles`)"
+      >
+        Artikel
+      </UButton>
+    </template>
+    <template #center>
+      <h1
+          v-if="itemInfo"
+          class="text-xl font-medium"
+      >{{itemInfo.name ? `Rolle: ${itemInfo.name}` : (mode === 'create' ? 'Rolle erstellen' : 'Rolle bearbeiten')}}</h1>
+    </template>
+    <template #right>
+      <UButton
+          v-if="mode === 'edit'"
+          @click="dataStore.updateItem('roles',itemInfo)"
+      >
+        Speichern
+      </UButton>
+      <UButton
+          v-else-if="mode === 'create'"
+          @click="dataStore.createNewItem('roles',itemInfo)"
+      >
+        Erstellen
+      </UButton>
+      <UButton
+          @click="router.push(itemInfo.id ? `/roles/show/${itemInfo.value.id}` : `/products/`)"
+          color="red"
+          class="ml-2"
+          v-if="mode === 'edit' || mode === 'create'"
+      >
+        Abbrechen
+      </UButton>
+      <UButton
+          v-if="mode === 'show'"
+          @click="  router.push(`/roles/edit/${itemInfo.id}`)"
+      >
+        Bearbeiten
+      </UButton>
+    </template>
+  </UDashboardNavbar>
+  <UTabs
+    :items="[{label: 'Informationen'}]"
+    v-if="mode === 'show' && itemInfo"
+    class="p-5"
+    v-model="openTab"
+  >
+    <template #item="{item}">
+      <div v-if="item.label === 'Informationen'" class="mt-5 flex flex-row">
+        <div class="w-1/2 mr-5">
+          <UCard>
+            <table class="w-full">
+              <tr>
+                <td>Name:</td>
+                <td>{{itemInfo.name}}</td>
+              </tr>
+              <tr>
+                <td>Rechte:</td>
+                <td>{{rightList}}</td>
+              </tr>
+              <tr>
+                <td>Beschreibung:</td>
+                <td>{{itemInfo.description}}</td>
+              </tr>
+            </table>
+          </UCard>
+        </div>
+        <div class="w-1/2">
+          <UCard>
+            <HistoryDisplay
+                type="role"
+                v-if="itemInfo"
+                :element-id="id"
+                render-headline
+            />
+          </UCard>
+        </div>
+      </div>
+    </template>
+  </UTabs>
+  <UForm
+      v-else-if="mode == 'edit' || mode == 'create'"
+      class="p-5"
+  >
+    <UFormGroup
+        label="Name:"
+    >
+      <UInput
+          v-model="itemInfo.name"
+          autofocus
+      />
+    </UFormGroup>
+    <UFormGroup
+        label="Rechte:"
+    >
+      <USelectMenu
+          :options="rightOptions"
+          value-attribute="key"
+          option-attribute="label"
+          v-model="itemInfo.rights"
+          multiple
+      >
+      </USelectMenu>
+    </UFormGroup>
+    <UFormGroup
+        label="Beschreibung:"
+    >
+      <UTextarea
+          v-model="itemInfo.description"
+      />
+    </UFormGroup>
+  </UForm>
+</template>
+
+<style scoped>
+td {
+  border-bottom: 1px solid lightgrey;
+  vertical-align: top;
+  padding-bottom: 0.15em;
+  padding-top: 0.15em;
+}
+</style>
\ No newline at end of file
diff --git a/pages/roles/index.vue b/pages/roles/index.vue
new file mode 100644
index 0000000..36a1d43
--- /dev/null
+++ b/pages/roles/index.vue
@@ -0,0 +1,24 @@
+<script setup>
+definePageMeta({
+  middleware: "auth"
+})
+
+const items = ref([])
+const setup = async () => {
+    items.value = await useSupabaseSelect("roles","*")
+}
+
+setup()
+
+</script>
+
+<template>
+  <EntityList
+    :items="items"
+    type="roles"
+  />
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/pages/vendors/index.vue b/pages/vendors/index.vue
index 6069dc9..2b7943c 100644
--- a/pages/vendors/index.vue
+++ b/pages/vendors/index.vue
@@ -3,64 +3,6 @@
     :items="items"
     type="vendors"
   />
-
-
-  <!--  <UDashboardNavbar title="Lieferanten" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          name="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/vendors/create/`)">+ Lieferant</UButton>
-
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      class="w-full"
-      @select="(i) => router.push(`/vendors/show/${i.id}`)"
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Lieferanten anzuzeigen' }"
-  >
-    <template #name-data="{row}">
-      <span v-if="row === filteredRows[selectedItem]" class="text-primary-500 font-bold">{{row.name}}</span>
-      <span v-else>{{row.name}}</span>
-    </template>
-    <template #address-data="{row}">
-      {{row.infoData.street ? `${row.infoData.street}, ` : ''}}{{row.infoData.special ? `${row.infoData.special},` : ''}} {{(row.infoData.zip || row.infoData.city) ? `${row.infoData.zip} ${row.infoData.city}, ` : ''}} {{row.infoData.country}}
-    </template>
-  </UTable>-->
-
 </template>
 
 <script setup>
@@ -75,11 +17,6 @@ const setupPage = async () => {
 }
 
 setupPage()
-
-
-const templateColumns = [
-
-]
 </script>
 
 <style scoped>
diff --git a/stores/data.js b/stores/data.js
index 3fe0753..99cc28a 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -429,7 +429,23 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Überprüfung",
             redirect: true,
             historyItemHolder: "check"
-        }
+        },
+        roles: {
+            label: "Rollen",
+            labelSingle: "Rolle",
+            redirect:true,
+            historyItemHolder: "role",
+            filters: [],
+            templateColumns: [
+                {
+                    key: "name",
+                    label: "Name"
+                }, {
+                    key: "description",
+                    label: "Beschreibung"
+                }
+            ]
+        },
     }
 
     const documentTypesForCreation = ref({

From b465f4a75aeed5f1bc8134c785acfbd374df4b8c Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 21 Dec 2024 22:33:42 +0100
Subject: [PATCH 004/104] Introduced ProfileStore Corrected All Links to
 DataStore

---
 RechteDoku.xlsx                               | Bin 0 -> 11833 bytes
 app.vue                                       |   2 -
 components/DocumentDisplay.vue                |   3 +-
 components/DocumentUpload.vue                 |   3 +-
 components/EntityList.vue                     |   3 +-
 components/HelpSlideover.vue                  |  17 +-
 components/HistoryDisplay.vue                 |  14 +-
 components/MainNav.vue                        |  19 +-
 components/ProfileDropdown.vue                |  15 +-
 components/ProfileSelection.vue               |   8 +-
 components/UserDropdown.vue                   |  13 +-
 components/displayIncomeAndExpenditure.vue    |   5 +-
 composables/useNumberRange.js                 |   5 +-
 composables/usePrintLabel.js                  |   3 +-
 composables/useRole.js                        |   4 +-
 composables/useSupabase.js                    |  19 +-
 layouts/default.vue                           | 386 +----------------
 pages/absenceRequests/[mode]/[[id]].vue       |   7 +-
 pages/absenceRequests/index.vue               |   3 +-
 pages/banking/index.vue                       |   3 +-
 pages/banking/statements/[mode]/[[id]].vue    |   3 +-
 pages/chat.vue                                |   9 +-
 pages/chats/create.vue                        |   8 +-
 pages/chats/show/[id].vue                     |  26 +-
 pages/communication/historyItems/index.vue    |   3 +-
 pages/contacts/[mode]/[[id]].vue              |  22 +-
 pages/contracts/[mode]/[[id]].vue             |   7 +-
 pages/createDocument/edit/[[id]].vue          |  46 +--
 pages/createDocument/index.vue                |   4 -
 pages/createDocument/show/[id].vue            |   3 +-
 pages/customers/[mode]/[[id]].vue             |  23 +-
 .../{ => deprecated}/users/[mode]/[[id]].vue  |   5 +-
 pages/{ => deprecated}/users/index.vue        |   0
 pages/documents.vue                           |   5 +-
 pages/email/index.vue                         |   3 +-
 pages/email/new.vue                           |   3 +-
 pages/employees/timetracking.vue              |  15 +-
 pages/events/[mode]/[[id]].vue                |   3 +-
 pages/index.vue                               |   5 +-
 pages/inventory/index.vue                     |  17 +-
 pages/login.vue                               |   6 +-
 pages/plants/[mode]/[[id]].vue                |   7 +-
 pages/products/[mode]/[[id]].vue              |   3 +-
 pages/profiles/index.vue                      |   3 +-
 pages/profiles/show/[id].vue                  |  13 +-
 pages/projects/[mode]/[[id]].vue              |  29 +-
 pages/services/[mode]/[[id]].vue              |   3 +-
 pages/settings/banking/index.vue              |   5 +-
 pages/settings/emailAccounts.vue              |   3 +-
 pages/settings/index.vue                      |   5 +-
 pages/settings/labels/[mode]/[[id]].vue       |   3 +-
 pages/settings/numberRanges.vue               |   6 +-
 pages/settings/ownfields.vue                  |   6 -
 pages/settings/tenant.vue                     |   9 +-
 pages/spaces/[mode]/[[id]].vue                |   2 +-
 pages/tasks/[mode]/[[id]].vue                 |   7 +-
 pages/tasks/index.vue                         |   3 +-
 pages/vehicles/[mode]/[[id]].vue              |   7 +-
 pages/vendors/[mode]/[[id]].vue               |  23 +-
 pages/workingtimes/[mode]/[[id]].vue          |   5 +-
 pages/workingtimes/evaluate/[id].vue          |   9 +-
 pages/workingtimes/index.vue                  |  31 +-
 stores/data.js                                | 387 +++---------------
 stores/profile.js                             | 150 +++++++
 64 files changed, 508 insertions(+), 959 deletions(-)
 create mode 100644 RechteDoku.xlsx
 rename pages/{ => deprecated}/users/[mode]/[[id]].vue (98%)
 rename pages/{ => deprecated}/users/index.vue (100%)
 create mode 100644 stores/profile.js

diff --git a/RechteDoku.xlsx b/RechteDoku.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c81d02140204a0677522b324ed2b24d4fcad41e3
GIT binary patch
literal 11833
zcmeHtWmH`0(skn&g1cKFxLa^{hu{Q<;O-6$!QEXG+=IKjyL<59&et<@?>jS@`~LoZ
zy!Z54=d823_g;OTQ@g63s#1`KfJ6sC17HCF00|%;a{PxK7yytA1puG{V8OM7ZLA%Q
ztsV7L+-!{<bm(2JEQxa=!KtzV;Gp0C_xL}&0zL8L)?JKm`p)8R-l~=><83g?q6I-L
zN8(K_Kp1_=K`}?|_3K<7NAzKpC4f~lPZG1*I(uA<;KjH399Kq??Obp4oZHV_IrZKO
zi{df4bq9&Io2nGGPlIX^Gde>2J4g589E1tFRh5xy_)CmKJjM(-!hYw}*h-M5h&v*}
zX^?g()VW}V%XmQzisgu5UZ+?$WpY@;m&HpU-<bqBw$Y-IOXW}Ml=C&S_oOiwb*k;!
z7p=mAF+bj@Eo~F%Gp-#@96woAMtS5-L6#Axg(B;T%3^yO-X$Rn%kL-ln#W*Dab#J*
z4GpTwVo*)MAj8x6s;7~biPF{b+Gd^02gei@tTRc(>7lko8=lMK$D9(JU$wNMOYX^R
zVSk6NJX+5Z8Rz;)>gyim$6f2-o3&)hna^miG^u*h04u(#{4&Eoy}>g@4rj~Np|8R^
z*+@wOtJrO)Udy&R8B;hhizCdkkNy?YCUfub01p6oeT4uh{7tEKs*Ge;AoG&}2@wIL
zR6ToRO9uw}-_HM4=>K6^{^ik2V`b&L8Q%cUB%Xo?Zf94ck%gpP1SOhDRJ?s9SCHx=
z^2qU4+bQvpRd53!#C=-5pN5uKc_I!6NN%=ROT$pnKakbClmU|-?3`ez-`OXM*_Ceg
zpg7N7&)%enOSw@ww?<KyG<?mG9$Y6AoBk<Mg*;CG5f=`v03V3So8qV0C#$h$a90jC
zE2Ml<2CV$fk$o69p5`;3Soi~xKZHx>cq#>Bz`?+DvD|aOlH~dxS5?`J%e>Mc)1I5u
zP0z@(<5DE89qrkZPA+{wiIf%fj(J?XpCbF(N3)jo=WvEw4+mU#$-w!be;Co%HBiv{
zr%2dF`L@#_004M6000TJGOm^kE;jZS1~xVpzlE|=RV$l3PUIKwsb`oTm(WoyKtj2%
zZ@E%)arNTOsq(Jx`!?_~oay}HoA&kOz}nSPwZ>D?FA*n$+omR&IAi=)%VHk6xuz{)
zj-Eir2xlk;ja%d&dP$9&N16<hA7g<otW#O$6+TUO&)+W*v7%_kh}ZxJ4-ypx+QEg3
zSZr33K7I4G0db*Wi4y9eFg1DzQbTQpD)kZOBs(c|`WbD)u)XiGTZ+{M_gk<vmj($!
zvJqnh+A9{DvL=?c&>Ip%`t_~QTXZ0LLfK^aqOzOjFgJIF`=K=0Hf}JRm()7u1Bk>J
z)u&}`9UWDN;X6Ha2U&dCUGk%z`UiUMbYScInK%&#nV`H3sDokDx*myX&U|-U{q?Vg
z&9L*?K2rp4cp;DS+SXi!U52t<IaBIHl+I^KmN3sAXbQWhB*;uLPnlNk;5}Fizd17c
zgqUt%nUi9zi@)PZRvW8kWVVAE$kQp_6hw<hVhq<6f+r~|PA=<4DH!b0?yc%T=B(+U
z&`_WK`bI{9igp6)4xa42Q1zirNNJrQYmBw`NvB)Q=Y~)DC1!9XY<UrG;vZWByP8p+
zY%~YfRHRmr1xGnjDf*!<h*YHEG2qb*s<xXwUijz*v;yOpZSp5J?(Myy7Vm{Ji9cqC
z*y{}?QRCcreGEZfZ*Ra}Hb;g8?)I~EOXIJHD5ql!`f6M3Evu!vu6N*U20>8<l-@Ec
zOvIcDj73G34?1&qQsJxLOKn4)@B>rZ@d|5fhV*C8t#MYbD*P3ttvvdhVr|5tGK=<8
zAYQEc0zRk>aZgzpwVpl;E(#-BRuTDDs)#F=l0H+|^3GqUuT<`Pn;0c-V@n?Q10x{P
z_o(Vjt@)~%)+cb5sV8tv%kZT21;aFz4%UlzBf;j_P>MhF7=KCNw<$|95={dN>3vw}
zzU*AXMdQ;^jxO|7Qk;f8HZ+17^0(eqW$4FI8R{T7&UOWY_Y0();6@Uu1J4!`W4Ik?
z984E^q_q>IuW{jCqfEFlr8!%((1%lD8`1M!1HUi%tHJ#c^fUy>Y&<4fZau(N`{l-M
zuh`o9hLiuq@6On-|ImHOs$7*dKz&<+RL{JQ|0??hKYK(qDC$Td;@<nVQsadE#?9+v
z(WXK9R@>|C_?vd$TSVST&UW5O#%Isg7QV?FYOS^P-6Gun`9U7ORX$zXt@gyltZ9rr
zB#0*I23+x!)HoUX7f|B)PaVIQAAW=fDSQN^Wn2I(7)Zx|#Jj($`QNb*43wRMe*1s>
zXo-`T?qNjkJ@a2D8CfkXYYMS!f)QOPDJLS%pDwgaiyyfwT3=JBa?<~nv}Lyzee2D`
zyu4~UAL{aE#<hr8S_%0eoB{76jVmvY&Z-~rT=`6y%hyi={yKJURbG8+4xS?QKO{x4
z#NlZjd>ANj!ZHebZV$E!FLI{w`xS<D)AGs{_spAOHowE5Q)U|IQNuo7;P&Vr7+$Qe
zwH4zAM6I<r9o)$T?hFJ?Dg@(dbaHx!X`l)UW||Jn8{M66N?^vAMoN-$Szk~jA7|-f
zrY)Aj89G`JmRhf@jF8i@**Cv~)F7zz+(c&ZHHk)ZgWEGv#U@;GwVe(wuzUHEM9HD<
z`5z-fWBfo89W(&IN(ca8{}~Y+%#4j49T<MUF#Q%9(&L7$ml=^oZ=oKLAa9vPHJpt*
z?V}eEQ*|cUf20<QVd^WXNInGRzGlX#d;n`<0zY6P<=P($NxE##n>0ciqgh6ek1~+T
zj;U7}EzBNoC(H{+B@$7Fx5A@3fa7V^@_b?CSO0#^CO|A<<|%lDyp+zwV8PfGWr=_|
zrZR_vaz1U9Y(o%IEzg`vVaH=E_7(UxaAmctQni4*v~&f>tP5b5E!y$mRi^1vh~tJZ
z2K#-rE~d6nv`5n%Lyk8dmF%)e)-Xfe;`nhunPhNsGhu_5Z}@8aqm-DWX=_;*?4ae>
z`=)1{G$s;;{G%6}uJd@Vg%WFsb%nuxsjWB!8n=K5e%LhKPpfD4_i_nP&mZL6T1H|S
zCcBw4#q46`@)m{D#o`{5i{dQ%?r9&zu`ZQ1-@53az^DqIxxKLM#?$S!`st$MKQ$*q
zR=vRC8UfHZ;~ihLwVF>b`8E~8CDs`ZqJ^OAf+@^&CT1b&UW%|fk)akuH@!U7JdO#T
zS7YkVD{CLVQwvALy4p*9?U4&6x;aOjDSXSx-8=T-XlK_PN;lWEDqeAFP@*K}i@bq~
z%gu!S7Uv8f@w8EVM4amgTB*XRXXPI44ZqJo&mte%dN7HDf8`P698DW2Wqy4Hz5LhL
zc#UPyYku>b&?S#oNtY0R1!NW2x~cP6M8Ym_GLhcya-P0Eqik#oVU|oof||ky@^QsG
zN*L?#YH6(-JJo9>^*(C2rG4EgbsvpP@NlY;8hiO>oVd>8y|PICz5juo>oq5Cl>0VE
z3+rg@+sbRv=)Jq$QYn^O*olygAT44QLda@RGH}5wqzsskAl|xP0rjL~IleCPBy5TE
zv!6+z8`i8rT|SRKBU(P~YG1hN+39uTrOopC`;Le1Qfd9*{Por#!m}o(kEQO%lSh;j
z_K(W3$<84<H(3z1N#INLiFsa2%eN<+jC-r#C_mZpq<DH@x2(U7>DJTNGdxn~q8L<p
zb3$J=BTv{?#e0|7EnaS^C*f$^vg1(eg`iyMz`Hi9N4jX=`f=*su@ek|(0d=j_dwVu
zRh2vBFoY<>?DKhWT>3=RbNI!x;A4rC8+No}oe-3zZw`a{XZ~DEdCxC{cnnQG_Ijb}
z)&Qj$Q9caZ;Ks-dY7ud5TjUvCNuGWfWoGIi!rLgDo%*xt92$Ucd?ad~QiqOM<hUEs
z6O}ce)D|CK^2}s3_uiP457zD)>dRt5FI0xUh}4z{pX&m&Vp?s0*^2O}Eg3}>8IcTp
zD7KRE@H8K#)6Sc39x7zab&SH&_B3HOB7R>)thVLsFok_>1A^bN3>G*clx8R=Z3itL
zayBw@1t^h7z~O4n>?8rkP;dJ}FA2Z{W!=qql(kt6c@A-Z#IF@MxmHnBbvHX6yoDhq
z$$wjB8tZvPbny9nNBl%-oX|z?)p3doOkxsg^>ZvAwiBttin+5yDig(z39omJwhpMw
zRQG*x*2&L#<^-nUQrwOulBX+`JB@}q4#Ju0P%8~PDc5=tnov2ivehuUXi+k$X(_PC
znb4qndwokOGIpox{(gTR1kR)>mc4g$cJGN~<VG^xTVT0QdvG@_%RDemt27NPKx@L#
zUHsYFUnykkBqI?!8tGk~P+|Vl;-1e>H2xENJ5B5_WcQyESIjtks)dh|ofp;JQOB7&
zNOJ`_f~a(<$$r8T$$Zm~{<3G3b$jn;hCfY@S0ZMHr<@cItcn1xxz5);h1idtLzAT#
zd7f9+<o;j{qEe(E9MNCe#yyf4v0srpi8{qD4!bbaTgEa7cH&yhl?0-6r(YlrHkhGE
z=Q^^;Ig&NPUv_%^P@5D;2X{Qk*x;?&c^P8N3+faLn-9mGn4-thVje6@)R#L3YHKsQ
z=p8Mh6r|dD)x~S;-EZWmOok+bvwn6s+Y}Ghhh0mTrq55@ND8041aQ}CWsPgSX<vMT
z`5&2Azn74azm}zy8Xuui8<3QxsZwR0VEL#-H6%0cTP1yg(2<L|_YN9Zxc4p*`BPzj
zbiAHYY*v^sGZ`BbMI9`;d1-!hVwN8G_QCSvLDD{!F_vk5VdBDXS;jw;mBoB}19C_J
zfC~A44Kd7rgqY>XG)83L8O=2T?K%tuSfVIN39I=`Yl#}K_6HMKHA@+*{ruvyHNSLf
z(c;_$0G`(6DF60)TvC9V5zL(AbRsLfkW@BCVeCm${(3u|I2Xm(W&PGrt-=%;=L7Te
zoqjck^ENI(K6;`lmVM0y%219qyAeSKhVFEx@AK);`SO$_+Vjt_Q=z^3$xNfh((-{_
zd|ixAbWpV63!lxN;S2=rq8@a}KDgwV|AduuXkK(C({~IGNl=+0f}x_&M6WoSQ*TpJ
zza^1sAchH(4?nw$HBoOL&M&C!OId=EFrgg1-Q}+_?dwf&)O!_9rqaiBuIBH+qxR0q
zr)sU<!n1smQ+E!!KB?|iQ=@q1&EhrQX3dD2^306Nr4o!9oian`8@(WpO1$4MlJ_}q
zRFdS`Y@;^Fq5nZkjcF&f=*WzH5FFV0Xe#H<Umm`Ag;$YGDG~?)mFoh%$$9+gt<-fs
zI`8w53_<kqP`aG;C4vu^>s<*2&FLrW8F`I+Xa<C}1o+QwsxPC*?Y`O^gdbT->o}wp
z39vRGo6vh9?JBgfgJhmi=^mGX@3w<u4N7h)cU<wa*{ht^4x|$uHr_+xaRqL;zWuUA
zJRHl|y%vqZ*&g2-@+uU|0@*LU#uGvqP?-a4|J_FZ2sVj2)?ET`0xSIOeSuDQA46uM
z!$i#U`6fd}YFoVsG<&yoMyhQ()YlkjS!B3cZl4!w4Yd-IqAGfKlN&9WJnQ%U^a#`z
zx0cJ6PS0<quY~8b`VH$nb4sb3&94$n@8kT|^-8=_^h%h|Ug~h`49a@rP&qU$<JCtD
z#(Y^QC=@P^Wqu?Qz6<T0>lU$dBFdKlY-)hn5yFOo!G=P^uFp>2_SJw3{p)^!8!XTi
zN~HYZ=BQZljer8H06QEp4-Ikk84_eK08$jfC=Jk61HQFbC|Je#c9{aduf{%kL4nIE
zt1`;eI4fE5#9=tzcT<0{q1i?-30)(ZUQS4wrLZTgJDzwDtCfj@5`QU!oa(9%z5Bxz
z-Iwj_KJ<NVR$`p@CrY%Oh~qA@eHF_&Np}|RPq%^IB;zvIwV(MID(jT!u&*@Hp-07l
zi}+1+O(-W~Yd#-&%VPV{j#fxd@>RBf!e-zGqyTqsTDCtIVDg270IY84(6VygEF`Lo
z;Mgj3*dxJI;l<d3uL_?5mm&}(;fbJI9B-HuwZ%k*;_J~*)S~(-v*#YLytJfJb)Og~
zav6&iT{CJ6gN;SL@yXB=JYxO-@hoz^#f1$ZuZBSSTXp{Ta)zUsv6V5y@8{q1)?>}l
zD7^0&?Jxtc0wX$eBL^P(ToXkcH>d8K2|7CxlJP*@F<SwpW*T%b`287aKXCI&X}>jh
zs!(V%U+Bi2D5g(jvacaL_F}1<p`ooW0<i`z3@kHeyf1sL{kLn;4!3b7$vFt5<hzpd
z2&Z?1q=Vt(=GDjU^6$2#mW7ozjUsX6CFZrzet6lRZAYDML14rr6GzMMfStO>DE$zu
zqc&v>-zCV5h4j|4MKOf>ZlIBY;0fn$sD|j(t`Wf`%M-tWJ;SF-dl2q=%l=vXjU%Ph
zp&t&Kspk8|-m!6rh-eG0PvAPA=B_^hx!TjCX?96~1^z@$nKmyihpo-3p3w+Qb>j8p
z9PB=g+VqV4NTcZnT&r@2QC-fw3x^zlLT9_Y`j_=X764CLXPk-l5O;vsv`sKqJ>(EQ
zLDPq_Y?E#22a6Bs0dh4&b9B$p@joig__iBZaM@{Fz>M$u-nQ)rKg*4F;VA%ZPB)J7
zbZPK4Tp>cSWyf45N7b5FM<%rf{A+|MTc#}^%JkndC?F#)A51CJy5`>WYKCXoF+ux6
zGnbnA&u~*9@C4kQ6og8%<}(|+p5&lYYIju<L4yVAt|EPZ?c2KZ-H5H-gOb@9i{1;^
zk(p3&YK6(3r4iKiz8nqP*K2ou$->g}{JC}CK7pbmMy+f-NU&w3k@&cI=JT|!=M(($
zc-H=WzMHk;s?pc}uz#lK^|&hkEx14}d22VT-TnIdBg5-O@Y(Cn0$~sN4Raj69Hy9q
zK<(Uq9v}>BVdZ_?w}zA+@~)ZK4wM7uuY}(Qz%xsk95x?%*f*8IH2R=g+TBg;c*A<6
z6#GYz@)p1e9mXECIT6nl##O7&jS^^A<HA&NZn3u!=2sxn)!!19DM?h!6xbu9gzdfW
z{?a8KiyU-i^OTO<KkX&<&3N9B8%_HnNGMBjrhmpf7A`~6PX(4>3j3+r83ppARy~(@
z=tFvArn>~aB{?m^2>uRbpoU3H)JOP!`UEumn(EG|%1~|c@i_yvzKDEqc?P&`GgeBa
zCL=;P*R|MbA_ECax$i_ZPL^arx%>1P;>nlH_5<TED3QvPrl}&v$3++TLg;zQ<=W?l
z))mNJNZuWTx-R?$J@&UpXq{*hw#HJTz6W}0U7N#?fy+mBqnODJ)iUxuYR)HchvAVg
zpUs1AP)OeBZE=wt3>LkG_R7>`XOQ3zAuhp3{rHKu!@2bEF;K!^Mz1D~H0o=u&`mh)
zJt1HJk;NC&h&b#puT=StBeerLC|a?82R?(EOXl-Hp>3F-TdYH5aNJUzyh}ybtX*m+
zQ@2wD6&CvUXR>qHrNgEiI!VOB*0c~`o+GSSI!98oVUyts4+avf1$*p$NOF&gQM9;r
zF>i9|Rsaz(vu8c5ZaS9^{y`f_{PJg)olS(_w_JX>-0UWFTj-4OtyENg$JtV~m&#5*
zepkLcw^v{H^W{t{&CBAxKBv*j%o-1Oo@N2Y+$@w3dMVAIq~G$X$K%!uGro$Y&SXa-
zwTuX^g6)#&O)BsE8m7io7#XsLnQ;g-^@f5DF=)7QZ(&tO%uV#0VDOsl#`wm=0+IJg
zl~zW;Q90_y!evXovMoct@%j&=FR@uE3I?j-kBAGdLw))sQpN`+G(<B`>@$eV1&g0o
zkteD-NEA~?-YGgnn^{5Y2@9R2w-R9zz=YMSwcE``zV}_4qd8xT*sy9nVmrhkTZjoD
z^eTUjZ*<?*IZ3}g{NdGSv<vH7)~h4$!aCm?Rg^`KP{(mzE84|Lfk2ZM_%p%$+z8U9
z+s!fYcGZV^!}{<@Zc`~NlfBo34V_i<1ZmSEL!^8cIx(IFN_v8#^d~ZAMz9Izi95mq
z2XL4(Xd~uf6`_U#zj-8nK<#NcKT$=3t%rGt*1B45FDsdv6gkgsetNte5hgL2JT~U2
zW9qpe7UA0eu^<MbVp;cH7*xu)>UC+drKv@_{5x6=P9L@{8>G2dPpDJAu)QR+A+;?g
zAhJa*_{l0)f~_aAQF*2^C(^P>HR(&aY9Y^~R<O1xUmtCRt*+A0B2Pe?e|3T3X+1mD
z>hAa(=vB5&$8R*pACgw*=RaFD=JGj*=9(8^=&-LYUUjS9qn6}`YL-^7c=7H#vk$%n
zpVfG`)_Rll6(de#hIM<Dr!>x)@3XQ;6oKHk2iDsKD=qT$MAzjhB>VY1wT~gPhUVbw
z_$f)__4ije<WVH)q~+?)OQWa_EM>;-)ZsQoo^4|cDI=(|dk(AdCf}ZzG>Ey|58ZQ0
z97d3$F0FkjeA#&!N-N8<YnE%EoT`RJYoMAj#+DW=o{Q;P5*F}ltb<19a>MGImeRi-
z>8_5H5+w50Np|-s+16Qza=u_;YwjO2atyado0hArnRjDo!Yy5UA91)}3oc-*JUJVx
ze49V?E?7O7rEV3=!wkpu<3A40g5bsI6(oDy(|=PWXqn-2|EbTV%{znxM%TrJr`-P1
zNqE+E-SZhaFtUPZLd0ih!;j2QjT8P*p8;P5x;tCrTX45Y!D{g}bwDN88xMurwC%Nh
z!Y0OzY<~R6{)oycd_ei>EpCEtJNsAG<vefBw_?{hNE<Cr+MQbAV~ve;8&l^^w`Biu
z3n6!r{IwWVrO*IXsu2GO^bU@0mc|ah?Hlq{*KL*<k-f8OUpp^64#_FrD8v@Wixtnv
z#vSChruKl9yr3)sfwGV5E^@xU+*ZnuLSy@vF6*nNL_cI{pq7{n8`W?k%Z0*|shxUf
zxx3dhLqGY)IH{<rnDsKZm}0K)5b@{Foj_?>V>`eS$B&-(HJXTp&~eBpc@*Fkekz(1
zQ-YDMc~{RAt~N&$>))f#`7YKz$RjX?_7z4%>9WPjUuhV~-L~c5>=hgoLu-m;QGloe
zm%SuLrkTr*n}%Jtmz;muHbmxTUOQXY46dDfl$vzRw)#E=Rr9Tc?-P4I6^Xv5qKCy=
z2rDV@q#+4u-@GiL=Ie~su7C{jp%$Zu+Jh*D_wa|uuRL}96Or)eJ;^)f--6f&{2V75
z2RzUdN~0RA((4Zp*u>iJGE$}JZ=Q8s8seUiX}MrG@<J#b?$kMZf;bh!coA%O-kTjH
zD?-subb2pwbO?4j9qBhU_=r>>u8P~)JNr7qT{;%XLd|=a4NWE#`Om%$!EIZ+tC&W7
zDzA00g}SKSaxBBZXp1M@F%saSKr{G})p7d(-dq;5G$hm%Ox=B+?1>in4&9#7qs4pk
z=lG=iu}gPueOnJq56co(zWk3EEZ*+n)6O(_`Ux<|vU+XK@)rRdg%W2op#wJC7bxcw
zu3bM}mC{13%}lv89Kz%A(k(5VtlYMX3}*rnAk5>W1xAF|+qouj1gtl0W)`kMpS5v*
zS*%-8e3`C$a%`O%^5l1yqS4`}dtstXh}-9<^NaYd{pbgMYMEV+sTyE4UHGBA@eTN%
z6QlZ*(`VN2C;0aHBKkM2P=f^R2*f(gWGFk0JTo9gQG3IFnt5lT58~YJL`;*CE6$7)
z$n&Le(Wh)2ew|g!abO669BxM!jFgJr<R^Ir+3Y{}#lkG$2n-;j)(06i`oE0YOyAzv
zNZHZe+}iYa+xAplww@M1_7dMBQuCH4u*MLIq=5-h!3Ziw4|LV4puE{y)u_Qr+S779
zHa$-yGMo|!YDwdJ7}*^;PRGGA<*zd!Q>R3vuQsK;3<rasmaxQH+&`K<cIr#tU$8Ys
z#$2RpI4<>k$hRG12^IZ5z<n0X;dUwlliG~N0*Ey>EZxiGvr2331h>(K*{B=J8s9H!
z+(Tt~CnF%=!k}kFoBf2caRTP%l$sC}XS_K~gPg%&uZMY0$mvUCF#*A@>^Uf!<qKoc
z7I1ET_~HZ)D`nx<<uKa+?aUJXO{n2W)gEqPX40d(JJBW<7+%M>TNpUJ%J>iLItr~k
zF<;@+66dR4+0^Nnw!BOqvi)ESXVwMYsnfK8!7LO+T$A<PlG8?(l?V#rRjGFJ8tB*`
z=M`<zEeM{RKCuruN0Qa`(0$jv$tH#SIc81Lqgpx;{h2$Xkh_ETb^@0MZ5rZ-XU9!L
zF9FgE_}ucUj`mJJ_xtR+pY|V4Y7e~t1=vzc<TsL}k)R5vc~9)df?2eVA4_LwgT$dt
z>X|kY{EdB#ijL5dB^<UHF*~)$w?uH`eA}h*cjWb_4D>I&*0mjPkEx*WyQ5%2H(Dkg
z@075Jod6Qj5nona+CQUauRgDli_35*UZM2EW}s7-Yp&7EEof<S6Wp?%ixf#`cUuU~
z_3)qUlIYo6sXJNXBiXT7^*u_CL+YI0@z8EUYm%B=MQ4)Vw0qh=h{pT;N3RJdnSs9y
z`bHRJWT4v1Z{1!)eM>`OGktUG-yEk=jMnFFP)+|8VKE^2RU~n$5Q#Qe;Q)RK3f2u5
z?}{;&>g2Qp{gCf8N<h4u*Fn+86G^wlj@}^@I8#p6Iay#AX)4SxF2DQ%wP1-;Gm8}O
zVMC~2-(mK{(dxF*K9!~rEwE5C3FduR8s|c_G(!K)MXG&eozA63B1H|saF2FCQq$2}
z=2`%*J7smw^h;*XN+R(lLy@-I@@Cj;G(<EWu?I1(M9CwEhR<1L(-qx_uZ~{#n+2z%
z>v1S&C|QgK^ak`RrRX<x*%%=mmnE^<?LK#)I@3Rura1uhP6||<asn*`3aDLXWMimc
zZ)5AgU}$4+{M$-^CPe<*B?DPVc<iuTHzT^pt;Cb?j@K4B9RrOdg@A@4+!s>h55sL%
zbX&oe!b|P_l1s=l^y*72x2}6by#|zN2Y97unh8|WO6YzDsR(uNCy$CFZ4`HSRMXit
z1;5;EOyoATP$iSdXt~xe`Cfx-qe~2-m`K%LuOWvMEc@rv!@b4msjH8Du&u?jq<YN9
z>u^ieHH6EwKYV}cTZQxGz<0+|B$Z+L3NXgVN-XFWTtnX7u8XABR0Gk<Y$vsO`_7TO
zC!?ARuV=E=!GN{iDy_DLPi!D-^LBSyT8|C0co_pi1tT5B#LwNTq-j!30b{nKJ2%3&
zumi18%UC!=4_H<Kb^iFg_(l1nYhDE_4<rvf$)LiIuPvj5gdf?8FIcnsH3;_?shdg6
z<;wSnbVB$qbq+R#2y>sJl1<5xdYa*W!hVJKyihDA`j1K+xc@<!3o<}nP`?)WuLh`Z
zYx`gO11;IVj`X<B-`Y>WGl-kFz|)8oODdp%nqoelyL#0pI}cMMZp?Smz#iPeOjDa`
zEIfj|$Y}!TW3h`OA1_j4Cl527IYSxtJ0Wcb`<NV#oN8~qkfMv>S;`m+a6LZ+LIk@W
za_j3ym(OUz!7;Rj;dGwVBEmCe`7(u_m{b17<5C0$2tDR2!wU0r8(xeIbndakJnb>A
z#8((<A6Jd2#QIg`UoAADSk4RfFBX_8)m(J;OTo6Z4#h1DBytLmQNpj$mEyekupOnw
zmeC!oCtF0M#WQHQ<Y(u6yV;0xENtNtc(7(5x)|FK7m{la&1ds+kZX*5E&xfS%Yt2C
zrO3P@2$|TnW_WSR$4w%N>%9b;QXg&~u~5V)8ZA`hHlG6AEcp+2zxf3W_jP{C*WZk-
zsoi1pD&YXl*ep;2QQUj(BMV6~yHadIr517=IKf9Z<%RXbIbbS;m;Lyw8AbKVUSl$w
zm{%Y+k2)B_J}(ROgu1ZO8Bu?Q$#ilI7;FM-??0^Dx6yZ{8sA>euCT$p4^HRcFM03g
zef#j+w9p@p6%3pXl&<{e0oi}Q$A4e{!?>)1^xp~oKDYO8;BVJrkXZgQ#rG@l*IA}N
zq2r*0>X*r;U%`JLp!gFC03^Zx4*p-pDSqYowSE34)8?E1`4j(WrvJ+FYlq}d77<Wc
z^IwnhSC-%VCBL%#S`Gb^B@<Mi1+n~E8~q2tFT1Qi34%dx4Mgzgp6gfWuet1>P;Jsb
zpuc9ezcT!qto+H)O8z^;-%^)f(SMKde_{cEJ_-QfAMyTI_}~5WU*Y0Ze}VtYTPsLI
Ufh-IFcmw)Cf{c`i=C`~52S9u9*Z=?k

literal 0
HcmV?d00001

diff --git a/app.vue b/app.vue
index cec450a..cab9291 100644
--- a/app.vue
+++ b/app.vue
@@ -6,8 +6,6 @@ const tenants = (await supabase.from("tenants").select()).data
 const dataStore = useDataStore()
 const viewport = useViewport()
 
-console.log("1.")
-
 /*watch(viewport.breakpoint, (newBreakpoint, oldBreakpoint) => {
   console.log('Breakpoint updated:', oldBreakpoint, '->', newBreakpoint)
 })*/
diff --git a/components/DocumentDisplay.vue b/components/DocumentDisplay.vue
index 5411188..e506a33 100644
--- a/components/DocumentDisplay.vue
+++ b/components/DocumentDisplay.vue
@@ -3,6 +3,7 @@
 const toast = useToast()
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const router = useRouter()
 const props = defineProps({
   documentData: {
@@ -61,7 +62,7 @@ const createVendorInvoice = async () => {
       .from("incominginvoices")
       .insert([{
         document: documentData.id,
-        tenant: dataStore.currentTenant
+        tenant: profileStore.currentTenant
       }])
       .select()
   if(vendorInvoiceError) {
diff --git a/components/DocumentUpload.vue b/components/DocumentUpload.vue
index 9f806a3..a7ba1bb 100644
--- a/components/DocumentUpload.vue
+++ b/components/DocumentUpload.vue
@@ -12,6 +12,7 @@ const props = defineProps({
 const {type, elementId} = props
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const tags = dataStore.getDocumentTags
 
 const uploadModalOpen = ref(false)
@@ -19,7 +20,7 @@ const uploadInProgress = ref(false)
 const fileUploadFormData = ref({
   tags: ["Dokument"],
   project: null,
-  tenant: dataStore.currentTenant
+  tenant: profileStore.currentTenant
 })
 
 const openModal = () => {
diff --git a/components/EntityList.vue b/components/EntityList.vue
index b5ba3c7..8dcdc40 100644
--- a/components/EntityList.vue
+++ b/components/EntityList.vue
@@ -46,6 +46,7 @@ defineShortcuts({
 
 const router = useRouter()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 
 const dataType = dataStore.dataTypes[type]
 
@@ -81,7 +82,7 @@ const filteredRows = computed(() => {
     } else if(useRole().checkRight(type)){
       console.log("Only Righty to show Own")
       console.log(tempItems)
-      tempItems = tempItems.filter(item => item.profiles.includes(dataStore.activeProfile.id))
+      tempItems = tempItems.filter(item => item.profiles.includes(profileStore.activeProfile.id))
     } else {
       console.log("No Right to Show")
       tempItems = []
diff --git a/components/HelpSlideover.vue b/components/HelpSlideover.vue
index a635fde..2c273b6 100644
--- a/components/HelpSlideover.vue
+++ b/components/HelpSlideover.vue
@@ -4,6 +4,7 @@ const { metaSymbol } = useShortcuts()
 
 const shortcuts = ref(false)
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const query = ref('')
 const supabase = useSupabaseClient()
 const toast = useToast()
@@ -101,12 +102,12 @@ const filteredCategories = computed(() => {
 
 const contactRequestData = ref({
   source: "helpSlideover",
-  tenant: dataStore.currentTenant,
+  tenant: profileStore.currentTenant,
   message: "",
   title: "",
-  contactName: dataStore.activeProfile.fullName,
-  contactTel: dataStore.activeProfile.phoneMobile || dataStore.activeProfile.phoneHome,
-  contactMail: dataStore.activeProfile.email,
+  contactName: profileStore.activeProfile.fullName,
+  contactTel: profileStore.activeProfile.phoneMobile || profileStore.activeProfile.phoneHome,
+  contactMail: profileStore.activeProfile.email,
   contactType: "Hilfe",
   currentPath: router.currentRoute
 })
@@ -125,12 +126,12 @@ const addContactRequest = async () => {
 const resetContactRequest = () => {
   contactRequestData.value = {
     source: "helpSlideover",
-    tenant: dataStore.currentTenant,
+    tenant: profileStore.currentTenant,
     message: "",
     title: "",
-    contactName: dataStore.activeProfile.fullName,
-    contactTel: dataStore.activeProfile.phoneMobile || dataStore.activeProfile.phoneHome,
-    contactMail: dataStore.activeProfile.email,
+    contactName: profileStore.activeProfile.fullName,
+    contactTel: profileStore.activeProfile.phoneMobile || profileStore.activeProfile.phoneHome,
+    contactMail: profileStore.activeProfile.email,
     contactType: "Hilfe"
   }
 }
diff --git a/components/HistoryDisplay.vue b/components/HistoryDisplay.vue
index 774b1b3..feab0fd 100644
--- a/components/HistoryDisplay.vue
+++ b/components/HistoryDisplay.vue
@@ -14,7 +14,7 @@ const props = defineProps({
   }
 })
 const { metaSymbol } = useShortcuts()
-const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const user = useSupabaseUser()
 const supabase = useSupabaseClient()
 const toast = useToast()
@@ -79,13 +79,13 @@ const addHistoryItemData = ref({
 
 const addHistoryItem = async () => {
   console.log(addHistoryItemData.value)
-  addHistoryItemData.value.createdBy = dataStore.activeProfile.id
+  addHistoryItemData.value.createdBy = profileStore.activeProfile.id
 
   addHistoryItemData.value[type] = elementId
 
   const {data,error} = await supabase
       .from("historyitems")
-      .insert([{...addHistoryItemData.value, tenant: dataStore.currentTenant}])
+      .insert([{...addHistoryItemData.value, tenant: profileStore.currentTenant}])
       .select()
 
   if(error) {
@@ -100,9 +100,9 @@ const addHistoryItem = async () => {
         let rawUsername = i[1]
 
         return {
-          tenant: dataStore.currentTenant,
+          tenant: profileStore.currentTenant,
           profile: profiles.find(x => x.username === rawUsername).id,
-          initiatingProfile: dataStore.activeProfile.id,
+          initiatingProfile: profileStore.activeProfile.id,
           title: "Sie wurden im Logbuch erwähnt",
           link: `/${type}s/show/${elementId}`,
           message: addHistoryItemData.value.text
@@ -198,11 +198,11 @@ const renderText = (text) => {
             :src="colorMode.value === 'light' ? '/Logo.png' : '/Logo_Dark.png' "
         />
         <UAvatar
-            :alt="dataStore.getProfileById(item.createdBy).fullName"
+            :alt="profileStore.getProfileById(item.createdBy).fullName"
             v-else
         />
         <div>
-          <h3 v-if="item.createdBy">{{dataStore.getProfileById(item.createdBy) ? dataStore.getProfileById(item.createdBy).fullName : ""}}</h3>
+          <h3 v-if="item.createdBy">{{profileStore.getProfileById(item.createdBy) ? profileStore.getProfileById(item.createdBy).fullName : ""}}</h3>
           <h3 v-else>FEDEO Bot</h3>
           <span v-html="renderText(item.text)"/><br>
           <span class="text-gray-500">{{dayjs(item.created_at).format("DD.MM.YY HH:mm")}}</span>
diff --git a/components/MainNav.vue b/components/MainNav.vue
index 8a4c3c3..9bbea02 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -1,13 +1,10 @@
 <script setup>
 import {useRole} from "~/composables/useRole.js";
 
-const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 
 const role = useRole()
-console.log(role)
-console.log(role.checkRight("projects"))
-
 const links = computed(() => {
   return [
     {
@@ -26,17 +23,17 @@ const links = computed(() => {
           to: "/tasks",
           icon: "i-heroicons-rectangle-stack"
         },
-        ... dataStore.ownTenant.features.planningBoard ? [{
+        ... profileStore.ownTenant.features.planningBoard ? [{
           label: "Plantafel",
           to: "/calendar/timeline",
           icon: "i-heroicons-calendar-days"
         }] : [],
-        ... dataStore.ownTenant.features.calendar ? [{
+        ... profileStore.ownTenant.features.calendar ? [{
           label: "Kalender",
           to: "/calendar/grid",
           icon: "i-heroicons-calendar-days"
         }] : [],
-        ... dataStore.ownTenant.features.calendar ? [{
+        ... profileStore.ownTenant.features.calendar ? [{
           label: "Termine",
           to: "/events",
           icon: "i-heroicons-calendar-days"
@@ -68,7 +65,7 @@ const links = computed(() => {
         }
       ]
     },
-    ... dataStore.ownTenant.features.contacts ? [{
+    ... profileStore.ownTenant.features.contacts ? [{
       label: "Kontakte",
       defaultOpen: false,
       icon: "i-heroicons-user-group",
@@ -95,12 +92,12 @@ const links = computed(() => {
       defaultOpen:false,
       icon: "i-heroicons-user-group",
       children: [
-          ... dataStore.ownTenant.features.timeTracking ? [{
+          ... profileStore.ownTenant.features.timeTracking ? [{
           label: "Zeiterfassung",
           to: "/employees/timetracking",
           icon: "i-heroicons-clock"
         }] : [],
-        ... dataStore.ownTenant.features.workingTimeTracking ? [{
+        ... profileStore.ownTenant.features.workingTimeTracking ? [{
           label: "Anwesenheiten",
           to: "/workingtimes",
           icon: "i-heroicons-clock"
@@ -112,7 +109,7 @@ const links = computed(() => {
         },
       ]
     },
-    ... dataStore.ownTenant.features.accounting ? [{
+    ... profileStore.ownTenant.features.accounting ? [{
       label: "Buchhaltung",
       defaultOpen: false,
       icon: "i-heroicons-chart-bar-square",
diff --git a/components/ProfileDropdown.vue b/components/ProfileDropdown.vue
index 4d4d0b2..a5c7281 100644
--- a/components/ProfileDropdown.vue
+++ b/components/ProfileDropdown.vue
@@ -1,30 +1,29 @@
 <script setup>
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
-//const tenants = ref(dataStore.getOwnProfile ? dataStore.getOwnProfile.tenants : [])
-//const tenant = ref(dataStore.currentTenant)
 
-const selectedProfile = ref(dataStore.activeProfile.id)
+const selectedProfile = ref(profileStore.activeProfile.id)
 
 
 </script>
 
 <template>
   <USelectMenu
-    :options="dataStore.ownProfiles"
+    :options="profileStore.ownProfiles"
     value-attribute="id"
     class="w-40"
-    @change="dataStore.changeProfile(selectedProfile)"
+    @change="profileStore.changeProfile(selectedProfile)"
     v-model="selectedProfile"
   >
     <UButton color="gray" variant="ghost" :class="[open && 'bg-gray-50 dark:bg-gray-800']" class="w-full">
-      <UAvatar :alt="dataStore.tenants.find(i => dataStore.getProfileById(selectedProfile).tenant === i.id).name" size="md" />
+      <UAvatar :alt="profileStore.tenants.find(i => profileStore.profiles.find(i => i.id === selectedProfile).tenant === i.id).name" size="md" />
 
-      <span class="truncate text-gray-900 dark:text-white font-semibold">{{dataStore.tenants.find(i => dataStore.getProfileById(selectedProfile).tenant === i.id).name}}</span>
+      <span class="truncate text-gray-900 dark:text-white font-semibold">{{profileStore.tenants.find(i => profileStore.profiles.find(i => i.id === selectedProfile).tenant === i.id).name}}</span>
     </UButton>
 
     <template #option="{option}">
-      {{dataStore.tenants.find(i => i.id === option.tenant).name}}
+      {{profileStore.tenants.find(i => i.id === option.tenant).name}}
     </template>
   </USelectMenu>
 </template>
\ No newline at end of file
diff --git a/components/ProfileSelection.vue b/components/ProfileSelection.vue
index 01dbb63..49ce1f3 100644
--- a/components/ProfileSelection.vue
+++ b/components/ProfileSelection.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-const dataStore = useDataStore()
+const profileStore = useProfileStore()
 
 
 
@@ -9,11 +9,11 @@ const dataStore = useDataStore()
 <template>
   <div class="w-1/2 mx-auto">
     <p class="text-2xl mb-5 text-center">Bitte wähle dein gewünschtes Profil</p>
-    <div v-for="profile in dataStore.ownProfiles" class="flex justify-between my-3">
-      {{dataStore.tenants.find(i => i.id === profile.tenant).name}}
+    <div v-for="profile in profileStore.ownProfiles" class="flex justify-between my-3">
+      {{profileStore.tenants.find(i => i.id === profile.tenant).name}}
       <UButton
         variant="outline"
-        @click="dataStore.changeProfile(profile.id)"
+        @click="profileStore.changeProfile(profile.id)"
       >Auswählen</UButton>
     </div>
   </div>
diff --git a/components/UserDropdown.vue b/components/UserDropdown.vue
index b65b581..b0b57f0 100644
--- a/components/UserDropdown.vue
+++ b/components/UserDropdown.vue
@@ -1,9 +1,10 @@
-<script setup lang="ts">
+<script setup>
 const { isHelpSlideoverOpen } = useDashboard()
 const { isDashboardSearchModalOpen } = useUIState()
 const { metaSymbol } = useShortcuts()
 const user = useSupabaseUser()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const router = useRouter()
 
@@ -15,13 +16,13 @@ const items = computed(() => [
   }],  [{
     label: 'Mein Profil',
     icon: 'i-heroicons-user',
-    to: `/profiles/show/${dataStore.activeProfile.id}`
+    to: `/profiles/show/${profileStore.activeProfile.id}`
   },{
     label: 'Abmelden',
     icon: 'i-heroicons-arrow-left-on-rectangle',
     click: async () => {
       await supabase.auth.signOut()
-      await dataStore.clearStore()
+      //await dataStore.clearStore()
       await router.push('/login')
 
     }
@@ -32,9 +33,9 @@ const items = computed(() => [
 <template>
   <UDropdown mode="hover" :items="items" :ui="{ width: 'w-full', item: { disabled: 'cursor-text select-text' } }" :popper="{ strategy: 'absolute', placement: 'top' }" class="w-full">
     <template #default="{ open }">
-      <UButton color="gray" variant="ghost" class="w-full" :label="dataStore.activeProfile.fullName" :class="[open && 'bg-gray-50 dark:bg-gray-800']">
+      <UButton color="gray" variant="ghost" class="w-full" :label="profileStore.activeProfile.fullName" :class="[open && 'bg-gray-50 dark:bg-gray-800']">
         <template #leading>
-          <UAvatar :alt="dataStore.activeProfile ? dataStore.activeProfile.fullName : ''"  size="xs" />
+          <UAvatar :alt="profileStore.activeProfile ? profileStore.activeProfile.fullName : ''"  size="xs" />
         </template>
 
         <template #trailing>
@@ -49,7 +50,7 @@ const items = computed(() => [
           Angemeldet als
         </p>
         <p class="truncate font-medium text-gray-900 dark:text-white">
-          {{dataStore.activeProfile.email}}
+          {{profileStore.activeProfile.email}}
         </p>
       </div>
     </template>
diff --git a/components/displayIncomeAndExpenditure.vue b/components/displayIncomeAndExpenditure.vue
index 4058167..19d50bd 100644
--- a/components/displayIncomeAndExpenditure.vue
+++ b/components/displayIncomeAndExpenditure.vue
@@ -6,13 +6,14 @@ dayjs.extend(customParseFormat)
 
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 
 let incomeData = ref({})
 let expenseData = ref({})
 
 const setup = async () => {
-  let incomeRawData = (await supabase.from("createddocuments").select().eq("tenant",dataStore.currentTenant).in('type',['invoices'])).data
-  let expenseRawData =(await supabase.from("incominginvoices").select().eq("tenant",dataStore.currentTenant)).data
+  let incomeRawData = (await supabase.from("createddocuments").select().eq("tenant",profileStore.currentTenant).in('type',['invoices'])).data
+  let expenseRawData =(await supabase.from("incominginvoices").select().eq("tenant",profileStore.currentTenant)).data
 
   expenseRawData = expenseRawData.filter(i => i.date).map(i => {
     let amount = 0
diff --git a/composables/useNumberRange.js b/composables/useNumberRange.js
index ccf05d2..fc52a3b 100644
--- a/composables/useNumberRange.js
+++ b/composables/useNumberRange.js
@@ -3,8 +3,9 @@ export const useNumberRange = (resourceType) => {
     const supabase = useSupabaseClient()
 
     const dataStore = useDataStore()
+    const profileStore = useProfileStore()
 
-    const numberRanges = dataStore.ownTenant.numberRanges
+    const numberRanges = profileStore.ownTenant.numberRanges
 
     const numberRange = numberRanges[resourceType]
 
@@ -19,7 +20,7 @@ export const useNumberRange = (resourceType) => {
         const {data,error} = await supabase
             .from("tenants")
             .update({numberRanges: newNumberRanges})
-            .eq('id',dataStore.currentTenant)
+            .eq('id',profileStore.currentTenant)
 
 
         dataStore.fetchOwnTenant()
diff --git a/composables/usePrintLabel.js b/composables/usePrintLabel.js
index 959156c..9ce3245 100644
--- a/composables/usePrintLabel.js
+++ b/composables/usePrintLabel.js
@@ -4,9 +4,10 @@ import Handlebars from "handlebars";
 export const usePrintLabel = async (printServerId,printerName , rawZPL ) => {
     const supabase = useSupabaseClient()
     const dataStore = useDataStore()
+    const profileStore = useProfileStore()
 
     await supabase.from("printJobs").insert({
-        tenant: dataStore.currentTenant,
+        tenant: profileStore.currentTenant,
         rawContent: rawZPL,
         printerName: printerName,
         printServer: printServerId
diff --git a/composables/useRole.js b/composables/useRole.js
index e30a876..9646682 100644
--- a/composables/useRole.js
+++ b/composables/useRole.js
@@ -4,7 +4,7 @@
 
 
 export const useRole = () => {
-    const dataStore = useDataStore()
+    const profileStore = useProfileStore()
 
 
     const generalAvailableRights = ref({
@@ -178,7 +178,7 @@ export const useRole = () => {
     })
 
 
-    let role = dataStore.activeProfile.role
+    let role = profileStore.activeProfile.role
 
     const checkRight = (right) => {
         let rightsToCheck = [right]
diff --git a/composables/useSupabase.js b/composables/useSupabase.js
index dd5de77..86456ce 100644
--- a/composables/useSupabase.js
+++ b/composables/useSupabase.js
@@ -2,7 +2,7 @@
 
 export const useSupabaseSelect = async (relation,select = '*', sortColumn = null, ascending = true) => {
     const supabase = useSupabaseClient()
-    const dataStore = useDataStore()
+    const profileStore = useProfileStore()
     let data = null
 
 
@@ -10,13 +10,13 @@ export const useSupabaseSelect = async (relation,select = '*', sortColumn = null
         data = (await supabase
             .from(relation)
             .select(select)
-            .eq("tenant", dataStore.currentTenant)
+            .eq("tenant", profileStore.currentTenant)
             .order(sortColumn, {ascending: ascending})).data
     } else {
         data = (await supabase
             .from(relation)
             .select(select)
-            .eq("tenant", dataStore.currentTenant)).data
+            .eq("tenant", profileStore.currentTenant)).data
     }
 
     return data
@@ -24,7 +24,8 @@ export const useSupabaseSelect = async (relation,select = '*', sortColumn = null
 
 export const useSupabaseSelectDocuments = async (select = '*', sortColumn = null, folderPath = "_") => {
     const supabase = useSupabaseClient()
-    const dataStore = useDataStore()
+    const profileStore = useProfileStore()
+
     let data = null
 
 
@@ -32,13 +33,13 @@ export const useSupabaseSelectDocuments = async (select = '*', sortColumn = null
         data = (await supabase
             .from("documents")
             .select(select)
-            .eq("tenant", dataStore.currentTenant)
+            .eq("tenant", profileStore.currentTenant)
             .order(sortColumn, {ascending: true})).data
     } else {
         data = (await supabase
             .from("documents")
             .select(select)
-            .eq("tenant", dataStore.currentTenant)).data
+            .eq("tenant", profileStore.currentTenant)).data
 
     }
 
@@ -68,7 +69,7 @@ export const useSupabaseSelectDocuments = async (select = '*', sortColumn = null
 
 export const useSupabaseSelectSingle = async (relation,idToEq,select = '*' ) => {
     const supabase = useSupabaseClient()
-    const dataStore = useDataStore()
+    const profileStore = useProfileStore()
     let data = null
 
 
@@ -76,14 +77,14 @@ export const useSupabaseSelectSingle = async (relation,idToEq,select = '*' ) =>
         data = (await supabase
             .from(relation)
             .select(select)
-            .eq("tenant", dataStore.currentTenant)
+            .eq("tenant", profileStore.currentTenant)
             .eq("id",idToEq)
             .single()).data
     } else {
         data = (await supabase
             .from(relation)
             .select(select)
-            .eq("tenant", dataStore.currentTenant)
+            .eq("tenant", profileStore.currentTenant)
             .single()).data
     }
 
diff --git a/layouts/default.vue b/layouts/default.vue
index 9d84f92..68f5edb 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -3,398 +3,20 @@
 
 import MainNav from "~/components/MainNav.vue";
 import dayjs from "dayjs";
+import {useProfileStore} from "~/stores/profile.js";
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const colorMode = useColorMode()
 const { isHelpSlideoverOpen } = useDashboard()
 const supabase = useSupabaseClient()
 const router = useRouter()
 const route = useRoute()
 
-console.log("2.")
-
-dataStore.initializeData((await supabase.auth.getUser()).data.user.id)
+profileStore.initializeData((await supabase.auth.getUser()).data.user.id)
 
 const month = dayjs().format("MM")
 
-
-/*const isLight = computed({
-  get() {
-    return colorMode.value !== 'dark'
-  },
-  set() {
-    colorMode.preference = colorMode.value === 'dark' ? 'light' : 'dark'
-  }
-})
-
-const navLinks = [
-  {
-    label: "Home",
-    to: "/",
-    icon: 'i-heroicons-home'
-  },
-  {
-    label: "Kontakte",
-    icon: 'i-heroicons-user-group',
-    children: [
-      {
-        label: "Kunden",
-        to: "/customers",
-        icon: "i-heroicons-user-group"
-      },
-      {
-        label: "Lieferanten",
-        to: "/vendors",
-        icon: "i-heroicons-truck"
-      },
-      {
-        label: "Ansprechpartner",
-        to: "/contacts",
-        icon: "i-heroicons-user-group"
-      },
-    ]
-  },
-  {
-    label: "Buchhaltung",
-    icon: 'i-heroicons-document-chart-bar',
-    children: [
-      {
-        label: "Belege",
-        to: "/receipts",
-        icon: "i-heroicons-document-text"
-      },
-      {
-        label: "Bank",
-        to: "/banking",
-        icon: "i-heroicons-currency-euro"
-      },
-    ]
-  },
-  {
-    label: "Aufträge",
-    icon: "i-heroicons-square-3-stack-3d",
-    children: [
-      {
-        label: "Projekte",
-        to: "/projects",
-        icon: "i-heroicons-clipboard-document-check"
-      },
-      {
-        label: "Verträge",
-        to: "/contracts",
-        icon: "i-heroicons-clipboard-document"
-      },
-      {
-        label: "Objekte",
-        to: "/plants",
-        icon: "i-heroicons-clipboard-document"
-      },
-    ]
-  },
-  {
-    label: "Verwaltung",
-    icon: "i-heroicons-square-3-stack-3d",
-    children: [
-      {
-        label: "Aufgaben",
-        to: "/tasks",
-        icon: "i-heroicons-rectangle-stack"
-      },
-      {
-        label: "Plantafel",
-        to: "/calendar/timeline",
-        icon: "i-heroicons-calendar-days"
-      },
-      {
-        label: "Kalender",
-        to: "/calendar/grid",
-        icon: "i-heroicons-calendar-days"
-      },
-      {
-        label: "Dokumente",
-        to: "/documents",
-        icon: "i-heroicons-document"
-      },
-      {
-        label: "E-Mail",
-        to: "/email",
-        icon: "i-heroicons-envelope"
-      },
-    ]
-  },/!*
-  {
-    label: "Chat",
-    to: "/chat",
-    icon:'i-heroicons-chat-bubble-left-right'
-  },*!/
-  {
-    label: "Mitarbeiter",
-    icon: 'i-heroicons-user',
-    children: [
-      {
-        label: "Zeiterfassung",
-        to: "/employees/timetracking",
-        icon: "i-heroicons-clock"
-      },
-      {
-        label: "Anwesenheiten",
-        to: "/workingtimes",
-        icon: "i-heroicons-clock"
-      },
-      {
-        label: "Abwesenheiten",
-        to: "/absenceRequests",
-        icon: "i-heroicons-document-text"
-      }
-    ]
-  },
-  {
-    label: "Lager",
-    icon: 'i-heroicons-home',
-    children: [
-      {
-        label: "Steuerung",
-        to: "/inventory",
-        icon: "i-heroicons-square-3-stack-3d"
-      },
-      {
-        label: "Artikelstamm",
-        to: "/products",
-        icon: "i-heroicons-puzzle-piece"
-      },
-      {
-        label: "Lagerplätze",
-        to: "/spaces",
-        icon: "i-heroicons-square-3-stack-3d"
-      },
-      {
-        label: "Fahrzeuge",
-        to: "/vehicles",
-        icon: "i-heroicons-truck"
-      }, {
-        label: "Inventar",
-        to: "/inventoryitems",
-        icon: "i-heroicons-puzzle-piece"
-      },
-    ]
-  },
-]*/
-
-//const activeFeatures = dataStore.tenants.find(dataStore.currentTenant).features
-
-let links = computed(() => {
-  return [
-    {
-      id: 'dashboard',
-      label: "Dashboard",
-      to: "/",
-      icon: "i-heroicons-home"
-    },
-    {
-      label: "Organisation",
-      icon: "i-heroicons-rectangle-stack",
-      defaultOpen: false,
-      children: [
-        {
-          label: "Aufgaben",
-          to: "/tasks",
-          icon: "i-heroicons-rectangle-stack"
-        },
-        ... dataStore.ownTenant.features.planningBoard ? [{
-          label: "Plantafel",
-          to: "/calendar/timeline",
-          icon: "i-heroicons-calendar-days"
-        }] : [],
-        ... dataStore.ownTenant.features.calendar ? [{
-          label: "Kalender",
-          to: "/calendar/grid",
-          icon: "i-heroicons-calendar-days"
-        }] : [],
-        ... dataStore.ownTenant.features.calendar ? [{
-          label: "Termine",
-          to: "/events",
-          icon: "i-heroicons-calendar-days"
-        }] : [],
-        {
-          label: "Dokumente",
-          to: "/documents",
-          icon: "i-heroicons-document"
-        },
-      ]
-    },
-    /*{
-      label: "E-Mail",
-      to: "/email",
-      icon: "i-heroicons-envelope"
-    },*/
-    ... dataStore.ownTenant.features.contacts ? [{
-      label: "Kontakte",
-      defaultOpen: false,
-      icon: "i-heroicons-user-group",
-      children: [
-        {
-          label: "Kunden",
-          to: "/customers",
-          icon: "i-heroicons-user-group"
-        },
-        {
-          label: "Lieferanten",
-          to: "/vendors",
-          icon: "i-heroicons-truck"
-        },
-        {
-          label: "Ansprechpartner",
-          to: "/contacts",
-          icon: "i-heroicons-user-group"
-        },
-      ]
-    },] : [],
-    {
-      label: "Mitarbeiter",
-      defaultOpen:false,
-      icon: "i-heroicons-user-group",
-      children: [
-        ... dataStore.ownTenant.features.timeTracking ? [{
-          label: "Zeiterfassung",
-          to: "/employees/timetracking",
-          icon: "i-heroicons-clock"
-        }] : [],
-        ... dataStore.ownTenant.features.workingTimeTracking ? [{
-          label: "Anwesenheiten",
-          to: "/workingtimes",
-          icon: "i-heroicons-clock"
-        }] : [],
-        {
-          label: "Abwesenheiten",
-          to: "/absenceRequests",
-          icon: "i-heroicons-document-text"
-        },
-      ]
-    },
-    ... dataStore.ownTenant.features.accounting ? [{
-      label: "Buchhaltung",
-      defaultOpen: false,
-      icon: "i-heroicons-chart-bar-square",
-      children: [
-        {
-          label: "Ausgangsbelege",
-          to: "/createDocument",
-          icon: "i-heroicons-document-text"
-        },{
-          label: "Eingangsbelege",
-          to: "/incomingInvoices",
-          icon: "i-heroicons-document-text"
-        },
-        {
-          label: "Bank",
-          to: "/banking",
-          icon: "i-heroicons-document-text"
-        },
-      ]
-    },] : [],
-    ... dataStore.ownTenant.features.inventory ? [{
-      label: "Lager",
-      icon: "i-heroicons-puzzle-piece",
-      defaultOpen: false,
-      children: [
-        {
-          label: "Vorgänge",
-          to: "/inventory",
-          icon: "i-heroicons-square-3-stack-3d"
-        },{
-          label: "Bestände",
-          to: "/inventory/stocks",
-          icon: "i-heroicons-square-3-stack-3d"
-        },
-        {
-          label: "Lagerplätze",
-          to: "/spaces",
-          icon: "i-heroicons-square-3-stack-3d"
-        },
-      ]
-    },] : [],
-    {
-      label: "Inventar",
-      to: "/inventoryitems",
-      icon: "i-heroicons-puzzle-piece"
-    },
-    ... dataStore.ownTenant.features.vehicles ? [{
-      label: "Fahrzeuge",
-      to: "/vehicles",
-      icon: "i-heroicons-truck",
-    }] : [],
-    {
-      label: "Stammdaten",
-      defaultOpen: false,
-      icon: "i-heroicons-clipboard-document",
-      children: [
-        {
-          label: "Artikelstamm",
-          to: "/products",
-          icon: "i-heroicons-puzzle-piece"
-        },{
-          label: "Leistungsstamm",
-          to: "/services",
-          icon: "i-heroicons-puzzle-piece"
-        },
-
-      ]
-    },
-    ... dataStore.ownTenant.features.projects ? [{
-      label: "Projekte",
-      to: "/projects",
-      icon: "i-heroicons-clipboard-document-check"
-    },] : [],
-    ... dataStore.ownTenant.features.contracts ? [{
-      label: "Verträge",
-      to: "/contracts",
-      icon: "i-heroicons-clipboard-document"
-    }] : [],
-    ... dataStore.ownTenant.features.objects ? [{
-      label: "Objekte",
-      to: "/plants",
-      icon: "i-heroicons-clipboard-document"
-    },] : [],
-
-    {
-      label: "Einstellungen",
-      defaultOpen: false,
-      icon: "i-heroicons-cog-8-tooth",
-      children: [
-        {
-          label: "Nummernkreise",
-          to: "/settings/numberRanges",
-          icon: "i-heroicons-clipboard-document-list"
-        },{
-          label: "Mitarbeiter",
-          to: "/profiles",
-          icon: "i-heroicons-clipboard-document-list"
-        },{
-          label: "Bankkonten",
-          to: "/settings/banking",
-          icon: "i-heroicons-clipboard-document-list"
-        },{
-          label: "Text Vorlagen",
-          to: "/settings/texttemplates",
-          icon: "i-heroicons-clipboard-document-list"
-        },{
-          label: "Eigene Felder",
-          to: "/settings/ownfields",
-          icon: "i-heroicons-clipboard-document-list"
-        },{
-          label: "Firmeneinstellungen",
-          to: "/settings/tenant",
-          icon: "i-heroicons-clipboard-document-list"
-        },{
-          label: "Reparaturprozesse",
-          to: "/repairs/prozess/",
-          icon: "i-heroicons-bars-3-solid"
-        }
-      ]
-    },
-  ]
-})
-
 const actions = [
   {
     id: 'new-customer',
@@ -489,7 +111,7 @@ const footerLinks = [/*{
 </script>
 
 <template>
-  <UDashboardLayout  v-if="dataStore.loaded">
+  <UDashboardLayout  v-if="profileStore.loaded">
 
     <UDashboardPanel :width="250" :resizable="{ min: 200, max: 300 }" collapsible>
       <UDashboardNavbar class="!border-transparent" :ui="{ left: 'flex-1' }">
diff --git a/pages/absenceRequests/[mode]/[[id]].vue b/pages/absenceRequests/[mode]/[[id]].vue
index 3f751c8..6367720 100644
--- a/pages/absenceRequests/[mode]/[[id]].vue
+++ b/pages/absenceRequests/[mode]/[[id]].vue
@@ -7,6 +7,7 @@ definePageMeta({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -110,7 +111,7 @@ setupPage()
       <UCard class="mt-5">
         <div v-if="item.label === 'Informationen'">
           <div class="truncate">
-            <p>Mitarbeiter: {{dataStore.profiles.find(item => item.id === itemInfo.user) ? dataStore.profiles.find(item => item.id === itemInfo.user).fullName : ""}}</p>
+            <p>Mitarbeiter: {{profileStore.profiles.find(item => item.id === itemInfo.user) ? profileStore.profiles.find(item => item.id === itemInfo.user).fullName : ""}}</p>
             <p>Start: {{dayjs(itemInfo.start).format("DD.MM.YYYY")}}</p>
             <p>Ende: {{dayjs(itemInfo.end).format("DD.MM.YYYY")}}</p>
             <p>Grund: {{itemInfo.reason}}</p>
@@ -151,14 +152,14 @@ setupPage()
     >
       <USelectMenu
           v-model="itemInfo.user"
-          :options="dataStore.profiles"
+          :options="profileStore.profiles"
           option-attribute="fullName"
           value-attribute="id"
           searchable
           :search-attributes="['fullName']"
       >
         <template #label>
-          {{dataStore.getProfileById(itemInfo.user) ? dataStore.getProfileById(itemInfo.user).fullName : "Mitarbeiter auswählen"}}
+          {{profileStore.getProfileById(itemInfo.user) ? profileStore.getProfileById(itemInfo.user).fullName : "Mitarbeiter auswählen"}}
         </template>
       </USelectMenu>
     </UFormGroup>
diff --git a/pages/absenceRequests/index.vue b/pages/absenceRequests/index.vue
index 74bbfd5..1992d76 100644
--- a/pages/absenceRequests/index.vue
+++ b/pages/absenceRequests/index.vue
@@ -61,7 +61,7 @@
         </span>
     </template>
     <template #user-data="{row}">
-      {{dataStore.profiles.find(profile => profile.id === row.user) ? dataStore.profiles.find(profile => profile.id === row.user).fullName : ""}}
+      {{profileStore.profiles.find(profile => profile.id === row.user) ? profileStore.profiles.find(profile => profile.id === row.user).fullName : ""}}
     </template>
   </UTable>
 </template>
@@ -84,6 +84,7 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const router = useRouter()
 
 const templateColumns = [
diff --git a/pages/banking/index.vue b/pages/banking/index.vue
index 5476542..51b5f87 100644
--- a/pages/banking/index.vue
+++ b/pages/banking/index.vue
@@ -20,6 +20,7 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const router = useRouter()
 const supabase = useSupabaseClient()
 
@@ -27,7 +28,7 @@ const bankstatements = ref([])
 
 
 const setupPage = async () => {
-  bankstatements.value = (await supabase.from("bankstatements").select("*, statementallocations(*)").eq('tenant', dataStore.currentTenant).order("date", {ascending:false})).data
+  bankstatements.value = (await supabase.from("bankstatements").select("*, statementallocations(*)").eq('tenant', profileStore.currentTenant).order("date", {ascending:false})).data
 
 }
 
diff --git a/pages/banking/statements/[mode]/[[id]].vue b/pages/banking/statements/[mode]/[[id]].vue
index 6acb7b1..57a42f6 100644
--- a/pages/banking/statements/[mode]/[[id]].vue
+++ b/pages/banking/statements/[mode]/[[id]].vue
@@ -14,6 +14,7 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const mode = ref(route.params.mode || "show")
@@ -132,7 +133,7 @@ const saveAllocations = async () =>  {
 const saveAllocation = async (allocation) => {
   const {data,error} = await supabase.from("statementallocations").insert({
     ...allocation,
-    tenant: dataStore.currentTenant
+    tenant: profileStore.currentTenant
   }).select()
 
   if(data) {
diff --git a/pages/chat.vue b/pages/chat.vue
index 64c8685..421b901 100644
--- a/pages/chat.vue
+++ b/pages/chat.vue
@@ -11,6 +11,7 @@ const supabase = useSupabaseClient()
 const user = useSupabaseUser()
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const selectedChat = ref({})
 const messageText = ref("")
 
@@ -24,8 +25,8 @@ const messageText = ref("")
           @click="selectedChat = chat"
       >
         <UAlert
-            :title="chat.title ? chat.title : chat.members.map(i => { if(i !== user.id) return dataStore.getProfileById(i).fullName}).join(' ')"
-            :avatar="{alt: chat.members.map(i => { if(i !== user.id) return dataStore.getProfileById(i).fullName}).join(' ')}"
+            :title="chat.title ? chat.title : chat.members.map(i => { if(i !== user.id) return profileStore.getProfileById(i).fullName}).join(' ')"
+            :avatar="{alt: chat.members.map(i => { if(i !== user.id) return profileStore.getProfileById(i).fullName}).join(' ')}"
             :color="selectedChat.id === chat.id ? 'primary' : 'white'"
             variant="outline"
         >
@@ -49,13 +50,13 @@ const messageText = ref("")
               {{message.text}}
             </div>
             <UAvatar
-                :alt="dataStore.getProfileById(message.origin) ? dataStore.getProfileById(message.origin).fullName : ''"
+                :alt="profileStore.getProfileById(message.origin) ? profileStore.getProfileById(message.origin).fullName : ''"
                 size="md"
             />
           </div>
           <div class="flex justify-start mb-4" v-else>
             <UAvatar
-                :alt="dataStore.getProfileById(message.origin) ? dataStore.getProfileById(message.origin).fullName : ''"
+                :alt="profileStore.getProfileById(message.origin) ? profileStore.getProfileById(message.origin).fullName : ''"
                 size="md"
             />
             <div
diff --git a/pages/chats/create.vue b/pages/chats/create.vue
index 743e035..659260b 100644
--- a/pages/chats/create.vue
+++ b/pages/chats/create.vue
@@ -1,6 +1,6 @@
 <script setup>
 
-const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 
 const profiles = ref([])
@@ -10,14 +10,14 @@ const selectedProfiles = ref([])
 
 const setup = async () => {
   profiles.value = await useSupabaseSelect("profiles")
-  selectedProfiles.value = [dataStore.activeProfile.id]
+  selectedProfiles.value = [profileStore.activeProfile.id]
 }
 
 setup()
 
 const createChat = async () => {
   const {data,error} = await supabase.from("chats").insert({
-    tenant: dataStore.currentTenant,
+    tenant: profileStore.currentTenant,
     name: itemInfo.value.name
   }).select()
 
@@ -105,7 +105,7 @@ const createChat = async () => {
             :search-attributes="['fullName']"
         >
           <template #label>
-            {{selectedProfiles.length > 0 ? selectedProfiles.map(i => dataStore.getProfileById(i).fullName).join(", ") : "Keine Benutzer ausgewählt"}}
+            {{selectedProfiles.length > 0 ? selectedProfiles.map(i => profileStore.getProfileById(i).fullName).join(", ") : "Keine Benutzer ausgewählt"}}
           </template>
         </USelectMenu>
       </UFormGroup>
diff --git a/pages/chats/show/[id].vue b/pages/chats/show/[id].vue
index ee17f99..2b480d6 100644
--- a/pages/chats/show/[id].vue
+++ b/pages/chats/show/[id].vue
@@ -13,17 +13,17 @@ defineShortcuts({
 })
 
 const itemInfo = ref({})
-const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 
 const setup = async () => {
   itemInfo.value = await useSupabaseSelectSingle("chats",useRoute().params.id,"*, profiles(*), chatmessages(*)")
 
-  let unseenMessages = itemInfo.value.chatmessages.filter(i => !i.seenBy.includes(dataStore.activeProfile.id))
+  let unseenMessages = itemInfo.value.chatmessages.filter(i => !i.seenBy.includes(profileStore.activeProfile.id))
 
 
   for await (const message of unseenMessages){
-    await supabase.from("chatmessages").update({seenBy: [...message.seenBy, dataStore.activeProfile.id]}).eq("id",message.id)
+    await supabase.from("chatmessages").update({seenBy: [...message.seenBy, profileStore.activeProfile.id]}).eq("id",message.id)
   }
 
 
@@ -34,11 +34,11 @@ const messageText = ref("")
 const sendMessage = async () => {
   if(messageText.value.length > 0) {
     const message = {
-      origin: dataStore.activeProfile.id,
+      origin: profileStore.activeProfile.id,
       destinationchat: itemInfo.value.id,
       text: messageText.value,
-      tenant: dataStore.currentTenant,
-      seenBy: [dataStore.activeProfile.id]
+      tenant: profileStore.currentTenant,
+      seenBy: [profileStore.activeProfile.id]
     }
 
     const {data,error} = await supabase.from("chatmessages").insert(message)
@@ -49,11 +49,11 @@ const sendMessage = async () => {
       //Reset
       messageText.value = ""
       //Create Notifications
-      let notifications = itemInfo.value.profiles.filter(i => i.id !== dataStore.activeProfile.id).map(i => {
+      let notifications = itemInfo.value.profiles.filter(i => i.id !== profileStore.activeProfile.id).map(i => {
         return {
-          tenant: dataStore.currentTenant,
+          tenant: profileStore.currentTenant,
           profile: i.id,
-          initiatingProfile: dataStore.activeProfile.id,
+          initiatingProfile: profileStore.activeProfile.id,
           title: `Sie haben eine neue Nachricht im Chat ${itemInfo.value.name}`,
           link: `/chats/show/${itemInfo.value.id}`,
           message: message.text
@@ -88,13 +88,13 @@ const sendMessage = async () => {
   </UDashboardNavbar>
   <div class="scrollList p-5">
     <UAlert
-        :color="message.seenBy.includes(dataStore.activeProfile.id) ? 'white' : 'primary'"
-        :variant="message.seenBy.includes(dataStore.activeProfile.id) ? 'solid' : 'outline'"
+        :color="message.seenBy.includes(profileStore.activeProfile.id) ? 'white' : 'primary'"
+        :variant="message.seenBy.includes(profileStore.activeProfile.id) ? 'solid' : 'outline'"
         class="my-2"
         v-for="message in itemInfo.chatmessages"
         :description="message.text"
-        :avatar="{ alt: dataStore.getProfileById(message.origin).fullName }"
-        :title="`${dataStore.getProfileById(message.origin).fullName} - ${isToday(new Date(message.created_at)) ? dayjs(message.created_at).format('HH:mm') : dayjs(message.created_at).format('DD.MM.YYYY HH:mm')}`"
+        :avatar="{ alt: profileStore.getProfileById(message.origin).fullName }"
+        :title="`${profileStore.getProfileById(message.origin).fullName} - ${isToday(new Date(message.created_at)) ? dayjs(message.created_at).format('HH:mm') : dayjs(message.created_at).format('DD.MM.YYYY HH:mm')}`"
       />
 
   </div>
diff --git a/pages/communication/historyItems/index.vue b/pages/communication/historyItems/index.vue
index 968cf1c..8c81f86 100644
--- a/pages/communication/historyItems/index.vue
+++ b/pages/communication/historyItems/index.vue
@@ -3,6 +3,7 @@ import dayjs from "dayjs"
 
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const router = useRouter()
 
 
@@ -10,7 +11,7 @@ const items = ref([])
 
 const setup = async () => {
 
-  items.value = (await supabase.from("historyitems").select().like('text',`%@${dataStore.activeProfile.username}%`)/*.textSearch("text", `'@${dataStore.activeProfile.username}'`)*/.order("created_at")).data
+  items.value = (await supabase.from("historyitems").select().like('text',`%@${profileStore.activeProfile.username}%`)/*.textSearch("text", `'@${profileStore.activeProfile.username}'`)*/.order("created_at")).data
 }
 
 const navigateToHistoryItem = (item) => {
diff --git a/pages/contacts/[mode]/[[id]].vue b/pages/contacts/[mode]/[[id]].vue
index e4fc1d1..65f491f 100644
--- a/pages/contacts/[mode]/[[id]].vue
+++ b/pages/contacts/[mode]/[[id]].vue
@@ -23,6 +23,7 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -33,7 +34,8 @@ const openTab = ref(0)
 //Working
 const mode = ref(route.params.mode || "show")
 const itemInfo = ref({
-  active: true
+  active: true,
+  profiles: [profileStore.activeProfile.id]
 })
 const oldItemInfo = ref({})
 
@@ -300,6 +302,23 @@ setupPage()
         </template>
       </UPopover>
     </UFormGroup>
+    <UFormGroup
+        label="Berechtige Benutzer:"
+    >
+      <USelectMenu
+          v-model="itemInfo.profiles"
+          :options="profileStore.profiles"
+          option-attribute="fullName"
+          value-attribute="id"
+          searchable
+          multiple
+          :search-attributes="['fullName']"
+      >
+        <template #label>
+          {{itemInfo.profiles.length > 0 ? itemInfo.profiles.map(i => profileStore.getProfileById(i).fullName).join(", ") : "Kein Benutzer ausgewählt"}}
+        </template>
+      </USelectMenu>
+    </UFormGroup>
     <UFormGroup
         label="Notizen:"
     >
@@ -307,6 +326,7 @@ setupPage()
           v-model="itemInfo.notes"
       />
     </UFormGroup>
+
   </UForm>
 </template>
 
diff --git a/pages/contracts/[mode]/[[id]].vue b/pages/contracts/[mode]/[[id]].vue
index 3524ff6..a9eb614 100644
--- a/pages/contracts/[mode]/[[id]].vue
+++ b/pages/contracts/[mode]/[[id]].vue
@@ -24,6 +24,7 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -215,7 +216,7 @@ setupPage()
                     <td colspan="2"><span class="font-bold">Eigene Felder:</span></td>
                   </tr>
                   <tr v-for="fieldKey in Object.keys(itemInfo.ownFields)">
-                    <td>{{dataStore.ownTenant.ownFields.contracts.find(i => i.key === fieldKey).label}}</td>
+                    <td>{{profileStore.ownTenant.ownFields.contracts.find(i => i.key === fieldKey).label}}</td>
                     <td>{{itemInfo.ownFields[fieldKey]}}</td>
                   </tr>
                 </table>
@@ -491,14 +492,14 @@ setupPage()
         </UFormGroup>
 
         <div
-            v-if="dataStore.ownTenant.ownFields"
+            v-if="profileStore.ownTenant.ownFields"
         >
           <UDivider
               class="mt-3"
           >Eigene Felder</UDivider>
 
           <UFormGroup
-              v-for="field in dataStore.ownTenant.ownFields.contracts"
+              v-for="field in profileStore.ownTenant.ownFields.contracts"
               :key="field.key"
               :label="field.label"
           >
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 5551f94..eb4a76d 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -5,6 +5,7 @@ import {useNumberRange} from "~/composables/useNumberRange.js";
 import { v4 as uuidv4 } from 'uuid';
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const user = useSupabaseUser()
 const route = useRoute()
 const router = useRouter()
@@ -37,7 +38,7 @@ const itemInfo = ref({
   deliveryDateType: "Lieferdatum",
   dateOfPerformance: null,
   paymentDays: 7,
-  createdBy: dataStore.activeProfile.id,
+  createdBy: profileStore.activeProfile.id,
   title: null,
   description: null,
   startText: null,
@@ -45,7 +46,7 @@ const itemInfo = ref({
   rows: [
 
   ],
-  contactPerson: dataStore.activeProfile.id,
+  contactPerson: profileStore.activeProfile.id,
   contactPersonName: null,
   contactTel: null,
   contactEMail: null,
@@ -74,6 +75,7 @@ const servicecategories = ref([])
 const selectedServicecategorie = ref(null)
 const customers = ref([])
 const contacts = ref([])
+const texttemplates = ref([])
 
 const loaded = ref(false)
 const setupPage = async () => {
@@ -87,6 +89,7 @@ const setupPage = async () => {
   productcategories.value = (await useSupabaseSelect("productcategories","*"))
   customers.value = (await useSupabaseSelect("customers","*","customerNumber"))
   contacts.value = (await useSupabaseSelect("contacts","*"))
+  texttemplates.value = (await useSupabaseSelect("texttemplates","*"))
   if(productcategories.value.length > 0) selectedProductcategorie.value = productcategories.value[0].id
   if(servicecategories.value.length > 0) selectedServicecategorie.value = servicecategories.value[0].id
 
@@ -216,8 +219,8 @@ const setDocumentTypeConfig = (withTexts = false) => {
   }
 
   if(withTexts) {
-    itemInfo.value.startText = dataStore.getTextTemplatesByDocumentType(itemInfo.value.type).find(i => i.default && i.pos === "startText").text
-    itemInfo.value.endText = dataStore.getTextTemplatesByDocumentType(itemInfo.value.type).find(i => i.default && i.pos === "endText").text
+    itemInfo.value.startText = texttemplates.value.find(i => i.documentType === itemInfo.value.type && i.default && i.pos === "startText").text
+    itemInfo.value.endText = texttemplates.value.find(i => i.documentType === itemInfo.value.type && i.default && i.pos === "endText").text
   }
 
   itemInfo.value.letterhead = letterheads.value[0].id
@@ -310,7 +313,7 @@ const addPosition = (mode) => {
       discountPercent: 0
     }
 
-    itemInfo.value.rows.push({...rowData, ...dataStore.ownTenant.extraModules.includes("agriculture") ? {agriculture: {}}: {}})
+    itemInfo.value.rows.push({...rowData, ...profileStore.ownTenant.extraModules.includes("agriculture") ? {agriculture: {}}: {}})
 
   } else if(mode === 'normal'){
     itemInfo.value.rows.push({
@@ -334,7 +337,7 @@ const addPosition = (mode) => {
     }
 
     //Push Agriculture Holder only if Module is activated
-    itemInfo.value.rows.push({...rowData, ...dataStore.ownTenant.extraModules.includes("agriculture") ? {agriculture: {}}: {}})
+    itemInfo.value.rows.push({...rowData, ...profileStore.ownTenant.extraModules.includes("agriculture") ? {agriculture: {}}: {}})
   } else if(mode === "pagebreak") {
     itemInfo.value.rows.push({
       id: uuidv4(),
@@ -373,7 +376,7 @@ const removePosition = (id) => {
 
 const getRowMargin = (row) => {
   if(row.mode === "normal" && row.product) {
-    let purchasePrice = dataStore.getProductById(row.product).purchasePrice || 0
+    let purchasePrice = products.value.find(i => i.id === row.product).purchasePrice || 0
     return row.price - purchasePrice
   } else {
     return 0
@@ -530,9 +533,9 @@ const getDocumentData = () => {
 
   let customerData = dataStore.getCustomerById(itemInfo.value.customer)
   let contactData = dataStore.getContactById(itemInfo.value.contact)
-  let businessInfo = dataStore.ownTenant.businessInfo
+  let businessInfo = profileStore.ownTenant.businessInfo
 
-  if(dataStore.ownTenant.extraModules.includes("agriculture")) {
+  if(profileStore.ownTenant.extraModules.includes("agriculture")) {
     itemInfo.value.rows.forEach(row => {
       if(row.agriculture && row.agriculture.dieselUsage) {
         row.agriculture.description = `${row.agriculture.dieselUsage} L Diesel zu ${renderCurrency(row.agriculture.dieselPrice)}/L verbraucht ${row.description ? "\n" + row.description : ""}`
@@ -555,7 +558,7 @@ const getDocumentData = () => {
     }
 
     if(!['pagebreak','title','text'].includes(row.mode)) {
-      if(row.mode === 'normal') row.text = dataStore.getProductById(row.product).name
+      if(row.mode === 'normal') row.text = products.value.find(i => i.id === row.product).name
       if(row.mode === 'service') row.text = dataStore.getServiceById(row.service).name
 
 
@@ -630,7 +633,7 @@ const getDocumentData = () => {
 const showDocument = ref(false)
 const uri = ref("")
 const generateDocument = async () => {
-  const ownTenant = dataStore.ownTenant
+  const ownTenant = profileStore.ownTenant
   const path = letterheads.value.find(i => i.id === itemInfo.value.letterhead).path
 
 
@@ -717,7 +720,7 @@ const saveDocument = async (state) => {
     setDocumentTypeConfig(false)
   }
 
-  if(dataStore.ownTenant.extraModules.includes("agriculture")) {
+  if(profileStore.ownTenant.extraModules.includes("agriculture")) {
     itemInfo.value.rows.forEach(row => {
       if(row.agriculture && row.agriculture.dieselUsage) {
         row.agriculture.description = `${row.agriculture.dieselUsage} L Diesel zu ${renderCurrency(row.agriculture.dieselPrice)}/L verbraucht ${row.description ? "\n" + row.description : ""}`
@@ -1193,7 +1196,7 @@ setupPage()
                   label="Ansprechpartner:"
               >
                 <USelectMenu
-                    :options="dataStore.profiles"
+                    :options="profileStore.profiles"
                     v-model="itemInfo.contactPerson"
                     option-attribute="fullName"
                     value-attribute="id"
@@ -1464,12 +1467,12 @@ setupPage()
                           searchable-placeholder="Suche ..."
                           :search-attributes="['name']"
                           v-model="row.product"
-                          @change="row.unit = dataStore.getProductById(row.product).unit,
-                             row.price = (dataStore.getProductById(row.product).sellingPrice || 0),
-                             row.description = dataStore.getProductById(row.product).description"
+                          @change="row.unit = products.find(i => i.id === row.product).unit,
+                             row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
+                             row.description = products.find(i => i.id === row.product).description"
                       >
                         <template #label>
-                          <span class="truncate">{{row.product ? dataStore.getProductById(row.product).name : "Kein Produkt ausgewählt" }}</span>
+                          <span class="truncate">{{row.product ? products.find(i => i.id === row.product).name : "Kein Produkt ausgewählt" }}</span>
                         </template>
                       </USelectMenu>
                       <UButton
@@ -1503,9 +1506,9 @@ setupPage()
                             :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
                             @select=" (i) => {
                              row.product = i.id
-                             row.unit = dataStore.getProductById(row.product).unit,
-                             row.price = (dataStore.getProductById(row.product).sellingPrice || 0),
-                             row.description = dataStore.getProductById(row.product).description
+                             row.unit = products.find(i => i.id === row.product).unit,
+                             row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
+                             row.description = products.find(i => i.id === row.product).description
                               showProductSelectionModal = false}"
                           >
 
@@ -1514,9 +1517,6 @@ setupPage()
                       </UModal>
                     </InputGroup>
 
-<!--
-                    {{dataStore.getProductById(66)}}
--->
                   </td>
                   <td
                       class="w-120"
diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue
index de8ed43..3bff7e7 100644
--- a/pages/createDocument/index.vue
+++ b/pages/createDocument/index.vue
@@ -280,10 +280,6 @@ const isPaid = (item) => {
   let amountPaid = 0
   item.statementallocations.forEach(allocation => amountPaid += allocation.amount)
 
-  console.log(item.documentNumber)
-  console.log(amountPaid)
-  console.log(calculateDocSum(item))
-
   return Number(amountPaid.toFixed(2)) === Number(calculateDocSum(item))
 }
 </script>
diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue
index eae1a75..00bd902 100644
--- a/pages/createDocument/show/[id].vue
+++ b/pages/createDocument/show/[id].vue
@@ -12,6 +12,7 @@ defineShortcuts({
 const supabase = useSupabaseClient()
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 
@@ -26,7 +27,7 @@ const setupPage = async () => {
 
   }
 
-  currentTenant.value = (await supabase.from("tenants").select().eq("id",dataStore.currentTenant).single()).data
+  currentTenant.value = (await supabase.from("tenants").select().eq("id",profileStore.currentTenant).single()).data
   console.log(currentTenant.value)
 
 }
diff --git a/pages/customers/[mode]/[[id]].vue b/pages/customers/[mode]/[[id]].vue
index fbe2abb..74310b6 100644
--- a/pages/customers/[mode]/[[id]].vue
+++ b/pages/customers/[mode]/[[id]].vue
@@ -23,10 +23,9 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
 
 const openTab = ref(0)
 
@@ -39,7 +38,8 @@ const itemInfo = ref({
     country: "Deutschland"
   },
   active: true,
-  isCompany: true
+  isCompany: true,
+  profiles: [profileStore.activeProfile.id]
 })
 const oldItemInfo = ref({})
 
@@ -356,6 +356,23 @@ setupPage()
             v-model="itemInfo.infoData.ustid"
         />
       </UFormGroup>
+      <UFormGroup
+          label="Berechtigte Benutzer:"
+      >
+        <USelectMenu
+            v-model="itemInfo.profiles"
+            :options="profileStore.profiles"
+            option-attribute="fullName"
+            value-attribute="id"
+            searchable
+            multiple
+            :search-attributes="['fullName']"
+        >
+          <template #label>
+            {{itemInfo.profiles.length > 0 ? itemInfo.profiles.map(i => profileStore.getProfileById(i).fullName).join(", ") : "Kein Benutzer ausgewählt"}}
+          </template>
+        </USelectMenu>
+      </UFormGroup>
     </UForm>
   </UDashboardPanelContent>
 
diff --git a/pages/users/[mode]/[[id]].vue b/pages/deprecated/users/[mode]/[[id]].vue
similarity index 98%
rename from pages/users/[mode]/[[id]].vue
rename to pages/deprecated/users/[mode]/[[id]].vue
index a4d2b19..08f498a 100644
--- a/pages/users/[mode]/[[id]].vue
+++ b/pages/deprecated/users/[mode]/[[id]].vue
@@ -11,6 +11,7 @@ definePageMeta({
 
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const route = useRoute()
 const router = useRouter()
@@ -81,7 +82,7 @@ const filteredTimes = computed(() => {
 //Functions
 const setupPage = () => {
   if(mode.value === "show" || mode.value === "edit"){
-    currentItem = dataStore.getProfileById(useRoute().params.id)
+    currentItem = profileStore.getProfileById(useRoute().params.id)
   }
 
   itemInfo.value = currentItem
@@ -337,7 +338,7 @@ setupPage()
                 <div class="text-right">{{dayjs(row.end).format("HH:mm")}}</div>
               </template>
               <template #user-data="{row}">
-                {{dataStore.getProfileById(row.user) ? dataStore.getProfileById(row.user).fullName : ""}}
+                {{profileStore.getProfileById(row.user) ? profileStore.getProfileById(row.user).fullName : ""}}
               </template>
               <template #duration-data="{row}">
                 <div class="text-right">{{ getDuration(row).composed}} Std</div>
diff --git a/pages/users/index.vue b/pages/deprecated/users/index.vue
similarity index 100%
rename from pages/users/index.vue
rename to pages/deprecated/users/index.vue
diff --git a/pages/documents.vue b/pages/documents.vue
index eee0793..9753c16 100644
--- a/pages/documents.vue
+++ b/pages/documents.vue
@@ -8,6 +8,7 @@ definePageMeta({
   middleware: "auth"
 })
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const user = useSupabaseUser()
 const toast = useToast()
@@ -21,7 +22,7 @@ const uploadInProgress = ref(false)
 const fileUploadFormData = ref({
   tags: ["Eingang"],
   path: "",
-  tenant: dataStore.currentTenant,
+  tenant: profileStore.currentTenant,
   folder: null
 })
 
@@ -163,7 +164,7 @@ const uploadFiles = async (files) => {
   uploadInProgress.value = true;
 
   if(files) {
-    await dataStore.uploadFiles({tags: ["Ablage"],tenant: dataStore.currentTenant,folder: currentFolder.value.id}, files, true)
+    await dataStore.uploadFiles({tags: ["Ablage"],tenant: profileStore.currentTenant,folder: currentFolder.value.id}, files, true)
 
   } else {
     await dataStore.uploadFiles(fileUploadFormData.value, document.getElementById("fileUploadInput").files, true)
diff --git a/pages/email/index.vue b/pages/email/index.vue
index 13ce4f0..f0f4e30 100644
--- a/pages/email/index.vue
+++ b/pages/email/index.vue
@@ -2,6 +2,7 @@
 
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 
 
 const selectedTab = ref(0)
@@ -12,7 +13,7 @@ const accountData = ref(null)
 const availableAccounts = ref(null)
 const selectedAccount = ref(null)
 const setupPage = async () => {
-  availableAccounts.value = (await supabase.from("emailAccounts").select("*").contains("profiles",[dataStore.activeProfile.id])).data
+  availableAccounts.value = (await supabase.from("emailAccounts").select("*").contains("profiles",[profileStore.activeProfile.id])).data
   console.log(availableAccounts.value)
 
   if(availableAccounts.value.length > 0) {
diff --git a/pages/email/new.vue b/pages/email/new.vue
index cfce0cd..8e935d6 100644
--- a/pages/email/new.vue
+++ b/pages/email/new.vue
@@ -2,6 +2,7 @@
 
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -29,7 +30,7 @@ const setupPage = async () => {
   } else {
     emailData.value.account = emailAccounts.value[0].id
 
-    preloadedContent.value = `<p></p><p></p><p></p>${dataStore.activeProfile.emailSignature}`
+    preloadedContent.value = `<p></p><p></p><p></p>${profileStore.activeProfile.emailSignature}`
 
     //Check Query
     if(route.query.to) emailData.value.to = route.query.to
diff --git a/pages/employees/timetracking.vue b/pages/employees/timetracking.vue
index 257356d..88d2c4a 100644
--- a/pages/employees/timetracking.vue
+++ b/pages/employees/timetracking.vue
@@ -9,6 +9,7 @@ definePageMeta({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const user = useSupabaseUser()
 const toast = useToast()
@@ -111,7 +112,7 @@ const startTime = async () => {
   console.log("started")
   timeInfo.value.user = user.value.id
   timeInfo.value.start = new Date().toISOString()
-  timeInfo.value.tenant = dataStore.currentTenant
+  timeInfo.value.tenant = profileStore.currentTenant
 
   const {data,error} = await supabase
       .from("times")
@@ -162,7 +163,7 @@ if(dataStore.times.find(time => time.user == user.value.id && !time.end)) {
 const createTime = async () => {
   const {data,error} = await supabase
       .from("times")
-      .insert({...itemInfo.value, tenant: dataStore.currentTenant})
+      .insert({...itemInfo.value, tenant: profileStore.currentTenant})
       .select()
 
   if(error) {
@@ -241,13 +242,13 @@ const setState = async (newState) => {
       </UButton>
       <USelectMenu
           v-if="dataStore.hasRight('viewTimes')"
-          :options="dataStore.profiles"
+          :options="profileStore.profiles"
           option-attribute="fullName"
           value-attribute="id"
           v-model="filterUser"
       >
         <template #label>
-          {{dataStore.getProfileById(filterUser) ? dataStore.getProfileById(filterUser).fullName : "Kein Benutzer ausgewählt"}}
+          {{profileStore.getProfileById(filterUser) ? profileStore.getProfileById(filterUser).fullName : "Kein Benutzer ausgewählt"}}
         </template>
       </USelectMenu>
     </template>
@@ -339,14 +340,14 @@ const setState = async (newState) => {
           label="Benutzer:"
       >
         <USelectMenu
-            :options="dataStore.profiles"
+            :options="profileStore.profiles"
             v-model="itemInfo.user"
             option-attribute="fullName"
             value-attribute="id"
             :disabled="(configTimeMode === 'create' ? false : itemInfo.state !== 'Entwurf') || (!dataStore.hasRight('createTime') || !dataStore.hasRight('createOwnTime'))"
         >
           <template #label>
-            {{dataStore.profiles.find(profile => profile.id === itemInfo.user) ? dataStore.profiles.find(profile => profile.id === itemInfo.user).fullName : "Benutzer auswählen"}}
+            {{profileStore.profiles.find(profile => profile.id === itemInfo.user) ? profileStore.profiles.find(profile => profile.id === itemInfo.user).fullName : "Benutzer auswählen"}}
           </template>
         </USelectMenu>
       </UFormGroup>
@@ -444,7 +445,7 @@ const setState = async (newState) => {
       >{{row.state}}</span>
     </template>
     <template #user-data="{row}">
-      {{dataStore.profiles.find(profile => profile.id === row.user) ? dataStore.profiles.find(profile => profile.id === row.user).fullName : row.user }}
+      {{profileStore.profiles.find(profile => profile.id === row.user) ? profileStore.profiles.find(profile => profile.id === row.user).fullName : row.user }}
     </template>
 
     <template #start-data="{row}">
diff --git a/pages/events/[mode]/[[id]].vue b/pages/events/[mode]/[[id]].vue
index b10130f..411314b 100644
--- a/pages/events/[mode]/[[id]].vue
+++ b/pages/events/[mode]/[[id]].vue
@@ -4,6 +4,7 @@ import dayjs from "dayjs";
 const route = useRoute()
 const router = useRouter()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 
 const mode = ref(route.params.mode || "show")
 
@@ -13,7 +14,7 @@ const itemInfo = ref({
 })
 const oldItemInfo = ref({})
 
-const resourceToAdd = ref(dataStore.activeProfile.id)
+const resourceToAdd = ref(profileStore.activeProfile.id)
 /*const mapResources = () => {
   console.log(itemInfo.value.resources)
   itemInfo.value.resources.map(resource => {
diff --git a/pages/index.vue b/pages/index.vue
index b9e1bd3..df0bf44 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -18,7 +18,7 @@
             title="Anwesenheiten"
           v-if="dataStore.getStartedWorkingTimes().length > 0"
         >
-          <p v-for="time in dataStore.getStartedWorkingTimes()"><UIcon name="i-heroicons-check"/>{{dataStore.getProfileById(time.profile).fullName}}</p>
+          <p v-for="time in dataStore.getStartedWorkingTimes()"><UIcon name="i-heroicons-check"/>{{profileStore.getProfileById(time.profile).fullName}}</p>
         </UDashboardCard>
 
 <!--TODO: Fix Card Table overflowing        <UDashboardCard
@@ -27,7 +27,7 @@
           class="w-1/2 h-1/2"
         >
           <UTable
-            :rows="dataStore.tasks.filter(i => i.categorie !== 'Erledigt' && (i.profile === dataStore.activeProfile.id ||!i.profile))"
+            :rows="dataStore.tasks.filter(i => i.categorie !== 'Erledigt' && (i.profile === profileStore.activeProfile.id ||!i.profile))"
             @select="(row) => router.push(`/tasks/show/${row.id}`)"
             :columns="[
                 {
@@ -69,6 +69,7 @@ definePageMeta({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const toast = useToast()
 const router = useRouter()
 
diff --git a/pages/inventory/index.vue b/pages/inventory/index.vue
index 8ba428f..8407047 100644
--- a/pages/inventory/index.vue
+++ b/pages/inventory/index.vue
@@ -4,6 +4,7 @@ definePageMeta({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const router = useRouter()
 const mode = ref("incoming")
@@ -41,8 +42,8 @@ const createMovement = async () => {
       spaceId: inventoryChangeData.value.destinationSpaceId,
       projectId: inventoryChangeData.value.destinationProjectId,
       quantity: inventoryChangeData.value.quantity,
-      profileId: dataStore.activeProfile.id,
-      tenant: dataStore.currentTenant
+      profileId: profileStore.activeProfile.id,
+      tenant: profileStore.currentTenant
     }
 
     movements.push(movement)
@@ -61,8 +62,8 @@ const createMovement = async () => {
       spaceId: inventoryChangeData.value.sourceSpaceId,
       projectId: inventoryChangeData.value.sourceProjectId,
       quantity: inventoryChangeData.value.quantity * -1,
-      profileId: dataStore.activeProfile.id,
-      tenant: dataStore.currentTenant
+      profileId: profileStore.activeProfile.id,
+      tenant: profileStore.currentTenant
     }
 
     movements.push(movement)
@@ -72,16 +73,16 @@ const createMovement = async () => {
       spaceId: inventoryChangeData.value.sourceSpaceId,
       projectId: inventoryChangeData.value.sourceProjectId,
       quantity: inventoryChangeData.value.quantity * -1,
-      profileId: dataStore.activeProfile.id,
-      tenant: dataStore.currentTenant
+      profileId: profileStore.activeProfile.id,
+      tenant: profileStore.currentTenant
     }
     let inMovement = {
       productId: inventoryChangeData.value.productId,
       spaceId: inventoryChangeData.value.destinationSpaceId,
       projectId: inventoryChangeData.value.destinationProjectId,
       quantity: inventoryChangeData.value.quantity,
-      profileId: dataStore.activeProfile.id,
-      tenant: dataStore.currentTenant
+      profileId: profileStore.activeProfile.id,
+      tenant: profileStore.currentTenant
     }
 
     movements.push(outMovement)
diff --git a/pages/login.vue b/pages/login.vue
index 9d642f0..05c6225 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,5 +1,7 @@
 <script setup >
 
+import {useProfileStore} from "~/stores/profile.js";
+
 definePageMeta({
   layout: "notLoggedIn"
 })
@@ -8,8 +10,8 @@ const supabase = useSupabaseClient()
 const user = useSupabaseUser()
 const router = useRouter()
 const colorMode = useColorMode()
-const dataStore = useDataStore()
 const toast = useToast()
+const profileStore = useProfileStore()
 
 const isLight = computed({
   get () {
@@ -61,7 +63,7 @@ const onSubmit = async (data) => {
 
   } else {
     //console.log("Login Successful")
-    dataStore.initializeData(user.id)
+    profileStore.initializeData(user.id)
     router.push("/")
 
 
diff --git a/pages/plants/[mode]/[[id]].vue b/pages/plants/[mode]/[[id]].vue
index c6c9110..b0a1ffd 100644
--- a/pages/plants/[mode]/[[id]].vue
+++ b/pages/plants/[mode]/[[id]].vue
@@ -20,9 +20,6 @@ const id = ref(route.params.id ? route.params.id : null )
 //Working
 const mode = ref(route.params.mode || "show")
 const itemInfo = ref({
-  description: {
-    html: ""
-  }
 })
 
 const tabItems = [
@@ -105,7 +102,7 @@ setupPage()
         Erstellen
       </UButton>
       <UButton
-          @click="router.push(itemInfo.id ? `/plants/show/${itemInfo.value.id}` : `/plants/`)"
+          @click="router.push(itemInfo.id ? `/plants/show/${itemInfo.id}` : `/plants/`)"
           color="red"
           class="ml-2"
           v-if="mode === 'edit' || mode === 'create'"
@@ -144,7 +141,7 @@ setupPage()
               </tr>
             </table>
           </div>
-          <div v-if="itemInfo.description.html">
+          <div v-if="itemInfo.description">
             <p>Notizen:</p>
             <span v-html="itemInfo.description.html"></span>
           </div>
diff --git a/pages/products/[mode]/[[id]].vue b/pages/products/[mode]/[[id]].vue
index faeb1c4..eb844a6 100644
--- a/pages/products/[mode]/[[id]].vue
+++ b/pages/products/[mode]/[[id]].vue
@@ -25,6 +25,7 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const route = useRoute()
 const router = useRouter()
@@ -270,7 +271,7 @@ setupPage()
     >
       <USelectMenu
           v-model="itemInfo.tags"
-          :options="dataStore.ownTenant.tags.products"
+          :options="profileStore.ownTenant.tags.products"
           multiple
       >
         <template #label>
diff --git a/pages/profiles/index.vue b/pages/profiles/index.vue
index 0f9bf3a..ad44dde 100644
--- a/pages/profiles/index.vue
+++ b/pages/profiles/index.vue
@@ -1,5 +1,6 @@
 <script setup>
   const dataStore = useDataStore()
+  const profileStore = useProfileStore()
   const router = useRouter()
 
 
@@ -35,7 +36,7 @@
   </UDashboardNavbar>
 
   <UTable
-    :rows="dataStore.profiles"
+    :rows="profileStore.profiles"
     @select="(item) => router.push(`/profiles/show/${item.id}`)"
     :columns="columns"
   >
diff --git a/pages/profiles/show/[id].vue b/pages/profiles/show/[id].vue
index 81368c8..298eec8 100644
--- a/pages/profiles/show/[id].vue
+++ b/pages/profiles/show/[id].vue
@@ -12,6 +12,7 @@ dayjs.extend(isoWeek)
 dayjs.extend(isBetween)
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const supabase = useSupabaseClient()
@@ -33,7 +34,7 @@ const setupPage = async () => {
 
 setupPage()
 
-const emailSignature = ref(dataStore.activeProfile.emailSignature)
+const emailSignature = ref(profileStore.activeProfile.emailSignature)
 const tiptapLoaded = ref(false)
 const contentSaved = ref(true)
 const contentChanged = async (content) => {
@@ -49,7 +50,7 @@ const contentChanged = async (content) => {
 
 
 const saveSignature = async () => {
-  const {data,error} = await supabase.from("profiles").update({emailSignature: emailSignature.value}).eq("id", dataStore.activeProfile.id)
+  const {data,error} = await supabase.from("profiles").update({emailSignature: emailSignature.value}).eq("id", profileStore.activeProfile.id)
 
   if(error) {
     toast.add({title: "Fehler beim Speichern der Signatur", color:"rose"})
@@ -66,8 +67,8 @@ const addToNewsletter = async () => {
     url: "https://newsletter.fedeo.io/api/public/subscription",
     method: "post",
     data: {
-      email: dataStore.activeProfile.email,
-      name: dataStore.activeProfile.name,
+      email: profileStore.activeProfile.email,
+      name: profileStore.activeProfile.name,
       list_uuids: ["b97453fd-14b2-4b25-8f9b-b83847317ea3"],
 
     }
@@ -227,12 +228,12 @@ const isLight = computed({
             </UFormGroup>
           </InputGroup>
 
-          <UDivider class="my-5" v-if="dataStore.activeProfile.id === itemInfo.id">
+          <UDivider class="my-5" v-if="profileStore.activeProfile.id === itemInfo.id">
             Helligkeitseinstellung
           </UDivider>
 
           <UButton
-              v-if="dataStore.activeProfile.id === itemInfo.id"
+              v-if="profileStore.activeProfile.id === itemInfo.id"
               :icon="isLight ? 'i-heroicons-moon-20-solid' : 'i-heroicons-sun-20-solid'"
               color="white"
               variant="outline"
diff --git a/pages/projects/[mode]/[[id]].vue b/pages/projects/[mode]/[[id]].vue
index 9084b14..f4b4d7b 100644
--- a/pages/projects/[mode]/[[id]].vue
+++ b/pages/projects/[mode]/[[id]].vue
@@ -23,6 +23,7 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const user = useSupabaseUser()
 const route = useRoute()
@@ -90,11 +91,9 @@ const mode = ref(route.params.mode || "show")
 const itemInfo = ref({
   name: "",
   customer: 0,
-  users: [dataStore.activeProfile.id]
+  profiles: [profileStore.activeProfile.id]
 })
 const oldItemInfo = ref({})
-const tags = dataStore.getDocumentTags
-const phasesTemplates = ref([])
 
 const plants = ref([])
 const contracts = ref([])
@@ -180,7 +179,7 @@ const changeActivePhase = async (key) => {
     if(p.key === key) {
       p.active = true
       p.activated_at = dayjs().format()
-      p.activated_by = dataStore.activeProfile.id
+      p.activated_by = profileStore.activeProfile.id
       phaseLabel = p.label
     }
 
@@ -191,8 +190,8 @@ const changeActivePhase = async (key) => {
 
   await supabase.from("projects").update({phases: item.phases}).eq("id",item.id)
   const {error} = await supabase.from("historyitems").insert({
-    createdBy: dataStore.activeProfile.id,
-    tenant: dataStore.currentTenant,
+    createdBy: profileStore.activeProfile.id,
+    tenant: profileStore.currentTenant,
     text: `Aktive Phase zu "${phaseLabel}" gewechselt`,
     project: item.id
   })
@@ -304,8 +303,8 @@ const invoiceDeliveryNotes = () => {
               <h1 class="font-bold text-lg mb-3">Beteiligte Benutzer:</h1>
               <UAlert
                   v-for="projectUser in itemInfo.profiles"
-                  :avatar="{ alt: dataStore.getProfileById(projectUser).fullName }"
-                  :title="dataStore.getProfileById(projectUser).fullName"
+                  :avatar="{ alt: profileStore.getProfileById(projectUser).fullName }"
+                  :title="profileStore.getProfileById(projectUser).fullName"
                   class="mb-3"
 
               />
@@ -378,7 +377,7 @@ const invoiceDeliveryNotes = () => {
 
                   <div>
                     <p v-if="item.activated_at" class="text-black">Aktiviert am: {{dayjs(item.activated_at).format("DD.MM.YY HH:mm")}} Uhr</p>
-                    <p v-if="item.activated_by" class="text-black">Aktiviert durch: {{dataStore.getProfileById(item.activated_by).fullName}}</p>
+                    <p v-if="item.activated_by" class="text-black">Aktiviert durch: {{profileStore.getProfileById(item.activated_by).fullName}}</p>
                     <p v-if="item.description" class="text-black">Beschreibung: {{item.description}}</p>
                   </div>
                 </UCard>
@@ -406,7 +405,7 @@ const invoiceDeliveryNotes = () => {
 
             >
               <template #user-data="{row}">
-                {{dataStore.profiles.find(i => i.id === row.user) ? dataStore.profiles.find(i => i.id === row.user).fullName : ""}}
+                {{profileStore.profiles.find(i => i.id === row.user) ? profileStore.profiles.find(i => i.id === row.user).fullName : ""}}
               </template>
             </UTable>
           </UCard>
@@ -462,7 +461,7 @@ const invoiceDeliveryNotes = () => {
                 <span v-if="row.type === 'deliveryNotes'">Lieferschein</span>
               </template>
               <template #createdBy-data="{row}">
-                {{dataStore.getProfileById(row.createdBy).fullName}}
+                {{profileStore.getProfileById(row.createdBy).fullName}}
               </template>
             </UTable>
 
@@ -482,7 +481,7 @@ const invoiceDeliveryNotes = () => {
                 :empty-state="{ icon: 'i-heroicons-clock', label: 'Noch keine Zeiten in diesem Projekt' }"
             >
               <template #user-data="{row}">
-                {{dataStore.profiles.find(profile => profile.id === row.user) ? dataStore.profiles.find(profile => profile.id === row.user).fullName : row.user }}
+                {{profileStore.profiles.find(profile => profile.id === row.user) ? profileStore.profiles.find(profile => profile.id === row.user).fullName : row.user }}
               </template>
               <template #duration-data="{row}">
                 {{(row.start && row.end) ? `${String(dayjs(row.end).diff(row.start,'hour',true).toFixed(2)).replace(".",",")} h` : ""}}
@@ -640,11 +639,11 @@ const invoiceDeliveryNotes = () => {
 
 
       <UFormGroup
-          label="Beteiligte Benutzer:"
+          label="Berechtigte Benutzer:"
       >
         <USelectMenu
             v-model="itemInfo.profiles"
-            :options="dataStore.profiles"
+            :options="profileStore.profiles"
             option-attribute="fullName"
             value-attribute="id"
             searchable
@@ -652,7 +651,7 @@ const invoiceDeliveryNotes = () => {
             :search-attributes="['fullName']"
         >
           <template #label>
-            {{itemInfo.profiles.length > 0 ? itemInfo.profiles.map(i => dataStore.getProfileById(i).fullName).join(", ") : "Kein Benutzer ausgewählt"}}
+            {{itemInfo.profiles.length > 0 ? itemInfo.profiles.map(i => profileStore.getProfileById(i).fullName).join(", ") : "Kein Benutzer ausgewählt"}}
           </template>
         </USelectMenu>
       </UFormGroup>
diff --git a/pages/services/[mode]/[[id]].vue b/pages/services/[mode]/[[id]].vue
index 816f7c4..d0e4e32 100644
--- a/pages/services/[mode]/[[id]].vue
+++ b/pages/services/[mode]/[[id]].vue
@@ -20,6 +20,7 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -210,7 +211,7 @@ setupPage()
     >
       <USelectMenu
           v-model="itemInfo.tags"
-          :options="dataStore.ownTenant.tags.products"
+          :options="profileStore.ownTenant.tags.products"
           multiple
       />
     </UFormGroup>
diff --git a/pages/settings/banking/index.vue b/pages/settings/banking/index.vue
index 346a7e2..4877adf 100644
--- a/pages/settings/banking/index.vue
+++ b/pages/settings/banking/index.vue
@@ -1,5 +1,6 @@
 <script setup>
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const supabase = useSupabaseClient()
 const toast = useToast()
@@ -43,7 +44,7 @@ const generateLink = async () => {
       body: {
         method: "generateLink",
         institutionId: bankData.value.id,
-        tenant: dataStore.currentTenant
+        tenant: profileStore.currentTenant
       }
     })
 
@@ -62,7 +63,7 @@ const addAccount = async (account) => {
       accountId: account.id,
       ownerName: account.owner_name,
       iban: account.iban,
-      tenant: dataStore.currentTenant,
+      tenant: profileStore.currentTenant,
       bankId: account.institution_id
     }
 
diff --git a/pages/settings/emailAccounts.vue b/pages/settings/emailAccounts.vue
index b65a4e4..37357c4 100644
--- a/pages/settings/emailAccounts.vue
+++ b/pages/settings/emailAccounts.vue
@@ -2,6 +2,7 @@
 import axios from "axios"
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 
 const createEMailAddress = ref("")
 const createEMailType = ref("imap")
@@ -22,7 +23,7 @@ const createAccount = async () => {
     body: {
       emailAddress: createEMailAddress.value,
       accountType: createEMailType.value,
-      profile: dataStore.activeProfile.id
+      profile: profileStore.activeProfile.id
     }
   })
 
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
index 572bdae..78654d9 100644
--- a/pages/settings/index.vue
+++ b/pages/settings/index.vue
@@ -3,6 +3,7 @@ definePageMeta({
   middleware: "auth"
 })
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const router = useRouter()
 
@@ -71,14 +72,14 @@ const isLight = computed({
           />
           <InputGroup>
             <UBadge
-                v-for="tag in dataStore.ownTenant.tags.documents"
+                v-for="tag in profileStore.ownTenant.tags.documents"
             >
               {{tag}}
             </UBadge>
           </InputGroup>
 
 
-          {{dataStore.ownTenant.tags}}
+          {{profileStore.ownTenant.tags}}
         </div>
       </UCard>
 
diff --git a/pages/settings/labels/[mode]/[[id]].vue b/pages/settings/labels/[mode]/[[id]].vue
index 0095ffe..ca0b2a0 100644
--- a/pages/settings/labels/[mode]/[[id]].vue
+++ b/pages/settings/labels/[mode]/[[id]].vue
@@ -87,6 +87,7 @@ defineShortcuts({
 const router = useRouter()
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const mode = useRoute().params.mode
 const openTab = ref(0)
 
@@ -106,7 +107,7 @@ const renderDemoZPL = () => {
 
 const printLabel = async () => {
   await supabase.from("printJobs").insert({
-    tenant: dataStore.currentTenant,
+    tenant: profileStore.currentTenant,
     rawContent: useGenerateZPL(itemInfo.value.handlebarsZPL,{barcode:"XXX"}),
     printerName: "ZD411",
     printServer: "0dbe30f3-3008-4cde-8a7c-e785b1c22bfc"
diff --git a/pages/settings/numberRanges.vue b/pages/settings/numberRanges.vue
index c3633e8..ec2ce00 100644
--- a/pages/settings/numberRanges.vue
+++ b/pages/settings/numberRanges.vue
@@ -5,6 +5,8 @@ definePageMeta({
 
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
+const profileStore = useProfileStore()
 
 
 
@@ -38,14 +40,14 @@ const resources = {
   }
 }
 
-const numberRanges = ref(dataStore.ownTenant.numberRanges)
+const numberRanges = ref(profileStore.ownTenant.numberRanges)
 
 const updateNumberRanges = async (range) => {
 
   const {data,error} = await supabase
       .from("tenants")
       .update({numberRanges: numberRanges.value})
-      .eq('id',dataStore.currentTenant)
+      .eq('id',profileStore.currentTenant)
 
   await dataStore.fetchOwnTenant()
 }
diff --git a/pages/settings/ownfields.vue b/pages/settings/ownfields.vue
index f5b5bda..857233d 100644
--- a/pages/settings/ownfields.vue
+++ b/pages/settings/ownfields.vue
@@ -16,12 +16,6 @@ const setupPage = async () => {
   >
 
   </UDashboardNavbar>
-
-
-
-
-
-  {{dataStore.ownTenant.ownFields}}
 </template>
 
 <style scoped>
diff --git a/pages/settings/tenant.vue b/pages/settings/tenant.vue
index 9995a46..b99d2b7 100644
--- a/pages/settings/tenant.vue
+++ b/pages/settings/tenant.vue
@@ -1,6 +1,7 @@
 <script setup>
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 
 const itemInfo = ref({
@@ -10,17 +11,17 @@ const itemInfo = ref({
 })
 
 const setupPage = async () => {
-  itemInfo.value = (await supabase.from("tenants").select().eq("id",dataStore.currentTenant).single()).data
+  itemInfo.value = (await supabase.from("tenants").select().eq("id",profileStore.currentTenant).single()).data
   console.log(itemInfo.value)
 }
 
-const features = ref(dataStore.ownTenant.features)
-const businessInfo = ref(dataStore.ownTenant.businessInfo)
+const features = ref(profileStore.ownTenant.features)
+const businessInfo = ref(profileStore.ownTenant.businessInfo)
 
 const updateTenant = async (newData) => {
     const {data,error} = await supabase.from("tenants")
         .update(newData)
-        .eq("id",dataStore.currentTenant)
+        .eq("id",profileStore.currentTenant)
         .select()
 
     if (error) console.log(error)
diff --git a/pages/spaces/[mode]/[[id]].vue b/pages/spaces/[mode]/[[id]].vue
index 4ace13a..c299068 100644
--- a/pages/spaces/[mode]/[[id]].vue
+++ b/pages/spaces/[mode]/[[id]].vue
@@ -79,7 +79,7 @@ function getSpaceProductCount(productId) {
 /*
 const printSpaceLabel = async () => {
   axios
-      .post(`http://${dataStore.ownTenant.value.labelPrinterIp}/pstprnt`, `^XA^FO10,20^BCN,100^FD${itemInfo.value.spaceNumber}^XZ` )
+      .post(`http://${profileStore.ownTenant.value.labelPrinterIp}/pstprnt`, `^XA^FO10,20^BCN,100^FD${itemInfo.value.spaceNumber}^XZ` )
       .then(console.log)
       .catch(console.log)
 }
diff --git a/pages/tasks/[mode]/[[id]].vue b/pages/tasks/[mode]/[[id]].vue
index 7b7fc3c..9b2cf1c 100644
--- a/pages/tasks/[mode]/[[id]].vue
+++ b/pages/tasks/[mode]/[[id]].vue
@@ -4,6 +4,7 @@ definePageMeta({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -12,7 +13,7 @@ const id = ref(route.params.id ? route.params.id : null )
 //Working
 const mode = ref(route.params.mode || "show")
 const itemInfo = ref({
-  profile: dataStore.activeProfile.id
+  profile: profileStore.activeProfile.id
 })
 const oldItemInfo = ref({})
 const categories = ["Offen", "In Bearbeitung", "Dringed", "Erledigt"]
@@ -148,7 +149,7 @@ setupPage()
     >
       <USelectMenu
           v-model="itemInfo.profile"
-          :options="dataStore.profiles"
+          :options="profileStore.profiles"
           option-attribute="fullName"
           value-attribute="id"
           searchable-placeholder="Suche..."
@@ -156,7 +157,7 @@ setupPage()
           :search-attributes="['fullName']"
       >
         <template #label>
-          {{dataStore.getProfileById(itemInfo.profile) ? dataStore.getProfileById(itemInfo.profile).fullName : "Kein Benutzer ausgewählt"}}
+          {{profileStore.getProfileById(itemInfo.profile) ? profileStore.getProfileById(itemInfo.profile).fullName : "Kein Benutzer ausgewählt"}}
         </template>
       </USelectMenu>
     </UFormGroup>
diff --git a/pages/tasks/index.vue b/pages/tasks/index.vue
index d0fcd03..b353a4c 100644
--- a/pages/tasks/index.vue
+++ b/pages/tasks/index.vue
@@ -64,7 +64,7 @@
       {{row.created_at ? dayjs(row.created_at).format("DD.MM.YY HH:mm") : ''}}
     </template>
     <template #user-data="{row}">
-      {{dataStore.profiles.find(i => i.id === row.user) ? dataStore.profiles.find(i => i.id === row.user).fullName : ""}}
+      {{profileStore.profiles.find(i => i.id === row.user) ? profileStore.profiles.find(i => i.id === row.user).fullName : ""}}
     </template>
     <template #project-data="{row}">
       {{dataStore.projects.find(i => i.id === row.project) ? dataStore.projects.find(i => i.id === row.project).name : ""}}
@@ -86,6 +86,7 @@ definePageMeta({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const router = useRouter()
 
 defineShortcuts({
diff --git a/pages/vehicles/[mode]/[[id]].vue b/pages/vehicles/[mode]/[[id]].vue
index 508a917..b2c0aee 100644
--- a/pages/vehicles/[mode]/[[id]].vue
+++ b/pages/vehicles/[mode]/[[id]].vue
@@ -23,6 +23,7 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -205,7 +206,7 @@ setupPage()
               </tr>
               <tr>
                 <td>Fahrer:</td>
-                <td>{{dataStore.profiles.find(profile => profile.id === itemInfo.driver) ? dataStore.profiles.find(profile => profile.id === itemInfo.driver).fullName : 'Kein Fahrer gewählt'}}</td>
+                <td>{{profileStore.profiles.find(profile => profile.id === itemInfo.driver) ? profileStore.profiles.find(profile => profile.id === itemInfo.driver).fullName : 'Kein Fahrer gewählt'}}</td>
               </tr>
               <tr>
                 <td>Tankvolumen:</td>
@@ -334,13 +335,13 @@ setupPage()
     >
       <USelectMenu
           v-model="itemInfo.driver"
-          :options="[{id: null, fullName: 'Kein Fahrer'},...dataStore.profiles]"
+          :options="[{id: null, fullName: 'Kein Fahrer'},...profileStore.profiles]"
           option-attribute="fullName"
           value-attribute="id"
 
       >
         <template #label>
-          {{dataStore.profiles.find(profile => profile.id === itemInfo.driver) ? dataStore.profiles.find(profile => profile.id === itemInfo.driver).fullName : 'Kein Fahrer ausgewählt'}}
+          {{profileStore.profiles.find(profile => profile.id === itemInfo.driver) ? profileStore.profiles.find(profile => profile.id === itemInfo.driver).fullName : 'Kein Fahrer ausgewählt'}}
         </template>
       </USelectMenu>
     </UFormGroup>
diff --git a/pages/vendors/[mode]/[[id]].vue b/pages/vendors/[mode]/[[id]].vue
index 1e0bb1c..6a26558 100644
--- a/pages/vendors/[mode]/[[id]].vue
+++ b/pages/vendors/[mode]/[[id]].vue
@@ -21,10 +21,9 @@ defineShortcuts({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
 const openTab = ref(0)
 let currentItem = ref(null)
 
@@ -33,7 +32,8 @@ let currentItem = ref(null)
 //Working
 const mode = ref(route.params.mode || "show")
 const itemInfo = ref({
-  infoData: {}
+  infoData: {},
+  profiles: [profileStore.activeProfile.id]
 })
 const oldItemInfo = ref({})
 
@@ -266,6 +266,23 @@ setupPage()
           v-model="itemInfo.infoData.ustid"
       />
     </UFormGroup>
+    <UFormGroup
+        label="Berechtigte Benutzer:"
+    >
+      <USelectMenu
+          v-model="itemInfo.profiles"
+          :options="profileStore.profiles"
+          option-attribute="fullName"
+          value-attribute="id"
+          searchable
+          multipledataStore
+          :search-attributes="['fullName']"
+      >
+        <template #label>
+          {{itemInfo.profiles.length > 0 ? itemInfo.profiles.map(i => profileStore.getProfileById(i).fullName).join(", ") : "Kein Benutzer ausgewählt"}}
+        </template>
+      </USelectMenu>
+    </UFormGroup>
   </UForm>
 </template>
 
diff --git a/pages/workingtimes/[mode]/[[id]].vue b/pages/workingtimes/[mode]/[[id]].vue
index b7b7842..4cde3f6 100644
--- a/pages/workingtimes/[mode]/[[id]].vue
+++ b/pages/workingtimes/[mode]/[[id]].vue
@@ -3,6 +3,7 @@ import dayjs from "dayjs";
 
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -12,7 +13,7 @@ const mode = ref(route.params.mode || "show")
 const itemInfo = ref({
   startDate: new Date(),
   endDate: new Date(),
-  profile: dataStore.activeProfile.id
+  profile: profileStore.activeProfile.id
 })
 const oldItemInfo = ref({})
 
@@ -88,7 +89,7 @@ setupPage()
       label="Mitarbeiter:"
     >
       <USelectMenu
-        :options="dataStore.profiles"
+        :options="profileStore.profiles"
         v-model="itemInfo.profile"
         option-attribute="fullName"
         value-attribute="id"
diff --git a/pages/workingtimes/evaluate/[id].vue b/pages/workingtimes/evaluate/[id].vue
index b913ded..d534dd1 100644
--- a/pages/workingtimes/evaluate/[id].vue
+++ b/pages/workingtimes/evaluate/[id].vue
@@ -15,6 +15,7 @@ dayjs.extend(isSameOrBefore)
 
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const route = useRoute()
 const router = useRouter()
@@ -27,7 +28,7 @@ const absencerequests = ref([])
 
 
 const setupPage = async () => {
-  if(route.params.id) itemInfo.value = dataStore.getProfileById(route.params.id)
+  if(route.params.id) itemInfo.value = profileStore.getProfileById(route.params.id)
   if(itemInfo.value.id) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
   workingtimes.value = (await supabase.from("workingtimes").select().eq("profile",itemInfo.value.id).order("startDate",{ascending:false})).data
   absencerequests.value = (await supabase.from("absencerequests").select().eq("user",itemInfo.value.id).order("start",{ascending: false})).data
@@ -177,13 +178,13 @@ const getDuration = (time) => {
 const showDocument = ref(false)
 const uri = ref("")
 const generateDocument = async () => {
-  const ownTenant = dataStore.ownTenant
+  const ownTenant = profileStore.ownTenant
   const path = ownTenant.letterheadConfig["workingTimesEvaluation"]
 
   const {data,error} = await supabase.storage.from("files").download(path)
 
   uri.value = await useCreateWorkingTimesPdf({
-    profile: dataStore.getProfileById(route.params.id).fullName,
+    profile: profileStore.getProfileById(route.params.id).fullName,
     ...workingTimeInfo.value}, await data.arrayBuffer())
   //alert(uri.value)
   showDocument.value = true
@@ -345,7 +346,7 @@ changeRange()
             ]"
           >
             <template #profile-data="{row}">
-              {{dataStore.profiles.find(profile => profile.id === row.profile) ? dataStore.profiles.find(profile => profile.id === row.profile).fullName : row.profile }}
+              {{profileStore.profiles.find(profile => profile.id === row.profile) ? profileStore.profiles.find(profile => profile.id === row.profile).fullName : row.profile }}
             </template>
             <template #approved-data="{row}">
               <span v-if="row.approved" class="text-primary-500">Ja</span>
diff --git a/pages/workingtimes/index.vue b/pages/workingtimes/index.vue
index 9256000..08c140d 100644
--- a/pages/workingtimes/index.vue
+++ b/pages/workingtimes/index.vue
@@ -9,6 +9,7 @@ definePageMeta({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const user = useSupabaseUser()
 const toast = useToast()
@@ -22,7 +23,7 @@ const timeInfo = ref({
   notes: null,
 })
 
-const filterUser = ref(dataStore.activeProfile.id || "")
+const filterUser = ref(profileStore.activeProfile.id || "")
 
 const workingtimes = ref([])
 
@@ -43,15 +44,6 @@ const filteredRows = computed(() => {
 
   times = times.filter(i => i.profile === filterUser.value)
 
-  /*if(dataStore.hasRight('viewTimes')) {
-    if(filterUser.value !== "") {
-      times = times.filter(i => i.profile === filterUser.value)
-    }
-  } else if(dataStore.hasRight('viewOwnTimes')) {
-    times = times.filter(i => i.profile === dataStore.getOwnProfile.id)
-  } else {
-    times  = []
-  }*/
 
   return times/*.map(i => {
     return {
@@ -115,16 +107,15 @@ const columns = [
   }
 ]
 
-console.log(dataStore.workingtimes)
 
 const runningTimeInfo = ref({})
 
 const startTime = async () => {
   console.log("started")
   timeInfo.value = {
-    profile: dataStore.activeProfile.id,
+    profile: profileStore.activeProfile.id,
     startDate: dayjs(),
-    tenant: dataStore.currentTenant,
+    tenant: profileStore.currentTenant,
     state: "Im Web gestartet"
   }
 
@@ -137,7 +128,7 @@ const startTime = async () => {
   } else if(data) {
     //timeInfo.value = data[0]
     await dataStore.fetchWorkingTimes()
-    runningTimeInfo.value = timeInfo.value//dataStore.times.find(time => time.profile === dataStore.activeProfile.id && !time.endDate)
+    runningTimeInfo.value = timeInfo.value//dataStore.times.find(time => time.profile === profileStore.activeProfile.id && !time.endDate)
   }
 }
 
@@ -161,8 +152,8 @@ const stopStartedTime = async () => {
   }
 }
 
-if(dataStore.workingtimes.find(time => time.profile === dataStore.activeProfile.id && !time.endDate)) {
-  runningTimeInfo.value = dataStore.workingtimes.find(time => time.profile === dataStore.activeProfile.id && !time.end)
+if(dataStore.workingtimes.find(time => time.profile === profileStore.activeProfile.id && !time.endDate)) {
+  runningTimeInfo.value = dataStore.workingtimes.find(time => time.profile === profileStore.activeProfile.id && !time.end)
 }
 
 const getDuration = (time) => {
@@ -216,14 +207,14 @@ const expand = ref({
     <template #left>
 
       <USelectMenu
-          :options="dataStore.profiles"
+          :options="profileStore.profiles"
           option-attribute="fullName"
           value-attribute="id"
           v-model="filterUser"
           @change="setupPage"
       >
         <template #label>
-          {{dataStore.getProfileById(filterUser) ? dataStore.getProfileById(filterUser).fullName : "Kein Benutzer ausgewählt"}}
+          {{profileStore.getProfileById(filterUser) ? profileStore.getProfileById(filterUser).fullName : "Kein Benutzer ausgewählt"}}
         </template>
       </USelectMenu>
       <UButton
@@ -337,7 +328,7 @@ const expand = ref({
 
       </div>
       <div class="px-4 pb-4" v-else>
-        <p><span class="font-bold">Mitarbeitende/r:</span> {{dataStore.getProfileById(row.profile).fullName}}</p>
+        <p><span class="font-bold">Mitarbeitende/r:</span> {{profileStore.getProfileById(row.profile).fullName}}</p>
         <p><span class="font-bold">Start:</span> {{dayjs(row.startDate).format("DD.MM.YYYY HH:mm")}}</p>
         <p><span class="font-bold">Ende:</span> {{dayjs(row.endDate).format("DD.MM.YYYY HH:mm")}}</p>
         <p><span class="font-bold">Genehmigt:</span> {{row.approved ? "Ja" : "Nein"}}</p>
@@ -345,7 +336,7 @@ const expand = ref({
       </div>
     </template>
     <template #profile-data="{row}">
-      {{dataStore.profiles.find(profile => profile.id === row.profile) ? dataStore.profiles.find(profile => profile.id === row.profile).fullName : row.profile }}
+      {{profileStore.profiles.find(profile => profile.id === row.profile) ? profileStore.profiles.find(profile => profile.id === row.profile).fullName : row.profile }}
     </template>
     <template #approved-data="{row}">
       <span v-if="row.approved" class="text-primary-500">Ja</span>
diff --git a/stores/data.js b/stores/data.js
index 99cc28a..8a0c299 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -18,6 +18,7 @@ import unit from "~/components/columnRenderings/unit.vue";
 export const useDataStore = defineStore('data', () => {
 
     const supabase = useSupabaseClient()
+    const profileStore = useProfileStore()
     const user = useSupabaseUser()
     const toast = useToast()
     const router = useRouter()
@@ -477,28 +478,6 @@ export const useDataStore = defineStore('data', () => {
     })
 
 
-    const loaded = ref(false)
-    const showProfileSelection = ref(false)
-    const ownTenant = ref({
-        calendarConfig: {
-            eventTypes: []
-        },
-        timeConfig: {
-            timeTypes: []
-        },
-        tags: {
-            documents: [] ,
-                products: []
-        },
-        measures: []
-    })
-
-
-    const profiles = ref([])
-    const ownProfiles = ref([])
-    const activeProfile = ref([])
-    const tenants = ref([])
-    const currentTenant = ref(null)
     const events = ref([])
     const customers = ref([])
     const tasks = ref([])
@@ -520,7 +499,6 @@ export const useDataStore = defineStore('data', () => {
     const bankstatements = ref([])
     const bankrequisitions = ref([])
     const historyItems = ref([])
-    const numberRanges = ref([])
     const notifications = ref([])
     const absencerequests = ref([])
     const accounts = ref([])
@@ -538,126 +516,8 @@ export const useDataStore = defineStore('data', () => {
     const servicecategories =ref([])
     const resources =ref([])
 
-
-    /*const rights = ref({
-        createUser: {label: "Benutzer erstellen"},
-        modifyUser: {label: "Benutzer bearbeiten"},
-        deactivateUser: {label: "Benutzer sperren"},
-        createProject: {label: "Projekt erstellen"},
-        viewOwnProjects: {label: "Eigene Projekte sehen"},
-        viewAllProjects: {label: "Alle Projekte sehen"},
-        createTask: {label: "Aufgabe erstellen"},
-        viewOwnTasks: {label:"Eigene Aufgaben sehen"},
-        viewAllTasks: {label: "Alle Aufgaben sehen"},
-        trackOwnTime: {label:"Eigene Zeite erfassen"},
-        createOwnTime: {label:"Eigene Zeiten erstellen"},
-        createTime: {label:"Zeiten erstellen"},
-        viewOwnTimes: {label:"Eigene Zeiten anzeigen"},
-        viewTimes: {label:"Zeiten anzeigen"},
-    })*/
-
-    /*const roles = ref([
-        {
-            key: "tenantAdmin",
-            label: "Firmenadministrator",
-            rights: [
-                ...Object.keys(rights.value)
-            ]
-        },
-        {
-            key:"worker",
-            label: "Monteur",
-            rights: [
-                "viewOwnProjects",
-                "createTasks",
-                "viewOwnTasks",
-                "viewOwnTimes",
-                "createOwnTime"
-            ]
-        },
-        {
-            key:"manager",
-            label: "Vorarbeiter",
-            rights: [
-                "createProjects",
-                "viewOwnProjects",
-                "createTasks",
-                "viewOwnTasks",
-            ]
-        },
-        {
-            key:"booker",
-            label: "Buchhalter",
-            rights: [
-                "createTasks",
-                "viewOwnTasks",
-                "createTime",
-                "viewAllTimes"
-            ]
-        }
-    ])*/
-
-    async function initializeData (userId) {
-
-        let profileconnections = (await supabase.from("profileconnections").select()).data
-        let profiles = (await supabase.from("profiles").select("*, role(*)")).data
-        let activeProfileConnection = profileconnections.find(i => i.active)
-        if(activeProfileConnection) {
-            activeProfile.value = profiles.find(i => i.id === activeProfileConnection.profile_id)
-            currentTenant.value = activeProfile.value.tenant
-
-            await fetchData()
-
-            //loaded.value = true
-
-        } else {
-            await fetchOwnProfiles()
-            await fetchTenants()
-            showProfileSelection.value = true
-        }
-
-
-    }
-
-    async function changeProfile(newActiveProfileId) {
-        loaded.value = false
-
-        let profileconnections = (await supabase.from("profileconnections").select()).data
-
-        let oldActiveProfileConnection = profileconnections.find(i => i.active)
-
-        const {error} = await supabase.from("profileconnections").update({active: true}).eq("profile_id", newActiveProfileId)
-
-        if(error) {
-            console.log(error)
-        } else {
-            if(oldActiveProfileConnection){
-                const {error} = await supabase.from("profileconnections").update({active: false}).eq("profile_id", oldActiveProfileConnection.profile_id)
-            }
-
-            reloadNuxtApp({
-                path:"/",
-                ttl: 10000
-            })
-
-            /*await clearStore()
-            await fetchData()
-            router.push("/")
-            loaded.value = true*/
-
-
-        }
-    }
-
     async function fetchData () {
-        await fetchOwnProfiles()
-        await fetchProfiles()
-
-        await fetchTenants()
-        await fetchOwnTenant()
-
-        //loaded.value = true
-         await fetchDocuments()
+        await fetchDocuments()
         await fetchEvents()
         await fetchTasks()
         await fetchProjects()
@@ -678,7 +538,6 @@ export const useDataStore = defineStore('data', () => {
         await fetchBankStatements()
         await fetchBankRequisitions()
         await fetchHistoryItems()
-        await fetchNumberRanges()
         await fetchNotifications()
         await fetchAbsenceRequests()
         await fetchAccounts()
@@ -695,18 +554,9 @@ export const useDataStore = defineStore('data', () => {
         await fetchServices()
         await fetchServiceCategories()
         await fetchResources()
-        loaded.value = true
-
-
     }
 
     function clearStore () {
-        console.log("Clear")
-        loaded.value = false
-        ownTenant.value =  {}
-        profiles.value = []
-        ownProfiles.value = []
-        tenants.value = []
         events.value= []
         customers.value= []
         tasks.value= []
@@ -728,7 +578,6 @@ export const useDataStore = defineStore('data', () => {
         bankstatements.value= []
         bankrequisitions.value= []
         historyItems.value = []
-        numberRanges.value = []
         notifications.value = []
         absencerequests.value = []
         accounts.value = []
@@ -747,16 +596,6 @@ export const useDataStore = defineStore('data', () => {
         resources.value = []
     }
 
-    /*function hasRight (right) {
-        const role = profiles.value.find(i => i.id === activeProfile.value.id).role
-        const grantedRights = roles.value.find(i => i.key === role).rights
-
-        if(grantedRights.includes(right)){
-            return true
-        } else return false
-
-    }*/
-
     var deepDiffMapper = function () {
         return {
             VALUE_CREATED: 'created',
@@ -831,8 +670,6 @@ export const useDataStore = defineStore('data', () => {
         }
     }();
 
-
-
     const generateHistoryItems = async (dataType,newData, oldData=null) => {
         //console.log(oldData)
         //console.log(newData)
@@ -1022,7 +859,7 @@ export const useDataStore = defineStore('data', () => {
                     createdBy: activeProfile.value.id,
                     oldVal: prop.data.o,
                     newVal: prop.data.n,
-                    tenant: currentTenant.value
+                    tenant: profileStore.currentTenant
                 }
 
                 historyItem[dataTypes[dataType].historyItemHolder] = newData.id
@@ -1056,7 +893,7 @@ export const useDataStore = defineStore('data', () => {
                 let historyItem = {
                     text: `${dataTypes[dataType].labelSingle} erstellt`,
                     createdBy: activeProfile.value.id,
-                    tenant: currentTenant.value
+                    tenant: profileStore.currentTenant
                 }
 
                 historyItem[dataTypes[dataType].historyItemHolder] = newData.id
@@ -1075,38 +912,14 @@ export const useDataStore = defineStore('data', () => {
         }
     }
 
-
-    //Realtime Update
-    /*const channelA = supabase
-        .channel('schema-db-changes')
-        .on(
-            'postgres_changes',
-            {
-                event: '*',
-                schema: 'public',
-            },
-            (payload) => {
-                //console.log(payload)
-
-                /!*if(payload.eventType === 'INSERT') {
-                    const c = payload.table + '.value.push(' + JSON.stringify(payload.new) + ')'
-                    eval(c)
-                } else if(payload.eventType === 'UPDATE'){
-                    const c = payload.table + '.value[' + payload.table + '.value.findIndex(i => i.id === ' + JSON.stringify(payload.old.id) + ')] = ' + JSON.stringify(payload.new)
-                    eval(c)
-                }*!/
-            }
-        )
-        .subscribe()*/
-
     async function createNewItem (dataType,data){
         if(typeOf(data) === 'object') {
-            data = {...data, tenant: currentTenant.value}
+            data = {...data, tenant: profileStore.currentTenant}
         } else if(typeOf(data) === 'array') {
             data.map(i => {
                 return {
                     ...i,
-                    tenant: currentTenant.value
+                    tenant: profileStore.currentTenant
                 }
             })
         }
@@ -1226,7 +1039,7 @@ export const useDataStore = defineStore('data', () => {
             const {data, error} = await supabase
                 .storage
                 .from("files")
-                .upload(`${currentTenant.value}/${file.name}`, file, {upsert: upsert})
+                .upload(`${profileStore.currentTenant}/${file.name}`, file, {upsert: upsert})
 
             if (error) {
                 console.log(error)
@@ -1246,7 +1059,7 @@ export const useDataStore = defineStore('data', () => {
             } else if (data) {
                 const returnPath = data.path
 
-                documentsToInsert.push({...formData, path: returnPath, tenant: currentTenant.value})
+                documentsToInsert.push({...formData, path: returnPath, tenant: profileStore.currentTenant})
             }
 
             //console.log(data)
@@ -1285,95 +1098,72 @@ export const useDataStore = defineStore('data', () => {
 
     }
 
-    async function fetchOwnTenant () {
-        ownTenant.value = (await supabase.from("tenants").select().eq('id', currentTenant.value).single()).data
-    }
-
-    async function fetchProfiles () {
-        profiles.value = (await supabase.from("profiles").select().eq("tenant",currentTenant.value).order("lastName")).data
-    }
-
-    async function fetchOwnProfiles () {
-        let profiles = (await supabase.from("profiles").select().order("fullName")).data
-        let conns = (await supabase.from("profileconnections").select()).data.map(i => i.profile_id)
-        //console.log(conns)
-        //console.log(profiles.filter(i => conns.includes(i.id)))
-        ownProfiles.value = profiles.filter(i => conns.includes(i.id))
-    }
-
-    async function fetchTenants () {
-        tenants.value = (await supabase.from("tenants").select()).data
-    }
-
     async function fetchBankAccounts () {
-        bankAccounts.value = (await supabase.from("bankaccounts").select().eq('tenant', currentTenant.value)).data
+        bankAccounts.value = (await supabase.from("bankaccounts").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchBankStatements () {
-        bankstatements.value = (await supabase.from("bankstatements").select().eq('tenant', currentTenant.value).order("date", {ascending:false})).data
+        bankstatements.value = (await supabase.from("bankstatements").select().eq('tenant', profileStore.currentTenant).order("date", {ascending:false})).data
     }
     async function fetchBankRequisitions () {
         bankrequisitions.value = (await supabase.from("bankrequisitions").select().eq('status', "LN")).data
     }
     async function fetchEvents () {
-        events.value = (await supabase.from("events").select().eq('tenant', currentTenant.value)).data
+        events.value = (await supabase.from("events").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchContracts () {
-        contracts.value = (await supabase.from("contracts").select().eq('tenant', currentTenant.value)).data
+        contracts.value = (await supabase.from("contracts").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchContacts () {
-        contacts.value = (await supabase.from("contacts").select().eq('tenant', currentTenant.value)).data
+        contacts.value = (await supabase.from("contacts").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchCustomers () {
-        customers.value = (await supabase.from("customers").select().eq('tenant', currentTenant.value).order("customerNumber", {ascending:true})).data
+        customers.value = (await supabase.from("customers").select().eq('tenant', profileStore.currentTenant).order("customerNumber", {ascending:true})).data
     }
     async function fetchTasks () {
-        tasks.value = (await supabase.from("tasks").select().eq('tenant', currentTenant.value)).data
+        tasks.value = (await supabase.from("tasks").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchForms () {
-        forms.value = (await supabase.from("forms").select().eq('tenant', currentTenant.value)).data
+        forms.value = (await supabase.from("forms").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchFormSubmits () {
-        formSubmits.value = (await supabase.from("formSubmits").select().eq('tenant', currentTenant.value)).data
+        formSubmits.value = (await supabase.from("formSubmits").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchProducts () {
-        products.value = (await supabase.from("products").select().eq('tenant', currentTenant.value)).data
+        products.value = (await supabase.from("products").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchUnits () {
         units.value = (await supabase.from("units").select()).data
     }
     async function fetchProjects () {
-        projects.value = (await supabase.from("projects").select().eq("tenant",currentTenant.value)).data
+        projects.value = (await supabase.from("projects").select().eq("tenant",profileStore.currentTenant)).data
     }
     async function fetchSpaces () {
-        spaces.value = (await supabase.from("spaces").select().eq('tenant', currentTenant.value).order("spaceNumber", {ascending:true})).data
+        spaces.value = (await supabase.from("spaces").select().eq('tenant', profileStore.currentTenant).order("spaceNumber", {ascending:true})).data
     }
     async function fetchMovements () {
-        movements.value = (await supabase.from("movements").select().eq('tenant', currentTenant.value)).data
+        movements.value = (await supabase.from("movements").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchVehicles () {
-        vehicles.value = (await supabase.from("vehicles").select().eq('tenant', currentTenant.value)).data
+        vehicles.value = (await supabase.from("vehicles").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchTimes () {
-        times.value = (await supabase.from("times").select().eq('tenant', currentTenant.value).order("start", {ascending:false})).data
+        times.value = (await supabase.from("times").select().eq('tenant', profileStore.currentTenant).order("start", {ascending:false})).data
     }
     async function fetchHistoryItems () {
 
-        historyItems.value = (await supabase.from("historyitems").select().eq('tenant', currentTenant.value)).data
+        historyItems.value = (await supabase.from("historyitems").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchVendors () {
-        vendors.value = (await supabase.from("vendors").select().eq('tenant', currentTenant.value).order("vendorNumber", {ascending:true})).data
+        vendors.value = (await supabase.from("vendors").select().eq('tenant', profileStore.currentTenant).order("vendorNumber", {ascending:true})).data
     }
     async function fetchIncomingInvoices () {
-        incominginvoices.value = (await supabase.from("incominginvoices").select().eq('tenant', currentTenant.value)).data
-    }
-    async function fetchNumberRanges () {
-        numberRanges.value = (await supabase.from("numberranges").select().eq('tenant', currentTenant.value)).data
+        incominginvoices.value = (await supabase.from("incominginvoices").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchNotifications () {
-        notifications.value = (await supabase.from("notifications").select().eq('tenant', currentTenant.value).order("created_at", {ascending: false})).data
+        notifications.value = (await supabase.from("notifications").select().eq('tenant', profileStore.currentTenant).order("created_at", {ascending: false})).data
     }
     async function fetchAbsenceRequests () {
-        absencerequests.value = (await supabase.from("absencerequests").select().eq('tenant', currentTenant.value)).data
+        absencerequests.value = (await supabase.from("absencerequests").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchAccounts () {
         accounts.value = (await supabase.from("accounts").select()).data
@@ -1382,51 +1172,51 @@ export const useDataStore = defineStore('data', () => {
         taxTypes.value = (await supabase.from("taxtypes").select()).data
     }
     async function fetchPlants () {
-        plants.value = (await supabase.from("plants").select().eq('tenant', currentTenant.value)).data
+        plants.value = (await supabase.from("plants").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchInventoryItems () {
-        inventoryitems.value = (await supabase.from("inventoryitems").select().eq('tenant', currentTenant.value)).data
+        inventoryitems.value = (await supabase.from("inventoryitems").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchChats() {
         chats.value = (await supabase.from("chats").select()).data
     }
     async function fetchMessages() {
-        messages.value = (await supabase.from("messages").select().eq('tenant', currentTenant.value).order('created_at', {ascending:true})).data
+        messages.value = (await supabase.from("messages").select().eq('tenant', profileStore.currentTenant).order('created_at', {ascending:true})).data
     }
     async function fetchCreatedDocuments() {
-        createddocuments.value = (await supabase.from("createddocuments").select().eq('tenant', currentTenant.value).order('created_at', {ascending:true})).data
+        createddocuments.value = (await supabase.from("createddocuments").select().eq('tenant', profileStore.currentTenant).order('created_at', {ascending:true})).data
     }
 
     async function fetchWorkingTimes() {
-        workingtimes.value = (await supabase.from("workingtimes").select().eq('tenant', currentTenant.value).order('created_at', {ascending:true})).data
+        workingtimes.value = (await supabase.from("workingtimes").select().eq('tenant', profileStore.currentTenant).order('created_at', {ascending:true})).data
     }
 
     async function fetchPhasesTemplates() {
-        phasesTemplates.value = (await supabase.from("phasesTemplates").select().eq('tenant', currentTenant.value).order('created_at', {ascending:true})).data
+        phasesTemplates.value = (await supabase.from("phasesTemplates").select().eq('tenant', profileStore.currentTenant).order('created_at', {ascending:true})).data
     }
 
     async function fetchEmailAccounts() {
-        emailAccounts.value = (await supabase.from("emailAccounts").select().eq('tenant', currentTenant.value)).data
+        emailAccounts.value = (await supabase.from("emailAccounts").select().eq('tenant', profileStore.currentTenant)).data
     }
 
     async function fetchTextTemplates() {
-        texttemplates.value = (await supabase.from("texttemplates").select().eq('tenant', currentTenant.value)).data
+        texttemplates.value = (await supabase.from("texttemplates").select().eq('tenant', profileStore.currentTenant)).data
     }
 
     async function fetchServices() {
-        services.value = (await supabase.from("services").select().eq('tenant', currentTenant.value)).data
+        services.value = (await supabase.from("services").select().eq('tenant', profileStore.currentTenant)).data
     }
 
     async function fetchServiceCategories() {
-        servicecategories.value = (await supabase.from("servicecategories").select().eq('tenant', currentTenant.value)).data
+        servicecategories.value = (await supabase.from("servicecategories").select().eq('tenant', profileStore.currentTenant)).data
     }
 
     async function fetchResources() {
-        resources.value = (await supabase.from("resources").select().eq('tenant', currentTenant.value)).data
+        resources.value = (await supabase.from("resources").select().eq('tenant', profileStore.currentTenant)).data
     }
 
     async function fetchDocuments () {
-        let tempDocuments = (await supabase.from("documents").select().eq('tenant', currentTenant.value)).data
+        let tempDocuments = (await supabase.from("documents").select().eq('tenant', profileStore.currentTenant)).data
 
         if(tempDocuments.length > 0){
             let paths = []
@@ -1482,22 +1272,17 @@ export const useDataStore = defineStore('data', () => {
         return tasks.value.filter(task => task.categorie != "Erledigt").length
     })
 
-    const getOwnProfile = computed(()  => {
-        return profiles.value.find(i => i.id === user.value.id)
-
-    })
-
     const getMovementsBySpace = computed(() => (spaceId) => {
         return movements.value.filter(movement => movement.spaceId === spaceId)
     })
 
-    const getContactsByCustomerId = computed(() => (customerId) => {
-        return contacts.value.filter(item => item.customer === customerId)
-    })
+    async function getContactsByCustomerId (itemId) {
+        return (await supabase.from("contacts").select().eq("customer", itemId)).data
+    }
 
-    const getProjectsByCustomerId = computed(() => (customerId) => {
-        return projects.value.filter(item => item.customer === customerId)
-    })
+    async function getProjectsByCustomerId (itemId) {
+        return (await supabase.from("projects").select().eq("customer",itemId)).data
+    }
 
     const getPlantsByCustomerId = computed(() => (customerId) => {
         return plants.value.filter(item => item.customer === customerId)
@@ -1673,7 +1458,7 @@ export const useDataStore = defineStore('data', () => {
 
     const getResources = computed(() => {
         return [
-            ...profiles.value.filter(i => i.tenant === currentTenant.value).map(profile => {
+            ...profiles.value.filter(i => i.tenant === profileStore.currentTenant).map(profile => {
                 return {
                     type: 'Mitarbeiter',
                     title: profile.fullName,
@@ -1699,7 +1484,7 @@ export const useDataStore = defineStore('data', () => {
 
     const getResourcesList = computed(() => {
         return [
-            ...profiles.value.filter(i => i.tenant === currentTenant.value).map(profile => {
+            ...profiles.value.filter(i => i.tenant === profileStore.currentTenant).map(profile => {
                 return {
                     type: 'Mitarbeiter',
                     title: profile.fullName,
@@ -1886,10 +1671,6 @@ export const useDataStore = defineStore('data', () => {
         return absencerequests.value.find(item => item.id === itemId)
     })
 
-    const getProfileById = computed(() => (itemId) => {
-        return profiles.value.find(item => item.id === itemId)
-    })
-
     const getAccountById = computed(() => (accountId) => {
         return accounts.value.find(item => item.id === accountId)
     })
@@ -1910,34 +1691,9 @@ export const useDataStore = defineStore('data', () => {
         return bankAccounts.value.find(item => item.id === itemId)
     })
 
-    const getEventById = computed(() => (itemId) => {
-        return events.value.find(item => item.id === itemId)
-    })
-
     const getWorkingTimeById = computed(() => (itemId) => {
         return workingtimes.value.find(item => item.id === itemId)
     })
-
-    /*const getOpenDocuments = computed(() => (itemId) => {
-
-        let items = createddocuments.value.filter(i => i.type === "invoices" || i.type === "advanceInvoices")
-        items = items.filter(i => bankstatements.value.filter(x => x.assignments.find(y => y.type === 'createdDocument' && y.id === i.id)).length === 0)
-
-        /!*let finalItems = []
-        items.forEach(item => {
-            if(bankstatements.value.filter(i => i.assignments.find(x => x.id === item.id))){
-                finalItems.push(item)
-            }
-
-        })
-
-        return finalItems*!/
-
-        return items
-
-        //return createddocuments.value.filter(i => (i.type === "invoices" || i.type === "advanceInvoices") && !bankstatements.value.some(x => x.amount -))
-
-    })*/
     const getOpenIncomingInvoices = computed(() => (itemId) => {
 
         return incominginvoices.value.filter(i => bankstatements.value.filter(x => x.assignments.find(y => y.type === 'incomingInvoice' && y.id === i.id)).length === 0)
@@ -1967,22 +1723,11 @@ export const useDataStore = defineStore('data', () => {
     })
 
     return {
-        //General
-        currentTenant,
-        loaded,
-        showProfileSelection,
-        ownTenant,
-        initializeData,
-        changeProfile,
         uploadFiles,
         generateHistoryItems,
         dataTypes,
 
         //Data
-        profiles,
-        ownProfiles,
-        activeProfile,
-        tenants,
         events,
         customers,
         tasks,
@@ -2004,7 +1749,6 @@ export const useDataStore = defineStore('data', () => {
         bankstatements,
         bankrequisitions,
         historyItems,
-        numberRanges,
         notifications,
         absencerequests,
         accounts,
@@ -2027,42 +1771,12 @@ export const useDataStore = defineStore('data', () => {
         updateItem,
         fetchData,
         clearStore,
-        fetchOwnTenant,
-        fetchProfiles,
-        fetchOwnProfiles,
-        fetchBankAccounts,
-        fetchBankStatements,
-        fetchBankRequisitions,
-        fetchEvents,
-        fetchContracts,
-        fetchContacts,
-        fetchCustomers,
-        fetchTasks,
-        fetchForms,
-        fetchFormSubmits,
-        fetchProducts,
-        fetchUnits,
-        fetchProjects,
-        fetchSpaces,
-        fetchMovements,
-        fetchVehicles,
         fetchTimes,
-        fetchHistoryItems,
-        fetchVendors,
         fetchIncomingInvoices,
-        fetchNumberRanges,
-        fetchNotifications,
         fetchDocuments,
-        fetchAbsenceRequests,
-        fetchPlants,
-        fetchInventoryItems,
-        fetchChats,
-        fetchMessages,
         fetchWorkingTimes,
-        addHistoryItem,
         //Getters
         getOpenTasksCount,
-        getOwnProfile,
         getMovementsBySpace,
         getContactsByCustomerId,
         getProjectsByCustomerId,
@@ -2115,17 +1829,12 @@ export const useDataStore = defineStore('data', () => {
         getTaskById,
         getAbsenceRequestById,
         getProjectById,
-        getProfileById,
         getAccountById,
         getPlantById,
         getCreatedDocumentById,
         getInventoryItemById,
         getBankAccountById,
-        getEventById,
         getWorkingTimeById,
-        //getOpenDocuments,
         getOpenIncomingInvoices
     }
-
-
 })
\ No newline at end of file
diff --git a/stores/profile.js b/stores/profile.js
new file mode 100644
index 0000000..e9ac524
--- /dev/null
+++ b/stores/profile.js
@@ -0,0 +1,150 @@
+import {defineStore} from 'pinia'
+
+// @ts-ignore
+export const useProfileStore = defineStore('profile', () => {
+
+    const supabase = useSupabaseClient()
+    const dataStore = useDataStore()
+    const user = useSupabaseUser()
+    const toast = useToast()
+    const router = useRouter()
+
+    const loaded = ref(false)
+    const showProfileSelection = ref(false)
+    const ownTenant = ref({
+        calendarConfig: {
+            eventTypes: []
+        },
+        timeConfig: {
+            timeTypes: []
+        },
+        tags: {
+            documents: [] ,
+                products: []
+        },
+        measures: []
+    })
+
+
+    const profiles = ref([])
+    const ownProfiles = ref([])
+    const activeProfile = ref([])
+    const tenants = ref([])
+    const currentTenant = ref(null)
+
+
+    async function initializeData (userId) {
+
+        let profileconnections = (await supabase.from("profileconnections").select()).data
+        let profiles = (await supabase.from("profiles").select("*, role(*)")).data
+        let activeProfileConnection = profileconnections.find(i => i.active)
+        if(activeProfileConnection) {
+            toast.add({title: 'Aktives Profil ausgewählt'})
+            console.log("Active Profile selected")
+            activeProfile.value = profiles.find(i => i.id === activeProfileConnection.profile_id)
+            currentTenant.value = activeProfile.value.tenant
+
+            await fetchData()
+            await dataStore.fetchData()
+        } else {
+            toast.add({title: 'Kein aktives Profil', color: 'orange'})
+            await fetchOwnProfiles()
+            await fetchTenants()
+            showProfileSelection.value = true
+        }
+
+
+    }
+
+    async function changeProfile(newActiveProfileId) {
+        loaded.value = false
+
+        let profileconnections = (await supabase.from("profileconnections").select()).data
+
+        let oldActiveProfileConnection = profileconnections.find(i => i.active)
+
+        const {error} = await supabase.from("profileconnections").update({active: true}).eq("profile_id", newActiveProfileId)
+
+        if(error) {
+            console.log(error)
+        } else {
+            if(oldActiveProfileConnection){
+                const {error} = await supabase.from("profileconnections").update({active: false}).eq("profile_id", oldActiveProfileConnection.profile_id)
+            }
+
+            reloadNuxtApp({
+                path:"/",
+                ttl: 10000
+            })
+        }
+    }
+
+    async function fetchData () {
+        await fetchOwnProfiles()
+        await fetchProfiles()
+
+        await fetchTenants()
+        await fetchOwnTenant()
+
+        loaded.value = true
+        console.log("Finished Loading")
+    }
+
+    function clearStore () {
+        loaded.value = false
+        ownTenant.value =  {}
+        profiles.value = []
+        ownProfiles.value = []
+        tenants.value = []
+    }
+
+    async function fetchOwnTenant () {
+        ownTenant.value = (await supabase.from("tenants").select().eq('id', currentTenant.value).single()).data
+    }
+
+    async function fetchProfiles () {
+        profiles.value = (await supabase.from("profiles").select().eq("tenant",currentTenant.value).order("lastName")).data
+    }
+
+    async function fetchOwnProfiles () {
+        let profiles = (await supabase.from("profiles").select().order("fullName")).data
+        let conns = (await supabase.from("profileconnections").select()).data.map(i => i.profile_id)
+        ownProfiles.value = profiles.filter(i => conns.includes(i.id))
+    }
+
+    async function fetchTenants () {
+        tenants.value = (await supabase.from("tenants").select()).data
+    }
+
+    const getOwnProfile = computed(()  => {
+        return profiles.value.find(i => i.id === user.value.id)
+
+    })
+
+    const getProfileById = computed(() => (itemId) => {
+        return profiles.value.find(item => item.id === itemId)
+    })
+
+    return {
+        //General
+        currentTenant,
+        loaded,
+        showProfileSelection,
+        ownTenant,
+        initializeData,
+        changeProfile,
+
+        //Data
+        profiles,
+        ownProfiles,
+        activeProfile,
+        tenants,
+        fetchData,
+        clearStore,
+        fetchOwnTenant,
+        getOwnProfile,
+        getProfileById
+    }
+
+
+})
\ No newline at end of file

From 565d53137633f8812ba9be8ee21930fbe670d491 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sun, 22 Dec 2024 16:59:18 +0100
Subject: [PATCH 005/104] Introduced EntityEdit.vue Introduced EntityShow.vue

Deprecated following as non standardEntity contracts, customers, vendors, projects, plants, vehicles
---
 components/EntityEdit.vue                     | 280 +++++++
 components/EntityList.vue                     |  16 +-
 components/EntityShow.vue                     | 352 +++++++++
 components/MainNav.vue                        |  12 +-
 components/columnRenderings/active.vue        |   3 +-
 components/columnRenderings/address.vue       |  17 +
 components/columnRenderings/contact.vue       |  13 +
 components/columnRenderings/description.vue   |  13 +
 components/columnRenderings/isCompany.vue     |  13 +
 components/columnRenderings/recurring.vue     |  14 +
 components/columnRenderings/sepa.vue          |  14 +
 pages/banking/statements/[mode]/[[id]].vue    | 171 ++---
 pages/createDocument/edit/[[id]].vue          | 714 +++++++++---------
 .../entitys}/contracts/[mode]/[[id]].vue      |  10 -
 .../entitys}/contracts/index.vue              |   0
 .../entitys}/customers/[mode]/[[id]].vue      |  17 -
 .../entitys}/customers/index.vue              |   0
 .../entitys}/projects/[mode]/[[id]].vue       |   0
 .../entitys}/projects/index.vue               |   0
 .../entitys/vehicles/[mode]/[[id]].vue        | 236 ++++++
 .../entitys}/vehicles/index.vue               |   0
 .../deprecated/entitys/vehicles/show/[id].vue |  33 +
 .../entitys}/vendors/[mode]/[[id]].vue        |   0
 .../entitys}/vendors/index.vue                |   0
 pages/settings/numberRanges.vue               |   1 -
 .../standardEntity/[type]/[[mode]]/[[id]].vue |  60 ++
 pages/vehicles/[mode]/[[id]].vue              | 406 ----------
 stores/data.js                                | 479 ++++++++++--
 28 files changed, 1942 insertions(+), 932 deletions(-)
 create mode 100644 components/EntityEdit.vue
 create mode 100644 components/EntityShow.vue
 create mode 100644 components/columnRenderings/address.vue
 create mode 100644 components/columnRenderings/contact.vue
 create mode 100644 components/columnRenderings/description.vue
 create mode 100644 components/columnRenderings/isCompany.vue
 create mode 100644 components/columnRenderings/recurring.vue
 create mode 100644 components/columnRenderings/sepa.vue
 rename pages/{ => deprecated/entitys}/contracts/[mode]/[[id]].vue (96%)
 rename pages/{ => deprecated/entitys}/contracts/index.vue (100%)
 rename pages/{ => deprecated/entitys}/customers/[mode]/[[id]].vue (92%)
 rename pages/{ => deprecated/entitys}/customers/index.vue (100%)
 rename pages/{ => deprecated/entitys}/projects/[mode]/[[id]].vue (100%)
 rename pages/{ => deprecated/entitys}/projects/index.vue (100%)
 create mode 100644 pages/deprecated/entitys/vehicles/[mode]/[[id]].vue
 rename pages/{ => deprecated/entitys}/vehicles/index.vue (100%)
 create mode 100644 pages/deprecated/entitys/vehicles/show/[id].vue
 rename pages/{ => deprecated/entitys}/vendors/[mode]/[[id]].vue (100%)
 rename pages/{ => deprecated/entitys}/vendors/index.vue (100%)
 create mode 100644 pages/standardEntity/[type]/[[mode]]/[[id]].vue
 delete mode 100644 pages/vehicles/[mode]/[[id]].vue

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
new file mode 100644
index 0000000..b8a173d
--- /dev/null
+++ b/components/EntityEdit.vue
@@ -0,0 +1,280 @@
+<script setup>
+import dayjs from "dayjs";
+
+const props = defineProps({
+  type: {
+    required: true,
+    type: String
+  },
+  item: {
+    required: true,
+    type: Object
+  }
+})
+
+const {type} = props
+
+defineShortcuts({
+  'backspace': () => {
+    router.push(`/${type}`)
+  },
+  'arrowleft': () => {
+    if(openTab.value > 0){
+      openTab.value -= 1
+    }
+  },
+  'arrowright': () => {
+    if(openTab.value < 3) {
+      openTab.value += 1
+    }
+  },
+})
+
+
+const router = useRouter()
+const dataStore = useDataStore()
+const profileStore = useProfileStore()
+const supabase = useSupabaseClient()
+
+const dataType = dataStore.dataTypes[type]
+const openTab = ref(0)
+
+const oldItem = ref(null)
+const generateOldItemData = () => {
+  oldItem.value = JSON.parse(JSON.stringify(props.item))
+}
+generateOldItemData()
+
+
+const setupCreate = () => {
+  dataType.templateColumns.forEach(datapoint => {
+    if(datapoint.key.includes(".")){
+      props.item[datapoint.key.split(".")[0]] = {}
+    }
+
+    if(datapoint.inputType === "editor") {
+      if(datapoint.key.includes(".")){
+        props.item[datapoint.key.split(".")[0]][datapoint.key.split(".")[1]] = {}
+      } else {
+        props.item[datapoint.key] = {}
+      }
+
+
+    }
+
+  })
+}
+
+setupCreate()
+
+const loadedOptions = ref({})
+const loadOptions = async () => {
+  let optionsToLoad = dataType.templateColumns.filter(i => i.selectDataType).map(i => {
+    return {
+      option: i.selectDataType,
+      key: i.key
+    }
+  })
+
+  for await(const option of optionsToLoad) {
+    if(option.option === "countrys") {
+      loadedOptions.value[option.option] = (await supabase.from("countrys").select()).data
+    } else {
+      loadedOptions.value[option.option] = (await useSupabaseSelect(option.option))
+
+      if(dataType.templateColumns.find(x => x.key === option.key).selectDataTypeFilter){
+        loadedOptions.value[option.option] = loadedOptions.value[option.option].filter(i => dataType.templateColumns.find(x => x.key === option.key).selectDataTypeFilter(i, props.item))
+      }
+    }
+  }
+}
+
+loadOptions()
+
+const contentChanged = (content, datapoint) => {
+  if(datapoint.key.includes(".")){
+    props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html = content.html
+    props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].text = content.text
+    props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].json = content.json
+  } else {
+    props.item[datapoint.key].html = content.html
+    props.item[datapoint.key].text = content.text
+    props.item[datapoint.key].json = content.json
+  }
+}
+
+</script>
+
+<template>
+  <UDashboardNavbar
+      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
+  >
+    <template #left>
+      <UButton
+          icon="i-heroicons-chevron-left"
+          variant="outline"
+          @click="router.push(`/standardEntity/${type}`)"
+      >
+        {{dataType.label}}
+      </UButton>
+    </template>
+    <template #center>
+      <h1
+          v-if="props.item"
+          :class="['text-xl','font-medium']"
+      >{{props.item.id ? `${dataType.labelSingle} bearbeiten` : `${dataType.labelSingle} erstellen` }}</h1>
+    </template>
+    <template #right>
+      <UButton
+          v-if="props.item.id"
+          @click="dataStore.updateItem(type,props.item, oldItem)"
+      >
+        Speichern
+      </UButton>
+      <UButton
+          v-else
+          @click="dataStore.createNewItem(type,props.item)"
+      >
+        Erstellen
+      </UButton>
+      <UButton
+          @click="router.push(props.item.id ? `/standardEntity/${type}/show/${props.item.id}` : `/standardEntity/${type}`)"
+          color="red"
+          class="ml-2"
+      >
+        Abbrechen
+      </UButton>
+    </template>
+  </UDashboardNavbar>
+  <UDashboardPanelContent>
+    <UForm
+        class="p-5"
+    >
+      <UFormGroup
+          v-for="datapoint in dataType.templateColumns.filter(i => i.inputType)"
+          :label="datapoint.label"
+      >
+        <div v-if="datapoint.key.includes('.')">
+          <UInput
+              v-if="['text','number'].includes(datapoint.inputType)"
+              v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              :type="datapoint.inputType"
+              :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
+          />
+          <UToggle
+              v-else-if="datapoint.inputType === 'bool'"
+              v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+          />
+          <USelectMenu
+              v-else-if="datapoint.inputType === 'select'"
+              v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              :option-attribute="datapoint.selectOptionAttribute"
+              :value-attribute="datapoint.selectValueAttribute || 'id'"
+              :options="datapoint.selectManualOptions || loadedOptions[datapoint.selectDataType]"
+              :searchable="datapoint.selectSearchAttributes"
+              :search-attributes="datapoint.selectSearchAttributes"
+              :multiple="datapoint.selectMultiple"
+          />
+          <UTextarea
+              v-else-if="datapoint.inputType === 'textarea'"
+              v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              rows="4"
+          />
+          <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'date'">
+            <UButton
+                icon="i-heroicons-calendar-days-20-solid"
+                :label="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] ? dayjs(props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]).format('DD.MM.YYYY') : 'Datum auswählen'"
+                variant="outline"
+            />
+
+            <template #panel="{ close }">
+              <LazyDatePicker v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close" />
+            </template>
+          </UPopover>
+          <Tiptap
+              v-else-if="datapoint.inputType === 'editor'"
+              @updateContent="(i) => contentChanged(i,datapoint)"
+              :preloadedContent="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html"
+          />
+        </div>
+        <div v-else>
+          <UInput
+              v-if="['text','number'].includes(datapoint.inputType)"
+              v-model="props.item[datapoint.key]"
+              :type="datapoint.inputType"
+              :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
+          />
+          <UToggle
+              v-else-if="datapoint.inputType === 'bool'"
+              v-model="props.item[datapoint.key]"
+          />
+          <USelectMenu
+              v-else-if="datapoint.inputType === 'select'"
+              v-model="props.item[datapoint.key]"
+              :option-attribute="datapoint.selectOptionAttribute"
+              :value-attribute="datapoint.selectValueAttribute || 'id'"
+              :options="datapoint.selectManualOptions || loadedOptions[datapoint.selectDataType]"
+              :searchable="datapoint.selectSearchAttributes"
+              :search-attributes="datapoint.selectSearchAttributes"
+              :multiple="datapoint.selectMultiple"
+              searchable-placeholder="Suche..."
+          />
+          <UTextarea
+              v-else-if="datapoint.inputType === 'textarea'"
+              v-model="props.item[datapoint.key]"
+              rows="4"
+          />
+          <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'date'">
+            <UButton
+                icon="i-heroicons-calendar-days-20-solid"
+                :label="props.item[datapoint.key] ? dayjs(props.item[datapoint.key]).format('DD.MM.YYYY') : 'Datum auswählen'"
+                variant="outline"
+            />
+
+            <template #panel="{ close }">
+              <LazyDatePicker v-model="props.item[datapoint.key]" @close="close" />
+            </template>
+          </UPopover>
+          <Tiptap
+              v-else-if="datapoint.inputType === 'editor'"
+              @updateContent="(i) => contentChanged(i,datapoint)"
+              :preloadedContent="props.item[datapoint.key].html"
+          />
+        </div>
+        <div
+            v-if="profileStore.ownTenant.ownFields"
+        >
+          <UDivider
+              class="mt-3"
+          >Eigene Felder</UDivider>
+
+          <UFormGroup
+              v-for="field in profileStore.ownTenant.ownFields.contracts"
+              :key="field.key"
+              :label="field.label"
+          >
+            <UInput
+                v-if="field.type === 'text'"
+                v-model="props.item.ownFields[field.key]"
+            />
+            <USelectMenu
+                v-else-if="field.type === 'select'"
+                :options="field.options"
+                v-model="props.item.ownFields[field.key]"
+            />
+          </UFormGroup>
+        </div>
+
+      </UFormGroup>
+    </UForm>
+  </UDashboardPanelContent>
+</template>
+
+<style scoped>
+td {
+  border-bottom: 1px solid lightgrey;
+  vertical-align: top;
+  padding-bottom: 0.15em;
+  padding-top: 0.15em;
+}
+</style>
\ No newline at end of file
diff --git a/components/EntityList.vue b/components/EntityList.vue
index 8dcdc40..483d51b 100644
--- a/components/EntityList.vue
+++ b/components/EntityList.vue
@@ -55,8 +55,8 @@ const dataType = dataStore.dataTypes[type]
 const selectedItem = ref(0)
 
 
-const selectedColumns = ref(dataType.templateColumns)
-const columns = computed(() => dataType.templateColumns.filter((column) => selectedColumns.value.includes(column)))
+const selectedColumns = ref(dataType.templateColumns.filter(i => !i.disabledInTable))
+const columns = computed(() => dataType.templateColumns.filter((column) => !column.disabledInTable && selectedColumns.value.includes(column)))
 
 const searchString = ref('')
 
@@ -114,7 +114,7 @@ const filteredRows = computed(() => {
         </template>
       </UInput>
 
-      <UButton v-if="useRole().checkRight(`${type}-create`)" @click="router.push(`/${type}/create`)">+ {{dataType.labelSingle}}</UButton>
+      <UButton v-if="useRole().checkRight(`${type}-create`)" @click="router.push(`/standardEntity/${type}/create`)">+ {{dataType.labelSingle}}</UButton>
     </template>
   </UDashboardNavbar>
 
@@ -127,10 +127,11 @@ const filteredRows = computed(() => {
       <USelectMenu
           v-model="selectedColumns"
           icon="i-heroicons-adjustments-horizontal-solid"
-          :options="dataType.templateColumns"
+          :options="dataType.templateColumns.filter(i => !i.disabledInTable)"
           multiple
           class="hidden lg:block"
           by="key"
+          :color="selectedColumns.length !== dataType.templateColumns.filter(i => !i.disabledInTable).length ? 'primary' : 'white'"
       >
         <template #label>
           Spalten
@@ -142,6 +143,7 @@ const filteredRows = computed(() => {
           multiple
           v-model="selectedFilters"
           :options="selectableFilters"
+          :color="selectedFilters.length > 0 ? 'primary' : 'white'"
       >
         <template #label>
           Filter
@@ -154,7 +156,7 @@ const filteredRows = computed(() => {
       :columns="columns"
       class="w-full"
       :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/${type}/show/${i.id}`) "
+      @select="(i) => router.push(`/standardEntity/${type}/show/${i.id}`) "
       :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: `Keine ${dataType.label} anzuzeigen` }"
   >
     <template #name-data="{row}">
@@ -185,10 +187,10 @@ const filteredRows = computed(() => {
       </span>
     </template>
     <template
-        v-for="column in dataType.templateColumns.filter(i => i.key !== 'name' && i.key !== 'fullName' && i.key !== 'licensePlate')"
+        v-for="column in dataType.templateColumns.filter(i => i.key !== 'name' && i.key !== 'fullName' && i.key !== 'licensePlate' && !i.disabledInTable)"
         v-slot:[`${column.key}-data`]="{row}">
       <component v-if="column.component" :is="column.component" :row="row"></component>
-      <span v-else>{{row[column.key]}}</span>
+      <span v-else>{{row[column.key] ? `${row[column.key]} ${column.unit ? column.unit : ''}`: ''}}</span>
     </template>
   </UTable>
 </template>
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
new file mode 100644
index 0000000..d733458
--- /dev/null
+++ b/components/EntityShow.vue
@@ -0,0 +1,352 @@
+<script setup>
+import dayjs from "dayjs";
+
+const props = defineProps({
+  type: {
+    required: true,
+    type: String
+  },
+  item: {
+    required: true,
+    type: Object
+  }
+})
+
+const {type} = props
+
+defineShortcuts({
+  'backspace': () => {
+    router.push(`/${type}`)
+  },
+  'arrowleft': () => {
+    if(openTab.value > 0){
+      openTab.value -= 1
+    }
+  },
+  'arrowright': () => {
+    if(openTab.value < 3) {
+      openTab.value += 1
+    }
+  },
+})
+
+
+const router = useRouter()
+const dataStore = useDataStore()
+const profileStore = useProfileStore()
+
+const dataType = dataStore.dataTypes[type]
+
+const openTab = ref(0)
+
+const renderedPhases = computed(() => {
+
+  if(type === "projects" && props.item.phases) {
+    return props.item.phases.map((phase,index,array) => {
+
+      let isAvailable = false
+
+      if(phase.active) {
+        isAvailable = true
+      } else if(index > 0 && array[index-1].active ){
+        isAvailable = true
+      } else if(index > 1 && array[index-1].optional && array[index-2].active){
+        isAvailable = true
+      } else if(array.findIndex(i => i.active) > index) {
+        isAvailable = true
+      }
+
+
+      return {
+        ...phase,
+        label: phase.optional ? `${phase.label}(optional)`: phase.label,
+        disabled: !isAvailable,
+        defaultOpen: phase.active ? true : false
+      }
+    })
+  } else {
+    return []
+  }
+})
+
+
+
+</script>
+
+<template>
+  <UDashboardNavbar
+      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
+  >
+    <template #left>
+      <UButton
+          icon="i-heroicons-chevron-left"
+          variant="outline"
+          @click="router.push(`/standardEntity/${type}`)"
+      >
+        {{dataType.label}}
+      </UButton>
+    </template>
+    <template #center>
+      <h1
+          v-if="item"
+          :class="['text-xl','font-medium']"
+      >{{item ? `${dataType.labelSingle}: ${props.item[dataType.templateColumns.find(i => i.title).key]}`: '' }}</h1>
+    </template>
+    <template #right>
+      <ButtonWithConfirm
+          color="rose"
+          variant="outline"
+          @confirmed="dataStore.updateItem(type,{...item, archived: true})"
+      >
+        <template #button>
+          Archivieren
+        </template>
+        <template #header>
+          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
+        </template>
+        Möchten Sie das Fahrzeug {{item.name}} wirklich archivieren?
+      </ButtonWithConfirm>
+      <UButton
+          @click="router.push(`/standardEntity/${type}/edit/${item.id}`)"
+      >
+        Bearbeiten
+      </UButton>
+    </template>
+  </UDashboardNavbar>
+  <UTabs
+      :items="dataType.showTabs"
+      v-if="props.item.id"
+      class="p-5"
+      v-model="openTab"
+  >
+    <template #item="{item}">
+      <div v-if="item.label === 'Informationen'" class="flex flex-row mt-5">
+        <UCard class="w-1/2 mr-5">
+          <UAlert
+              v-if="item.archived"
+              color="rose"
+              variant="outline"
+              :title="`${dataType.labelSingle} archiviert`"
+              icon="i-heroicons-light-bulb"
+              class="mb-5"
+          />
+          <div class="text-wrap">
+            <table class="w-full">
+              <tbody>
+              <tr
+                  v-for="datapoint in dataType.templateColumns"
+              >
+                <td>{{datapoint.label}}:</td>
+                <td>
+                  <component v-if="datapoint.component" :is="datapoint.component" :row="props.item"></component>
+                  <div v-else>
+                    <span v-if="datapoint.key.includes('.')">{{props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]}}{{datapoint.unit}}</span>
+                    <span v-else>{{props.item[datapoint.key]}} {{datapoint.unit}}</span>
+                  </div>
+                </td>
+              </tr>
+              </tbody>
+
+            </table>
+          </div>
+
+        </UCard>
+        <UCard class="w-1/2">
+          <HistoryDisplay
+              :type="type.substring(0,type.length-1)"
+              v-if="props.item.id"
+              :element-id="props.item.id"
+              render-headline
+          />
+        </UCard>
+      </div>
+      <div v-else-if="item.label === 'Dokumente'">
+        <UCard class="mt-5">
+          <!--          <Toolbar>
+                      <DocumentUpload
+                          type="vehicle"
+                          :element-id="item.id"
+                      />
+                    </Toolbar>
+
+                    <DocumentList
+                        :documents="dataStore.getDocumentsByVehicleId(item.id)"
+                    />-->
+          {{props.item.documents}}
+        </UCard>
+      </div>
+      <div v-else-if="item.label === 'Projekte'">
+        <UCard class="mt-5">
+          <Toolbar>
+            <UButton
+                @click="router.push(`/standardEntity/projects/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
+            >
+              + Projekt
+            </UButton>
+          </Toolbar>
+          <UTable
+              :rows="props.item.projects"
+              @select="(row) => router.push(`/standardEntity/projects/show/${row.id}`)"
+              :columns="[{label: 'Name', key: 'name'},{label: 'Phase', key: 'phase'}]"
+              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Projekte' }"
+
+          >
+            <template #phase-data="{row}">
+              {{row.phases ? row.phases.find(i => i.active).label : ""}}
+            </template>
+          </UTable>
+
+        </UCard>
+      </div>
+      <div v-else-if="item.label === 'Objekte'">
+        <UCard class="mt-5">
+          <Toolbar>
+            <UButton
+                @click="router.push(`/standardEntity/plants/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
+            >
+              + Objekt
+            </UButton>
+          </Toolbar>
+          <UTable
+              :rows="props.item.plants"
+              @select="(row) => router.push(`/standardEntity/plants/show/${row.id}`)"
+              :columns="[{label: 'Name', key: 'name'}]"
+              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Objekte' }"
+
+          >
+
+          </UTable>
+        </UCard>
+      </div>
+      <div v-else-if="item.label === 'Aufgaben'">
+        <UCard class="mt-5">
+          <Toolbar>
+            <UButton
+                @click="router.push(`/standardEntity/tasks/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
+            >
+              + Aufgabe
+            </UButton>
+          </Toolbar>
+          <UTable
+              :rows="props.item.tasks"
+              @select="(row) => router.push(`/standardEntity/tasks/show/${row.id}`)"
+              :columns="[{label: 'Name', key: 'name'}]"
+              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Aufgaben' }"
+          />
+        </UCard>
+      </div>
+      <div v-else-if="item.label === 'Verträge'">
+        <UCard class="mt-5">
+          <Toolbar>
+            <UButton
+                @click="router.push(`/standardEntity/contracts/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
+            >
+              + Vertrag
+            </UButton>
+          </Toolbar>
+          <UTable
+              :rows="props.item.contracts"
+              @select="(row) => router.push(`/standardEntity/contracts/show/${row.id}`)"
+              :columns="[{label: 'Name', key: 'name'},{label: 'Aktiv', key: 'active'}]"
+              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Verträge' }"
+
+          ></UTable>
+        </UCard>
+      </div>
+      <div v-else-if="item.label === 'Überprüfungen'">
+        <UCard class="mt-5">
+          <UTable
+              :rows="props.item.checks"
+              :columns="[{key:'name',label: 'Name'},{key:'rhythm',label: 'Rhythmus'},{key:'description',label: 'Beschreibung'}]"
+              class="w-full"
+              :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
+              @select="(i) => router.push(`/checks/show/${i.id}`) "
+              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Überprüfungen anzuzeigen' }"
+          >
+            <template #rhythm-data="{row}">
+              {{row.distance}}
+              <span v-if="row.distanceUnit === 'dayjs'">Tage</span>
+              <span v-if="row.distanceUnit === 'years'">Jahre</span>
+            </template>
+          </UTable>
+        </UCard>
+      </div>
+      <div v-else-if="item.label === 'Phasen'">
+        <UCard class="mt-5">
+          <UAccordion
+              :items="renderedPhases"
+          >
+            <template #default="{item,index,open}">
+              <UButton
+                  variant="ghost"
+                  :color="item.active ? 'primary' : 'white'"
+                  class="mb-1"
+                  :disabled="true"
+              >
+                <template #leading>
+                  <div class="w-6 h-6  flex items-center justify-center -my-1">
+                    <UIcon :name="item.icon" class="w-4 h-4 " />
+                  </div>
+                </template>
+
+                <span class="truncate"> {{item.label}}</span>
+
+                <template #trailing>
+                  <UIcon
+                      name="i-heroicons-chevron-right-20-solid"
+                      class="w-5 h-5 ms-auto transform transition-transform duration-200"
+                      :class="[open && 'rotate-90']"
+                  />
+                </template>
+
+              </UButton>
+            </template>
+            <template #item="{item, index}">
+              <UCard class="mx-5">
+                <template #header>
+                  <span class="text-black">{{item.label}}</span>
+                </template>
+                <InputGroup>
+                  <!-- TODO: Reactive Change Phase                  -->
+                  <UButton
+                      v-if="!item.activated_at && index !== 0 "
+                      @click="changeActivePhase(item.key)"
+                  >
+                    Phase aktivieren
+                  </UButton>
+                  <UButton
+                      v-if="item.active"
+                      v-for="button in item.quickactions"
+                      @click="router.push(`${button.link}&customer=${itemInfo.customer.id}&project=${itemInfo.id}`)"
+                  >
+                    {{button.label}}
+                  </UButton>
+                </InputGroup>
+
+                <div>
+                  <p v-if="item.activated_at" class="text-black">Aktiviert am: {{dayjs(item.activated_at).format("DD.MM.YY HH:mm")}} Uhr</p>
+                  <p v-if="item.activated_by" class="text-black">Aktiviert durch: {{profileStore.getProfileById(item.activated_by).fullName}}</p>
+                  <p v-if="item.description" class="text-black">Beschreibung: {{item.description}}</p>
+                </div>
+              </UCard>
+
+
+            </template>
+          </UAccordion>
+        </UCard>
+      </div>
+
+    </template>
+
+  </UTabs>
+
+</template>
+
+<style scoped>
+td {
+  border-bottom: 1px solid lightgrey;
+  vertical-align: top;
+  padding-bottom: 0.15em;
+  padding-top: 0.15em;
+}
+</style>
\ No newline at end of file
diff --git a/components/MainNav.vue b/components/MainNav.vue
index 9bbea02..19bc384 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -72,17 +72,17 @@ const links = computed(() => {
       children: [
         ... role.checkRight("customers") ? [{
           label: "Kunden",
-          to: "/customers",
+          to: "/standardEntity/customers",
           icon: "i-heroicons-user-group"
         }] : [],
         ... role.checkRight("vendors") ? [{
           label: "Lieferanten",
-          to: "/vendors",
+          to: "/standardEntity/vendors",
           icon: "i-heroicons-truck"
         }] : [],
         ... role.checkRight("contacts") ? [{
           label: "Ansprechpartner",
-          to: "/contacts",
+          to: "/standardEntity/contacts",
           icon: "i-heroicons-user-group"
         }] : [],
       ]
@@ -210,17 +210,17 @@ const links = computed(() => {
     },] : [],
     ... role.checkRight("projects") ? [{
       label: "Projekte",
-      to: "/projects",
+      to: "/standardEntity/projects",
       icon: "i-heroicons-clipboard-document-check"
     },] : [],
     ... role.checkRight("contracts") ? [{
       label: "Verträge",
-      to: "/contracts",
+      to: "/standardEntity/contracts",
       icon: "i-heroicons-clipboard-document"
     }] : [],
     ... role.checkRight("plants") ? [{
       label: "Objekte",
-      to: "/plants",
+      to: "/standardEntity/plants",
       icon: "i-heroicons-clipboard-document"
     },] : [],
 
diff --git a/components/columnRenderings/active.vue b/components/columnRenderings/active.vue
index 67d544f..40035ce 100644
--- a/components/columnRenderings/active.vue
+++ b/components/columnRenderings/active.vue
@@ -9,5 +9,6 @@ const props = defineProps({
 </script>
 
 <template>
-  <span>{{props.row.active ? 'Ja' : 'Nein'}}</span>
+  <span v-if="props.row.active" class="text-primary">Ja</span>
+  <span v-else class="text-rose-600">Nein</span>
 </template>
diff --git a/components/columnRenderings/address.vue b/components/columnRenderings/address.vue
new file mode 100644
index 0000000..ef7072d
--- /dev/null
+++ b/components/columnRenderings/address.vue
@@ -0,0 +1,17 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span v-if="props.row.infoData.streetNumber">{{props.row.infoData.streetNumber}},</span>
+  <span v-if="props.row.infoData.special">{{props.row.infoData.special}},</span>
+  <span v-if="props.row.infoData.zip">{{props.row.infoData.zip}},</span>
+  <span v-if="props.row.infoData.city">{{props.row.infoData.city}}</span>
+
+</template>
diff --git a/components/columnRenderings/contact.vue b/components/columnRenderings/contact.vue
new file mode 100644
index 0000000..7b83524
--- /dev/null
+++ b/components/columnRenderings/contact.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span>{{props.row.contact ? props.row.contact.name : ''}}</span>
+</template>
diff --git a/components/columnRenderings/description.vue b/components/columnRenderings/description.vue
new file mode 100644
index 0000000..0647bd5
--- /dev/null
+++ b/components/columnRenderings/description.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <div v-if="props.row.description" v-html="props.row.description.html"/>
+</template>
diff --git a/components/columnRenderings/isCompany.vue b/components/columnRenderings/isCompany.vue
new file mode 100644
index 0000000..f5ab098
--- /dev/null
+++ b/components/columnRenderings/isCompany.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span>{{props.row.isCompany ? 'Unternehmen' : 'Privat'}}</span>
+</template>
diff --git a/components/columnRenderings/recurring.vue b/components/columnRenderings/recurring.vue
new file mode 100644
index 0000000..dcf6f03
--- /dev/null
+++ b/components/columnRenderings/recurring.vue
@@ -0,0 +1,14 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span v-if="props.row.recurring">Ja</span>
+  <span v-else>Nein</span>
+</template>
diff --git a/components/columnRenderings/sepa.vue b/components/columnRenderings/sepa.vue
new file mode 100644
index 0000000..7bc955c
--- /dev/null
+++ b/components/columnRenderings/sepa.vue
@@ -0,0 +1,14 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span v-if="props.row.hasSEPA">Ja</span>
+  <span v-else>Nein</span>
+</template>
diff --git a/pages/banking/statements/[mode]/[[id]].vue b/pages/banking/statements/[mode]/[[id]].vue
index 57a42f6..e71339b 100644
--- a/pages/banking/statements/[mode]/[[id]].vue
+++ b/pages/banking/statements/[mode]/[[id]].vue
@@ -252,92 +252,95 @@ setup()
       </template>
 
       <table class="w-full" v-if="itemInfo.id">
-        <tr class="flex-row flex justify-between">
-          <td>
-            <span class="font-semibold">Buchungsdatum:</span>
-          </td>
-          <td>
-            {{dayjs(itemInfo.date).format("DD.MM.YYYY")}}
-          </td>
-        </tr>
-        <tr class="flex-row flex justify-between">
-          <td>
-            <span class="font-semibold">Wertstellungsdatum:</span>
-          </td>
-          <td>
-            {{dayjs(itemInfo.valueDate).format("DD.MM.YYYY")}}
-          </td>
-        </tr>
-        <tr class="flex-row flex justify-between text-right">
-          <td>
-            <span class="font-semibold">Partner:</span>
-          </td>
-          <td>
-            {{itemInfo.amount > 0 ? itemInfo.debName : itemInfo.credName}}
+        <tbody>
+          <tr class="flex-row flex justify-between">
+            <td>
+              <span class="font-semibold">Buchungsdatum:</span>
+            </td>
+            <td>
+              {{dayjs(itemInfo.date).format("DD.MM.YYYY")}}
+            </td>
+          </tr>
+          <tr class="flex-row flex justify-between">
+            <td>
+              <span class="font-semibold">Wertstellungsdatum:</span>
+            </td>
+            <td>
+              {{dayjs(itemInfo.valueDate).format("DD.MM.YYYY")}}
+            </td>
+          </tr>
+          <tr class="flex-row flex justify-between text-right">
+            <td>
+              <span class="font-semibold">Partner:</span>
+            </td>
+            <td>
+              {{itemInfo.amount > 0 ? itemInfo.debName : itemInfo.credName}}
 
-          </td>
-        </tr>
-        <tr class="flex-row flex justify-between">
-          <td>
-            <span class="font-semibold">Partner IBAN:</span>
-          </td>
-          <td>
-            {{itemInfo.amount > 0 ? separateIBAN(itemInfo.debIban) : separateIBAN(itemInfo.credIban)}}
-          </td>
-        </tr>
-        <tr class="flex-row flex justify-between">
-          <td>
-            <span class="font-semibold">Konto:</span>
-          </td>
-          <td>
-            {{dataStore.getBankAccountById(itemInfo.account) ? dataStore.getBankAccountById(itemInfo.account).name || separateIBAN(dataStore.getBankAccountById(itemInfo.account).iban) : ""}}
-          </td>
-        </tr>
-        <tr class="flex-row flex justify-between">
-          <td colspan="2">
-            <span class="font-semibold">Verknüpfte Dokumente:</span>
-          </td>
-        </tr>
-        <tr
-            class="flex-row flex justify-between mb-3"
-            v-for="item in itemInfo.statementallocations"
-        >
+            </td>
+          </tr>
+          <tr class="flex-row flex justify-between">
+            <td>
+              <span class="font-semibold">Partner IBAN:</span>
+            </td>
+            <td>
+              {{itemInfo.amount > 0 ? separateIBAN(itemInfo.debIban) : separateIBAN(itemInfo.credIban)}}
+            </td>
+          </tr>
+          <tr class="flex-row flex justify-between">
+            <td>
+              <span class="font-semibold">Konto:</span>
+            </td>
+            <td>
+              {{dataStore.getBankAccountById(itemInfo.account) ? dataStore.getBankAccountById(itemInfo.account).name || separateIBAN(dataStore.getBankAccountById(itemInfo.account).iban) : ""}}
+            </td>
+          </tr>
+          <tr class="flex-row flex justify-between">
+            <td colspan="2">
+              <span class="font-semibold">Verknüpfte Dokumente:</span>
+            </td>
+          </tr>
+          <tr
+              class="flex-row flex justify-between mb-3"
+              v-for="item in itemInfo.statementallocations"
+          >
+
+            <td>
+              <!--            <span v-if="itemInfo.createdDocument"><nuxt-link :to="`/createDocument/show/${itemInfo.createdDocument}`">{{dataStore.createddocuments.find(i => i.id === itemInfo.createdDocument).documentNumber}}</nuxt-link></span>
+                          <span v-else-if="itemInfo.incomingInvoice"><nuxt-link :to="`/incominInvoices/show/${itemInfo.incomingInvoice}`">{{dataStore.getIncomingInvoiceById(itemInfo.incomingInvoice).reference}}</nuxt-link></span>-->
+              <span v-if="item.cd_id">
+                {{dataStore.getCreatedDocumentById(item.cd_id).documentNumber}}
+              </span>
+              <span v-else-if="item.ii_id">
+                {{dataStore.getVendorById(dataStore.getIncomingInvoiceById(item.ii_id).vendor).name}} - {{dataStore.getIncomingInvoiceById(item.ii_id).reference}}
+              </span>
+            </td>
+            <td>
+              <UButton
+                  variant="outline"
+                  icon="i-heroicons-arrow-right-end-on-rectangle"
+                  @click="router.push(`/createDocument/show/${item.cd_id}`)"
+                  v-if="item.cd_id"
+              />
+              <UButton
+                  variant="outline"
+                  icon="i-heroicons-arrow-right-end-on-rectangle"
+                  @click="router.push(`/incominginvoices/show/${item.ii_id}`)"
+                  v-else-if="item.ii_id"
+              />
+            </td>
+          </tr>
+          <tr class="flex-row flex justify-between">
+            <td colspan="2">
+              <span class="font-semibold">Beschreibung:</span>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              {{itemInfo.text}}
+            </td>
+          </tr>
+        </tbody>
 
-          <td>
-<!--            <span v-if="itemInfo.createdDocument"><nuxt-link :to="`/createDocument/show/${itemInfo.createdDocument}`">{{dataStore.createddocuments.find(i => i.id === itemInfo.createdDocument).documentNumber}}</nuxt-link></span>
-            <span v-else-if="itemInfo.incomingInvoice"><nuxt-link :to="`/incominInvoices/show/${itemInfo.incomingInvoice}`">{{dataStore.getIncomingInvoiceById(itemInfo.incomingInvoice).reference}}</nuxt-link></span>-->
-            <span v-if="item.cd_id">
-              {{dataStore.getCreatedDocumentById(item.cd_id).documentNumber}}
-            </span>
-            <span v-else-if="item.ii_id">
-              {{dataStore.getVendorById(dataStore.getIncomingInvoiceById(item.ii_id).vendor).name}} - {{dataStore.getIncomingInvoiceById(item.ii_id).reference}}
-            </span>
-          </td>
-          <td>
-            <UButton
-              variant="outline"
-              icon="i-heroicons-arrow-right-end-on-rectangle"
-              @click="router.push(`/createDocument/show/${item.cd_id}`)"
-              v-if="item.cd_id"
-            />
-            <UButton
-              variant="outline"
-              icon="i-heroicons-arrow-right-end-on-rectangle"
-              @click="router.push(`/incominginvoices/show/${item.ii_id}`)"
-              v-else-if="item.ii_id"
-            />
-          </td>
-        </tr>
-        <tr class="flex-row flex justify-between">
-          <td colspan="2">
-            <span class="font-semibold">Beschreibung:</span>
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            {{itemInfo.text}}
-          </td>
-        </tr>
       </table>
 
     </UCard>
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index eb4a76d..8e64697 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -1388,379 +1388,379 @@ setupPage()
 
           <table class="w-full" v-if="itemInfo.rows.length > 0">
             <thead>
-            <tr>
-              <th></th>
-              <th>Pos.</th>
-              <th>Name</th>
-              <th>Menge</th>
-              <th>Einheit</th>
-              <th v-if="itemInfo.type !== 'deliveryNotes'">Preis</th>
-              <th v-if="itemInfo.type !== 'deliveryNotes'">Steuer</th>
-              <th v-if="itemInfo.type !== 'deliveryNotes'">Rabatt</th>
-              <th>Beschreibung</th>
-              <th v-if="itemInfo.type !== 'deliveryNotes'">Gesamt</th>
-            </tr>
+              <tr>
+                <th></th>
+                <th>Pos.</th>
+                <th>Name</th>
+                <th>Menge</th>
+                <th>Einheit</th>
+                <th v-if="itemInfo.type !== 'deliveryNotes'">Preis</th>
+                <th v-if="itemInfo.type !== 'deliveryNotes'">Steuer</th>
+                <th v-if="itemInfo.type !== 'deliveryNotes'">Rabatt</th>
+                <th>Beschreibung</th>
+                <th v-if="itemInfo.type !== 'deliveryNotes'">Gesamt</th>
+              </tr>
             </thead>
-
-
-            <draggable
-                v-model="itemInfo.rows"
-                handle=".handle"
-                tag="tbody"
-                itemKey="pos"
-                @end="setPosNumbers"
-            >
-              <template #item="{element: row}">
-                <tr>
-                  <td>
-                    <UIcon
-                        class="handle"
-                        name="i-mdi-menu"
-                    />
-                  </td>
-                  <td
-                      v-if="row.mode === 'pagebreak'"
-                      colspan="9"
-                  >
-                    <UDivider/>
-                  </td>
-                  <td
-                      v-if="row.mode === 'text'"
-                      colspan="9"
-                  >
-                    <UInput
-                      v-model="row.text"
-                      placeholder="Titel"
-                      maxlength="60"
-                    />
-                    <UTextarea
-                        class="mt-2"
-                      v-model="row.description"
-                      placeholder="Text"
-                    />
-                  </td>
-                  <td
-                      v-if="!['pagebreak','text'].includes(row.mode)"
-                  >{{row.pos}}</td>
-                  <td
-                      class="w-120"
-                      v-if="row.mode === 'free'"
-                  >
-                    <UInput
-                        v-model="row.text"
-                        placeholder="Name"
-                        class="min-w-40"
-                    />
-                  </td>
-                  <td
-                      class="w-120"
-                      v-else-if="row.mode === 'normal'"
-                  >
-                    <InputGroup class="w-full">
-                      <USelectMenu
-                          class="flex-auto"
-                          :options="products"
-                          :color="row.product ? 'primary' : 'rose'"
-                          option-attribute="name"
-                          value-attribute="id"
-                          searchable
-                          searchable-placeholder="Suche ..."
-                          :search-attributes="['name']"
-                          v-model="row.product"
-                          @change="row.unit = products.find(i => i.id === row.product).unit,
-                             row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
-                             row.description = products.find(i => i.id === row.product).description"
-                      >
-                        <template #label>
-                          <span class="truncate">{{row.product ? products.find(i => i.id === row.product).name : "Kein Produkt ausgewählt" }}</span>
-                        </template>
-                      </USelectMenu>
-                      <UButton
-                          icon="i-heroicons-magnifying-glass"
-                          @click="showProductSelectionModal = true"
+            <tbody>
+              <draggable
+                  v-model="itemInfo.rows"
+                  handle=".handle"
+                  tag="tbody"
+                  itemKey="pos"
+                  @end="setPosNumbers"
+              >
+                <template #item="{element: row}">
+                  <tr>
+                    <td>
+                      <UIcon
+                          class="handle"
+                          name="i-mdi-menu"
                       />
-                      <UModal v-model="showProductSelectionModal">
-                        <UCard>
-                          <template #header>
-                            Artikel Auswählen
-                          </template>
-
-                          <InputGroup class="w-full">
-                            <UFormGroup label="Artikelkategorie:">
-                              <USelectMenu
-                                  v-if="productcategories.length > 0"
-                                  :options="[{name: 'Nicht zugeordnet',id:'not set'},...productcategories]"
-                                  value-attribute="id"
-                                  option-attribute="name"
-                                  v-model="selectedProductcategorie"
-                              />
-                            </UFormGroup>
-                          </InputGroup>
-                          <UTable
-                            :rows="selectedProductcategorie !== 'not set' ? products.filter(i => i.productcategories.includes(selectedProductcategorie)) : products.filter(i => i.productcategories.length === 0)"
-                            :columns="[
-                                {key: 'name',label:'Name'},
-                                {key: 'manufacturer',label:'Hersteller'},
-                                {key: 'articleNumber',label:'Artikelnummer'},
-                            ]"
-                            :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
-                            @select=" (i) => {
-                             row.product = i.id
-                             row.unit = products.find(i => i.id === row.product).unit,
-                             row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
-                             row.description = products.find(i => i.id === row.product).description
-                              showProductSelectionModal = false}"
-                          >
-
-                          </UTable>
-                        </UCard>
-                      </UModal>
-                    </InputGroup>
-
-                  </td>
-                  <td
-                      class="w-120"
-                      v-else-if="row.mode === 'service'"
-                  >
-                    <InputGroup class="w-full">
-                      <USelectMenu
-                          class="flex-auto"
-                          :options="services"
-                          :color="row.service ? 'primary' : 'rose'"
-                          option-attribute="name"
-                          value-attribute="id"
-                          searchable
-                          searchable-placeholder="Suche ..."
-                          :search-attributes="['name']"
-                          v-model="row.service"
-                          @change="row.unit = dataStore.getServiceById(row.service).unit,
-                               row.price = dataStore.getServiceById(row.service).sellingPrice || 0,
-                               row.description = dataStore.getServiceById(row.service).description"
-                      >
-                        <template #label>
-                          <span class="truncate">{{dataStore.getServiceById(row.service) ? dataStore.getServiceById(row.service).name : "Keine Leistung ausgewählt" }}</span>
-                        </template>
-                      </USelectMenu>
-                      <UButton
-                          icon="i-heroicons-magnifying-glass"
-                          @click="showServiceSelectionModal = true"
+                    </td>
+                    <td
+                        v-if="row.mode === 'pagebreak'"
+                        colspan="9"
+                    >
+                      <UDivider/>
+                    </td>
+                    <td
+                        v-if="row.mode === 'text'"
+                        colspan="9"
+                    >
+                      <UInput
+                          v-model="row.text"
+                          placeholder="Titel"
+                          maxlength="60"
                       />
-                      <UModal v-model="showServiceSelectionModal">
-                        <UCard>
-                          <template #header>
-                            Leistung Auswählen
+                      <UTextarea
+                          class="mt-2"
+                          v-model="row.description"
+                          placeholder="Text"
+                      />
+                    </td>
+                    <td
+                        v-if="!['pagebreak','text'].includes(row.mode)"
+                    >{{row.pos}}</td>
+                    <td
+                        class="w-120"
+                        v-if="row.mode === 'free'"
+                    >
+                      <UInput
+                          v-model="row.text"
+                          placeholder="Name"
+                          class="min-w-40"
+                      />
+                    </td>
+                    <td
+                        class="w-120"
+                        v-else-if="row.mode === 'normal'"
+                    >
+                      <InputGroup class="w-full">
+                        <USelectMenu
+                            class="flex-auto"
+                            :options="products"
+                            :color="row.product ? 'primary' : 'rose'"
+                            option-attribute="name"
+                            value-attribute="id"
+                            searchable
+                            searchable-placeholder="Suche ..."
+                            :search-attributes="['name']"
+                            v-model="row.product"
+                            @change="row.unit = products.find(i => i.id === row.product).unit,
+                               row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
+                               row.description = products.find(i => i.id === row.product).description"
+                        >
+                          <template #label>
+                            <span class="truncate">{{row.product ? products.find(i => i.id === row.product).name : "Kein Produkt ausgewählt" }}</span>
                           </template>
+                        </USelectMenu>
+                        <UButton
+                            icon="i-heroicons-magnifying-glass"
+                            @click="showProductSelectionModal = true"
+                        />
+                        <UModal v-model="showProductSelectionModal">
+                          <UCard>
+                            <template #header>
+                              Artikel Auswählen
+                            </template>
 
-                          <InputGroup class="w-full">
-                            <UFormGroup label="Leistungskategorie:">
-                              <USelectMenu
-                                  v-if="servicecategories.length > 0"
-                                  :options="[{name: 'Nicht zugeordnet',id:'not set'},...servicecategories]"
-                                  value-attribute="id"
-                                  option-attribute="name"
-                                  v-model="selectedServicecategorie"
-                              />
-                            </UFormGroup>
-                          </InputGroup>
-                          <UTable
-                              :rows="selectedServicecategorie !== 'not set' ? services.filter(i => i.servicecategories.includes(selectedServicecategorie)) : services.filter(i => i.servicecategories.length === 0)"
-                              :columns="[
+                            <InputGroup class="w-full">
+                              <UFormGroup label="Artikelkategorie:">
+                                <USelectMenu
+                                    v-if="productcategories.length > 0"
+                                    :options="[{name: 'Nicht zugeordnet',id:'not set'},...productcategories]"
+                                    value-attribute="id"
+                                    option-attribute="name"
+                                    v-model="selectedProductcategorie"
+                                />
+                              </UFormGroup>
+                            </InputGroup>
+                            <UTable
+                                :rows="selectedProductcategorie !== 'not set' ? products.filter(i => i.productcategories.includes(selectedProductcategorie)) : products.filter(i => i.productcategories.length === 0)"
+                                :columns="[
                                   {key: 'name',label:'Name'},
-                                  {key: 'serviceNumber',label:'Leistungsnummer'},
-                                  {key: 'sellingPrice',label:'Verkaufspreis'},
+                                  {key: 'manufacturer',label:'Hersteller'},
+                                  {key: 'articleNumber',label:'Artikelnummer'},
                               ]"
-                              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Leistungen anzuzeigen' }"
-                              @select=" (i) => {
-                               row.service = i.id
-                               row.unit = dataStore.getServiceById(row.service).unit,
-                               row.price = dataStore.getServiceById(row.service).sellingPrice || 0,
-                               row.description = dataStore.getServiceById(row.service).description
-                                showServiceSelectionModal = false}"
+                                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
+                                @select=" (i) => {
+                               row.product = i.id
+                               row.unit = products.find(i => i.id === row.product).unit,
+                               row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
+                               row.description = products.find(i => i.id === row.product).description
+                                showProductSelectionModal = false}"
+                            >
+
+                            </UTable>
+                          </UCard>
+                        </UModal>
+                      </InputGroup>
+
+                    </td>
+                    <td
+                        class="w-120"
+                        v-else-if="row.mode === 'service'"
+                    >
+                      <InputGroup class="w-full">
+                        <USelectMenu
+                            class="flex-auto"
+                            :options="services"
+                            :color="row.service ? 'primary' : 'rose'"
+                            option-attribute="name"
+                            value-attribute="id"
+                            searchable
+                            searchable-placeholder="Suche ..."
+                            :search-attributes="['name']"
+                            v-model="row.service"
+                            @change="row.unit = dataStore.getServiceById(row.service).unit,
+                                 row.price = dataStore.getServiceById(row.service).sellingPrice || 0,
+                                 row.description = dataStore.getServiceById(row.service).description"
+                        >
+                          <template #label>
+                            <span class="truncate">{{dataStore.getServiceById(row.service) ? dataStore.getServiceById(row.service).name : "Keine Leistung ausgewählt" }}</span>
+                          </template>
+                        </USelectMenu>
+                        <UButton
+                            icon="i-heroicons-magnifying-glass"
+                            @click="showServiceSelectionModal = true"
+                        />
+                        <UModal v-model="showServiceSelectionModal">
+                          <UCard>
+                            <template #header>
+                              Leistung Auswählen
+                            </template>
+
+                            <InputGroup class="w-full">
+                              <UFormGroup label="Leistungskategorie:">
+                                <USelectMenu
+                                    v-if="servicecategories.length > 0"
+                                    :options="[{name: 'Nicht zugeordnet',id:'not set'},...servicecategories]"
+                                    value-attribute="id"
+                                    option-attribute="name"
+                                    v-model="selectedServicecategorie"
+                                />
+                              </UFormGroup>
+                            </InputGroup>
+                            <UTable
+                                :rows="selectedServicecategorie !== 'not set' ? services.filter(i => i.servicecategories.includes(selectedServicecategorie)) : services.filter(i => i.servicecategories.length === 0)"
+                                :columns="[
+                                    {key: 'name',label:'Name'},
+                                    {key: 'serviceNumber',label:'Leistungsnummer'},
+                                    {key: 'sellingPrice',label:'Verkaufspreis'},
+                                ]"
+                                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Leistungen anzuzeigen' }"
+                                @select=" (i) => {
+                                 row.service = i.id
+                                 row.unit = dataStore.getServiceById(row.service).unit,
+                                 row.price = dataStore.getServiceById(row.service).sellingPrice || 0,
+                                 row.description = dataStore.getServiceById(row.service).description
+                                  showServiceSelectionModal = false}"
+                            >
+
+                            </UTable>
+                          </UCard>
+                        </UModal>
+                      </InputGroup>
+                    </td>
+                    <td
+                        class="w-20"
+                        v-if="!['pagebreak','title','text'].includes(row.mode)"
+                    >
+                      <UInput
+                          v-model="row.quantity"
+                          type="number"
+                          :step="dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).step : '1' "
+
+                      />
+                    </td>
+                    <td
+                        class="w-40"
+                        v-if="!['pagebreak','title','text'].includes(row.mode)"
+                    >
+                      <USelectMenu
+                          v-model="row.unit"
+                          :options="dataStore.units"
+                          option-attribute="name"
+                          value-attribute="id"
+                      >
+                        <template #label>
+                          {{dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).name : "Keine Einheit gewählt"}}
+                        </template>
+                      </USelectMenu>
+                    </td>
+                    <td
+                        class="w-40"
+                        v-if="!['pagebreak','title','text'].includes(row.mode) && itemInfo.type !== 'deliveryNotes'"
+                    >
+                      <UInput
+                          v-model="row.price"
+                          type="number"
+                          step="0.001"
+                          :color="getRowMargin(row) > 0 ? 'primary' : 'rose'"
+                      >
+                        <template #trailing>
+                          <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
+                        </template>
+                      </UInput>
+                    </td>
+                    <td
+                        class="w-40"
+                        v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
+
+                    >
+                      <USelectMenu
+                          :options="[19,7,0]"
+                          v-model="row.taxPercent"
+                      >
+                        <template #option="{option}">
+                          {{option}} %
+                        </template>
+                        <template #label>
+                          {{row.taxPercent}} %
+                        </template>
+                      </USelectMenu>
+
+                    </td>
+                    <td
+                        class="w-40"
+                        v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
+                    >
+                      <UInput
+                          v-model="row.discountPercent"
+                          type="number"
+                          step="0.01"
+                          placeholder="0"
+                      >
+                        <template #trailing>
+                          <span class="text-gray-500 dark:text-gray-400 text-xs">%</span>
+                        </template>
+                      </UInput>
+                    </td>
+                    <td
+                        class="w-40"
+                        v-if="!['pagebreak','title','text'].includes(row.mode)"
+                    >
+                      <UButton
+                          icon="i-heroicons-document-text"
+                          @click="row.showEdit = true"
+                      />
+                      <UButton
+                          icon="i-mdi-water-drop-outline"
+                          class="ml-3"
+                          v-if="row.agriculture"
+                          @click="row.showEditDiesel = true"
+                      />
+                      <UModal v-model="row.showEdit">
+                        <UCard>
+                          <template #header>
+                            Beschreibung bearbeiten
+                          </template>
+                          <UTextarea
+                              v-model="row.description"
+
                           >
 
-                          </UTable>
+                          </UTextarea>
+                          <template #footer>
+                            <UButton
+                                @click="row.showEdit = false"
+                            >
+                              Speichern
+                            </UButton>
+                          </template>
                         </UCard>
+
+
                       </UModal>
-                    </InputGroup>
-                  </td>
-                  <td
-                      class="w-20"
-                      v-if="!['pagebreak','title','text'].includes(row.mode)"
-                  >
-                    <UInput
-                        v-model="row.quantity"
-                        type="number"
-                        :step="dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).step : '1' "
-
-                    />
-                  </td>
-                  <td
-                      class="w-40"
-                      v-if="!['pagebreak','title','text'].includes(row.mode)"
-                  >
-                    <USelectMenu
-                        v-model="row.unit"
-                        :options="dataStore.units"
-                        option-attribute="name"
-                        value-attribute="id"
-                    >
-                      <template #label>
-                        {{dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).name : "Keine Einheit gewählt"}}
-                      </template>
-                    </USelectMenu>
-                  </td>
-                  <td
-                      class="w-40"
-                      v-if="!['pagebreak','title','text'].includes(row.mode) && itemInfo.type !== 'deliveryNotes'"
-                  >
-                    <UInput
-                        v-model="row.price"
-                        type="number"
-                        step="0.001"
-                        :color="getRowMargin(row) > 0 ? 'primary' : 'rose'"
-                    >
-                      <template #trailing>
-                        <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
-                      </template>
-                    </UInput>
-                  </td>
-                  <td
-                      class="w-40"
-                      v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
-
-                  >
-                    <USelectMenu
-                        :options="[19,7,0]"
-                        v-model="row.taxPercent"
-                    >
-                      <template #option="{option}">
-                        {{option}} %
-                      </template>
-                      <template #label>
-                        {{row.taxPercent}} %
-                      </template>
-                    </USelectMenu>
-
-                  </td>
-                  <td
-                      class="w-40"
-                      v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
-                  >
-                    <UInput
-                        v-model="row.discountPercent"
-                        type="number"
-                        step="0.01"
-                        placeholder="0"
-                    >
-                      <template #trailing>
-                        <span class="text-gray-500 dark:text-gray-400 text-xs">%</span>
-                      </template>
-                    </UInput>
-                  </td>
-                  <td
-                      class="w-40"
-                      v-if="!['pagebreak','title','text'].includes(row.mode)"
-                  >
-                    <UButton
-                      icon="i-heroicons-document-text"
-                      @click="row.showEdit = true"
-                    />
-                    <UButton
-                      icon="i-mdi-water-drop-outline"
-                      class="ml-3"
-                      v-if="row.agriculture"
-                      @click="row.showEditDiesel = true"
-                    />
-                    <UModal v-model="row.showEdit">
-                      <UCard>
-                        <template #header>
-                          Beschreibung bearbeiten
-                        </template>
-                        <UTextarea
-                            v-model="row.description"
-
-                        >
-
-                        </UTextarea>
-                        <template #footer>
-                          <UButton
-                            @click="row.showEdit = false"
+                      <UModal v-model="row.showEditDiesel">
+                        <UCard>
+                          <template #header>
+                            Dieselverbrauch bearbeiten
+                          </template>
+                          <UFormGroup
+                              label="Menge:"
                           >
-                            Speichern
-                          </UButton>
-                        </template>
-                      </UCard>
-
-
-                    </UModal>
-                    <UModal v-model="row.showEditDiesel">
-                      <UCard>
-                        <template #header>
-                          Dieselverbrauch bearbeiten
-                        </template>
-                        <UFormGroup
-                          label="Menge:"
-                        >
-                          <UInput
-                            v-model="row.agriculture.dieselUsage"
+                            <UInput
+                                v-model="row.agriculture.dieselUsage"
+                            >
+                              <template #trailing>
+                                L
+                              </template>
+                            </UInput>
+                          </UFormGroup>
+                          <UFormGroup
+                              label="Preis:"
                           >
-                            <template #trailing>
-                              L
-                            </template>
-                          </UInput>
-                        </UFormGroup>
-                        <UFormGroup
-                          label="Preis:"
-                        >
-                          <UInput
-                            v-model="row.agriculture.dieselPrice"
-                            type="number"
-                            steps="0.01"
-                          >
-                            <template #trailing>
-                              €/L
-                            </template>
-                          </UInput>
-                        </UFormGroup>
-                        <template #footer>
-                          <UButton
-                            @click="row.showEditDiesel = false,
-                                    processDieselPosition()"
-                          >
-                            Speichern
-                          </UButton>
-                        </template>
-                      </UCard>
+                            <UInput
+                                v-model="row.agriculture.dieselPrice"
+                                type="number"
+                                steps="0.01"
+                            >
+                              <template #trailing>
+                                €/L
+                              </template>
+                            </UInput>
+                          </UFormGroup>
+                          <template #footer>
+                            <UButton
+                                @click="row.showEditDiesel = false,
+                                      processDieselPosition()"
+                            >
+                              Speichern
+                            </UButton>
+                          </template>
+                        </UCard>
 
 
-                    </UModal>
-                  </td>
-                  <td
-                      v-if="!['pagebreak','title','text'].includes(row.mode) && itemInfo.type !== 'deliveryNotes'"
-                  >
+                      </UModal>
+                    </td>
+                    <td
+                        v-if="!['pagebreak','title','text'].includes(row.mode) && itemInfo.type !== 'deliveryNotes'"
+                    >
 
-                    <p class="text-right font-bold whitespace-nowrap"><span v-if="row.discountPercent !== 0" class="line-through mr-2 text-rose-500">{{getRowAmountUndiscounted(row)}} €</span>{{getRowAmount(row)}} €</p>
-                  </td>
-                  <td
-                      v-if="row.mode === 'title'"
-                      colspan="8"
-                  >
-                    <UInput
-                        v-model="row.text"
-                        placeholder="Titel"
-                    />
-                  </td>
-                  <td>
-                    <UButton
-                        variant="ghost"
-                        color="rose"
-                        icon="i-heroicons-x-mark-16-solid"
-                        @click="removePosition(row.id)"
-                    />
-                  </td>
-                </tr>
-              </template>
-            </draggable>
+                      <p class="text-right font-bold whitespace-nowrap"><span v-if="row.discountPercent !== 0" class="line-through mr-2 text-rose-500">{{getRowAmountUndiscounted(row)}} €</span>{{getRowAmount(row)}} €</p>
+                    </td>
+                    <td
+                        v-if="row.mode === 'title'"
+                        colspan="8"
+                    >
+                      <UInput
+                          v-model="row.text"
+                          placeholder="Titel"
+                      />
+                    </td>
+                    <td>
+                      <UButton
+                          variant="ghost"
+                          color="rose"
+                          icon="i-heroicons-x-mark-16-solid"
+                          @click="removePosition(row.id)"
+                      />
+                    </td>
+                  </tr>
+                </template>
+              </draggable>
+            </tbody>
           </table>
           <UAlert
             v-else
diff --git a/pages/contracts/[mode]/[[id]].vue b/pages/deprecated/entitys/contracts/[mode]/[[id]].vue
similarity index 96%
rename from pages/contracts/[mode]/[[id]].vue
rename to pages/deprecated/entitys/contracts/[mode]/[[id]].vue
index a9eb614..2b7847e 100644
--- a/pages/contracts/[mode]/[[id]].vue
+++ b/pages/deprecated/entitys/contracts/[mode]/[[id]].vue
@@ -344,17 +344,7 @@ setupPage()
                   label="Vertragsstart:"
                   class="mt-2"
               >
-                <UPopover :popper="{ placement: 'bottom-start' }">
-                  <UButton
-                      icon="i-heroicons-calendar-days-20-solid"
-                      :label="itemInfo.startDate ? dayjs(itemInfo.startDate).format('DD.MM.YYYY') : 'Datum auswählen'"
-                      variant="outline"
-                  />
 
-                  <template #panel="{ close }">
-                    <LazyDatePicker v-model="itemInfo.startDate" @close="close" />
-                  </template>
-                </UPopover>
               </UFormGroup>
               <UFormGroup
                   label="Vertragsende(voraussichtlich):"
diff --git a/pages/contracts/index.vue b/pages/deprecated/entitys/contracts/index.vue
similarity index 100%
rename from pages/contracts/index.vue
rename to pages/deprecated/entitys/contracts/index.vue
diff --git a/pages/customers/[mode]/[[id]].vue b/pages/deprecated/entitys/customers/[mode]/[[id]].vue
similarity index 92%
rename from pages/customers/[mode]/[[id]].vue
rename to pages/deprecated/entitys/customers/[mode]/[[id]].vue
index 74310b6..e27a9b9 100644
--- a/pages/customers/[mode]/[[id]].vue
+++ b/pages/deprecated/entitys/customers/[mode]/[[id]].vue
@@ -189,24 +189,7 @@ setupPage()
         <UCard class="mt-5" v-else>
 
           <div v-if="item.label === 'Projekte'">
-            <Toolbar>
-              <UButton
-                  @click="router.push(`/projects/create?customer=${itemInfo.id}`)"
-              >
-                + Projekt
-              </UButton>
-            </Toolbar>
-            <UTable
-                :rows="dataStore.getProjectsByCustomerId(itemInfo.id)"
-                @select="(row) => router.push(`/projects/show/${row.id}`)"
-                :columns="[{label: 'Name', key: 'name'},{label: 'Phase', key: 'phase'}]"
-                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Projekte' }"
 
-            >
-              <template #phase-data="{row}">
-                {{row.phases ? row.phases.find(i => i.active).label : ""}}
-              </template>
-            </UTable>
           </div>
           <div v-else-if="item.label === 'Objekte'">
             <Toolbar>
diff --git a/pages/customers/index.vue b/pages/deprecated/entitys/customers/index.vue
similarity index 100%
rename from pages/customers/index.vue
rename to pages/deprecated/entitys/customers/index.vue
diff --git a/pages/projects/[mode]/[[id]].vue b/pages/deprecated/entitys/projects/[mode]/[[id]].vue
similarity index 100%
rename from pages/projects/[mode]/[[id]].vue
rename to pages/deprecated/entitys/projects/[mode]/[[id]].vue
diff --git a/pages/projects/index.vue b/pages/deprecated/entitys/projects/index.vue
similarity index 100%
rename from pages/projects/index.vue
rename to pages/deprecated/entitys/projects/index.vue
diff --git a/pages/deprecated/entitys/vehicles/[mode]/[[id]].vue b/pages/deprecated/entitys/vehicles/[mode]/[[id]].vue
new file mode 100644
index 0000000..e28b844
--- /dev/null
+++ b/pages/deprecated/entitys/vehicles/[mode]/[[id]].vue
@@ -0,0 +1,236 @@
+<script setup>
+import dayjs from "dayjs";
+import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
+
+definePageMeta({
+  middleware: "auth"
+})
+
+defineShortcuts({
+  'backspace': () => {
+    router.push("/vehicles")
+  },
+  'arrowleft': () => {
+    if(openTab.value > 0){
+      openTab.value -= 1
+    }
+  },
+  'arrowright': () => {
+    if(openTab.value < 3) {
+      openTab.value += 1
+    }
+  },
+})
+
+const dataStore = useDataStore()
+const profileStore = useProfileStore()
+const route = useRoute()
+const router = useRouter()
+const toast = useToast()
+const id = ref(route.params.id ? route.params.id : null )
+const openTab = ref(0)
+
+
+//Working
+const mode = ref(route.params.mode || "show")
+const itemInfo = ref({
+  name: "",
+  licensePlate: "",
+  type: "",
+  driver: null,
+  active: true
+})
+const oldItemInfo = ref({})
+
+
+//Functions
+const setupPage = async () => {
+  if(mode.value === "show"){
+    itemInfo.value = await useSupabaseSelectSingle("vehicles",route.params.id,"*, checks(*)")
+  } else if(mode.value === "edit"){
+    itemInfo.value = await useSupabaseSelectSingle("vehicles",route.params.id,"*")
+  }
+
+  if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
+}
+
+const cancelEditorCreate = () => {
+  if(itemInfo.value.id) {
+    router.push(`/vehicles/show/${itemInfo.value.id}`)
+  } else {
+    router.push(`/vehicles`)
+  }
+
+}
+
+setupPage()
+</script>
+
+<template>
+  <EntityEdit
+    v-if="mode === 'edit' || mode === 'create'"
+    type="vehicles"
+    :item="itemInfo"
+  />
+
+
+<!--  <UDashboardNavbar
+      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
+  >
+    <template #left>
+      <UButton
+          icon="i-heroicons-chevron-left"
+          variant="outline"
+          @click="router.push(`/vehicles`)"
+      >
+        Fahrzeuge
+      </UButton>
+    </template>
+    <template #center>
+      <h1
+          v-if="itemInfo"
+          :class="['text-xl','font-medium']"
+      >{{itemInfo ? `Fahrzeug: ${itemInfo.licensePlate}` : (mode === 'create' ? 'Fahrzeug erstellen' : 'Fahrzeug bearbeiten')}}</h1>
+    </template>
+    <template #right>
+      <ButtonWithConfirm
+          color="rose"
+          variant="outline"
+          @confirmed="dataStore.updateItem('vehicles',{...itemInfo, archived: true})"
+          v-if="mode === 'edit'"
+      >
+        <template #button>
+          Archivieren
+        </template>
+        <template #header>
+          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
+        </template>
+        Möchten Sie das Fahrzeug {{itemInfo.name}} wirklich archivieren?
+      </ButtonWithConfirm>
+      <UButton
+          v-if="mode === 'edit'"
+          @click="dataStore.updateItem('vehicles',itemInfo, oldItemInfo)"
+      >
+        Speichern
+      </UButton>
+      <UButton
+          v-else-if="mode === 'create'"
+          @click="dataStore.createNewItem('vehicles',itemInfo)"
+      >
+        Erstellen
+      </UButton>
+      <UButton
+          @click="cancelEditorCreate"
+          color="red"
+          class="ml-2"
+          v-if="mode === 'edit' || mode === 'create'"
+      >
+        Abbrechen
+      </UButton>
+    </template>
+  </UDashboardNavbar>-->
+
+<!--  <UForm
+      class="p-5"
+  >
+
+    <UFormGroup
+        label="Kennzeichen:"
+    >
+      <UInput
+          v-model="itemInfo.licensePlate"
+      />
+    </UFormGroup>
+
+
+
+    <UFormGroup
+        label="Fahrzeug aktiv:"
+    >
+      <UCheckbox
+          v-model="itemInfo.active"
+      />
+    </UFormGroup>
+    <UFormGroup
+        label="Fahrgestellnummer:"
+    >
+      <UInput
+          v-model="itemInfo.vin"
+      />
+    </UFormGroup>
+    <UFormGroup
+        label="Typ:"
+    >
+      <UTextarea
+          v-model="itemInfo.type"
+      />
+    </UFormGroup>
+    <UFormGroup
+        label="Fahrer:"
+    >
+      <USelectMenu
+          v-model="itemInfo.driver"
+          :options="[{id: null, fullName: 'Kein Fahrer'},...profileStore.profiles]"
+          option-attribute="fullName"
+          value-attribute="id"
+
+      >
+        <template #label>
+          {{profileStore.profiles.find(profile => profile.id === itemInfo.driver) ? profileStore.profiles.find(profile => profile.id === itemInfo.driver).fullName : 'Kein Fahrer ausgewählt'}}
+        </template>
+      </USelectMenu>
+    </UFormGroup>
+    <UFormGroup
+        label="Tankvolumen:"
+    >
+      <UInput
+          v-model="itemInfo.tankSize"
+          type="number"
+      >
+        <template #trailing>
+          L
+        </template>
+      </UInput>
+    </UFormGroup>
+    <UFormGroup
+        label="Baujahr:"
+    >
+      <UInput
+          v-model="itemInfo.buildYear"
+          type="number"
+      />
+    </UFormGroup>
+    <UFormGroup
+        label="Anhängelast:"
+    >
+      <UInput
+          v-model="itemInfo.towingCapacity"
+          type="number"
+      >
+        <template #trailing>kg</template>
+      </UInput>
+    </UFormGroup>
+    <UFormGroup
+        label="Farbe:"
+    >
+      <UInput
+          v-model="itemInfo.color"
+          type="text"
+      />
+    </UFormGroup>
+    <UFormGroup
+        label="Leistung:"
+    >
+      <UInput
+          v-model="itemInfo.powerInKW"
+          type="number"
+      >
+        <template #trailing>kW</template>
+      </UInput>
+    </UFormGroup>
+  </UForm>-->
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/pages/vehicles/index.vue b/pages/deprecated/entitys/vehicles/index.vue
similarity index 100%
rename from pages/vehicles/index.vue
rename to pages/deprecated/entitys/vehicles/index.vue
diff --git a/pages/deprecated/entitys/vehicles/show/[id].vue b/pages/deprecated/entitys/vehicles/show/[id].vue
new file mode 100644
index 0000000..f108c7f
--- /dev/null
+++ b/pages/deprecated/entitys/vehicles/show/[id].vue
@@ -0,0 +1,33 @@
+<script setup>
+import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
+
+const route = useRoute()
+
+const itemInfo = ref({})
+
+const tabItems = [{
+  label: 'Informationen',
+}, {
+  label: 'Dokumente',
+}, {
+  label: 'Überprüfungen',
+}]
+
+const setupPage = async () => {
+  itemInfo.value = await useSupabaseSelectSingle("vehicles",route.params.id,"*, checks(*), documents(*)")
+  console.log(itemInfo.value)
+}
+
+setupPage()
+</script>
+
+<template>
+  <EntityShow
+    type="vehicles"
+    :item="itemInfo"
+  />
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/pages/vendors/[mode]/[[id]].vue b/pages/deprecated/entitys/vendors/[mode]/[[id]].vue
similarity index 100%
rename from pages/vendors/[mode]/[[id]].vue
rename to pages/deprecated/entitys/vendors/[mode]/[[id]].vue
diff --git a/pages/vendors/index.vue b/pages/deprecated/entitys/vendors/index.vue
similarity index 100%
rename from pages/vendors/index.vue
rename to pages/deprecated/entitys/vendors/index.vue
diff --git a/pages/settings/numberRanges.vue b/pages/settings/numberRanges.vue
index ec2ce00..c27084a 100644
--- a/pages/settings/numberRanges.vue
+++ b/pages/settings/numberRanges.vue
@@ -6,7 +6,6 @@ definePageMeta({
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
-const profileStore = useProfileStore()
 
 
 
diff --git a/pages/standardEntity/[type]/[[mode]]/[[id]].vue b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
new file mode 100644
index 0000000..ee8828b
--- /dev/null
+++ b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
@@ -0,0 +1,60 @@
+<script setup>
+const route = useRoute()
+const dataStore = useDataStore()
+
+const type = route.params.type
+
+const dataType = dataStore.dataTypes[route.params.type]
+
+const loaded = ref(false)
+const mode = ref("list")
+const items = ref([])
+const item = ref({})
+
+const setupPage = async () => {
+  if(route.params.mode) mode.value = route.params.mode
+
+  if(mode.value === "show") {
+    //Load Data for Show
+    item.value = await useSupabaseSelectSingle(type, route.params.id, dataType.supabaseSelectWithInformation || "*")
+  } else if(mode.value === "edit") {
+    //Load Data for Edit
+    item.value = await useSupabaseSelectSingle(type, route.params.id)
+  } else if(mode.value === "list") {
+    //Load Data for List
+    items.value = await useSupabaseSelect(type, dataType.supabaseSelectWithInformation || "*", dataType.supabaseSortColumn)
+  }
+
+  loaded.value = true
+}
+
+setupPage()
+
+</script>
+
+<template>
+  <EntityShow
+      v-if="loaded && mode === 'show'"
+      :type="route.params.type"
+      :item="item"
+  />
+  <EntityEdit
+      v-else-if="loaded && (mode === 'edit' || mode === 'create')"
+      :type="route.params.type"
+      :item="item"
+  />
+  <EntityList
+      v-else-if="loaded && mode === 'list'"
+      :type="type"
+      :items="items"
+  />
+  <UProgress
+      v-else
+      animation="carousel"
+      class="p-5 mt-10"
+  />
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/pages/vehicles/[mode]/[[id]].vue b/pages/vehicles/[mode]/[[id]].vue
deleted file mode 100644
index b2c0aee..0000000
--- a/pages/vehicles/[mode]/[[id]].vue
+++ /dev/null
@@ -1,406 +0,0 @@
-<script setup>
-import dayjs from "dayjs";
-import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/vehicles")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-const openTab = ref(0)
-
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  name: "",
-  licensePlate: "",
-  type: "",
-  driver: null,
-  active: true
-})
-const oldItemInfo = ref({})
-
-const tabItems = [{
-  label: 'Informationen',
-}, {
-  label: 'Dokumente',
-}, {
-  label: 'Überprüfungen',
-}]
-
-const incomingInvoicesColumns = [
-  {
-    key: "state",
-    label: "Status",
-    sortable: true
-  },{
-    key: "vendor",
-    label: "Lieferant",
-    sortable: true
-  },{
-    key: "date",
-    label: "Datum",
-    sortable: true
-  },{
-    key: "description",
-    label: "Beschreibung",
-    sortable: true
-  },{
-    key: "accounts",
-    label: "Betrag",
-    sortable: true
-  },
-]
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show"){
-    itemInfo.value = await useSupabaseSelectSingle("vehicles",route.params.id,"*, checks(*)")
-  } else if(mode.value === "edit"){
-    itemInfo.value = await useSupabaseSelectSingle("vehicles",route.params.id,"*")
-  }
-
-  if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value.id) {
-    router.push(`/vehicles/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/vehicles`)
-  }
-
-}
-
-
-
-const getRowAmount = (row) => {
-  let amount = 0
-
-  row.accounts.forEach(account => {
-    amount += account.amountNet
-    amount += account.amountTax
-  })
-
-  return amount
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar
-      :title="itemInfo ? itemInfo.licensePlate : (mode === 'create' ? 'Fahrzeug erstellen' : 'Fahrzeug bearbeiten')"
-      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
-  >
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/vehicles`)"
-      >
-        Fahrzeuge
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          :class="['text-xl','font-medium']"
-      >{{itemInfo ? `Fahrzeug: ${itemInfo.licensePlate}` : (mode === 'create' ? 'Fahrzeug erstellen' : 'Fahrzeug bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <ButtonWithConfirm
-          color="rose"
-          variant="outline"
-          @confirmed="dataStore.updateItem('vehicles',{...itemInfo, archived: true})"
-          v-if="mode === 'edit'"
-      >
-        <template #button>
-          Archivieren
-        </template>
-        <template #header>
-          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
-        </template>
-        Möchten Sie das Fahrzeug {{itemInfo.name}} wirklich archivieren?
-      </ButtonWithConfirm>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('vehicles',itemInfo, oldItemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('vehicles',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="router.push(`/vehicles/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UTabs
-      :items="tabItems"
-      v-if="mode === 'show' && itemInfo.id"
-      class="p-5"
-      v-model="openTab"
-  >
-    <template #item="{item}">
-      <div v-if="item.label === 'Informationen'" class="flex flex-row mt-5">
-        <UCard class="w-1/2 mr-5">
-          <UAlert
-              v-if="itemInfo.archived"
-              color="rose"
-              variant="outline"
-              title="Objekt archiviert"
-              icon="i-heroicons-light-bulb"
-              class="mb-5"
-          />
-          <div class="text-wrap">
-            <table class="w-full">
-              <tr>
-                <td>Kennzeichen: </td>
-                <td>{{itemInfo.licensePlate}}</td>
-              </tr>
-              <tr>
-                <td>Typ: </td>
-                <td>{{itemInfo.type}}</td>
-              </tr>
-              <tr>
-                <td>Fahrgestellnummer: </td>
-                <td>{{itemInfo.vin}}</td>
-              </tr>
-              <tr>
-                <td>Fahrer:</td>
-                <td>{{profileStore.profiles.find(profile => profile.id === itemInfo.driver) ? profileStore.profiles.find(profile => profile.id === itemInfo.driver).fullName : 'Kein Fahrer gewählt'}}</td>
-              </tr>
-              <tr>
-                <td>Tankvolumen:</td>
-                <td>{{itemInfo.tankSize !== 0 ? `${itemInfo.tankSize} L` : "Kein Tank verbaut"}}</td>
-              </tr>
-              <tr>
-                <td>Baujahr:</td>
-                <td>{{itemInfo.buildYear}}</td>
-              </tr>
-              <tr>
-                <td>Anhänglast:</td>
-                <td>{{itemInfo.towingCapacity}}</td>
-              </tr>
-              <tr>
-                <td>Farbe:</td>
-                <td>{{itemInfo.color}}</td>
-              </tr>
-              <tr>
-                <td>Leistung:</td>
-                <td>{{itemInfo.powerInKW && itemInfo.powerInKW + " kW"}}</td>
-              </tr>
-            </table>
-          </div>
-
-        </UCard>
-        <UCard class="w-1/2">
-          <HistoryDisplay
-              type="vehicle"
-              v-if="itemInfo"
-              :element-id="itemInfo.id"
-          />
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Eingangsrechnungen'">
-        <UTable
-            :rows="dataStore.getIncomingInvoicesByVehicleId(itemInfo.id)"
-            :columns="incomingInvoicesColumns"
-            @select="(row) => router.push('/receipts/show/' + row.id)"
-        >
-          <template #vendor-data="{row}">
-            {{dataStore.getVendorById(row.vendor) ? dataStore.getVendorById(row.vendor).name : ""}}
-          </template>
-          <template #date-data="{row}">
-            {{dayjs(row.date).format("DD.MM.YYYY")}}
-          </template>
-          <template #accounts-data="{row}">
-            {{getRowAmount(row) ? String(getRowAmount(row).toFixed(2)).replace('.',',') + " €" : ""}}
-          </template>
-        </UTable>
-
-      </div>
-      <div v-else-if="item.label === 'Dokumente'">
-        <UCard class="mt-5">
-          <Toolbar>
-            <DocumentUpload
-                type="vehicle"
-                :element-id="itemInfo.id"
-            />
-          </Toolbar>
-
-          <DocumentList
-              :documents="dataStore.getDocumentsByVehicleId(itemInfo.id)"
-          />
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Überprüfungen'">
-        <UCard class="mt-5">
-          <UTable
-              :rows="itemInfo.checks"
-              :columns="[{key:'name',label: 'Name'},{key:'rhythm',label: 'Rhythmus'},{key:'description',label: 'Beschreibung'}]"
-              class="w-full"
-              :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-              @select="(i) => router.push(`/checks/show/${i.id}`) "
-              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Überprüfungen anzuzeigen' }"
-          >
-            <template #rhythm-data="{row}">
-              {{row.distance}}
-              <span v-if="row.distanceUnit === 'dayjs'">Tage</span>
-              <span v-if="row.distanceUnit === 'years'">Jahre</span>
-            </template>
-          </UTable>
-        </UCard>
-      </div>
-
-    </template>
-
-  </UTabs>
-  <UForm
-      v-else-if="mode == 'edit' || mode == 'create'"
-      class="p-5"
-  >
-
-    <UFormGroup
-        label="Kennzeichen:"
-    >
-      <UInput
-          v-model="itemInfo.licensePlate"
-      />
-    </UFormGroup>
-
-
-
-    <UFormGroup
-        label="Fahrzeug aktiv:"
-    >
-      <UCheckbox
-          v-model="itemInfo.active"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Fahrgestellnummer:"
-    >
-      <UInput
-          v-model="itemInfo.vin"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Typ:"
-    >
-      <UTextarea
-          v-model="itemInfo.type"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Fahrer:"
-    >
-      <USelectMenu
-          v-model="itemInfo.driver"
-          :options="[{id: null, fullName: 'Kein Fahrer'},...profileStore.profiles]"
-          option-attribute="fullName"
-          value-attribute="id"
-
-      >
-        <template #label>
-          {{profileStore.profiles.find(profile => profile.id === itemInfo.driver) ? profileStore.profiles.find(profile => profile.id === itemInfo.driver).fullName : 'Kein Fahrer ausgewählt'}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Tankvolumen:"
-    >
-      <UInput
-          v-model="itemInfo.tankSize"
-          type="number"
-      >
-        <template #trailing>
-          L
-        </template>
-      </UInput>
-    </UFormGroup>
-    <UFormGroup
-        label="Baujahr:"
-    >
-      <UInput
-          v-model="itemInfo.buildYear"
-          type="number"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Anhängelast:"
-    >
-      <UInput
-          v-model="itemInfo.towingCapacity"
-          type="number"
-      >
-        <template #trailing>kg</template>
-      </UInput>
-    </UFormGroup>
-    <UFormGroup
-        label="Farbe:"
-    >
-      <UInput
-          v-model="itemInfo.color"
-          type="text"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Leistung:"
-    >
-      <UInput
-          v-model="itemInfo.powerInKW"
-          type="number"
-      >
-        <template #trailing>kW</template>
-      </UInput>
-    </UFormGroup>
-  </UForm>
-</template>
-
-<style scoped>
-td {
-  border-bottom: 1px solid lightgrey;
-  vertical-align: top;
-  padding-bottom: 0.15em;
-  padding-top: 0.15em;
-}
-</style>
\ No newline at end of file
diff --git a/stores/data.js b/stores/data.js
index 8a0c299..e0b6005 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -7,12 +7,17 @@ import {useNumberRange} from "~/composables/useNumberRange.js";
 
 import projecttype from "~/components/columnRenderings/projecttype.vue"
 import customer from "~/components/columnRenderings/customer.vue"
+import contact from "~/components/columnRenderings/contact.vue"
 import plant from "~/components/columnRenderings/plant.vue"
 import vendor from "~/components/columnRenderings/vendor.vue"
 import active from "~/components/columnRenderings/active.vue"
 import sellingPrice from "~/components/columnRenderings/sellingPrice.vue";
 import unit from "~/components/columnRenderings/unit.vue";
-
+import isCompany from "~/components/columnRenderings/isCompany.vue"
+import address from "~/components/columnRenderings/address.vue"
+import sepa from "~/components/columnRenderings/sepa.vue"
+import recurring from "~/components/columnRenderings/recurring.vue"
+import description from "~/components/columnRenderings/description.vue"
 
 // @ts-ignore
 export const useDataStore = defineStore('data', () => {
@@ -33,37 +38,112 @@ export const useDataStore = defineStore('data', () => {
         customers: {
             label: "Kunden",
             labelSingle: "Kunde",
+            isStandardEntity: true,
             redirect:true,
             numberRangeHolder: "customerNumber",
             historyItemHolder: "customer",
+            supabaseSortColumn: "customerNumber",
+            supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*)",
             filters: [],
             templateColumns: [
                 {
                     key: 'customerNumber',
                     label: "Kundennummer",
+                    inputIsNumberRange: true,
+                    inputType: "text"
                 },
                 {
                     key: "name",
-                    label: "Name"
+                    label: "Name",
+                    title: true,
+                    inputType: "text"
                 },
                 {
                     key: "isCompany",
-                    label: "Typ"
+                    label: "Typ",
+                    component: isCompany,
+                    inputType: "bool"
                 },
                 {
                     key: "notes",
-                    label: "Notizen"
+                    label: "Notizen",
+                    inputType: "textarea"
                 },
                 {
                     key: "active",
                     label: "Aktiv",
-                    component: active
+                    component: active,
+                    inputType: "bool"
+                },
+                {
+                    key: "infoData.streetNumber",
+                    label: "Straße + Hausnummer",
+                    inputType: "text",
+                    disabledInTable: true
+                },
+                {
+                    key: "infoData.special",
+                    label: "Adresszusatz",
+                    inputType: "text",
+                    disabledInTable: true
+                },
+                {
+                    key: "infoData.zip",
+                    label: "Postleitzahl",
+                    inputType: "number",
+                    disabledInTable: true
+                },
+                {
+                    key: "infoData.city",
+                    label: "Stadt",
+                    inputType: "text",
+                    disabledInTable: true
+                },
+                {
+                    key: "infoData.country",
+                    label: "Land",
+                    inputType: "select",
+                    selectDataType: "countrys",
+                    selectOptionAttribute: "name",
+                    selectValueAttribute: "name",
+                    disabledInTable: true
                 },
                 {
                     key: "address",
                     label: "Adresse",
-                }
-            ]
+                    component: address
+                },
+                {
+                    key: "infoData.tel",
+                    label: "Telefon",
+                    inputType: "text"
+                },
+                {
+                    key: "infoData.email",
+                    label: "E-Mail",
+                    inputType: "text"
+                },
+                {
+                    key: "infoData.web",
+                    label: "Web",
+                    inputType: "text"
+                },
+                {
+                    key: "infoData.ustid",
+                    label: "USt-Id",
+                    inputType: "text"
+                },
+                {
+                    key: "profiles",
+                    label: "Berechtigte Benutzer",
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                    selectMultiple: true
+                },
+            ],
+            showTabs: [{label: 'Informationen'},{label: 'Dokumente'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]
         },
         contacts: {
             label: "Kontakte",
@@ -116,21 +196,103 @@ export const useDataStore = defineStore('data', () => {
         contracts: {
             label: "Verträge",
             labelSingle: "Vertrag",
+            isStandardEntity: true,
             redirect:true,
             filters:[],
+            supabaseSelectWithInformation: "*, customer(*), documents(*)",
             templateColumns: [
                 {
                     key: "name",
-                    label: "Name"
+                    label: "Name",
+                    title: true,
+                    inputType: "text"
+                },{
+                    key: "active",
+                    label: "Aktiv",
+                    component: active,
+                    inputType: "bool"
+                },{
+                    key: "recurring",
+                    label: "Wiederkehrend",
+                    component: recurring,
+                    inputType: "bool"
                 },{
                     key: 'customer',
                     label: "Kunde",
-                    component: customer
+                    component: customer,
+                    inputType: "select",
+                    selectDataType: "customers",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },{
+                    key: 'contact',
+                    label: "Ansprechpartner",
+                    component: contact,
+                    inputType: "select",
+                    selectDataType: "contacts",
+                    selectDataTypeFilter: function (i,item) {
+                      return i.customer === item.customer
+                    },
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                },{
+                    key: 'duration',
+                    label: "mindest Vertragslaufzeit",
+                    inputType: "select",
+                    selectManualOptions: ['12 Monate','24 Monate','36 Monate','48 Monate']
+                },{
+                    key: 'invoiceDispatch',
+                    label: "Rechnungsversand",
+                    inputType: "select",
+                    selectManualOptions: ['E-Mail','Post']
+                },{
+                    key: 'paymentType',
+                    label: "Zahlungsart",
+                    inputType: "select",
+                    selectManualOptions: ['Einzug','Überweisung']
+                },{
+                    key: 'startDate',
+                    label: "Vertragsstart",
+                    inputType: "date",
+                },{
+                    key: 'endDate',
+                    label: "Vertragsende",
+                    inputType: "date",
+                },{
+                    key: 'signDate',
+                    label: "Unterschrieben am",
+                    inputType: "date",
+                },{
+                    key: 'sepaDate',
+                    label: "SEPA Datum",
+                    inputType: "date",
+                },{
+                    key: 'sepaRef',
+                    label: "Mandatsreferenz",
+                    inputType: "text",
+                },{
+                    key: 'bankingIban',
+                    label: "IBAN",
+                    inputType: "text",
+                },{
+                    key: 'bankingOwner',
+                    label: "Inhaber",
+                    inputType: "text",
+                },{
+                    key: 'bankingName',
+                    label: "Bank",
+                    inputType: "text",
+                },{
+                    key: 'bankinBIC',
+                    label: "BIC",
+                    inputType: "text",
                 },{
                     key: "notes",
-                    label: "Notizen"
+                    label: "Notizen",
+                    inputType: "textarea"
                 }
-            ]
+            ],
+            showTabs: [{label: 'Informationen'},{label: 'Dokumente'}]
         },
         absencerequests: {
             label: "Abwesenheitsanträge",
@@ -140,20 +302,43 @@ export const useDataStore = defineStore('data', () => {
         plants: {
             label: "Objekte",
             labelSingle: "Objekt",
+            isStandardEntity: true,
             redirect:true,
             historyItemHolder: "plant",
+            supabaseSelectWithInformation: "*, customer(id,name)",
             filters: [],
             templateColumns: [
                 {
                     key: "name",
-                    label: "Name"
+                    label: "Name",
+                    inputType: "text",
+                    title: true
                 },
                 {
                     key: "customer",
                     label: "Kunde",
-                    component: customer
-                }
-            ]
+                    component: customer,
+                    inputType: "select",
+                    selectDataType: "customers",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },{
+                    key: "description",
+                    label: "Beschreibung",
+                    inputType:"editor",
+                    component: description
+                },
+            ],
+            showTabs: [
+                {
+                label: "Informationen"
+            },{
+                label: "Projekte"
+            },{
+                label: "Aufgaben"
+            },{
+                label: "Dokumente"
+            }]
         },
         products: {
             label: "Artikel",
@@ -196,9 +381,12 @@ export const useDataStore = defineStore('data', () => {
         projects: {
             label: "Projekte",
             labelSingle: "Projekt",
+            isStandardEntity: true,
             redirect:true,
             historyItemHolder: "project",
             numberRangeHolder: "projectNumber",
+            supabaseSelectWithInformation: "*, customer(name), plant(name), projecttype(name, id), tasks(*), documents(*)",
+            supabaseSortColumn: "projectNumber",
             filters: [
                 {
                     name: "Abgeschlossen",
@@ -221,80 +409,273 @@ export const useDataStore = defineStore('data', () => {
                 {
                     key: "projecttype",
                     label: "Typ",
-                    component: projecttype
+                    component: projecttype,
+                    inputType: "select",
+                    selectDataType: "projecttypes",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
                 },{
                     key: "phase",
                     label: "Phase"
                 },{
                     key: "name",
-                    label: "Name"
+                    label: "Name",
+                    title: true,
+                    inputType: "text"
                 },
                 {
                     key: "customer",
                     label: "Kunde",
-                    component: customer
+                    component: customer,
+                    inputType: "select",
+                    selectDataType: "customers",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
                 },
                 {
                     key: "notes",
                     label: "Notizen",
+                    inputType: "textarea"
                 },
                 {
                     key: "plant",
                     label: "Objekt",
-                    component: plant
+                    component: plant,
+                    inputType: "select",
+                    selectDataType: "plants",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
                 },
                 {
                     key: "profiles",
-                    label: "Benutzer"
-                }]
+                    label: "Berechtigte Benutzer",
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                    selectMultiple: true
+                },],
+            showTabs: [
+                {
+                key: "information",
+                label: "Informationen"
+            },
+                {
+                    key: "phases",
+                    label: "Phasen"
+                },{
+                    key: "tasks",
+                    label: "Aufgaben"
+                },{
+                    key: "documents",
+                    label: "Dokumente"
+                }/*,{
+                    key: "timetracking",
+                    label: "Zeiterfassung"
+                },{
+                    key: "events",
+                    label: "Termine"
+                },{
+                    key: "material",
+                    label: "Material"
+                }*/]
         },
         vehicles: {
             label: "Fahrzeuge",
             labelSingle: "Fahrzeug",
+            isStandardEntity: true,
             redirect:true,
             historyItemHolder: "vehicle",
+            supabaseSelectWithInformation: "*, checks(*), documents(*)",
             filters:[],
             templateColumns:[
                 {
                     key: 'active',
                     label: "Aktiv",
-                    component: active
+                    component: active,
+                    inputType: "bool"
                 },{
                     key: 'licensePlate',
-                    label: "Kennzeichen"
+                    label: "Kennzeichen",
+                    inputType: "text",
+                    title: true
                 },{
                     key: 'vin',
-                    label: "Identifikationnummer"
+                    label: "Identifikationnummer",
+                    inputType: "text"
                 },
                 {
                     key: "type",
                     label: "Typ",
+                    inputType: "text"
+                },
+                {
+                    key: "driver",
+                    label: "Fahrer",
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName"
+                },
+                {
+                    key: "tankSize",
+                    label: "Tankvolumen",
+                    unit: "L",
+                    inputType: "number"
+                },
+                {
+                    key: "buildYear",
+                    label: "Baujahr",
+                    inputType: "number"
+                },
+                {
+                    key: "towingCapacity",
+                    label: "Anhängelast",
+                    unit: "kG",
+                    inputType: "number"
+                },
+                {
+                    key: "color",
+                    label: "Farbe",
+                    inputType: "text"
+                },
+                {
+                    key: "powerInKW",
+                    label: "Leistung",
+                    unit: "kW",
+                    inputType: "number"
+                },
+                {
+                    key: "profiles",
+                    label: "Berechtigte Benutzer",
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                    selectMultiple: true
+                },
+            ],
+            showTabs: [
+                {
+                    label: 'Informationen',
+                }, {
+                    label: 'Dokumente',
+                }, {
+                    label: 'Überprüfungen',
                 }
             ]
         },
         vendors: {
             label: "Lieferanten",
             labelSingle: "Lieferant",
+            isStandardEntity: true,
             redirect:true,
             numberRangeHolder: "vendorNumber",
             historyItemHolder: "vendor",
-            filters: [],
+            supabaseSortColumn: "vendorNumber",
+            supabaseSelectWithInformation: "*, contacts(*)",
+            filters: [{
+                name: "SEPA nicht erteilt",
+                "filterFunction": function (row) {
+                    return !row.hasSEPA
+                }
+            }],
             templateColumns: [
                 {
                     key: 'vendorNumber',
                     label: "Lieferantennummer",
+                    inputType: "text",
+                    inputIsNumberRange: true
                 },
                 {
                     key: "name",
-                    label: "Name"
+                    label: "Name",
+                    title: true,
+                    inputType: "text"
+                },
+                {
+                    key: "infoData.streetNumber",
+                    label: "Straße + Hausnummer",
+                    inputType: "text",
+                    disabledInTable: true
+                },
+                {
+                    key: "infoData.special",
+                    label: "Adresszusatz",
+                    inputType: "text",
+                    disabledInTable: true
+                },
+                {
+                    key: "infoData.zip",
+                    label: "Postleitzahl",
+                    inputType: "number",
+                    disabledInTable: true
+                },
+                {
+                    key: "infoData.city",
+                    label: "Stadt",
+                    inputType: "text",
+                    disabledInTable: true
+                },
+                {
+                    key: "infoData.country",
+                    label: "Land",
+                    inputType: "select",
+                    selectDataType: "countrys",
+                    selectOptionAttribute: "name",
+                    selectValueAttribute: "name",
+                    disabledInTable: true
                 },
                 {
                     key: "address",
-                    label: "Adresse"
+                    label: "Adresse",
+                    component: address
+                },
+                {
+                    key: "infoData.tel",
+                    label: "Telefon",
+                    inputType: "text"
+                },
+                {
+                    key: "infoData.email",
+                    label: "E-Mail",
+                    inputType: "text"
+                },
+                {
+                    key: "infoData.web",
+                    label: "Web",
+                    inputType: "text"
+                },
+                {
+                    key: "infoData.ustid",
+                    label: "USt-Id",
+                    inputType: "text"
+                },
+                {
+                    key: "hasSEPA",
+                    label: "SEPA Mandat erteilt",
+                    inputType: "bool",
+                    component: sepa
                 },
                 {
                     key: "notes",
-                    label: "Notizen"
+                    label: "Notizen",
+                    inputType: "textarea"
+                },
+                {
+                    key: "profiles",
+                    label: "Berechtigte Benutzer",
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                    selectMultiple: true
+                },
+            ],
+            showTabs: [
+                {
+                    label: 'Informationen',
+                }, {
+                    label: 'Dokumente',
                 }
             ]
         },
@@ -798,8 +1179,8 @@ export const useDataStore = defineStore('data', () => {
                     name = "Kategorie"
                 } else if(key === "profile") {
                     name = "Mitarbeiter"
-                    if(prop.data.o) oldVal = profiles.value.find(i => i.id === prop.data.o).fullName
-                    if(prop.data.n) newVal = profiles.value.find(i => i.id === prop.data.n).fullName
+                    if(prop.data.o) oldVal = profileStore.profiles.find(i => i.id === prop.data.o).fullName
+                    if(prop.data.n) newVal = profileStore.profiles.find(i => i.id === prop.data.n).fullName
                 } else if(key === "plant") {
                     name = "Objekt"
                     if(prop.data.o) oldVal = plants.value.find(i => i.id === prop.data.o).name
@@ -822,8 +1203,8 @@ export const useDataStore = defineStore('data', () => {
                     name = "Leistung"
                 } else if(key === "driver") {
                     name = "Fahrer"
-                    if(prop.data.o) oldVal = profiles.value.find(i => i.id === prop.data.o).fullName
-                    if(prop.data.n) newVal = profiles.value.find(i => i.id === prop.data.n).fullName
+                    if(prop.data.o) oldVal = profileStore.profiles.find(i => i.id === prop.data.o).fullName
+                    if(prop.data.n) newVal = profileStore.profiles.find(i => i.id === prop.data.n).fullName
                 } else if(key === "projecttype") {
                     name = "Projekttyp"
 
@@ -856,7 +1237,7 @@ export const useDataStore = defineStore('data', () => {
 
                 let historyItem = {
                     text: text,
-                    createdBy: activeProfile.value.id,
+                    createdBy: profileStore.activeProfile.id,
                     oldVal: prop.data.o,
                     newVal: prop.data.n,
                     tenant: profileStore.currentTenant
@@ -971,7 +1352,13 @@ export const useDataStore = defineStore('data', () => {
 
 
             toast.add({title: `${dataTypes[dataType].labelSingle} hinzugefügt`})
-            if(dataTypes[dataType].redirect) await router.push(`/${dataType}/show/${supabaseData[0].id}`)
+            if(dataTypes[dataType].redirect) {
+                if(dataTypes[dataType].isStandardEntity) {
+                    await router.push(dataTypes[dataType].redirectToList ? `/standardEntity/${dataType}` : `/standardEntity/${dataType}/show/${data.id}`)
+                } else {
+                    await router.push(dataTypes[dataType].redirectToList ? `/${dataType}` : `/${dataType}/show/${data.id}`)
+                }
+            }
             return supabaseData
         }
     }
@@ -1022,9 +1409,15 @@ export const useDataStore = defineStore('data', () => {
             toast.add({title: `Fehler beim Speichern`, color: 'rose'})
         } else if(supabaseData) {
             //await eval(dataType + '.value[' + dataType + '.value.findIndex(i => i.id === ' + JSON.stringify(data.id) + ')] = ' + JSON.stringify(supabaseData[0]))
-            if(dataType === 'profiles') await fetchProfiles()
+            //if(dataType === 'profiles') await fetchProfiles()
             toast.add({title: `${dataTypes[dataType].labelSingle} gespeichert`})
-            if(dataTypes[dataType].redirect) await router.push(dataTypes[dataType].redirectToList ? `/${dataType}` : `/${dataType}/show/${data.id}`)
+            if(dataTypes[dataType].redirect) {
+                if(dataTypes[dataType].isStandardEntity) {
+                    await router.push(dataTypes[dataType].redirectToList ? `/standardEntity/${dataType}` : `/standardEntity/${dataType}/show/${data.id}`)
+                } else {
+                    await router.push(dataTypes[dataType].redirectToList ? `/${dataType}` : `/${dataType}/show/${data.id}`)
+                }
+            }
             return supabaseData
         }
     }
@@ -1441,19 +1834,19 @@ export const useDataStore = defineStore('data', () => {
     })
 
     const getEventTypes = computed(() => {
-        return ownTenant.value.calendarConfig.eventTypes
+        return profileStore.ownTenant.calendarConfig.eventTypes
     })
 
     const getTimeTypes = computed(() => {
-        return ownTenant.value.timeConfig.timeTypes
+        return profileStore.ownTenant.timeConfig.timeTypes
     })
 
     const getDocumentTags = computed(() => {
-        return ownTenant.value.tags.documents
+        return profileStore.ownTenant.tags.documents
     })
 
     const getMeasures = computed(() => {
-        return ownTenant.value.measures
+        return profileStore.ownTenant.measures
     })
 
     const getResources = computed(() => {
@@ -1511,7 +1904,7 @@ export const useDataStore = defineStore('data', () => {
     const getEvents = computed(() => {
         return [
             ...events.value.map(event => {
-                let eventColor = ownTenant.value.calendarConfig.eventTypes.find(type => type.label === event.type).color
+                let eventColor = profileStore.ownTenant.calendarConfig.eventTypes.find(type => type.label === event.type).color
 
                 let title = ""
                 if(event.title) {
@@ -1548,7 +1941,7 @@ export const useDataStore = defineStore('data', () => {
             console.log(event)
             event.resources.forEach(resource => {
                 console.log(resource)
-                let eventColor = ownTenant.value.calendarConfig.eventTypes.find(type => type.label === event.type).color
+                let eventColor = profileStore.ownTenant.calendarConfig.eventTypes.find(type => type.label === event.type).color
 
                 let title = ""
                 if(event.title) {
@@ -1580,7 +1973,7 @@ export const useDataStore = defineStore('data', () => {
             /*...events.value.map(event => {
 
 
-                let eventColor = ownTenant.value.calendarConfig.eventTypes.find(type => type.label === event.type).color
+                let eventColor = profileStore.ownTenant.calendarConfig.eventTypes.find(type => type.label === event.type).color
 
                 return {
                     ...event,

From 61110da453b7cf8abf9afdf0dd106b5538082b56 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sun, 22 Dec 2024 17:00:21 +0100
Subject: [PATCH 006/104] Introduced EntityEdit.vue Introduced EntityShow.vue

Deprecated following as non standardEntity contracts, customers, vendors, projects, plants, vehicles
---
 pages/{ => deprecated/entitys}/plants/[mode]/[[id]].vue | 0
 pages/{ => deprecated/entitys}/plants/index.vue         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename pages/{ => deprecated/entitys}/plants/[mode]/[[id]].vue (100%)
 rename pages/{ => deprecated/entitys}/plants/index.vue (100%)

diff --git a/pages/plants/[mode]/[[id]].vue b/pages/deprecated/entitys/plants/[mode]/[[id]].vue
similarity index 100%
rename from pages/plants/[mode]/[[id]].vue
rename to pages/deprecated/entitys/plants/[mode]/[[id]].vue
diff --git a/pages/plants/index.vue b/pages/deprecated/entitys/plants/index.vue
similarity index 100%
rename from pages/plants/index.vue
rename to pages/deprecated/entitys/plants/index.vue

From 1ba3d9c3e971622e2366e19cb97e50e41cb7c873 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sun, 22 Dec 2024 22:13:34 +0100
Subject: [PATCH 007/104] Deprecated following as non standardEntity tasks,
 products, productcategories, services, servicecategories

---
 components/EntityEdit.vue                     |  16 +-
 components/EntityList.vue                     |   9 +-
 components/MainNav.vue                        |  14 +-
 components/columnRenderings/created_at.vue    |  15 ++
 components/columnRenderings/profile.vue       |  15 ++
 components/columnRenderings/profiles.vue      |  18 ++
 components/columnRenderings/project.vue       |  13 ++
 components/columnRenderings/purchasePrice.vue |  13 ++
 composables/useRole.js                        |  12 ++
 .../productcategories/[mode]/[[id]].vue       |   0
 .../entitys}/productcategories/index.vue      |   0
 .../entitys}/products/[mode]/[[id]].vue       |   0
 .../entitys}/products/index.vue               |   0
 .../servicecategories/[mode]/[[id]].vue       |   0
 .../entitys}/servicecategories/index.vue      |   0
 .../entitys}/services/[mode]/[[id]].vue       |   0
 .../entitys}/services/index.vue               |   0
 .../entitys}/tasks/[mode]/[[id]].vue          |   0
 .../{ => deprecated/entitys}/tasks/index.vue  |  30 +--
 stores/data.js                                | 195 +++++++++++++++---
 20 files changed, 287 insertions(+), 63 deletions(-)
 create mode 100644 components/columnRenderings/created_at.vue
 create mode 100644 components/columnRenderings/profile.vue
 create mode 100644 components/columnRenderings/profiles.vue
 create mode 100644 components/columnRenderings/project.vue
 create mode 100644 components/columnRenderings/purchasePrice.vue
 rename pages/{ => deprecated/entitys}/productcategories/[mode]/[[id]].vue (100%)
 rename pages/{ => deprecated/entitys}/productcategories/index.vue (100%)
 rename pages/{ => deprecated/entitys}/products/[mode]/[[id]].vue (100%)
 rename pages/{ => deprecated/entitys}/products/index.vue (100%)
 rename pages/{ => deprecated/entitys}/servicecategories/[mode]/[[id]].vue (100%)
 rename pages/{ => deprecated/entitys}/servicecategories/index.vue (100%)
 rename pages/{ => deprecated/entitys}/services/[mode]/[[id]].vue (100%)
 rename pages/{ => deprecated/entitys}/services/index.vue (100%)
 rename pages/{ => deprecated/entitys}/tasks/[mode]/[[id]].vue (100%)
 rename pages/{ => deprecated/entitys}/tasks/index.vue (87%)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index b8a173d..e69a29c 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -79,6 +79,8 @@ const loadOptions = async () => {
   for await(const option of optionsToLoad) {
     if(option.option === "countrys") {
       loadedOptions.value[option.option] = (await supabase.from("countrys").select()).data
+    } else if(option.option === "units") {
+      loadedOptions.value[option.option] = (await supabase.from("units").select()).data
     } else {
       loadedOptions.value[option.option] = (await useSupabaseSelect(option.option))
 
@@ -87,6 +89,8 @@ const loadOptions = async () => {
       }
     }
   }
+
+  console.log(loadedOptions.value)
 }
 
 loadOptions()
@@ -174,7 +178,11 @@ const contentChanged = (content, datapoint) => {
               :searchable="datapoint.selectSearchAttributes"
               :search-attributes="datapoint.selectSearchAttributes"
               :multiple="datapoint.selectMultiple"
-          />
+          >
+            <template #empty>
+              Keine Optionen verfügbar
+            </template>
+          </USelectMenu>
           <UTextarea
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
@@ -218,7 +226,11 @@ const contentChanged = (content, datapoint) => {
               :search-attributes="datapoint.selectSearchAttributes"
               :multiple="datapoint.selectMultiple"
               searchable-placeholder="Suche..."
-          />
+          >
+            <template #empty>
+              Keine Optionen verfügbar
+            </template>
+          </USelectMenu>
           <UTextarea
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="props.item[datapoint.key]"
diff --git a/components/EntityList.vue b/components/EntityList.vue
index 483d51b..3cd3bfb 100644
--- a/components/EntityList.vue
+++ b/components/EntityList.vue
@@ -62,8 +62,6 @@ const searchString = ref('')
 
 const selectableFilters = ref(dataType.filters.map(i => i.name))
 const selectedFilters = ref(dataType.filters.filter(i => i.default).map(i => i.name) || [])
-console.log(selectableFilters)
-console.log(selectedFilters)
 
 const filteredRows = computed(() => {
 
@@ -132,6 +130,7 @@ const filteredRows = computed(() => {
           class="hidden lg:block"
           by="key"
           :color="selectedColumns.length !== dataType.templateColumns.filter(i => !i.disabledInTable).length ? 'primary' : 'white'"
+          :ui-menu="{ width: 'min-w-max' }"
       >
         <template #label>
           Spalten
@@ -144,6 +143,7 @@ const filteredRows = computed(() => {
           v-model="selectedFilters"
           :options="selectableFilters"
           :color="selectedFilters.length > 0 ? 'primary' : 'white'"
+          :ui-menu="{ width: 'min-w-max' }"
       >
         <template #label>
           Filter
@@ -159,6 +159,11 @@ const filteredRows = computed(() => {
       @select="(i) => router.push(`/standardEntity/${type}/show/${i.id}`) "
       :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: `Keine ${dataType.label} anzuzeigen` }"
   >
+    <template
+        v-for="column in dataType.templateColumns.filter(i => !i.disabledInTable)"
+        v-slot:[`${column.key}-header`]="{row}">
+      <span class="text-nowrap">{{column.label}}</span>
+    </template>
     <template #name-data="{row}">
       <span
           v-if="row.id === filteredRows[selectedItem].id"
diff --git a/components/MainNav.vue b/components/MainNav.vue
index 19bc384..27c1157 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -18,11 +18,11 @@ const links = computed(() => {
       icon: "i-heroicons-rectangle-stack",
       defaultOpen: false,
       children: [
-        {
+        ... role.checkRight("tasks") ? [{
           label: "Aufgaben",
-          to: "/tasks",
+          to: "/standardEntity/tasks",
           icon: "i-heroicons-rectangle-stack"
-        },
+        }] : [],
         ... profileStore.ownTenant.features.planningBoard ? [{
           label: "Plantafel",
           to: "/calendar/timeline",
@@ -183,22 +183,22 @@ const links = computed(() => {
       children: [
         ... role.checkRight("products") ? [{
           label: "Artikel",
-          to: "/products",
+          to: "/standardEntity/products",
           icon: "i-heroicons-puzzle-piece"
         }] : [],
         ... role.checkRight("productcategories") ? [{
           label: "Artikelkategorien",
-          to: "/productcategories",
+          to: "/standardEntity/productcategories",
           icon: "i-heroicons-puzzle-piece"
         }] : [],
         ... role.checkRight("services") ? [{
           label: "Leistungen",
-          to: "/services",
+          to: "/standardEntity/services",
           icon: "i-heroicons-puzzle-piece"
         }] : [],
         ... role.checkRight("servicecategories") ? [{
           label: "Leistungskategorien",
-          to: "/servicecategories",
+          to: "/standardEntity/servicecategories",
           icon: "i-heroicons-puzzle-piece"
         }] : [],
       ]
diff --git a/components/columnRenderings/created_at.vue b/components/columnRenderings/created_at.vue
new file mode 100644
index 0000000..8edd716
--- /dev/null
+++ b/components/columnRenderings/created_at.vue
@@ -0,0 +1,15 @@
+<script setup>
+import dayjs from "dayjs";
+
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span v-if="props.row.created_at">{{dayjs(props.row.created_at).format("DD.MM.YYYY HH:mm")}}</span>
+</template>
diff --git a/components/columnRenderings/profile.vue b/components/columnRenderings/profile.vue
new file mode 100644
index 0000000..e9d5dba
--- /dev/null
+++ b/components/columnRenderings/profile.vue
@@ -0,0 +1,15 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+
+const profileStore = useProfileStore()
+</script>
+
+<template>
+  <span>{{props.row.profile ? profileStore.getProfileById(props.row.profile).fullName : ''}}</span>
+</template>
diff --git a/components/columnRenderings/profiles.vue b/components/columnRenderings/profiles.vue
new file mode 100644
index 0000000..617c3a0
--- /dev/null
+++ b/components/columnRenderings/profiles.vue
@@ -0,0 +1,18 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+
+const profileStore = useProfileStore()
+
+const profiles = computed(() => props.row.profiles.map(id => profileStore.getProfileById(id).fullName).join(', '))
+
+</script>
+
+<template>
+  <span>{{props.row.profiles ? profiles : ''}}</span>
+</template>
diff --git a/components/columnRenderings/project.vue b/components/columnRenderings/project.vue
new file mode 100644
index 0000000..d3cdb50
--- /dev/null
+++ b/components/columnRenderings/project.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span>{{props.row.project ? props.row.project.name : ''}}</span>
+</template>
diff --git a/components/columnRenderings/purchasePrice.vue b/components/columnRenderings/purchasePrice.vue
new file mode 100644
index 0000000..dfb1916
--- /dev/null
+++ b/components/columnRenderings/purchasePrice.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span>{{props.row.purchasePrice ? useCurrency(props.row.purchasePrice) : ''}}</span>
+</template>
diff --git a/composables/useRole.js b/composables/useRole.js
index 9646682..c142882 100644
--- a/composables/useRole.js
+++ b/composables/useRole.js
@@ -172,6 +172,18 @@ export const useRole = () => {
             label: "Rollen erstellen",
             parent: "roles"
         },
+        tasks: {
+            label: "Aufgaben",
+            showToAllUsers: false
+        },
+        "tasks-viewAll": {
+            label: "Alle Aufgaben einsehen",
+            parent: "tasks"
+        },
+        "tasks-create": {
+            label: "Aufgaben erstellen",
+            parent: "tasks"
+        },
         "inventory": {
             label: "Lager",
         },
diff --git a/pages/productcategories/[mode]/[[id]].vue b/pages/deprecated/entitys/productcategories/[mode]/[[id]].vue
similarity index 100%
rename from pages/productcategories/[mode]/[[id]].vue
rename to pages/deprecated/entitys/productcategories/[mode]/[[id]].vue
diff --git a/pages/productcategories/index.vue b/pages/deprecated/entitys/productcategories/index.vue
similarity index 100%
rename from pages/productcategories/index.vue
rename to pages/deprecated/entitys/productcategories/index.vue
diff --git a/pages/products/[mode]/[[id]].vue b/pages/deprecated/entitys/products/[mode]/[[id]].vue
similarity index 100%
rename from pages/products/[mode]/[[id]].vue
rename to pages/deprecated/entitys/products/[mode]/[[id]].vue
diff --git a/pages/products/index.vue b/pages/deprecated/entitys/products/index.vue
similarity index 100%
rename from pages/products/index.vue
rename to pages/deprecated/entitys/products/index.vue
diff --git a/pages/servicecategories/[mode]/[[id]].vue b/pages/deprecated/entitys/servicecategories/[mode]/[[id]].vue
similarity index 100%
rename from pages/servicecategories/[mode]/[[id]].vue
rename to pages/deprecated/entitys/servicecategories/[mode]/[[id]].vue
diff --git a/pages/servicecategories/index.vue b/pages/deprecated/entitys/servicecategories/index.vue
similarity index 100%
rename from pages/servicecategories/index.vue
rename to pages/deprecated/entitys/servicecategories/index.vue
diff --git a/pages/services/[mode]/[[id]].vue b/pages/deprecated/entitys/services/[mode]/[[id]].vue
similarity index 100%
rename from pages/services/[mode]/[[id]].vue
rename to pages/deprecated/entitys/services/[mode]/[[id]].vue
diff --git a/pages/services/index.vue b/pages/deprecated/entitys/services/index.vue
similarity index 100%
rename from pages/services/index.vue
rename to pages/deprecated/entitys/services/index.vue
diff --git a/pages/tasks/[mode]/[[id]].vue b/pages/deprecated/entitys/tasks/[mode]/[[id]].vue
similarity index 100%
rename from pages/tasks/[mode]/[[id]].vue
rename to pages/deprecated/entitys/tasks/[mode]/[[id]].vue
diff --git a/pages/tasks/index.vue b/pages/deprecated/entitys/tasks/index.vue
similarity index 87%
rename from pages/tasks/index.vue
rename to pages/deprecated/entitys/tasks/index.vue
index b353a4c..072bea1 100644
--- a/pages/tasks/index.vue
+++ b/pages/deprecated/entitys/tasks/index.vue
@@ -104,35 +104,7 @@ const templateColumns = [
 
   /*{
     key:"finish"
-  },*/{
-    key: "created_at",
-    label: "Erstellt am:",
-    sortable: true
-  },{
-    key: "name",
-    label: "Name:",
-    sortable: true
-  },{
-    key: "categorie",
-    label: "Kategorie:",
-    sortable: true
-  },{
-    key: "description",
-    label: "Beschreibung:",
-    sortable: true
-  },{
-    key: "user",
-    label: "Benutzer:",
-    sortable: true
-  },{
-    key: "project",
-    label: "Projekt:",
-    sortable: true
-  },{
-    key: "plant",
-    label: "Objekt:",
-    sortable: true
-  }
+  },*/
 ]
 const selectedColumns = ref(templateColumns)
 const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
diff --git a/stores/data.js b/stores/data.js
index e0b6005..119b731 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -18,6 +18,11 @@ import address from "~/components/columnRenderings/address.vue"
 import sepa from "~/components/columnRenderings/sepa.vue"
 import recurring from "~/components/columnRenderings/recurring.vue"
 import description from "~/components/columnRenderings/description.vue"
+import purchasePrice from "~/components/columnRenderings/purchasePrice.vue";
+import project from "~/components/columnRenderings/project.vue";
+import created_at from "~/components/columnRenderings/created_at.vue";
+import profile from "~/components/columnRenderings/profile.vue";
+import profiles from "~/components/columnRenderings/profiles.vue";
 
 // @ts-ignore
 export const useDataStore = defineStore('data', () => {
@@ -32,8 +37,74 @@ export const useDataStore = defineStore('data', () => {
         tasks: {
             label: "Aufgaben",
             labelSingle: "Aufgabe",
+            isStandardEntity: true,
             redirect: true,
-            historyItemHolder: "task"
+            historyItemHolder: "task",
+            supabaseSelectWithInformation: "*, plant(*), project(*), customer(*)",
+            filters: [
+                {
+                    name: "Nur Offene Aufgaben",
+                    default: true,
+                    "filterFunction": function (row) {
+                        if(row.categorie !== "Erledigt") {
+                            return true
+                        } else {
+                            return false
+                        }
+                    }
+                }
+            ],
+            templateColumns: [
+                {
+                    key: "created_at",
+                    label: "Erstellt am",
+                    component: created_at,
+                },{
+                    key: "name",
+                    label: "Name",
+                    title: true,
+                    inputType: "text"
+                },{
+                    key: "categorie",
+                    label: "Kategorie"
+                },{
+                    key: "profile",
+                    label: "Benutzer",
+                    component: profile,
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                },{
+                    key: "project",
+                    label: "Projekt",
+                    component: project,
+                    inputType: "select",
+                    selectDataType: "projects",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },{
+                    key: "customer",
+                    label: "Kunde",
+                    component: customer,
+                    inputType: "select",
+                    selectDataType: "customers",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },{
+                    key: "plant",
+                    label: "Objekt",
+                    component: plant,
+                    inputType: "select",
+                    selectDataType: "plants",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },{
+                    key: "description",
+                    label: "Beschreibung"
+                },
+            ],
+            showTabs: [{label: 'Informationen'}]
         },
         customers: {
             label: "Kunden",
@@ -140,7 +211,8 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true
+                    selectMultiple: true,
+                    component: profiles
                 },
             ],
             showTabs: [{label: 'Informationen'},{label: 'Dokumente'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]
@@ -343,38 +415,64 @@ export const useDataStore = defineStore('data', () => {
         products: {
             label: "Artikel",
             labelSingle: "Artikel",
+            isStandardEntity: true,
             redirect:true,
+            supabaseSelectWithInformation: "*, unit(name)",
             filters: [],
             templateColumns: [
                 {
                     key: "name",
-                    label:"Name"
-                },
-                {
-                    key: "description",
-                    label: "Beschreibung"
+                    label:"Name",
+                    title: true,
+                    inputType: "text"
                 },
                 {
                     key: "manufacturer",
-                    label: "Hersteller"
+                    label: "Hersteller",
+                    inputType: "text"
                 },
                 {
                     key: "unit",
                     label: "Einheit",
-                    component: unit
+                    component: unit,
+                    inputType: "select",
+                    selectDataType: "units",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
                 },
                 {
+                    key: "purchasePrice",
+                    label: "Einkaufspreis",
+                    component: purchasePrice,
+                    inputType: "number"
+                },{
                     key: "sellingPrice",
                     label: "Verkaufpreispreis",
-                    component: sellingPrice
+                    component: sellingPrice,
+                    inputType: "number"
                 },
-                {
+                /*{
                     key: "tags",
                     label: "Tags"
-                },
+                },*/
                 {
                     key: "productcategories",
-                    label: "Artikelkategorien"
+                    label: "Artikelkategorien",
+                    inputType: "select",
+                    selectDataType: "productcategories",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                    selectMultiple: true
+                },
+                {
+                    key: "description",
+                    label: "Beschreibung",
+                    inputType:"textarea"
+                },
+            ],
+            showTabs: [
+                {
+                    label: "Informationen"
                 }
             ]
         },
@@ -389,7 +487,7 @@ export const useDataStore = defineStore('data', () => {
             supabaseSortColumn: "projectNumber",
             filters: [
                 {
-                    name: "Abgeschlossen",
+                    name: "Nur Offene Projekte",
                     default: true,
                     "filterFunction": function (row) {
                         if(row.phases && row.phases.length > 0) {
@@ -453,7 +551,8 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true
+                    selectMultiple: true,
+                    component: profiles
                 },],
             showTabs: [
                 {
@@ -551,7 +650,8 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true
+                    selectMultiple: true,
+                    component: profiles
                 },
             ],
             showTabs: [
@@ -668,7 +768,8 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "profiles",
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
-                    selectMultiple: true
+                    selectMultiple: true,
+                    component: profiles
                 },
             ],
             showTabs: [
@@ -712,22 +813,50 @@ export const useDataStore = defineStore('data', () => {
         services: {
             label: "Leistungen",
             labelSingle: "Leistung",
+            isStandardEntity: true,
             redirect: true,
+            supabaseSelectWithInformation: "*, unit(*)",
             filters: [],
             templateColumns: [
                 {
                     key: "name",
-                    label: "Name"
+                    label: "Name",
+                    title: true,
+                    inputType: "text"
                 },
                 {
                     key: "unit",
                     label: "Einheit",
-                    component: unit
+                    component: unit,
+                    inputType: "select",
+                    selectDataType: "units",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
                 },
                 {
                     key: "sellingPrice",
                     label: "Verkaufspreis",
-                    component: sellingPrice
+                    component: sellingPrice,
+                    inputType: "number",
+                },
+                {
+                    key: "servicecategories",
+                    label: "Leistungskategorien",
+                    inputType: "select",
+                    selectDataType: "servicecategories",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                    selectMultiple: true
+                },
+                {
+                    key: "description",
+                    label: "Beschreibung",
+                    inputType:"textarea"
+                },
+            ],
+            showTabs: [
+                {
+                    label: 'Informationen',
                 }
             ]
         },
@@ -765,32 +894,52 @@ export const useDataStore = defineStore('data', () => {
         productcategories: {
             label: "Artikelkategorien",
             labelSingle: "Artikelkategorie",
+            isStandardEntity: true,
             redirect: true,
+            supabaseSelectWithInformation: "*",
             filters: [],
             templateColumns: [
                 {
                     key: "name",
                     label: "Name",
+                    title: true,
+                    inputType: "text"
                 },
                 {
                     key: "description",
                     label: "Beschreibung",
+                    inputType: "textarea"
+                }
+            ],
+            showTabs: [
+                {
+                    label: 'Informationen',
                 }
             ]
         },
         servicecategories: {
-            label: "Leistungskategorie",
-            labelSingle: "Leistungskategorien",
+            label: "Leistungskategorien",
+            labelSingle: "Leistungskategorie",
+            isStandardEntity: true,
             redirect: true,
+            supabaseSelectWithInformation: "*",
             filters: [],
             templateColumns: [
                 {
                     key: "name",
                     label: "Name",
+                    title: true,
+                    inputType: "text"
                 },
                 {
                     key: "description",
                     label: "Beschreibung",
+                    inputType: "textarea"
+                }
+            ],
+            showTabs: [
+                {
+                    label: 'Informationen',
                 }
             ]
         },
@@ -1273,7 +1422,7 @@ export const useDataStore = defineStore('data', () => {
             } else {
                 let historyItem = {
                     text: `${dataTypes[dataType].labelSingle} erstellt`,
-                    createdBy: activeProfile.value.id,
+                    createdBy: profileStore.activeProfile.id,
                     tenant: profileStore.currentTenant
                 }
 

From 4a0e0921154956c57b020981df49bcfd8f733ae6 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Wed, 25 Dec 2024 16:21:22 +0100
Subject: [PATCH 008/104] Deprecated following as non standardEntity checks,
 inventoryitems, spaces

---
 components/EntityEdit.vue                     | 195 ++++++++++++-
 components/MainNav.vue                        |   4 +-
 components/columnRenderings/profile.vue       |   3 +-
 components/columnRenderings/usePlanning.vue   |  13 +
 components/columnRenderings/vehicle.vue       |  13 +
 components/helpRenderings/quantity.vue        |  13 +
 .../checks/[mode]/[[id]].vue                  |   0
 {pages => deprecated}/checks/index.vue        |   0
 {pages/deprecated => deprecated}/email.vue    |   0
 .../entitys/contracts/[mode]/[[id]].vue       |   0
 .../entitys/contracts/index.vue               |   0
 .../entitys/customers/[mode]/[[id]].vue       |   0
 .../entitys/customers/index.vue               |   0
 .../entitys/plants/[mode]/[[id]].vue          |   0
 .../entitys/plants/index.vue                  |   0
 .../productcategories/[mode]/[[id]].vue       |   0
 .../entitys/productcategories/index.vue       |   0
 .../entitys/products/[mode]/[[id]].vue        |   0
 .../entitys/products/index.vue                |   0
 .../entitys/projects/[mode]/[[id]].vue        |   0
 .../entitys/projects/index.vue                |   0
 .../servicecategories/[mode]/[[id]].vue       |   0
 .../entitys/servicecategories/index.vue       |   0
 .../entitys/services/[mode]/[[id]].vue        |   0
 .../entitys/services/index.vue                |   0
 .../entitys/tasks/[mode]/[[id]].vue           |   0
 .../entitys/tasks/index.vue                   |   0
 .../entitys/vehicles/[mode]/[[id]].vue        |   0
 .../entitys/vehicles/index.vue                |   0
 .../entitys/vehicles/show/[id].vue            |   0
 .../entitys/vendors/[mode]/[[id]].vue         |   0
 .../entitys/vendors/index.vue                 |   0
 .../inventoryitems/[mode]/[[id]].vue          |   0
 .../inventoryitems/index.vue                  |   0
 .../spaces/[mode]/[[id]].vue                  |   0
 {pages => deprecated}/spaces/index.vue        |   0
 .../users/[mode]/[[id]].vue                   |   0
 .../deprecated => deprecated}/users/index.vue |   0
 stores/data.js                                | 270 +++++++++++++++++-
 39 files changed, 502 insertions(+), 9 deletions(-)
 create mode 100644 components/columnRenderings/usePlanning.vue
 create mode 100644 components/columnRenderings/vehicle.vue
 create mode 100644 components/helpRenderings/quantity.vue
 rename {pages => deprecated}/checks/[mode]/[[id]].vue (100%)
 rename {pages => deprecated}/checks/index.vue (100%)
 rename {pages/deprecated => deprecated}/email.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/contracts/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/contracts/index.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/customers/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/customers/index.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/plants/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/plants/index.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/productcategories/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/productcategories/index.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/products/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/products/index.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/projects/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/projects/index.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/servicecategories/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/servicecategories/index.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/services/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/services/index.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/tasks/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/tasks/index.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/vehicles/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/vehicles/index.vue (100%)
 rename {pages/deprecated => deprecated}/entitys/vehicles/show/[id].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/vendors/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/entitys/vendors/index.vue (100%)
 rename {pages => deprecated}/inventoryitems/[mode]/[[id]].vue (100%)
 rename {pages => deprecated}/inventoryitems/index.vue (100%)
 rename {pages => deprecated}/spaces/[mode]/[[id]].vue (100%)
 rename {pages => deprecated}/spaces/index.vue (100%)
 rename {pages/deprecated => deprecated}/users/[mode]/[[id]].vue (100%)
 rename {pages/deprecated => deprecated}/users/index.vue (100%)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index e69a29c..a528c11 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -76,6 +76,8 @@ const loadOptions = async () => {
     }
   })
 
+  console.log(optionsToLoad)
+
   for await(const option of optionsToLoad) {
     if(option.option === "countrys") {
       loadedOptions.value[option.option] = (await supabase.from("countrys").select()).data
@@ -154,24 +156,196 @@ const contentChanged = (content, datapoint) => {
     <UForm
         class="p-5"
     >
+      <div class="flex flex-row">
+        <div
+            v-for="columnName in dataType.inputColumns"
+            class="w-1/2 mr-5"
+        >
+          <UDivider>{{columnName}}</UDivider>
+
+          <!--
+           Die Form Group darf nur in der ersten bearbeitet werden und muss dann runterkopiert werden
+           -->
+
+          <UFormGroup
+              v-for="datapoint in dataType.templateColumns.filter(i => i.inputType && i.inputColumn === columnName)"
+              :label="datapoint.label"
+          >
+            <template #help>
+              <component
+                  v-if="datapoint.helpComponent"
+                  :is="datapoint.helpComponent"
+                  :item="props.item"
+              />
+            </template>
+            <div v-if="datapoint.key.includes('.')">
+              <UInput
+                  v-if="['text','number'].includes(datapoint.inputType)"
+                  v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  :type="datapoint.inputType"
+                  :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
+              />
+              <UToggle
+                  v-else-if="datapoint.inputType === 'bool'"
+                  v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              />
+              <USelectMenu
+                  v-else-if="datapoint.inputType === 'select'"
+                  v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  :option-attribute="datapoint.selectOptionAttribute"
+                  :value-attribute="datapoint.selectValueAttribute || 'id'"
+                  :options="datapoint.selectManualOptions || loadedOptions[datapoint.selectDataType]"
+                  :searchable="datapoint.selectSearchAttributes"
+                  :search-attributes="datapoint.selectSearchAttributes"
+                  :multiple="datapoint.selectMultiple"
+              >
+                <template #empty>
+                  Keine Optionen verfügbar
+                </template>
+              </USelectMenu>
+              <UTextarea
+                  v-else-if="datapoint.inputType === 'textarea'"
+                  v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  rows="4"
+              />
+              <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'date'">
+                <UButton
+                    icon="i-heroicons-calendar-days-20-solid"
+                    :label="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] ? dayjs(props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]).format('DD.MM.YYYY') : 'Datum auswählen'"
+                    variant="outline"
+                    :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+
+                />
+
+                <template #panel="{ close }">
+                  <LazyDatePicker
+                      v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
+                      :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  />
+                </template>
+              </UPopover>
+              <!-- TODO: DISABLED FOR TIPTAP -->
+              <Tiptap
+                  v-else-if="datapoint.inputType === 'editor'"
+                  @updateContent="(i) => contentChanged(i,datapoint)"
+                  :preloadedContent="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html"
+              />
+            </div>
+            <div v-else>
+              <UInput
+                  v-if="['text','number'].includes(datapoint.inputType)"
+                  v-model="props.item[datapoint.key]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  :type="datapoint.inputType"
+                  :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
+              />
+              <UToggle
+                  v-else-if="datapoint.inputType === 'bool'"
+                  v-model="props.item[datapoint.key]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              />
+              <USelectMenu
+                  v-else-if="datapoint.inputType === 'select'"
+                  v-model="props.item[datapoint.key]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  :option-attribute="datapoint.selectOptionAttribute"
+                  :value-attribute="datapoint.selectValueAttribute || 'id'"
+                  :options="datapoint.selectManualOptions || loadedOptions[datapoint.selectDataType]"
+                  :searchable="datapoint.selectSearchAttributes"
+                  :search-attributes="datapoint.selectSearchAttributes"
+                  :multiple="datapoint.selectMultiple"
+                  searchable-placeholder="Suche..."
+              >
+                <template #empty>
+                  Keine Optionen verfügbar
+                </template>
+              </USelectMenu>
+              <UTextarea
+                  v-else-if="datapoint.inputType === 'textarea'"
+                  v-model="props.item[datapoint.key]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  rows="4"
+              />
+              <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'date'">
+                <UButton
+                    icon="i-heroicons-calendar-days-20-solid"
+                    :label="props.item[datapoint.key] ? dayjs(props.item[datapoint.key]).format('DD.MM.YYYY') : 'Datum auswählen'"
+                    variant="outline"
+                    :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                />
+
+                <template #panel="{ close }">
+                  <LazyDatePicker
+                      v-model="props.item[datapoint.key]" @close="close"
+                      :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  />
+                </template>
+              </UPopover>
+              <Tiptap
+                  v-else-if="datapoint.inputType === 'editor'"
+                  @updateContent="(i) => contentChanged(i,datapoint)"
+                  :preloadedContent="props.item[datapoint.key].html"
+              />
+            </div>
+            <div
+                v-if="profileStore.ownTenant.ownFields"
+            >
+              <UDivider
+                  class="mt-3"
+              >Eigene Felder</UDivider>
+
+              <UFormGroup
+                  v-for="field in profileStore.ownTenant.ownFields.contracts"
+                  :key="field.key"
+                  :label="field.label"
+              >
+                <UInput
+                    v-if="field.type === 'text'"
+                    v-model="props.item.ownFields[field.key]"
+                />
+                <USelectMenu
+                    v-else-if="field.type === 'select'"
+                    :options="field.options"
+                    v-model="props.item.ownFields[field.key]"
+                />
+              </UFormGroup>
+            </div>
+
+          </UFormGroup>
+        </div>
+      </div>
       <UFormGroup
-          v-for="datapoint in dataType.templateColumns.filter(i => i.inputType)"
+          v-for="datapoint in dataType.templateColumns.filter(i => i.inputType && i.inputColumn === columnName)"
           :label="datapoint.label"
       >
+        <template #help>
+          <component
+              v-if="datapoint.helpComponent"
+              :is="datapoint.helpComponent"
+              :item="props.item"
+          />
+        </template>
         <div v-if="datapoint.key.includes('.')">
           <UInput
               v-if="['text','number'].includes(datapoint.inputType)"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               :type="datapoint.inputType"
               :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
           />
           <UToggle
               v-else-if="datapoint.inputType === 'bool'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
           />
           <USelectMenu
               v-else-if="datapoint.inputType === 'select'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               :option-attribute="datapoint.selectOptionAttribute"
               :value-attribute="datapoint.selectValueAttribute || 'id'"
               :options="datapoint.selectManualOptions || loadedOptions[datapoint.selectDataType]"
@@ -186,6 +360,7 @@ const contentChanged = (content, datapoint) => {
           <UTextarea
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               rows="4"
           />
           <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'date'">
@@ -193,12 +368,18 @@ const contentChanged = (content, datapoint) => {
                 icon="i-heroicons-calendar-days-20-solid"
                 :label="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] ? dayjs(props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]).format('DD.MM.YYYY') : 'Datum auswählen'"
                 variant="outline"
+                :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+
             />
 
             <template #panel="{ close }">
-              <LazyDatePicker v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close" />
+              <LazyDatePicker
+                  v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              />
             </template>
           </UPopover>
+          <!-- TODO: DISABLED FOR TIPTAP -->
           <Tiptap
               v-else-if="datapoint.inputType === 'editor'"
               @updateContent="(i) => contentChanged(i,datapoint)"
@@ -209,16 +390,19 @@ const contentChanged = (content, datapoint) => {
           <UInput
               v-if="['text','number'].includes(datapoint.inputType)"
               v-model="props.item[datapoint.key]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               :type="datapoint.inputType"
               :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
           />
           <UToggle
               v-else-if="datapoint.inputType === 'bool'"
               v-model="props.item[datapoint.key]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
           />
           <USelectMenu
               v-else-if="datapoint.inputType === 'select'"
               v-model="props.item[datapoint.key]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               :option-attribute="datapoint.selectOptionAttribute"
               :value-attribute="datapoint.selectValueAttribute || 'id'"
               :options="datapoint.selectManualOptions || loadedOptions[datapoint.selectDataType]"
@@ -234,6 +418,7 @@ const contentChanged = (content, datapoint) => {
           <UTextarea
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="props.item[datapoint.key]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               rows="4"
           />
           <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'date'">
@@ -241,10 +426,14 @@ const contentChanged = (content, datapoint) => {
                 icon="i-heroicons-calendar-days-20-solid"
                 :label="props.item[datapoint.key] ? dayjs(props.item[datapoint.key]).format('DD.MM.YYYY') : 'Datum auswählen'"
                 variant="outline"
+                :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
             />
 
             <template #panel="{ close }">
-              <LazyDatePicker v-model="props.item[datapoint.key]" @close="close" />
+              <LazyDatePicker
+                  v-model="props.item[datapoint.key]" @close="close"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              />
             </template>
           </UPopover>
           <Tiptap
diff --git a/components/MainNav.vue b/components/MainNav.vue
index 27c1157..305c5cb 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -155,7 +155,7 @@ const links = computed(() => {
         }] : [],
         ... role.checkRight("inventoryitems") ? [{
           label: "Inventar",
-          to: "/inventoryitems",
+          to: "/standardEntity/inventoryitems",
           icon: "i-heroicons-puzzle-piece"
         }] : [],
       ]
@@ -205,7 +205,7 @@ const links = computed(() => {
     },
     ... role.checkRight("checks") ? [{
       label: "Überprüfungen",
-      to: "/checks",
+      to: "/standardEntity/checks",
       icon: "i-heroicons-magnifying-glass"
     },] : [],
     ... role.checkRight("projects") ? [{
diff --git a/components/columnRenderings/profile.vue b/components/columnRenderings/profile.vue
index e9d5dba..8ed131b 100644
--- a/components/columnRenderings/profile.vue
+++ b/components/columnRenderings/profile.vue
@@ -8,8 +8,9 @@ const props = defineProps({
 })
 
 const profileStore = useProfileStore()
+
 </script>
 
 <template>
-  <span>{{props.row.profile ? profileStore.getProfileById(props.row.profile).fullName : ''}}</span>
+  <span v-if="props.row.profile">{{props.row.profile.id ? profileStore.getProfileById(props.row.profile.id).fullName : profileStore.getProfileById(props.row.profile).fullName}}</span>
 </template>
diff --git a/components/columnRenderings/usePlanning.vue b/components/columnRenderings/usePlanning.vue
new file mode 100644
index 0000000..c13ade1
--- /dev/null
+++ b/components/columnRenderings/usePlanning.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span>{{props.row.usePlanning ? 'Ja' : 'Nein'}}</span>
+</template>
diff --git a/components/columnRenderings/vehicle.vue b/components/columnRenderings/vehicle.vue
new file mode 100644
index 0000000..fab74bb
--- /dev/null
+++ b/components/columnRenderings/vehicle.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span v-if="props.row.vehicle">{{props.row.vehicle.id ? props.row.vehicle.licensePlate : ''}}</span>
+</template>
diff --git a/components/helpRenderings/quantity.vue b/components/helpRenderings/quantity.vue
new file mode 100644
index 0000000..09b286b
--- /dev/null
+++ b/components/helpRenderings/quantity.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  item: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span>{{props.item.serialNumber ? 'Menge deaktiviert durch Eingabe der Seriennummer' : 'Für Einzelartikel Menge gleich 0'}}</span>
+</template>
diff --git a/pages/checks/[mode]/[[id]].vue b/deprecated/checks/[mode]/[[id]].vue
similarity index 100%
rename from pages/checks/[mode]/[[id]].vue
rename to deprecated/checks/[mode]/[[id]].vue
diff --git a/pages/checks/index.vue b/deprecated/checks/index.vue
similarity index 100%
rename from pages/checks/index.vue
rename to deprecated/checks/index.vue
diff --git a/pages/deprecated/email.vue b/deprecated/email.vue
similarity index 100%
rename from pages/deprecated/email.vue
rename to deprecated/email.vue
diff --git a/pages/deprecated/entitys/contracts/[mode]/[[id]].vue b/deprecated/entitys/contracts/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/contracts/[mode]/[[id]].vue
rename to deprecated/entitys/contracts/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/contracts/index.vue b/deprecated/entitys/contracts/index.vue
similarity index 100%
rename from pages/deprecated/entitys/contracts/index.vue
rename to deprecated/entitys/contracts/index.vue
diff --git a/pages/deprecated/entitys/customers/[mode]/[[id]].vue b/deprecated/entitys/customers/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/customers/[mode]/[[id]].vue
rename to deprecated/entitys/customers/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/customers/index.vue b/deprecated/entitys/customers/index.vue
similarity index 100%
rename from pages/deprecated/entitys/customers/index.vue
rename to deprecated/entitys/customers/index.vue
diff --git a/pages/deprecated/entitys/plants/[mode]/[[id]].vue b/deprecated/entitys/plants/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/plants/[mode]/[[id]].vue
rename to deprecated/entitys/plants/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/plants/index.vue b/deprecated/entitys/plants/index.vue
similarity index 100%
rename from pages/deprecated/entitys/plants/index.vue
rename to deprecated/entitys/plants/index.vue
diff --git a/pages/deprecated/entitys/productcategories/[mode]/[[id]].vue b/deprecated/entitys/productcategories/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/productcategories/[mode]/[[id]].vue
rename to deprecated/entitys/productcategories/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/productcategories/index.vue b/deprecated/entitys/productcategories/index.vue
similarity index 100%
rename from pages/deprecated/entitys/productcategories/index.vue
rename to deprecated/entitys/productcategories/index.vue
diff --git a/pages/deprecated/entitys/products/[mode]/[[id]].vue b/deprecated/entitys/products/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/products/[mode]/[[id]].vue
rename to deprecated/entitys/products/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/products/index.vue b/deprecated/entitys/products/index.vue
similarity index 100%
rename from pages/deprecated/entitys/products/index.vue
rename to deprecated/entitys/products/index.vue
diff --git a/pages/deprecated/entitys/projects/[mode]/[[id]].vue b/deprecated/entitys/projects/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/projects/[mode]/[[id]].vue
rename to deprecated/entitys/projects/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/projects/index.vue b/deprecated/entitys/projects/index.vue
similarity index 100%
rename from pages/deprecated/entitys/projects/index.vue
rename to deprecated/entitys/projects/index.vue
diff --git a/pages/deprecated/entitys/servicecategories/[mode]/[[id]].vue b/deprecated/entitys/servicecategories/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/servicecategories/[mode]/[[id]].vue
rename to deprecated/entitys/servicecategories/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/servicecategories/index.vue b/deprecated/entitys/servicecategories/index.vue
similarity index 100%
rename from pages/deprecated/entitys/servicecategories/index.vue
rename to deprecated/entitys/servicecategories/index.vue
diff --git a/pages/deprecated/entitys/services/[mode]/[[id]].vue b/deprecated/entitys/services/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/services/[mode]/[[id]].vue
rename to deprecated/entitys/services/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/services/index.vue b/deprecated/entitys/services/index.vue
similarity index 100%
rename from pages/deprecated/entitys/services/index.vue
rename to deprecated/entitys/services/index.vue
diff --git a/pages/deprecated/entitys/tasks/[mode]/[[id]].vue b/deprecated/entitys/tasks/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/tasks/[mode]/[[id]].vue
rename to deprecated/entitys/tasks/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/tasks/index.vue b/deprecated/entitys/tasks/index.vue
similarity index 100%
rename from pages/deprecated/entitys/tasks/index.vue
rename to deprecated/entitys/tasks/index.vue
diff --git a/pages/deprecated/entitys/vehicles/[mode]/[[id]].vue b/deprecated/entitys/vehicles/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/vehicles/[mode]/[[id]].vue
rename to deprecated/entitys/vehicles/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/vehicles/index.vue b/deprecated/entitys/vehicles/index.vue
similarity index 100%
rename from pages/deprecated/entitys/vehicles/index.vue
rename to deprecated/entitys/vehicles/index.vue
diff --git a/pages/deprecated/entitys/vehicles/show/[id].vue b/deprecated/entitys/vehicles/show/[id].vue
similarity index 100%
rename from pages/deprecated/entitys/vehicles/show/[id].vue
rename to deprecated/entitys/vehicles/show/[id].vue
diff --git a/pages/deprecated/entitys/vendors/[mode]/[[id]].vue b/deprecated/entitys/vendors/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/entitys/vendors/[mode]/[[id]].vue
rename to deprecated/entitys/vendors/[mode]/[[id]].vue
diff --git a/pages/deprecated/entitys/vendors/index.vue b/deprecated/entitys/vendors/index.vue
similarity index 100%
rename from pages/deprecated/entitys/vendors/index.vue
rename to deprecated/entitys/vendors/index.vue
diff --git a/pages/inventoryitems/[mode]/[[id]].vue b/deprecated/inventoryitems/[mode]/[[id]].vue
similarity index 100%
rename from pages/inventoryitems/[mode]/[[id]].vue
rename to deprecated/inventoryitems/[mode]/[[id]].vue
diff --git a/pages/inventoryitems/index.vue b/deprecated/inventoryitems/index.vue
similarity index 100%
rename from pages/inventoryitems/index.vue
rename to deprecated/inventoryitems/index.vue
diff --git a/pages/spaces/[mode]/[[id]].vue b/deprecated/spaces/[mode]/[[id]].vue
similarity index 100%
rename from pages/spaces/[mode]/[[id]].vue
rename to deprecated/spaces/[mode]/[[id]].vue
diff --git a/pages/spaces/index.vue b/deprecated/spaces/index.vue
similarity index 100%
rename from pages/spaces/index.vue
rename to deprecated/spaces/index.vue
diff --git a/pages/deprecated/users/[mode]/[[id]].vue b/deprecated/users/[mode]/[[id]].vue
similarity index 100%
rename from pages/deprecated/users/[mode]/[[id]].vue
rename to deprecated/users/[mode]/[[id]].vue
diff --git a/pages/deprecated/users/index.vue b/deprecated/users/index.vue
similarity index 100%
rename from pages/deprecated/users/index.vue
rename to deprecated/users/index.vue
diff --git a/stores/data.js b/stores/data.js
index 119b731..9331a7d 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -23,6 +23,10 @@ import project from "~/components/columnRenderings/project.vue";
 import created_at from "~/components/columnRenderings/created_at.vue";
 import profile from "~/components/columnRenderings/profile.vue";
 import profiles from "~/components/columnRenderings/profiles.vue";
+import vehicle from "~/components/columnRenderings/vehicle.vue"
+import usePlanning from "~/components/columnRenderings/usePlanning.vue"
+
+import quantity from "~/components/helpRenderings/quantity.vue"
 
 // @ts-ignore
 export const useDataStore = defineStore('data', () => {
@@ -787,9 +791,104 @@ export const useDataStore = defineStore('data', () => {
         spaces: {
             label: "Lagerplätze",
             labelSingle: "Lagerplatz",
+            isStandardEntity: true,
+            supabaseSelectWithInformation: "*, documents(*)",
+            supabaseSortColumn: "spaceNumber",
             redirect: true,
             numberRangeHolder: "spaceNumber",
-            historyItemHolder: "space"
+            historyItemHolder: "space",
+            filters:[],
+            inputColumns: [
+                "Allgemeines",
+                "Ort"
+            ],
+            templateColumns: [
+                {
+                    key: "name",
+                    label: "Name",
+                    inputType: "text",
+                    title: true,
+                    inputColumn: "Allgemeines"
+                },
+                {
+                    key: 'spaceNumber',
+                    label: "Lagerplatznr.",
+                    inputType: "text",
+                    inputIsNumberRange: true,
+                    inputColumn: "Allgemeines"
+                },
+                {
+                    key: "type",
+                    label: "Typ",
+                    inputType: "select",
+                    selectManualOptions: ["Standort","Regalplatz", "Kiste", "Palettenplatz", "Sonstiges"],
+                    inputColumn: "Allgemeines"
+                },
+                {
+                    key: "parentSpace",
+                    label: "Übergeordneter Lagerplatz",
+                    inputType: "select",
+                    selectDataType: "spaces",
+                    selectOptionAttribute: "spaceNumber",
+                    selectValueAttribute: "id",
+                    inputColumn: "Allgemeines"
+                },
+                {
+                    key: "infoData.streetNumber",
+                    label: "Straße + Hausnummer",
+                    inputType: "text",
+                    disabledInTable: true,
+                    inputColumn: "Ort"
+                },
+                {
+                    key: "infoData.special",
+                    label: "Adresszusatz",
+                    inputType: "text",
+                    disabledInTable: true,
+                    inputColumn: "Ort"
+                },
+                {
+                    key: "infoData.zip",
+                    label: "Postleitzahl",
+                    inputType: "number",
+                    disabledInTable: true,
+                    inputColumn: "Ort"
+                },
+                {
+                    key: "infoData.city",
+                    label: "Stadt",
+                    inputType: "text",
+                    disabledInTable: true,
+                    inputColumn: "Ort"
+                },
+                {
+                    key: "infoData.country",
+                    label: "Land",
+                    inputType: "select",
+                    selectDataType: "countrys",
+                    selectOptionAttribute: "name",
+                    selectValueAttribute: "name",
+                    disabledInTable: true,
+                    inputColumn: "Ort"
+                },
+                {
+                    key: "address",
+                    label: "Adresse",
+                    component: address
+                },
+                {
+                    key: "description",
+                    label: "Beschreibung",
+                    inputType: "textarea",
+                }
+            ],
+            showTabs: [
+                {
+                    label: 'Informationen',
+                }, {
+                    label: 'Dokumente',
+                },{label: 'Inventarartikel'}
+            ]
         },
         users: {
             label: "Benutzer",
@@ -807,8 +906,127 @@ export const useDataStore = defineStore('data', () => {
         inventoryitems: {
             label: "Inventarartikel",
             labelSingle: "Inventarartikel",
+            isStandardEntity: true,
+            supabaseSelectWithInformation: "*, documents(*), vendor(id,name), currentSpace(id,name)",
             redirect: true,
-            numberRangeHolder: "articleNumber"
+            numberRangeHolder: "articleNumber",
+            inputColumns: [
+                "Allgemeines",
+                "Anschaffung"
+            ],
+            filters:[],
+            templateColumns: [
+                {
+                    key: "name",
+                    label: "Name",
+                    title: true,
+                    inputType: "text",
+                    inputColumn: "Allgemeines"
+                },
+                {
+                    key: "usePlanning",
+                    label: "In Plantafel anzeigen",
+                    inputType: "bool",
+                    inputColumn: "Allgemeines",
+                    component: usePlanning
+                },
+                {
+                    key: "description",
+                    label: "Beschreibung",
+                    inputType: "textarea",
+                },
+                {
+                    key: "currentSpace",
+                    label: "Aktueller Lagerplatz",
+                    inputType: "select",
+                    selectDataType: "spaces",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                    inputColumn: "Allgemeines"
+                },
+                {
+                    key: "articleNumber",
+                    label: "Artikelnummer",
+                    inputType: "text",
+                    inputIsNumberRange: true,
+                    inputColumn: "Allgemeines"
+                },
+                {
+                    key: "serialNumber",
+                    label: "Seriennummer",
+                    inputType: "text",
+                    inputColumn: "Allgemeines"
+                },
+                {
+                    key: "purchaseDate",
+                    label: "Kaufdatum",
+                    inputType: "date",
+                    inputColumn: "Anschaffung"
+                },
+                {
+                    key: "vendor",
+                    label: "Lieferant",
+                    inputType: "select",
+                    selectDataType: "vendors",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                    inputColumn: "Anschaffung"
+                },
+                {
+                    key: "quantity",
+                    label: "Menge",
+                    inputType: "number",
+                    inputColumn: "Allgemeines",
+                    disabledFunction: function (item) {
+                        return item.serialNumber
+                    },
+                    helpComponent: quantity
+                },
+                {
+                    key: "purchasePrice",
+                    label: "Kaufpreis",
+                    inputType: "number",
+                    inputStepSize: "0.01",
+                    inputColumn: "Anschaffung"
+                },
+                {
+                    key: "maunfacturer",
+                    label: "Hersteller",
+                    inputType: "text",
+                    inputColumn: "Anschaffung"
+                },
+                {
+                    key: "manufacturerNumber",
+                    label: "Herstellernummer",
+                    inputType: "text",
+                    inputColumn: "Anschaffung"
+                },
+                {
+                    key: "profiles",
+                    label: "Berechtigte Benutzer",
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                    selectMultiple: true,
+                    component: profiles
+                },
+                {
+                    key: "currentValue",
+                    label: "Aktueller Wert",
+                    inputType: "number",
+                    inputStepSize: "0.01",
+                    inputColumn: "Anschaffung"
+                },
+
+            ],
+            showTabs: [
+                {
+                    label: 'Informationen',
+                }, {
+                    label: 'Dokumente',
+                }
+            ]
         },
         services: {
             label: "Leistungen",
@@ -958,8 +1176,54 @@ export const useDataStore = defineStore('data', () => {
         checks: {
             label: "Überprüfungen",
             labelSingle: "Überprüfung",
+            isStandardEntity: true,
+            supabaseSelectWithInformation: "*, vehicle(id,licensePlate), profile(id, fullName), inventoryitem(name), documents(*)",
             redirect: true,
-            historyItemHolder: "check"
+            historyItemHolder: "check",
+            filters: [],
+            templateColumns: [
+                {
+                    key: "name",
+                    label: "Name",
+                    title: true,
+                    inputType: "text"
+                },
+                {
+                    key: "vehicle",
+                    label: "Fahrzeug",
+                    component: vehicle,
+                    inputType: "select",
+                    selectDataType: "vehicles",
+                    selectOptionAttribute: "licensePlate",
+                    selectSearchAttributes: ['licensePlate'],
+                },
+                {
+                    key: "profile",
+                    label: "Person",
+                    component: profile,
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                },
+                {
+                    key: "inventoryitem",
+                    label: "Inventarartikel",
+                    inputType: "select",
+                    selectDataType: "inventoryitems",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },
+                {
+                    key: "notes",
+                    label: "Notizen",
+                    inputType: "textarea"
+                }
+            ],
+            showTabs: [
+                {
+                label: 'Informationen',
+            }, {label: 'Dokumente'}, {label: 'Ausführungen'}]
         },
         roles: {
             label: "Rollen",

From 325d25034d5333ca01e3c2617e566c2c285aeb84 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Wed, 25 Dec 2024 16:21:55 +0100
Subject: [PATCH 009/104] Minor Changes, Tidying, Removed Module Google Fonts

---
 RechteDoku.xlsx      | Bin 11833 -> 11960 bytes
 app.vue              |   1 -
 nuxt.config.ts       |   2 +-
 pages/editortest.vue |  11 -----------
 4 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 pages/editortest.vue

diff --git a/RechteDoku.xlsx b/RechteDoku.xlsx
index c81d02140204a0677522b324ed2b24d4fcad41e3..2ba402f1589ef52c5724f858bc32182df9b6728c 100644
GIT binary patch
delta 4444
zcmZ8lbyU<{w;rUVLu%;m6eI<PltvnnE@_ZP;Qir%$Pgk7AwAMHfRr#ui^R|f3?W@2
zGJr_O_5JQ$*R{U$$6n{G9slg}?EUQBYTaT}_l*Eh-yuL1;(|a7L?93a2m}iC5)1M5
z_jL62^%M>D_Nq3s@hy_2iL`US#a+vD{6!1Zc|-|$TESwLrPp?8DrX=6G3tp^w(0cM
zX*(~6H(!xaa|6}k_U74Q_}GK(f@XcBqS1upQmnj^8cK5^m%cjk?(f>F;e#M#X0eFY
z$WwrEcdT(%+2-nI;XF2>|G{=LBd9U5+`>5crTa;k2GeB0;hW|<6aNWHB9lY=lRQN6
zj*yOvNe-QA{v74Zu0jkX7ut<Z-IQ8AA0Id0hu|S$co&g<sDD&Fk4#n=Iayzi4unnN
ze9oTMQ%XjlW;VJv)zJ7)W>-$=+UCu>)`4y|F1PCM+!%TJN{7}JMX^mVBu8QL(T$U{
z<CQ4h!a754?8ZB&l0<qhuFz`a+w_pGBinBA3l}NUNya8>$bnMa7Hi9si@vZyj~8w5
z8co!`q`PUUhfS5X*c4RTD&~T;G(v4zB<_6zp?R<97rN~4TYV~{GO9vu+ObwO5Mbb5
zMETQ!dMe`#_QdiG(?<14d|#d&KkRI+htFqQQ)ZePk?+d5_h^Voj`2HGb&sN|FPS)n
zyeWgqbL_(XmV`Y;8QgWPx~iQTrLjAx%*UZJ&|Ce0xf~rB6KDCkX2V7c<R;ofyGGSP
zRX8{zWF5PHr%^*(;Fl&b*_X^gTEKamBn)c(k~2P1z^>96bLuU6C*n4Bm~Mj8K$7cF
zTspT^QnFAsfE4}6JocJl9WN61Sq%L~E@}Nd8lv(Vg)65#kK$c$CoHnJ?-NR*Z@dLp
z-qvKDbO^kjeiee=DFtW~vpp6RX6Pa$UmQP7dPaWs5iGNB$x-$AW6E#T2|(yVL0i{%
z!yHqRVqMRN;`FpMIu_}Z_-eORvyIA!gM-(~G(F_rP(Av`858=39&Ck?lwoSk@*POZ
z6n@Jbj$|Qm(*C7m+%hta|1kFHtU6+pG85l?slADSv#~~C(VsA!fo%^daXlp=R}sL^
zJe|~~q&Z{#WE}ZvcM}us3V>UpS!hPa7bPBhw8gHEiS&kep)F-$>8J)NZ6^yC^GH+Z
z?YakxF5kNj^LQ7H7;B<b<sKOyZS=ci_C5&^??I%lbnrF99Ask9&s8?`O`_}xbFcpW
zg}hbgluC@DbNb~bp_ueC^Kz*=`QzitrT#F)yjSN7OW_cb%TFCus`K_)<t^Cdo2*s(
zgN{-@#%CY-7)6!rYHJJ|+jT5XL*^>JOa$esmn}R(yByC7UI)ncTsc5Oh%A2cn*^i|
z_H}|9QiyHu5EDs(EVu|jAYN9u^*u1$P8c7^g)jT&h*S12^Zf+st_%{12JaGASfM;3
zb4rns!NXM5n0IrdV)~cMA#Y!q59yi`1-v#qZB@AXeYEc;H5dJBs2P6~{*KzM1ZmnP
zuv1%LXru|FC`86Ii_je7<u4(X04vt&g$n|9O76xEg#KNd(RZ0-46A(2(R5r*L7D*G
zRUp%r0%0LzYND$)^H>&DWyv$ueIEx5%AA@Nxd?Xa1+PI8qOLDBgKktMkLYr#eA<3+
zy6eA=Ynl|yCE(}L+#1W7k^e9wdzw<Fnp)J$*ZrV94SZ572<FNA-AsOuyCGm~c3lhu
zC6Y_6+3qCjHQBPSy}*r7<6-lJjRBhGM+7<lP)f5oTx0#u4b1SbCH2FsT?aFF-Y0Gw
z<re>PJESa|*i+j2F8tK5W8h|Ty52an=i2nMip_X<KA<n>QnksBpvNb?9p!6hot^Qy
z?2?>;QLU;(@1?8YWh<s3f>h9W&wh0hdSJOylZH=kUfoK$owad!uD)-)Ftadw-;IWb
zlt8Wa0?!;MmLcBRQEdUaP4v39d92;KrUKHE;32K56qv80DX{R^c}*763(n$&du4w%
z$sguVQDCcXrTMYIEGZ%HTzFj|r-li-!z6fv+why*29LO1IU~vn4+N^F`jc-FK)kGu
z-#Oj&UJ$mDwKfS1rA;(hkgM2j!$Qd0jEe<ri0UNru?65;JywcJ9tCmp-5SI&3I9uj
z9i8AR=*?LNvrC#~e_Q-VR5X;ed$Rv~KLxy9+H(OU3ym42YkcklzwDqT<M&Z)e@Wi?
zb)J9!V7fY@O`@xcL#yc@2D}QOwq<Vz_BJP+0aa5H#V68CEFS`8aBJ<o^5&8`Q8ig(
z&0TYC|CShI&ZM4JpS~{(5isHeY=h<x>ibX>!dp;gQd^Ft2@O}vP9tMu2JfJs54kVP
za(&Uj0b7J<P4U77wx<pwQwP7s=_u?uE%}@(Boy&V0~=FfVYw^{_XS+c#+84~$tI;b
zE9umSNjnN_CXY}{6MtzC9>v^$ny7qTGNsLP7;{+}_Y#GW%n<8|xtJQXM-)(>oQ&kk
z+Wr$w7lTXVkam0{++=&oRPbB?Qp_TKtR<Se*v&lOj7V5o>m;PgEsO%pLKQm8MF<}O
z62%*ITc~Rup;-j?4IoGRHDUo(`{EY7QTe<j+i|l!=xFy0&m8egf>vzLCB`QOW?1Na
zi+#U&_8x&byCwo_*s8)XR%O!~o6Moa-Oc12viWM3J0<SS#TWr&Xprt4-=U#aMC?lF
z#K^;w0?IU|``w46Fg3CG9(Kn_!H*Bl)P9To>DRZn{|ewXEz`y)8bTUVOZ_}5^}#vv
zt}&6^-9oKMohr(bpFce(iNim6nRfD=58t;99xi5Hy11EdoNX2q!xki<IY{Ol&)mjv
zffu&V5^C!_+O}u0rEI912t{W!-%w>eldfG$1^_<0M9ycPBL#o$Cr@Y7dd578Vu~T_
zy0fa?+XPr=HC$BS`!{wqnUFZRzZkE>WV1?H>yyUNkaJiIsY0m=9k|uisQdxdvM>Tp
z3-T0eA<n_Luj14d?`h@6AlwC?fdZWx+LW!UuZ)_U5A+^RCaK+>ji;OnME>j8_VgEN
zu;&lT!6wehv&M-!t-XQK=aMz)IXsJPA=Uj&Kz%*~jWn0A;=QB<m%eYGkkOu+yD(a3
zokGpA0pb@&Z-<4gCnUq6toOKk2`!FE;}MGb_XYeklB=Sn`C!QB8p(>$!PGnkAqS!E
z!ubXiV999+7aF%I-w?9*&FM2DPm73;Aepw`@%y(=!k&m%XS+8U@^_M6%#!fsQ-?iN
za;Hl$E-E2l6u|dL=Vf=jH@3&Fs4&1QjQC(2>0KPiT4-#M2rZ}C<VT!*pNdGmAQLBw
z(@|`A!>&7rcqJ7dkz7b;oh@IM57wb9_nKE_6o^dwxH6e$Jm$rF*MN6y7P8K8%^$dV
zbh`mxpblxMrvFX|EYDgBZruTa*zSTrWdF<D0s_OlTmt^(ZF_%sTaGwQWI^Mt{dpdv
z+d%5w@@$G?oo`YCd5so?dXCd<DbJ1T-ESjjA$QEmygg1^=<8~KuCIr`sa?;pA`Wye
zU9;kmZ8?%~6r9DkSil3q20jsKrk7MARE08D?o}NC`WH7g)^l+CA1qFEI5CyfpBjRd
zxr&EE^d@(8uvyR)V<v5pz>y5o@Lo5gRt@8~<EQ=V#x;Hk;_&n3C@l|Gig2-6e?yUF
zzwVzE-91`c4Q<HDSRcH{$Y`n&BbG${IFEp(Vps>}(b3|LPUZ=*A52s?zacZQ%vr~6
zi3<lf`tcSTcedKlFuRqm#pQ@eQ8@Qw%(R*#-n>8v#}TR95W6PpC|3-Vwc0BPB~|(E
zXyL1?>P^bdsxmpN$PZYraK`J*jJAAxYV+RkE5r4MrjB5%Y?IT-n&y#D{RVqfjs|nq
zzC|~u=;v2fJC+dkBo#Gu;t(Plb<*oj!At{Skgwdgt{qNh#!V<Sqw$O9#FJ#^Y3#8|
z0^5%nNzAR-J<fu+Z_Kf)Z4)z4{K=M;z$#kWeSVRF5}f|QEK1K1{Em#Vx*yaP(Zj{<
zLe!+0gFLH?G0}k|bhSTauQ;p{u3arnGsg~bo<lCd-_a)nu>6&vfK`1Qf?de?Ru}MU
zbC*61r>XpsI}u{FQ(!Z5G2|sfG<v_~;3bw~_)yhs;5K-|^25`5hT8hR$|v{h;v3AI
zNG8301D*Tz*F_PiYH0P$^u(79`j1gXB<7RRbrhN1c&9&;t5*oYwyu#|kGz@U{=CCO
z)}bFv(x*>4p!acrK=Fs&%ND;VrhrXBl6IJKL1>XDUD%Xc$8q6=V~4e?iSjYMGQso}
zS<|Pmh)IUZjcV%0hx#Fy{kR`W1R;gk#$zVKJ3l#2-DOXFi@HwhJ(UkMo#YRB*MAJ4
z3)!vTJo;sprh&UZA>`R%2t`CHGM~G-wmL(r8qA-)iZ!AnLUqdF$qA`kWa27b6Twr6
zX@HlU%P_@1IEenkerWy=2W}4jF3u)_{_Z}{{sV^yvk{*u2xSM?A-T}9386X;M}InQ
zk|}L^rO4gq3)OrlYu}zUD2om@`0Y9Qp%Wyu5n4<7$v0cuIdkW(*16YT<H_vvq-4>y
zxq6ZW{CXlEvRn$VbnuVhfPBDdBwgj5i>Ke*lk=-5tGUl;5_~e6mQJxpi!eH=5WZ4E
zZuF4lh+^bCZ%8}7Z5v&eXL@I@f!%ht?(jQt9L2-@jv-6PIak*uuKxwE5D6c;CsT&q
z%5I}W_=v?1L_dQdtnNR{O%TO7orxe^{f4>z!9bZda}={p%l4%ME&+@Sy^-jrofSX%
zv@|_+ez%j<68BBJvX14;lEn|-Q+GFE>SmS?BEXl+FQ=)wmMBU|7~|~quF0ICO+Dd$
zQQq?{5j~*>J!_a29)35@X2BM|>VP*k$5Nkg7OH+mFRRaq`XMq}HfPY}rraD$^JFnC
z@%Uh4{jw=j!j^SbMkm0<@dbMx1%~-!%X+t6*Ne8uxP+@lJ>s3A&{lAWRghAYF)5EX
zbz6E|^m{`C#t+=G(hSZrD|&UDqNx{5+im0R&^&8yv&^^BIk*IjaY@8RmG2>7f!vb@
zav1V5ApuBc5~;&g(8B3ISbxbW>np|5@fBZ-1vF{w?RfgLmdB20+y|&l<tokLN5wfs
znG@4mh@8eh2-epvThD)yzY|Cv7%DQrbC?_+Hk@hAWX{6W@3g3%<DmQ<h9F@rcrCZ6
zruI3JbrSxW`pD?bw|#)US&6Uj?Dwse{{<`!0R8*N8qnNCIQT_)fy{ahb3D8_fRSOe
zIL)hN{VR%M?BkvBECS2ISia16aT8}VjUi9D(n^u_*Wn~yadWH@USq9xW3BGZ^D;pP
zWM78NH~C?XG*N5Fw;nk~vz4US$M!5H&}k%;nWd}H?0IDRbNw*SmAOX7M7TY!p>c+P
zUQu2^wxicMIio8V_Ob0^W2wU^z&1kX`9*n-P8_!WbTP^aDi<4WU(UxV&xv2~_5%GC
z7ve|yKnjuDr=7N9SBpD^Nx+T1A0R!+(ufUARCq?B6b}#g-E`hViSE*=krpU-V}F!o
zzW3la>l7j{AHXYH1O*@khENYuD-d|A^hlns;QYaBK~L9j^S+T>DvN9yq6WEbS4?Up
zha8kIDYW}__%^){4=mHm*(J1lV`8`~QhAby+O?H0D1oiZ@pX-W#3MG&3N2M_ovF>l
z&^t6>rAz)kiUtV3J1)`xFCgIcLIybba2#O~=D)+tpT)!<NdG-Mq;UItw137MTBg4Y
z_`i)*;K{-oI1}(`VP2;H?vj5)q2P2P>`eb%J^t#^a3c|wJMuj6G!ahb|KuJA1Pc07
cXsG_${JE*|!Y4%(alXJQMY#y_h5pt34{Z!bGXMYp

delta 4315
zcmZ8lXHXMbw+$r{K#CH2mnslCNDYMEL_mmiq)G2xN&?bEdgxt@;H7uzy(35wBp@Yp
zr7B41Jn#KxzWd%gKhDgaz1R7*X05ePvqg(}&C(r&#5i<4mjD1DAqD^_002Ost5AT4
zw~LL3hl^mKn`?!Uo5wpT%A2t1Yoh*uxN$Q;dKD5`WzbeuhdDiXx`}+)i9bO<gDyMm
zTFHuRSgL@x9H_od*dJMUcu_z<q2RWt7F=BH(Ei3ZB-%H@A1Gvkqx^1_*@E3Q71Df`
z8jT1LpDuK&Mzo$?e>^6mP2!(ml>qEqXjH#9k14^>O1Nnv2ER7ELdCtw&@hf8s<$H5
z8tp7GY)Wuq-^hko=XWZD1|HJ2ml?yh+v!XfMwnxZ$Wj!$sxhsFlM8F$=8V`OYd3Ja
z1wntDgbp;RsCAA8yQw?`G?7?6rD<D$Bf7u7VpS71o_Xx)>uWSd(i3bsB8HR<Kqp-d
z4fmf}fSQIxq{v1@fT1>gF+}j*OE&&P<Yq^N^~snc9a_SfD{?iIa$MfC{^ZSZoWzMg
zk3~Yo*Fw#5(b*kS<(Jv%I@6-l4mBH$7w*b;ckP~&<=MEt&33nB+6dujNQK)uA~x<v
z%JrzXMhP&o+Y|T3GHR--b3P8@fyD%Og&Fy9_?!CZH8&OA-qq3L6_}(wBjI?cRQJOp
zwxSUxp5h+1-xE~t-25C}?nqoN@h%}q{aHt3Z`-{q57XggL#=O=u<=JZTtmQLtcKbo
z)Ff0kwd-xcH&8)Evq+Sv2YPb#9N`@X#GES?usth^^|l(#<fA_geHKf(($!42=tM~v
zy*VV-r_Hny`!tUZhBSBCT7>5Wu5{C5qkufGDsZBDlPL#^6G@3xBmOcyyiCUDTI;}l
zh3K3v#*%uEQR~?wclxE1>Ii*px8R}HR1dYJg3|45f*ZHNSF-R?nQ1pWM90B345Liu
zTFZ*8F;v&DcyP_-DgX6%-nW|Vuore2>vWoXL(vHYd0V`V4(`x8k(EjMMZQS}he}3m
zYuFo8gPoPK%|yI8iF;+T{r0cZ6+9|4?NoE4m8@jv`;L2-8K|HZPm@cK2KqCgJzG2A
zXoUNwk<bvm;b=GWUQu8)0)I#`d!HeZ)j0ZaJ|jiOhu_BmBd2YiuKk;V_%`W<42`x_
zM<IAD2h;*a2S$Eeh=3D+hlSVzbXG4jT-Pp$>%xms>)$**k@1{Anfmg#n`HZr#h=y|
z4)fv4DVjuAm~J1xW-9t*6qU5AmvA12t1;P^JPitcR*JQ$TI;-(#eKfpg~XA`Pf2yj
zPYGX#bhJaKPWjB1S2jx-hQ5x-L6@MG0&86vn8F$AEee8G?Pdn`>>QMi;0+Mf%?qxt
zAko4nZb=)?gxmoD#8J0**%4#zi^7zuIN${ZAx>1)#NWQhJ9(Zg$6`wIdrpZOjkSTH
z=0#NTZ9$5mEMB_^{*K54>FtTw%;UCqQ+5;+{EOhUBpa=wlqSRRlA_ODEbrp)v#LBL
zabx7&A(rbf3%L<jF#h;kLXl0wF$A_txsWF!<RaXg<Vs35VK_&B?+7vDmgT`5TlYjX
zhs#UOUhP9PdE~dH-WsF#oD~({=pB0jUPY?i7onA=h!XlB(h1PVrN)$o64icFCu&{!
zwEG;#rH^g%ja~LGho7>KOkvYk<)LFI>(8{*G#xrBdqE?vAI@8^>2pQch0wb<9=%6t
z((~o+1S@(YLt1MnQhr3xs{{p5uI2NkL+^9lbl|nDZczKDRH3Op(E>HERNZ$N<vcai
zWmYN5b?{u^Ql0kL081WVagWFdb{KRcv6%+h>Ik<4GhMZ15!T)iGuQ#Z*fif8bF;R6
z8YosTUSmaQCt2xEV+@z0#pEm@<ffFihY~oiiVY2c2k$XoTP>wD9@R8leB@J3NDcJX
z`p~Z%!+Lr|_N9beN@id}c6Vdb320gDP@ASdJ)%*b^7@I5VZiC6_nOofDBFx(S^_HY
z6IF%YK}gM(z^MXaxE}+hT8UxziKy8noa67rum44EK}do@d)sgl0sy>}sbushZz?c?
z053z8y<FVsOGi0e-dy$t2=1!mwv8@3Tn^9UQ!Oh_2QZo)k1MRNpfX><?TF?yXEMY|
zl(dSdOH%h+(JNgLb!o1N<EFLI2EAzxsSDBTGwZrX{_6~YC&`nosglb9KwDk$q83se
zBFMp)LFa>?U#qfr1&*9S({TgVSt5vWd+jHYz0h7^KL}7De%{&fn%D;Bm2_djAsg`4
z=_g3nrw!xJVeK0en{GJGO2o@$3a;LrGww7n#<6QPvk|>{5`TD>`og$t4E?@lFnfVW
z;|0$+Zd0M&VQ?Vb*XmX|i`SaQzfPf>kuR(e&D&A8#^`#bYwREOd%tb~4o7fZ%NNSq
zuZ!m=O@|aD74yQ9#-|;@(D7fKNg3zcrB4t$z6P3d*iJs1w}RgV_-MSeFutO6J28<R
zmkzow6{_MfCydouJSvd{z~X>ASgF0|<XXScVEOA^9p>b{(L7!EV^V~4;8{5r|G{(j
zFHcO)?+B4Dr;|8$8r_WVbs>=Ek650GRWv@*)@P<&C2R!`5PDUc(?#iA-G^K*Msu&n
zq}r6@cs2r=iX?0OmUpx>d{!S4GD=6T29m#CV;f5q?psc#mg-9Dh`m)x6(bzdUY3hx
zc~$c^y6cZG-`@UnrDa&S_bT3vtd8(TM*E#Ti~W-PM#TvYor*)KG<1YAn+~j7e5&*4
zHeMDI5Yv%v$6e1i*qWthCRGn?X0^DAgfwl3TQS2iYm1c&2S=wfC(2(7hiscd-d6Cn
zIh~|CoTI{5tja^Pt;$6YZyFgIZ7K&)_aB+MrWt>-nLvthaq0cq)A^pk!W}m-*Qes;
z$BNbfU`_D6SU`w4JW$*n(8}x#Zm=F-i3RjeJuHJ4=>Sxzx;Wh})4!{zC$1<-%qGXr
zR(D82H~=72C9ul{^w#6AVM<`N!sLrwOoR2_S@U|*ZiO{T4)%pvn)^OuX-KR!rn$`n
zmI*e=64X`F7Axt0)0f6JLfaw2#ly6a&&hi-2uAeDo<Lr&{~iQy%ZRhlKioGEkRtmW
z@OZF#@onar%gZZVWElHro!<@4P@$Se0|?!TDfrH~S~P~K71DZdUu_xjOujO8h-&xS
zgMGB&`cF_k!>jD*&C~XE=l3+w_&)&gAn={Xx?y7MM#A`Xh7h_>F}(3*bg)}JXTY%v
zfjE17#-Ex#j3^t9$<QnNJ^q|e)!K0OC>SI!@Ib5ax$tDMaG8E!enUx&y~<xu9YN+x
z+IlBiD-c5WSJsCzd;q}YkA#!`CxiL;2D#e%{GGtiMk^i*!jxf!4YxhNf`4#w-PKDi
zOH(WR@))&)?#SuKE5EsiiH?4Jxe}m@M9R25y;PdmJ`Pw}a$x=bm>;+xV%q|zPpndk
z&*JkNn3d^UDTsR>k>Y1)Wau~`+U`KJvVmY#K+o+1&D`mHKx}E_M}sXd)M6ozbPR&u
zGnPCrol`R)(yr%j5{ZY;v8G1!TT5}LdPfCEW((XBsTdr$yG0m`May)qMYM&+M5PEg
zP`JD&vmh>7P~$KymSo7KYuw60A9s#&1UWU#Hn!oL7w_g|?nx{?%)W0*u7SLgL?d|F
ztwZ#KU6y0TA4KmrXHslCRi@W}_+qxHsKfTdOgI>Rp-LS#CVTlou2Eq!k>sd9Ys2ZU
zD9Pb)-^rHYU~qaxQnOoL(+;VGTGv^Aj+Wr*wPipv>WWf88npT@mdEGJSgJotO8<>K
zsprN+$DJ&Fpul8L*utZ3SdZVXbt|G7p;Aq@r0(VIkMt!z_I>{t_%+yZbSk|xVwOCX
zp>z4HdWP((s=>z-_^V;fx00H=GmT}#PEneR%I14vH|_$ztukd{RH-$FukR=;ges96
z>@6JJ9)|t-dFtg}KwoiFXFpND*a9v3$@dgm`M$A(o?H^aNj$>JCUdE(8$|@YUb(-c
z(vF1Z4bXpIdNbV8u%g5aTcDdu&$9QqV$F=cu(<PAzCW`{G|}ah3w1&$`CO|yDec`(
zN0&bdX8E(iV_KXllTPnBC!Iw-XBPLdYI6L+)*Dq3vh|~buNbDlA@I&1yrB0o#{{pw
zmnlv@t(hrga@=}q=Ft7&Bvfr1nlOZQyB`JfVpi*M)Zyu|3&|%`y+82gr(;+lc!VCe
zkudXsQ~%3n<|oi>X~FE(A0KA*-}(r}5{`9&VToGFSOxZ5vcKa9xw05Osn8!PTmPXl
z7=W6B&>%vL7TsqQDMQuQSm9w$nBA$B68VW@4XLBbz>$Gw)jX$bOD6TSnOkOodk#k#
zthUpNQSG_Vi%*-M_VVay9TXaEIE;D71nV4lj^pu2W;9%BG26Sddwzp?+w-3Glr$Jf
z^Ik>B1=@2$EKc>~u*_l1qo4y7qMSA=F+i%lEuvzp0P2?8)`Rb1PPE!MTKIXpv}NnQ
z7`Kk%lXf91JAtCBd#n3+L4G;uQ7C)t7(Zpckhc}hIg1pM-(`|O@@dG3Y9W%yrSsL1
z`;Qwx5|EZlP_NJU&|inHBzNO%Kh<tAloVuMzI@4wrNv|H{tHJ$%vh5qD`}zEA(!%j
zBo~qKwf0uR7$UM3>TppM4l4PwqR4H`-;PH#|32Y2#~_YVAhEI>24k!>>XEmx@ZNh@
ziiOO>_7AQkNBt8y8v7w1El-Oc5dWNTXYV(v7*2MU$uE)Vmd8yp@KenYd=Ke9Z608z
zxWS)WT(U6V7?OEd)cDg|cE90ADBwMv)&hd_RP#Y%G*sHDKXrB9G1($qtS7En<A+Di
zp*aP~sdtK@h0=m6F`XluB%jJ(8Tj^S&xOz2oJ|Kpf;aN+4c+8>yg;VDB%-+0_9@>p
z16npefQEL$>!pA$=lexV*UOyhI*;^E?hS$R!F*Mw%lvcmW~MUCIPoKuQthHX7Z~4M
zzry||yOp<_v7ajwg_oGy;HBngLW`p_IRWe)(+4k3k_$LbyF$D#RO>~!*zka+!$5AW
zdN?;X9%4+lPZ+F%)3{RJ2wmfZ2=QxjDVpdLzkWa|JJ#t2S&MO1Ug#RqT%i0SXuKeX
z3)~tVu;IzwVXUAsP3P4%0EgS;kTyP?+AT};(BF_V%9AvOy*^!?EN*S*&0^Ov3v60I
z{>C>4YmDA|q1EtvnKGVvF#;_}Oitb3*pzzViD+PS<-J5Rb_eBH+7cId|9E(Stfhaw
zgWPac$q`yS0Za&sv%!L5>N)$mEGgiv^#mQFURqcjx35fpew{R9|5S&Mjd+t=ZbLm(
zZMYDN+nmw1lAtMDq$V(=&b#*_{H0rY>l9p%dbYc-I00GGP1Ry%ubgicU0Dr0y1d3H
zzkd2G@LjdI9HATu`-tB65AEYDEYBp$eu)<jnXqhQ_}bW=bgQ;lEn*dpEq1U<EX7wz
zSq_{O{cXfQK_5s$e(9I7)_3tb5fJ}(%SVX_=;CFfkOB~<|1J$I007+|*ZKEg@1iIm
z)Tm_vYQ}$K=Kmj3L6JjL@d{9e5N@9TZ(#pE6~p?^m%@MS45cpsX8gYj@$V!6V2+xE
zz$iO7|3TPVyV@!{T06P_4PyF-6L<iC-ydnY_rEcKK`xZOpgf*BDoK#z4lDoPz5fAo
CkN0H&

diff --git a/app.vue b/app.vue
index cab9291..ab7ec7b 100644
--- a/app.vue
+++ b/app.vue
@@ -96,7 +96,6 @@ useSeoMeta({
 .scrollList {
   overflow-y: scroll;
   height: 85vh;
-  //margin-top: 1em;
 }
 
 
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 089e0f4..e1d372a 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -28,7 +28,7 @@ export default defineNuxtConfig({
       transpile: ['@vuepic/vue-datepicker']
   },
 
-  modules: ['@pinia/nuxt', '@nuxt/ui', '@nuxt/content', '@nuxtjs/supabase', "nuxt-editorjs", '@nuxtjs/fontaine', '@nuxtjs/google-fonts', '@vite-pwa/nuxt', 'nuxt-viewport', 'nuxt-tiptap-editor', '@nuxtjs/leaflet'],
+  modules: ['@pinia/nuxt', '@nuxt/ui', '@nuxt/content', '@nuxtjs/supabase', "nuxt-editorjs", '@nuxtjs/fontaine', '@vite-pwa/nuxt', 'nuxt-viewport', 'nuxt-tiptap-editor', '@nuxtjs/leaflet'],
 
   routeRules: {
       '/printing': {ssr: false}
diff --git a/pages/editortest.vue b/pages/editortest.vue
deleted file mode 100644
index 56d14d7..0000000
--- a/pages/editortest.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<script setup>
-
-</script>
-
-<template>
-  <tiptap/>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file

From 1a79f9dbd9f6e84e760ae38bbf04791cbf789cfb Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Wed, 25 Dec 2024 17:00:09 +0100
Subject: [PATCH 010/104] Deprecated absencerequests as non Standard Entity
 Added Respective Rights Changes to show title

---
 components/EntityEdit.vue                     |  4 --
 components/EntityShow.vue                     |  2 +-
 components/MainNav.vue                        |  6 +--
 composables/useRole.js                        | 12 +++++
 .../absenceRequests/[mode]/[[id]].vue         |  0
 .../absenceRequests/index.vue                 |  0
 stores/data.js                                | 54 ++++++++++++++++++-
 7 files changed, 69 insertions(+), 9 deletions(-)
 rename {pages => deprecated}/absenceRequests/[mode]/[[id]].vue (100%)
 rename {pages => deprecated}/absenceRequests/index.vue (100%)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index a528c11..3f06527 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -76,8 +76,6 @@ const loadOptions = async () => {
     }
   })
 
-  console.log(optionsToLoad)
-
   for await(const option of optionsToLoad) {
     if(option.option === "countrys") {
       loadedOptions.value[option.option] = (await supabase.from("countrys").select()).data
@@ -91,8 +89,6 @@ const loadOptions = async () => {
       }
     }
   }
-
-  console.log(loadedOptions.value)
 }
 
 loadOptions()
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index d733458..300dcde 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -90,7 +90,7 @@ const renderedPhases = computed(() => {
       <h1
           v-if="item"
           :class="['text-xl','font-medium']"
-      >{{item ? `${dataType.labelSingle}: ${props.item[dataType.templateColumns.find(i => i.title).key]}`: '' }}</h1>
+      >{{item ? `${dataType.labelSingle}${props.item[dataType.templateColumns.find(i => i.title).key] ? ': ' + props.item[dataType.templateColumns.find(i => i.title).key] : ''}`: '' }}</h1>
     </template>
     <template #right>
       <ButtonWithConfirm
diff --git a/components/MainNav.vue b/components/MainNav.vue
index 305c5cb..25ee9a6 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -102,11 +102,11 @@ const links = computed(() => {
           to: "/workingtimes",
           icon: "i-heroicons-clock"
         }] : [],
-        {
+        ... role.checkRight("absencerequests") ? [{
           label: "Abwesenheiten",
-          to: "/absenceRequests",
+          to: "/standardEntity/absencerequests",
           icon: "i-heroicons-document-text"
-        },
+        }] : [],
       ]
     },
     ... profileStore.ownTenant.features.accounting ? [{
diff --git a/composables/useRole.js b/composables/useRole.js
index c142882..f1248d3 100644
--- a/composables/useRole.js
+++ b/composables/useRole.js
@@ -148,6 +148,18 @@ export const useRole = () => {
             label: "Inventarartikel erstellen",
             parent: "inventoryitems"
         },
+        absencerequests: {
+            label: "Abwesenheiten",
+            showToAllUsers: false
+        },
+        "absencerequests-viewAll": {
+            label: "Alle Abwesenheiten einsehen",
+            parent: "absencerequests"
+        },
+        "absencerequests-create": {
+            label: "Abwesenheiten erstellen",
+            parent: "absencerequests"
+        },
         spaces: {
             label: "Lagerplätze",
             showToAllUsers: false
diff --git a/pages/absenceRequests/[mode]/[[id]].vue b/deprecated/absenceRequests/[mode]/[[id]].vue
similarity index 100%
rename from pages/absenceRequests/[mode]/[[id]].vue
rename to deprecated/absenceRequests/[mode]/[[id]].vue
diff --git a/pages/absenceRequests/index.vue b/deprecated/absenceRequests/index.vue
similarity index 100%
rename from pages/absenceRequests/index.vue
rename to deprecated/absenceRequests/index.vue
diff --git a/stores/data.js b/stores/data.js
index 9331a7d..f0a90a3 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -373,7 +373,59 @@ export const useDataStore = defineStore('data', () => {
         absencerequests: {
             label: "Abwesenheitsanträge",
             labelSingle: "Abwesenheitsantrag",
-            redirect:true
+            isStandardEntity: true,
+            supabaseSelectWithInformation: "*",
+            redirect:true,
+            filters:[],
+            templateColumns:[
+                {
+                    key: "approved",
+                    label: "Genehmigt",
+                    inputType: "select",
+                    selectManualOptions: ["Offen","Genehmigt", "Abgelehnt"]
+                },{
+                    key: "name",
+                    label: "Name",
+                    inputType: "text",
+                    title: true
+                },
+                {
+                    key: "profile",
+                    label: "Mitarbeiter",
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                    component: profile
+                },{
+                    key: "reason",
+                    label: "Grund",
+                    inputType: "select",
+                    selectManualOptions: ["Elternzeit",
+                        "Kind krank - Kinderbetreuung",
+                        "Krankheit",
+                        "Krankheit 1 Tag (mit Attest)",
+                        "Krankheit ab 2. Tag (mit Attest)",
+                        "Mutterschutz",
+                        "Sonderurlaub (bezahlt)",
+                        "Überstundenausgleich",
+                        "Unbezahlter Urlaub",
+                        "Urlaub"]
+                },{
+                    key: "startDate",
+                    label: "Start",
+                    inputType: "date"
+                },{
+                    key: "endDate",
+                    label: "Ende",
+                    inputType: "date"
+                },{
+                    key: "note",
+                    label: "Notizen",
+                    inputType: "textarea"
+                }
+            ],
+            showTabs: [{label: 'Informationen'}]
         },
         plants: {
             label: "Objekte",

From 43c7148637994bd2ac9574314bd29497cb5f2942 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 27 Dec 2024 11:04:07 +0100
Subject: [PATCH 011/104] Removed Deprecated Components

---
 .../entitys/contracts/[mode]/[[id]].vue       | 525 --------------
 deprecated/entitys/contracts/index.vue        |  23 -
 .../entitys/customers/[mode]/[[id]].vue       | 369 ----------
 deprecated/entitys/customers/index.vue        |  26 -
 deprecated/entitys/plants/[mode]/[[id]].vue   | 252 -------
 deprecated/entitys/plants/index.vue           |  24 -
 .../productcategories/[mode]/[[id]].vue       | 179 -----
 .../entitys/productcategories/index.vue       |  24 -
 deprecated/entitys/products/[mode]/[[id]].vue | 354 ---------
 deprecated/entitys/products/index.vue         |  27 -
 deprecated/entitys/projects/[mode]/[[id]].vue | 674 ------------------
 deprecated/entitys/projects/index.vue         |  45 --
 .../servicecategories/[mode]/[[id]].vue       | 179 -----
 .../entitys/servicecategories/index.vue       |  24 -
 deprecated/entitys/services/[mode]/[[id]].vue | 266 -------
 deprecated/entitys/services/index.vue         |  25 -
 deprecated/entitys/tasks/[mode]/[[id]].vue    | 211 ------
 deprecated/entitys/tasks/index.vue            | 129 ----
 deprecated/entitys/vehicles/[mode]/[[id]].vue | 236 ------
 deprecated/entitys/vehicles/index.vue         |  24 -
 deprecated/entitys/vehicles/show/[id].vue     |  33 -
 deprecated/entitys/vendors/[mode]/[[id]].vue  | 291 --------
 deprecated/entitys/vendors/index.vue          |  24 -
 23 files changed, 3964 deletions(-)
 delete mode 100644 deprecated/entitys/contracts/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/contracts/index.vue
 delete mode 100644 deprecated/entitys/customers/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/customers/index.vue
 delete mode 100644 deprecated/entitys/plants/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/plants/index.vue
 delete mode 100644 deprecated/entitys/productcategories/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/productcategories/index.vue
 delete mode 100644 deprecated/entitys/products/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/products/index.vue
 delete mode 100644 deprecated/entitys/projects/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/projects/index.vue
 delete mode 100644 deprecated/entitys/servicecategories/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/servicecategories/index.vue
 delete mode 100644 deprecated/entitys/services/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/services/index.vue
 delete mode 100644 deprecated/entitys/tasks/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/tasks/index.vue
 delete mode 100644 deprecated/entitys/vehicles/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/vehicles/index.vue
 delete mode 100644 deprecated/entitys/vehicles/show/[id].vue
 delete mode 100644 deprecated/entitys/vendors/[mode]/[[id]].vue
 delete mode 100644 deprecated/entitys/vendors/index.vue

diff --git a/deprecated/entitys/contracts/[mode]/[[id]].vue b/deprecated/entitys/contracts/[mode]/[[id]].vue
deleted file mode 100644
index 2b7847e..0000000
--- a/deprecated/entitys/contracts/[mode]/[[id]].vue
+++ /dev/null
@@ -1,525 +0,0 @@
-<script setup>
-import HistoryDisplay from "~/components/HistoryDisplay.vue";
-import dayjs from "dayjs";
-import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/contracts")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-const openTab = ref(0)
-
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  name: "",
-  customer: null,
-  active: true,
-  ownFields: {}
-})
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show" ){
-    itemInfo.value = await useSupabaseSelectSingle("contracts", route.params.id, "*, customer(id,name,isCompany, customerNumber), contact(id,fullName)")
-  } else if (mode.value === "edit"){
-    itemInfo.value = await useSupabaseSelectSingle("contracts", route.params.id, "*")
-  }
-
-
-  if(mode.value === "create") {
-    let query = route.query
-
-    if(query.customer) itemInfo.value.customer = Number(query.customer)
-  }
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/contracts/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/contracts/`)
-  }
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar :title="itemInfo ? itemInfo.name : (mode === 'create' ? 'Vertrag erstellen' : 'Vertrag bearbeiten')">
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/contracts`)"
-      >
-        Verträge
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          :class="['text-xl','font-medium', ... itemInfo.active ? ['text-primary'] : ['text-rose-500']]"
-      >{{itemInfo ? `Vertrag: ${itemInfo.name}` : (mode === 'create' ? 'Vertrag erstellen' : 'Vertrag bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('contracts',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('contracts',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="router.push(`/contracts/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UDashboardPanelContent>
-    <UTabs
-        v-if="itemInfo.id && mode === 'show'"
-        :items="[{label: 'Informationen'}, {label: 'Dokumente'}]"
-        class="p-5"
-        v-model="openTab"
-    >
-      <template #item="{item}">
-        <div v-if="item.label === 'Informationen'" class="flex mt-5">
-          <div class="w-1/2 mr-5">
-            <UCard>
-              <div class="text-wrap">
-                <table class="mb-3">
-                  <tr>
-                    <td>Name:</td>
-                    <td>{{itemInfo.name}}</td>
-                  </tr>
-                  <tr>
-                    <td>Aktiv:</td>
-                    <td>
-                      <span v-if="itemInfo.active" class="text-primary-500">Ja</span>
-                      <span v-else class="text-rose-600">Nein</span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>Kunde:</td>
-                    <td>
-                      <nuxt-link
-                        :to="`/customers/show/${itemInfo.customer.id}`"
-                        v-if="itemInfo.customer"
-                      >{{itemInfo.customer.customerNumber ? `${itemInfo.customer.customerNumber} - ` : ''}}{{itemInfo.customer ? itemInfo.customer.name : ""}}</nuxt-link>
-                    </td>
-                  </tr>
-                  <tr v-if="itemInfo.customer.isCompany">
-                    <td>Ansprechpartner:</td>
-                    <td>
-                      <nuxt-link
-                          v-if="itemInfo.contact"
-                          :to="`/contacts/show/${itemInfo.contact.id}`"
-                      >{{itemInfo.contact ? itemInfo.contact.fullName : ""}}</nuxt-link>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>Wiederkehrend:</td>
-                    <td>{{itemInfo.recurring ? "Ja" : "Nein"}}</td>
-                  </tr>
-                  <tr>
-                    <td>Startdatum:</td>
-                    <td>{{dayjs(itemInfo.startDate).format("DD.MM.YYYY")}}</td>
-                  </tr>
-                  <tr v-if="!itemInfo.active">
-                    <td>Enddatum:</td>
-                    <td>{{dayjs(itemInfo.endDate).format("DD.MM.YYYY")}}</td>
-                  </tr>
-                  <tr>
-                    <td>Unterschrieben am:</td>
-                    <td>{{dayjs(itemInfo.signDate).format("DD.MM.YYYY")}}</td>
-                  </tr>
-                  <tr>
-                    <td>Laufzeit:</td>
-                    <td>{{itemInfo.duration}}</td>
-                  </tr>
-                  <tr>
-                    <td>Rechnungsversand:</td>
-                    <td>{{itemInfo.invoiceDispatch}}</td>
-                  </tr>
-                  <tr>
-                    <td>Zahlart:</td>
-                    <td>{{itemInfo.paymentType}}</td>
-                  </tr>
-                  <tr v-if="itemInfo.paymentType === 'Einzug'">
-                    <td>SEPA Mandatsreferenz:</td>
-                    <td>{{itemInfo.sepaRef}}</td>
-                  </tr>
-                  <tr v-if="itemInfo.paymentType === 'Einzug'">
-                    <td>SEPA Unterschrieben am:</td>
-                    <td>{{dayjs(itemInfo.sepaDate).format("DD.MM.YYYY")}}</td>
-                  </tr>
-                  <tr>
-                    <td>Bank:</td>
-                    <td>{{itemInfo.bankingName}}</td>
-                  </tr>
-                  <tr>
-                    <td>BIC:</td>
-                    <td>{{itemInfo.bankingBIC}}</td>
-                  </tr>
-                  <tr>
-                    <td>IBAN:</td>
-                    <td>{{itemInfo.bankingIban}}</td>
-                  </tr>
-                  <tr>
-                    <td>Kontoinhaber:</td>
-                    <td>{{itemInfo.bankingOwner}}</td>
-                  </tr>
-                  <tr>
-                    <td>Beschreibung:</td>
-                    <td>{{itemInfo.notes}}</td>
-                  </tr>
-                  <tr>
-                    <td colspan="2"><span class="font-bold">Eigene Felder:</span></td>
-                  </tr>
-                  <tr v-for="fieldKey in Object.keys(itemInfo.ownFields)">
-                    <td>{{profileStore.ownTenant.ownFields.contracts.find(i => i.key === fieldKey).label}}</td>
-                    <td>{{itemInfo.ownFields[fieldKey]}}</td>
-                  </tr>
-                </table>
-
-              </div>
-            </UCard>
-          </div>
-          <div class="w-1/2">
-            <UCard class="h-full">
-              <HistoryDisplay
-                  type="contract"
-                  v-if="itemInfo"
-                  :element-id="itemInfo.id"
-                  :render-headline="true"
-              />
-            </UCard>
-
-          </div>
-
-
-
-
-          <!--        <UBadge
-                      v-if="itemInfo.active"
-                  >
-                    Vertrag aktiv
-                  </UBadge>
-                  <UBadge
-                      v-else
-                      color="red"
-                  >
-                    Vertrag gesperrt
-                  </UBadge>-->
-
-
-
-
-        </div>
-        <div v-else-if="item.label === 'Dokumente'">
-          <UCard class="mt-5">
-            <Toolbar>
-              <DocumentUpload
-                  type="contract"
-                  :element-id="itemInfo.id"
-              />
-            </Toolbar>
-            <DocumentList
-                :documents="dataStore.getDocumentsByContractId(itemInfo.id)"
-            />
-          </UCard>
-
-        </div>
-
-
-      </template>
-    </UTabs>
-    <UForm v-else-if="mode == 'edit' || mode == 'create'" class="p-5" >
-      <div class="mx-auto w-4/5">
-        <div class="flex flex-row justify-around">
-          <div class="w-1/2">
-            <UDivider>Vertragsdaten</UDivider>
-            <UFormGroup
-                label="Name:"
-            >
-              <UInput
-                  v-model="itemInfo.name"
-              />
-            </UFormGroup>
-
-            <UFormGroup
-                label="Kunde:"
-            >
-              <USelectMenu
-                  v-model="itemInfo.customer"
-                  option-attribute="name"
-                  value-attribute="id"
-                  :options="dataStore.customers"
-                  @change="itemInfo.contact = null"
-                  searchable
-                  :search-attributes="['name']"
-              >
-                <template #label>
-                  {{dataStore.getCustomerById(itemInfo.customer) ? dataStore.getCustomerById(itemInfo.customer).name : "Kein Kunde ausgewählt" }}
-                </template>
-              </USelectMenu>
-            </UFormGroup>
-            <UFormGroup
-                label="Ansprechpartner:"
-                v-if="itemInfo.customer"
-            >
-              <USelectMenu
-                  v-model="itemInfo.contact"
-                  option-attribute="fullName"
-                  value-attribute="id"
-                  :options="dataStore.getContactsByCustomerId(itemInfo.customer)"
-                  searchable
-                  :search-attributes="['name']"
-              >
-                <template #label>
-                  {{dataStore.getContactById(itemInfo.contact) ? dataStore.getContactById(itemInfo.contact).fullName : "Kein Ansprechpartner ausgewählt" }}
-                </template>
-              </USelectMenu>
-            </UFormGroup>
-
-            <InputGroup>
-              <UFormGroup
-                  label="Vertrag aktiv:"
-              >
-                <UCheckbox
-                    v-model="itemInfo.active"
-                />
-              </UFormGroup>
-              <UFormGroup
-                  label="Vertrag wiederkehrend:"
-              >
-                <UCheckbox
-                    v-model="itemInfo.recurring"
-                />
-              </UFormGroup>
-            </InputGroup>
-
-
-            <InputGroup>
-              <UFormGroup
-                  label="Vertragsstart:"
-                  class="mt-2"
-              >
-
-              </UFormGroup>
-              <UFormGroup
-                  label="Vertragsende(voraussichtlich):"
-                  class="mt-2"
-              >
-                <UPopover :popper="{ placement: 'bottom-start' }">
-                  <UButton
-                      icon="i-heroicons-calendar-days-20-solid"
-                      :label="itemInfo.endDate ? dayjs(itemInfo.endDate).format('DD.MM.YYYY') : 'Datum auswählen'"
-                      variant="outline"
-                  />
-
-                  <template #panel="{ close }">
-                    <LazyDatePicker v-model="itemInfo.endDate" @close="close" />
-                  </template>
-                </UPopover>
-              </UFormGroup>
-            </InputGroup>
-
-            <UFormGroup
-                label="mindest Vertragslaufzeit:"
-            >
-              <USelectMenu
-                  :options="['12 Monate','24 Monate','36 Monate','48 Monate']"
-                  v-model="itemInfo.duration"
-              />
-            </UFormGroup>
-
-            <UFormGroup
-                label="Datum der Unterzeichnung:"
-                class="mt-2"
-            >
-              <UPopover :popper="{ placement: 'bottom-start' }">
-                <UButton
-                    icon="i-heroicons-calendar-days-20-solid"
-                    :label="itemInfo.signDate ? dayjs(itemInfo.signDate).format('DD.MM.YYYY') : 'Datum auswählen'"
-                    variant="outline"
-                />
-
-                <template #panel="{ close }">
-                  <LazyDatePicker v-model="itemInfo.signDate" @close="close" />
-                </template>
-              </UPopover>
-            </UFormGroup>
-          </div>
-          <div class=" ml-5 w-1/2">
-            <UDivider>Abrechnung</UDivider>
-            <UFormGroup
-                label="Rechnungsversand:"
-            >
-              <USelectMenu
-                  :options="['E-Mail', 'Post']"
-                  v-model="itemInfo.invoiceDispatch"
-              >
-
-              </USelectMenu>
-            </UFormGroup>
-            <UFormGroup
-                label="Zahlungsart:"
-            >
-              <USelectMenu
-                  :options="['Einzug', 'Überweisung']"
-                  v-model="itemInfo.paymentType"
-              >
-
-              </USelectMenu>
-            </UFormGroup>
-            <UFormGroup
-                label="Sepa Mandat"
-            >
-              <InputGroup>
-                <UPopover :popper="{ placement: 'bottom-start' }">
-                  <UButton
-                      icon="i-heroicons-calendar-days-20-solid"
-                      :label="itemInfo.sepaDate ? dayjs(itemInfo.sepaDate).format('DD.MM.YYYY') : 'Datum auswählen'"
-                      variant="outline"
-                  />
-
-                  <template #panel="{ close }">
-                    <LazyDatePicker v-model="itemInfo.sepaDate" @close="close" />
-                  </template>
-                </UPopover>
-                <UInput
-                    placeholder="Mandatsreferenz"
-                    class="flex-auto"
-                    v-model="itemInfo.sepaRef"
-                />
-              </InputGroup>
-
-            </UFormGroup>
-            <UFormGroup
-                label="Kontodaten:"
-            >
-              <InputGroup>
-                <UInput
-                    v-model="itemInfo.bankingIban"
-                    placeholder="IBAN"
-                    class="w-1/2"
-                />
-                <UInput
-                    v-model="itemInfo.bankingOwner"
-                    class="w-1/2"
-                    placeholder="Inhaber"
-                />
-              </InputGroup>
-
-            </UFormGroup>
-            <UFormGroup
-                label="Bankdaten:"
-            >
-              <InputGroup>
-                <UInput
-                    v-model="itemInfo.bankingName"
-                    placeholder="Name"
-                    class="w-1/2"
-                />
-                <UInput
-                    v-model="itemInfo.bankingBIC"
-                    placeholder="BIC"
-                    class="w-1/2"
-                />
-              </InputGroup>
-
-            </UFormGroup>
-          </div>
-        </div>
-        <UFormGroup
-            label="Notizen:"
-        >
-          <UTextarea
-              v-model="itemInfo.notes"
-              rows="6"
-              maxrows="12"
-          />
-        </UFormGroup>
-
-        <div
-            v-if="profileStore.ownTenant.ownFields"
-        >
-          <UDivider
-              class="mt-3"
-          >Eigene Felder</UDivider>
-
-          <UFormGroup
-              v-for="field in profileStore.ownTenant.ownFields.contracts"
-              :key="field.key"
-              :label="field.label"
-          >
-            <UInput
-                v-if="field.type === 'text'"
-                v-model="itemInfo.ownFields[field.key]"
-            />
-            <USelectMenu
-                v-else-if="field.type === 'select'"
-                :options="field.options"
-                v-model="itemInfo.ownFields[field.key]"
-            />
-          </UFormGroup>
-        </div>
-      </div>
-
-
-
-
-
-    </UForm>
-  </UDashboardPanelContent>
-
-</template>
-
-<style scoped>
-td {
-  border-bottom: 1px solid lightgrey;
-  vertical-align: top;
-  padding-bottom: 0.15em;
-  padding-top: 0.15em;
-}
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/contracts/index.vue b/deprecated/entitys/contracts/index.vue
deleted file mode 100644
index 467108d..0000000
--- a/deprecated/entitys/contracts/index.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <EntityList
-    :items="items"
-    type="contracts"
-  />
-</template>
-
-<script setup>
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("contracts","*, customer(id,name)")
-}
-
-setupPage()
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/customers/[mode]/[[id]].vue b/deprecated/entitys/customers/[mode]/[[id]].vue
deleted file mode 100644
index e27a9b9..0000000
--- a/deprecated/entitys/customers/[mode]/[[id]].vue
+++ /dev/null
@@ -1,369 +0,0 @@
-<script setup>
-
-import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/customers")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const route = useRoute()
-const router = useRouter()
-
-const openTab = ref(0)
-
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  name: "",
-  infoData: {
-    country: "Deutschland"
-  },
-  active: true,
-  isCompany: true,
-  profiles: [profileStore.activeProfile.id]
-})
-const oldItemInfo = ref({})
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show"){
-    itemInfo.value = await useSupabaseSelectSingle("customers",route.params.id,"*, contacts(*)")
-  } else if(mode.value === "edit") {
-    itemInfo.value = await useSupabaseSelectSingle("customers",route.params.id,"*")
-  }
-
-  if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
-}
-
-const editItem = async () => {
-  await router.push(`/customers/edit/${itemInfo.value.id}`)
-}
-
-const setCityByZip = async () => {
-    itemInfo.value.infoData.city = await useZipCheck(itemInfo.value.infoData.zip)
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar
-      :title="itemInfo ? `Kunde: ${itemInfo.name}` : (mode === 'create' ? 'Kunde erstellen' : 'Kunde bearbeiten')"
-      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
-  >
-    <template #left>
-      <UButton
-        icon="i-heroicons-chevron-left"
-        variant="outline"
-        @click="router.push(`/customers`)"
-      >
-        Kunden
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          :class="['text-xl','font-medium', ... itemInfo.active ? ['text-primary'] : ['text-rose-500']]"
-      >{{itemInfo.id ? `Kunde: ${itemInfo.name}` : (mode === 'create' ? 'Kunde erstellen' : 'Kunde bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('customers',itemInfo,oldItemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('customers',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="itemInfo.id ? router.push(`/customers/show/${itemInfo.id}`) : router.push(`/customers`)"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="editItem"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-    <template #badge v-if="itemInfo">
-      <UBadge
-          v-if="itemInfo.active"
-      >
-        Aktiv
-      </UBadge>
-      <UBadge
-          v-else
-          color="red"
-      >
-        Gesperrt
-      </UBadge>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardPanelContent>
-    <UTabs
-        v-if="itemInfo.id && mode == 'show'"
-        :items="[{label: 'Informationen'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]"
-        class="p-5"
-        v-model="openTab"
-    >
-      <template #item="{item}">
-        <div v-if="item.label === 'Informationen'" class="flex mt-5">
-          <div class="w-1/2 mr-5">
-            <UCard >
-              <div class="text-wrap">
-                <p>Kundennummer: {{itemInfo.customerNumber}}</p>
-                <p>Typ: {{itemInfo.isCompany ? 'Firma' : 'Privatperson'}}</p>
-                <p v-if="itemInfo.infoData.street">Straße + Hausnummer: {{itemInfo.infoData.street}}</p>
-                <p v-if="itemInfo.infoData.zip && itemInfo.infoData.city">PLZ + Ort: {{itemInfo.infoData.zip}} {{itemInfo.infoData.city}}</p>
-                <p v-if="itemInfo.infoData.tel">Telefon: {{itemInfo.infoData.tel}}</p>
-                <p v-if="itemInfo.infoData.email">E-Mail: {{itemInfo.infoData.email}}</p>
-                <p v-if="itemInfo.infoData.web">Web: {{itemInfo.infoData.web}}</p>
-                <p v-if="itemInfo.infoData.ustid">USt-Id: {{itemInfo.infoData.ustid}}</p>
-                <p>Notizen:<br> {{itemInfo.notes}}</p>
-              </div>
-
-            </UCard>
-            <UCard class="mt-5">
-              <Toolbar>
-                <UButton
-                    @click="router.push(`/contacts/create?customer=${itemInfo.id}`)"
-                >
-                  + Ansprechpartner
-                </UButton>
-              </Toolbar>
-              <UTable
-                  :rows="dataStore.getContactsByCustomerId(itemInfo.id)"
-                  @select="(row) => router.push(`/contacts/show/${row.id}`)"
-                  :columns="[{label: 'Anrede', key: 'salutation'},{label: 'Name', key: 'fullName'},{label: 'Rolle', key: 'role'}]"
-                  :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Ansprechpartner' }"
-
-              >
-
-              </UTable>
-            </UCard>
-          </div>
-          <div class="w-1/2">
-            <UCard class="h-full">
-              <HistoryDisplay
-                  type="customer"
-                  v-if="itemInfo"
-                  :element-id="itemInfo.id"
-                  :render-headline="true"
-              />
-            </UCard>
-          </div>
-
-        </div>
-
-
-
-        <UCard class="mt-5" v-else>
-
-          <div v-if="item.label === 'Projekte'">
-
-          </div>
-          <div v-else-if="item.label === 'Objekte'">
-            <Toolbar>
-              <UButton
-                  @click="router.push(`/plants/create?customer=${itemInfo.id}`)"
-              >
-                + Objekt
-              </UButton>
-            </Toolbar>
-            <UTable
-                :rows="dataStore.getPlantsByCustomerId(itemInfo.id)"
-                @select="(row) => router.push(`/plants/show/${row.id}`)"
-                :columns="[{label: 'Name', key: 'name'}]"
-                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Objekte' }"
-
-            >
-
-            </UTable>
-          </div>
-          <div v-else-if="item.label === 'Verträge'">
-            <Toolbar>
-              <UButton
-                  @click="router.push(`/contracts/create?customer=${itemInfo.id}`)"
-              >
-                + Vertrag
-              </UButton>
-            </Toolbar>
-            <UTable
-                :rows="dataStore.getContractsByCustomerId(itemInfo.id)"
-                @select="(row) => router.push(`/contracts/show/${row.id}`)"
-                :columns="[{label: 'Name', key: 'name'},{label: 'Aktiv', key: 'active'}]"
-                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Verträge' }"
-
-            >
-
-            </UTable>
-          </div>
-        </UCard>
-
-      </template>
-    </UTabs>
-    <UForm v-else-if="mode === 'edit' || mode === 'create'" class="p-5">
-      <UFormGroup
-          label="Name:"
-      >
-        <UInput
-            v-model="itemInfo.name"
-        />
-      </UFormGroup>
-
-      <UFormGroup
-          label="Kundennummer:"
-      >
-        <UInput
-            v-model="itemInfo.customerNumber"
-            placeholder="Leer lassen für automatisch generierte Nummer"
-        />
-      </UFormGroup>
-
-      <UTooltip text="Ist ein Kunde nicht aktiv so wird er für neue Aufträge gesperrt">
-        <UFormGroup
-            label="Kunde aktiv:"
-        >
-          <UCheckbox
-              v-model="itemInfo.active"
-          />
-        </UFormGroup>
-      </UTooltip>
-      <UFormGroup
-          label="Firmenkunde:"
-      >
-        <UCheckbox
-            v-model="itemInfo.isCompany"
-        />
-      </UFormGroup>
-      <UFormGroup
-          label="Notizen:"
-      >
-        <UTextarea
-            v-model="itemInfo.notes"
-        />
-      </UFormGroup>
-
-      <UFormGroup
-          label="Straße + Hausnummer"
-      >
-        <UInput
-            v-model="itemInfo.infoData.street"
-        />
-      </UFormGroup>
-      <UFormGroup
-          label="Adresszusatz"
-      >
-        <UInput
-            v-model="itemInfo.infoData.special"
-        />
-      </UFormGroup>
-      <UFormGroup
-          label="Postleitzahl"
-      >
-        <UInput
-            v-model="itemInfo.infoData.zip"
-            @focusout="setCityByZip"
-        />
-      </UFormGroup>
-      <UFormGroup
-          label="Ort"
-      >
-        <UInput
-            v-model="itemInfo.infoData.city"
-        />
-      </UFormGroup>
-      <UFormGroup
-          label="Land"
-      >
-        <USelectMenu
-            :options="['Deutschland','Niederlande','Belgien','Italien', 'Frankreich','Irland','USA','Spanien', 'Schweden']"
-            v-model="itemInfo.infoData.country"
-        />
-      </UFormGroup>
-
-      <UFormGroup
-          label="Telefon:"
-      >
-        <UInput
-            v-model="itemInfo.infoData.tel"
-        />
-      </UFormGroup>
-      <UFormGroup
-          label="E-Mail:"
-      >
-        <UInput
-            v-model="itemInfo.infoData.email"
-        />
-      </UFormGroup>
-      <UFormGroup
-          label="Webseite:"
-      >
-        <UInput
-            v-model="itemInfo.infoData.web"
-        />
-      </UFormGroup>
-      <UFormGroup
-          label="USt-Id:"
-      >
-        <UInput
-            v-model="itemInfo.infoData.ustid"
-        />
-      </UFormGroup>
-      <UFormGroup
-          label="Berechtigte Benutzer:"
-      >
-        <USelectMenu
-            v-model="itemInfo.profiles"
-            :options="profileStore.profiles"
-            option-attribute="fullName"
-            value-attribute="id"
-            searchable
-            multiple
-            :search-attributes="['fullName']"
-        >
-          <template #label>
-            {{itemInfo.profiles.length > 0 ? itemInfo.profiles.map(i => profileStore.getProfileById(i).fullName).join(", ") : "Kein Benutzer ausgewählt"}}
-          </template>
-        </USelectMenu>
-      </UFormGroup>
-    </UForm>
-  </UDashboardPanelContent>
-
-
-
-
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/customers/index.vue b/deprecated/entitys/customers/index.vue
deleted file mode 100644
index 05190da..0000000
--- a/deprecated/entitys/customers/index.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <EntityList
-      type="customers"
-      :items="items"
-  ></EntityList>
-</template>
-
-<script setup>
-import EntityList from "~/components/EntityList.vue";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("customers",null,"customerNumber")
-}
-
-setupPage()
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/plants/[mode]/[[id]].vue b/deprecated/entitys/plants/[mode]/[[id]].vue
deleted file mode 100644
index b0a1ffd..0000000
--- a/deprecated/entitys/plants/[mode]/[[id]].vue
+++ /dev/null
@@ -1,252 +0,0 @@
-<script setup>
-import HistoryDisplay from "~/components/HistoryDisplay.vue";
-import DocumentList from "~/components/DocumentList.vue";
-import DocumentUpload from "~/components/DocumentUpload.vue";
-import Toolbar from "~/components/Toolbar.vue";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const dataStore = useDataStore()
-const supabase = useSupabaseClient()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-
-
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-})
-
-const tabItems = [
-  {
-    label: "Informationen"
-  },{
-    label: "Projekte"
-  },{
-    label: "Aufgaben"
-  },{
-    label: "Dokumente"
-  }
-]
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show"){
-    itemInfo.value = (await supabase.from("plants").select("*, customer(*)").eq("id",useRoute().params.id).single()).data
-  } else if(mode.value === "edit") {
-    itemInfo.value = (await supabase.from("plants").select().eq("id",useRoute().params.id).single()).data
-  }
-
-  if(mode.value === "create") {
-    let query = route.query
-    if(query.customer) itemInfo.value.customer = Number(query.customer)
-  }
-}
-
-const contentChanged = (content) => {
-  itemInfo.value.description.html = content.html
-  itemInfo.value.description.text = content.text
-  itemInfo.value.description.json = content.json
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar :title="itemInfo ? itemInfo.name : (mode === 'create' ? 'Objekt erstellen' : 'Objekt bearbeiten')">
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/plants`)"
-      >
-        Objekte
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          :class="['text-xl','font-medium']"
-      >{{itemInfo ? `Objekt: ${itemInfo.name}` : (mode === 'create' ? 'Objekt erstellen' : 'Objekt bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <ButtonWithConfirm
-          color="rose"
-          variant="outline"
-          @confirmed="dataStore.updateItem('plants',{...itemInfo, archived: true})"
-          v-if="mode === 'edit'"
-      >
-        <template #button>
-          Archivieren
-        </template>
-        <template #header>
-          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
-        </template>
-        Möchten Sie das Objekt {{itemInfo.name}} wirklich archivieren?
-      </ButtonWithConfirm>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('plants',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('plants',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="router.push(itemInfo.id ? `/plants/show/${itemInfo.id}` : `/plants/`)"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="router.push(`/plants/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UTabs
-      :items="tabItems"
-      v-if="mode === 'show'"
-      class="p-5"
-  >
-    <template #item="{item}">
-      <div v-if="item.label === 'Informationen'" class="flex flex-row mt-5">
-        <UCard class="w-1/2 mr-5">
-          <UAlert
-              v-if="itemInfo.archived"
-              color="rose"
-              variant="outline"
-              title="Objekt archiviert"
-              icon="i-heroicons-light-bulb"
-              class="mb-5"
-          />
-          <div class="text-wrap">
-            <table>
-              <tr>
-                <td>Kunde:</td>
-                <td><nuxt-link v-if="itemInfo.customer" :to="`/customers/show/${itemInfo.customer.id}`">{{itemInfo.customer.name}}</nuxt-link></td>
-              </tr>
-            </table>
-          </div>
-          <div v-if="itemInfo.description">
-            <p>Notizen:</p>
-            <span v-html="itemInfo.description.html"></span>
-          </div>
-        </UCard>
-        <UCard class="w-1/2">
-          <HistoryDisplay
-              type="plant"
-              v-if="itemInfo.id"
-              :element-id="itemInfo.id"
-              render-headline
-          />
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Projekte'">
-        <Toolbar>
-          <UButton
-              @click="router.push(`/projects/create?plant=${itemInfo.id}`)"
-          >
-            + Projekt
-          </UButton>
-        </Toolbar>
-
-        <UTable
-            :rows="dataStore.getProjectsByPlantId(itemInfo.id)"
-            :columns="[{key: 'name', label: 'Name'}]"
-            @select="(row) => router.push(`/projects/show/${row.id}`)"
-            :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Projekte' }"
-        >
-
-        </UTable>
-
-      </div>
-      <div v-else-if="item.label === 'Aufgaben'">
-        <Toolbar>
-          <UButton
-              @click="router.push(`/tasks/create?plant=${itemInfo.id}`)"
-          >
-            + Aufgabe
-          </UButton>
-        </Toolbar>
-        <UTable
-            :rows="dataStore.getTasksByPlantId(itemInfo.id)"
-            :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Aufgaben' }"
-            :columns="[{key: 'name', label: 'Name'},{key: 'categore', label: 'Kategorie'}]"
-            @select="(row) => router.push(`/tasks/show/${row.id}`)"
-        >
-
-        </UTable>
-      </div>
-      <div v-else-if="item.label === 'Dokumente'" class="space-y-3">
-        <Toolbar>
-          <DocumentUpload
-              type="plant"
-              :element-id="itemInfo.id"
-          />
-        </Toolbar>
-
-        <DocumentList :documents="dataStore.getDocumentsByPlantId(itemInfo.id)"/>
-
-      </div>
-    </template>
-  </UTabs>
-
-
-  <UForm
-      v-else-if="mode === 'edit' || mode === 'create'"
-      class="p-5"
-  >
-    <UFormGroup
-        label="Name:"
-    >
-      <UInput
-          v-model="itemInfo.name"
-      />
-    </UFormGroup>
-
-    <UFormGroup
-        label="Kundennummer:"
-    >
-      <USelectMenu
-          v-model="itemInfo.customer"
-          :options="dataStore.customers"
-          option-attribute="name"
-          value-attribute="id"
-          searchable
-          :search-attributes="['name']"
-      >
-        <template #label>
-          {{dataStore.customers.find(customer => customer.id === itemInfo.customer) ? dataStore.customers.find(customer => customer.id === itemInfo.customer).name : "Kunde auswählen"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-      label="Notizen:"
-    >
-      <Tiptap
-          v-if="itemInfo.description"
-          @updateContent="contentChanged"
-          :preloadedContent="itemInfo.description.html"
-      />
-    </UFormGroup>
-
-  </UForm>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/plants/index.vue b/deprecated/entitys/plants/index.vue
deleted file mode 100644
index 2bdfb71..0000000
--- a/deprecated/entitys/plants/index.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <EntityList
-    :items="items"
-    type="plants"
-  />
-</template>
-
-<script setup>
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("plants","*, customer(id,name)")
-}
-
-setupPage()
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/productcategories/[mode]/[[id]].vue b/deprecated/entitys/productcategories/[mode]/[[id]].vue
deleted file mode 100644
index b56c291..0000000
--- a/deprecated/entitys/productcategories/[mode]/[[id]].vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<script setup>
-import HistoryDisplay from "~/components/HistoryDisplay.vue";
-import DocumentList from "~/components/DocumentList.vue";
-import DocumentUpload from "~/components/DocumentUpload.vue";
-import {useSupabaseSelect} from "~/composables/useSupabase.js";
-import dayjs from "dayjs";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/productcategories")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({})
-const openTab = ref(0)
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show" || mode.value === "edit"){
-    itemInfo.value = await useSupabaseSelectSingle("productcategories",route.params.id,"*")
-  }
-
-
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/productcategories/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/productcategories/`)
-  }
-}
-
-
-
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar
-      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
-  >
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/productcategories`)"
-      >
-        Artikelkategorien
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          class="text-xl font-medium"
-      >{{itemInfo.name ? `Artikelkategorie: ${itemInfo.name}` : (mode === 'create' ? 'Artikelkategorie erstellen' : 'Artikelkategorie bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('productcategories',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('productcategories',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="  router.push(`/productcategories/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UTabs
-    :items="[{label: 'Informationen'}]"
-    v-if="mode === 'show' && itemInfo"
-    class="p-5"
-    v-model="openTab"
-  >
-    <template #item="{item}">
-      <div v-if="item.label === 'Informationen'" class="mr-5 flex flex-row">
-        <div class="w-1/2 mr-5">
-          <UCard>
-            <table class="w-full">
-              <tr>
-                <td>Name: </td>
-                <td>{{itemInfo.name}}</td>
-              </tr>
-              <tr>
-                <td>Beschreibung:</td>
-                <td>{{itemInfo.description}}</td>
-              </tr>
-            </table>
-          </UCard>
-        </div>
-        <div class="w-1/2">
-          <UCard>
-            <HistoryDisplay
-                type="product"
-                v-if="itemInfo"
-                :element-id="itemInfo.id"
-                render-headline
-            />
-          </UCard>
-
-        </div>
-      </div>
-
-
-
-
-    </template>
-  </UTabs>
-  <UForm
-      v-else-if="mode == 'edit' || mode == 'create'"
-      class="p-5"
-  >
-    <UFormGroup
-        label="Name:"
-    >
-      <UInput
-          v-model="itemInfo.name"
-          autofocus
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Beschreibung:"
-    >
-      <UTextarea
-          v-model="itemInfo.description"
-      />
-    </UFormGroup>
-  </UForm>
-</template>
-
-<style scoped>
-td {
-  border-bottom: 1px solid lightgrey;
-  vertical-align: top;
-  padding-bottom: 0.15em;
-  padding-top: 0.15em;
-}
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/productcategories/index.vue b/deprecated/entitys/productcategories/index.vue
deleted file mode 100644
index 2f863e0..0000000
--- a/deprecated/entitys/productcategories/index.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <EntityList
-    :items="items"
-    type="productcategories"
-  />
-</template>
-
-<script setup>
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("productcategories","*")
-}
-
-setupPage()
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/products/[mode]/[[id]].vue b/deprecated/entitys/products/[mode]/[[id]].vue
deleted file mode 100644
index eb844a6..0000000
--- a/deprecated/entitys/products/[mode]/[[id]].vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<script setup>
-import HistoryDisplay from "~/components/HistoryDisplay.vue";
-import DocumentList from "~/components/DocumentList.vue";
-import DocumentUpload from "~/components/DocumentUpload.vue";
-import {useSupabaseSelect} from "~/composables/useSupabase.js";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/products")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const supabase = useSupabaseClient()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-    unit: 1,
-    tags: [],
-    productcategories: []
-})
-const openTab = ref(0)
-
-const productcategories = ref([])
-const units = ref([])
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show" || mode.value === "edit"){
-    itemInfo.value = await useSupabaseSelectSingle("products",route.params.id,"*")
-  }
-
-  productcategories.value = await useSupabaseSelect("productcategories","*")
-  units.value = (await supabase.from("units").select()).data
-  console.log(units.value[0])
-
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/products/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/products/`)
-  }
-}
-
-
-
-const printLabel = async (content) => {
-  const label = await useSupabaseSelectSingle("printLabels",1,'*')
-
-
-  usePrintLabel('0dbe30f3-3008-4cde-8a7c-e785b1c22bfc','ZD411',useGenerateZPL(label.handlebarsZPL,{barcode:itemInfo.value.articleNumber }))
-
-}
-
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar
-      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
-  >
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/products`)"
-      >
-        Artikel
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          class="text-xl font-medium"
-      >{{itemInfo.name ? `Artikel: ${itemInfo.name}` : (mode === 'create' ? 'Artikel erstellen' : 'Artikel bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('products',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('products',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="  router.push(`/products/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UTabs
-    :items="[{label: 'Informationen'},{label: 'Bestand'},{label: 'Dokumente'}]"
-    v-if="mode === 'show' && itemInfo"
-    class="p-5"
-    v-model="openTab"
-  >
-    <template #item="{item}">
-      <div v-if="item.label === 'Informationen'" class="mt-5 flex flex-row">
-        <div class="w-1/2 mr-5">
-          <UCard>
-            <UBadge
-                v-for="tag in itemInfo.tags"
-                class="mr-2"
-
-            >
-              {{tag}}
-            </UBadge>
-            <UDivider
-                class="my-2"
-            />
-
-<!--
-            <UButton @click="printLabel(itemInfo.ean)">Print Label</UButton>
--->
-
-            <table class="w-full">
-              <tr>
-                <td>Name:</td>
-                <td>{{itemInfo.name}}</td>
-              </tr>
-              <tr>
-                <td>Hersteller:</td>
-                <td>{{itemInfo.manufacturer}}</td>
-              </tr>
-              <tr>
-                <td>Herstellernummer:</td>
-                <td>{{itemInfo.manufacturerNumber}}</td>
-              </tr>
-              <tr>
-                <td>Einheit:</td>
-                <td>{{units.find(i => i.id === itemInfo.unit) ? units.find(i => i.id === itemInfo.unit).name : ""}}</td>
-              </tr>
-              <tr>
-                <td>Tags:</td>
-                <td>{{itemInfo.tags.join(", ")}}</td>
-              </tr>
-              <tr>
-                <td>Artikelkategorien:</td>
-                <td>{{itemInfo.productcategories.map(i => productcategories.find(x => x.id === i).name).join(", ")}}</td>
-              </tr>
-              <tr>
-                <td>EAN:</td>
-                <td>{{itemInfo.ean}}</td>
-              </tr>
-              <tr>
-                <td>Verkaufspreis:</td>
-                <td>{{itemInfo.sellingPrice}}</td>
-              </tr>
-              <tr>
-                <td>Beschreibung:</td>
-                <td>{{itemInfo.description}}</td>
-              </tr>
-            </table>
-          </UCard>
-        </div>
-        <div class="w-1/2">
-          <UCard>
-            <HistoryDisplay
-                type="product"
-                v-if="itemInfo"
-                :element-id="itemInfo.id"
-                render-headline
-            />
-          </UCard>
-        </div>
-      </div>
-      <div
-          v-if="item.label === 'Bestand'"
-      >
-        <UCard class="mt-5">
-          Bestand: {{dataStore.getStockByProductId(itemInfo.id)}} {{dataStore.units.find(unit => unit.id === itemInfo.unit) ? dataStore.units.find(unit => unit.id === itemInfo.unit).name : ""}}
-        </UCard>
-      </div>
-      <div
-          v-if="item.label === 'Dokumente'"
-      >
-        <UCard class="mt-5">
-          <Toolbar>
-            <DocumentUpload
-                type="product"
-                :element-id="itemInfo.id"
-            />
-          </Toolbar>
-
-
-          <DocumentList :documents="dataStore.getDocumentsByProductId(itemInfo.id)"/>
-        </UCard>
-      </div>
-    </template>
-  </UTabs>
-  <UForm
-      v-else-if="mode == 'edit' || mode == 'create'"
-      class="p-5"
-  >
-    <UFormGroup
-        label="Name:"
-    >
-      <UInput
-          v-model="itemInfo.name"
-          autofocus
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Hersteller:"
-    >
-      <UInput
-          v-model="itemInfo.manufacturer"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Hersteller Nr.:"
-    >
-      <UInput
-          v-model="itemInfo.manufacturerNumber"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Einheit:"
-    >
-      <USelectMenu
-          v-model="itemInfo.unit"
-          :options="dataStore.units"
-          option-attribute="name"
-          value-attribute="id"
-      >
-        <template #label>
-          {{dataStore.units.find(unit => unit.id === itemInfo.unit) ? dataStore.units.find(unit => unit.id === itemInfo.unit).name : itemInfo.unit }}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Tags:"
-    >
-      <USelectMenu
-          v-model="itemInfo.tags"
-          :options="profileStore.ownTenant.tags.products"
-          multiple
-      >
-        <template #label>
-          {{itemInfo.tags.length > 0 ? itemInfo.tags.join(", ") : "Keine Tags ausgewählt"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Artikelkategorien:"
-    >
-      <USelectMenu
-          v-model="itemInfo.productcategories"
-          :options="productcategories"
-          value-attribute="id"
-          option-attribute="name"
-          multiple
-      >
-        <template #label>
-          {{itemInfo.productcategories.length > 0 ? itemInfo.productcategories.map(i => productcategories.find(x => x.id === i).name).join(", ") : "Keine Kategorien ausgewählt"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="EAN:"
-    >
-      <UInput
-          v-model="itemInfo.ean"
-      />
-    </UFormGroup>
-<!--    <UFormGroup
-        label="Barcode:"
-    >
-      <UInput
-          v-model="itemInfo.barcode"
-      />
-    </UFormGroup>-->
-    <UFormGroup
-        label="Einkaufspreis:"
-    >
-      <UInput
-          v-model="itemInfo.purchasePrice"
-          type="number"
-          steps="0.01"
-      >
-        <template #trailing>
-          <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
-        </template>
-      </UInput>
-    </UFormGroup>
-    <UFormGroup
-        label="Verkaufspreis:"
-    >
-      <UInput
-          v-model="itemInfo.sellingPrice"
-          type="number"
-          steps="0.01"
-      >
-        <template #trailing>
-          <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
-        </template>
-      </UInput>
-    </UFormGroup>
-    <UFormGroup
-        label="Beschreibung:"
-    >
-      <UTextarea
-          v-model="itemInfo.description"
-      />
-    </UFormGroup>
-  </UForm>
-</template>
-
-<style scoped>
-td {
-  border-bottom: 1px solid lightgrey;
-  vertical-align: top;
-  padding-bottom: 0.15em;
-  padding-top: 0.15em;
-}
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/products/index.vue b/deprecated/entitys/products/index.vue
deleted file mode 100644
index 05f0d4f..0000000
--- a/deprecated/entitys/products/index.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-  <EntityList
-    :items="items"
-    type="products"
-  />
-</template>
-
-<script setup>
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-const productcategories = ref([])
-
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("products","*, unit(name)")
-  productcategories.value = await useSupabaseSelect("productcategories", "*")
-}
-
-setupPage()
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/projects/[mode]/[[id]].vue b/deprecated/entitys/projects/[mode]/[[id]].vue
deleted file mode 100644
index f4b4d7b..0000000
--- a/deprecated/entitys/projects/[mode]/[[id]].vue
+++ /dev/null
@@ -1,674 +0,0 @@
-<script setup>
-import dayjs from "dayjs";
-
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/projects")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const supabase = useSupabaseClient()
-const user = useSupabaseUser()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-
-const openTab = ref(0)
-
-const tabItems = [
-  {
-    key: "information",
-    label: "Informationen"
-  },
-  {
-    key: "phases",
-    label: "Phasen"
-  },{
-    key: "tasks",
-    label: "Aufgaben"
-  },/*{
-    key: "forms",
-    label: "Formulare"
-  },*/{
-    key: "documents",
-    label: "Dokumente"
-  },{
-    key: "timetracking",
-    label: "Zeiterfassung"
-  },{
-    key: "events",
-    label: "Termine"
-  },{
-    key: "material",
-    label: "Material"
-  }
-]
-
-const timeTableRows = [
-  {
-    key:"user",
-    label: "Benutzer"
-  },{
-    key:"start",
-    label: "Start"
-  },{
-    key:"end",
-    label:"Ende"
-  },{
-    key:"duration",
-    label: "Dauer"
-  },{
-    key: "type",
-    label: "Typ"
-  },{
-    key:"notes",
-    label: "Notizen"
-  },
-]
-
-
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  name: "",
-  customer: 0,
-  profiles: [profileStore.activeProfile.id]
-})
-const oldItemInfo = ref({})
-
-const plants = ref([])
-const contracts = ref([])
-const projecttypes = ref([])
-const disableCustomerSelection =ref(false)
-
-
-//Functions
-const setupPage = async() => {
-  plants.value = await useSupabaseSelect("plants")
-  contracts.value = await useSupabaseSelect("contracts")
-  projecttypes.value = await useSupabaseSelect("projecttypes", "*", "id")
-
-  if(mode.value === "show" ){
-    itemInfo.value = await useSupabaseSelectSingle("projects",route.params.id,"*, customer(*), plant(*), createddocuments(*)")
-  } else if (mode.value === "edit") {
-    itemInfo.value = await useSupabaseSelectSingle("projects",route.params.id,"*")
-  }
-
-  if(mode.value === "create") {
-    let query = route.query
-
-    if(query.customer) itemInfo.value.customer = Number(query.customer)
-
-    if(query.plant) {
-      itemInfo.value.plant = Number(query.plant)
-      itemInfo.value.customer = dataStore.getPlantById(itemInfo.value.plant).customer
-    }
-  }
-  if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
-
-  if(!oldItemInfo.value.projecttype) {
-    itemInfo.value.projecttype = projecttypes.value[0].id
-  }
-
-}
-
-setupPage()
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/projects/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/projects/`)
-  }
-}
-
-const projectHours = () => {
-  let hours = 0
-  dataStore.getTimesByProjectId(itemInfo.value.id).forEach(item => {
-    hours += Number(dayjs(item.end).diff(item.start,'hour',true).toFixed(2))
-  })
-
-  return hours.toFixed(2)
-}
-
-const updateProject = async () => {
-  let initialPhases = projecttypes.value.find(i => i.id === itemInfo.value.projecttype).initialPhases
-
-  if(oldItemInfo.value.phases.length === 0) {
-    itemInfo.value.phases = initialPhases
-  }
-
-  await dataStore.updateItem('projects',itemInfo.value,oldItemInfo.value)
-
-}
-
-const createProject = async () => {
-  let initialPhases = projecttypes.value.find(i => i.id === itemInfo.value.projecttype).initialPhases
-  await dataStore.createNewItem('projects',{...itemInfo.value, phases: initialPhases })
-}
-
-const changeActivePhase = async (key) => {
-  let item = await useSupabaseSelectSingle("projects",itemInfo.value.id,'*')
-
-  console.log(key)
-
-  let phaseLabel = ""
-
-  item.phases = item.phases.map(p => {
-    if(p.active) p.active = false
-
-    if(p.key === key) {
-      p.active = true
-      p.activated_at = dayjs().format()
-      p.activated_by = profileStore.activeProfile.id
-      phaseLabel = p.label
-    }
-
-    return p
-  })
-
-  console.log(item.phases)
-
-  await supabase.from("projects").update({phases: item.phases}).eq("id",item.id)
-  const {error} = await supabase.from("historyitems").insert({
-    createdBy: profileStore.activeProfile.id,
-    tenant: profileStore.currentTenant,
-    text: `Aktive Phase zu "${phaseLabel}" gewechselt`,
-    project: item.id
-  })
-  console.log(error)
-
-  setupPage()
-}
-
-
-const renderedPhases = computed(() => {
-
-  if(itemInfo.value.phases) {
-    return itemInfo.value.phases.map((phase,index,array) => {
-
-      let isAvailable = false
-
-      if(phase.active) {
-        isAvailable = true
-      } else if(index > 0 && array[index-1].active ){
-        isAvailable = true
-      } else if(index > 1 && array[index-1].optional && array[index-2].active){
-        isAvailable = true
-      } else if(array.findIndex(i => i.active) > index) {
-        isAvailable = true
-      }
-
-
-      return {
-        ...phase,
-        label: phase.optional ? `${phase.label}(optional)`: phase.label,
-        disabled: !isAvailable,
-        defaultOpen: phase.active ? true : false
-      }
-    })
-  } else {
-    return []
-  }
-})
-
-const invoiceDeliveryNotes = () => {
-  router.push(`/createDocument/edit?type=invoices&linkedDocuments=[${itemInfo.value.createddocuments.filter(i => i.type === "deliveryNotes").map(i => i.id)}]`)
-}
-
-</script>
-
-<template>
-  <UDashboardNavbar :title="itemInfo ? itemInfo.name : (mode === 'create' ? 'Projekt erstellen' : 'Projekt bearbeiten')">
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/projects`)"
-      >
-        Projekte
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          class="text-xl font-medium"
-      >{{itemInfo.name ? `Projekt: ${itemInfo.name}` : (mode === 'create' ? 'Projekt erstellen' : 'Projekt bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="updateProject"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="createProject"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="router.push(`/projects/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UDashboardPanelContent>
-    <UTabs
-        :items="tabItems"
-        v-if="itemInfo.id && mode == 'show'"
-        v-model="openTab"
-    >
-      <template #item="{ item }">
-        <div v-if="item.key === 'information'" class="flex flex-row">
-          <div class="w-1/2 mr-3">
-            <UCard class="mt-5">
-              <div class="text-wrap">
-                <p>Kunde: <nuxt-link :to="`/customers/show/${itemInfo.customer.id}`">{{itemInfo.customer.name}}</nuxt-link></p>
-                <p>Objekt: <nuxt-link v-if="itemInfo.plant" :to="`/plants/show/${itemInfo.plant.id}`">{{itemInfo.plant ? itemInfo.plant.name : ""}}</nuxt-link><span v-else>-</span></p>
-                <p class="">Notizen: {{itemInfo.notes}}</p>
-              </div>
-            </UCard>
-            <UCard class="mt-3">
-              <h1 class="font-bold text-lg mb-3">Beteiligte Benutzer:</h1>
-              <UAlert
-                  v-for="projectUser in itemInfo.profiles"
-                  :avatar="{ alt: profileStore.getProfileById(projectUser).fullName }"
-                  :title="profileStore.getProfileById(projectUser).fullName"
-                  class="mb-3"
-
-              />
-            </UCard>
-          </div>
-          <div class="w-1/2">
-            <UCard class="mt-5">
-              <HistoryDisplay
-                  type="project"
-                  v-if="itemInfo"
-                  :element-id="itemInfo.id"
-                  render-headline
-              />
-            </UCard>
-          </div>
-
-
-
-        </div>
-        <div v-if="item.key === 'phases'" class="space-y-3">
-          <UCard class="mt-5">
-            <UAccordion
-                :items="renderedPhases"
-            >
-              <template #default="{item,index,open}">
-                <UButton
-                    variant="ghost"
-                    :color="item.active ? 'primary' : 'white'"
-                    class="mb-1"
-                    :disabled="true"
-                >
-                  <template #leading>
-                    <div class="w-6 h-6  flex items-center justify-center -my-1">
-                      <UIcon :name="item.icon" class="w-4 h-4 " />
-                    </div>
-                  </template>
-
-                  <span class="truncate"> {{item.label}}</span>
-
-                  <template #trailing>
-                    <UIcon
-                        name="i-heroicons-chevron-right-20-solid"
-                        class="w-5 h-5 ms-auto transform transition-transform duration-200"
-                        :class="[open && 'rotate-90']"
-                    />
-                  </template>
-
-                </UButton>
-              </template>
-              <template #item="{item, index}">
-                <UCard class="mx-5">
-                  <template #header>
-                    <span class="text-black">{{item.label}}</span>
-                  </template>
-                  <InputGroup>
-                    <UButton
-                        v-if="!item.activated_at && index !== 0 "
-                        @click="changeActivePhase(item.key)"
-                    >
-                      Phase aktivieren
-                    </UButton>
-                    <UButton
-                        v-if="item.active"
-                        v-for="button in item.quickactions"
-                        @click="router.push(`${button.link}&customer=${itemInfo.customer.id}&project=${itemInfo.id}`)"
-                    >
-                      {{button.label}}
-                    </UButton>
-                  </InputGroup>
-
-                  <div>
-                    <p v-if="item.activated_at" class="text-black">Aktiviert am: {{dayjs(item.activated_at).format("DD.MM.YY HH:mm")}} Uhr</p>
-                    <p v-if="item.activated_by" class="text-black">Aktiviert durch: {{profileStore.getProfileById(item.activated_by).fullName}}</p>
-                    <p v-if="item.description" class="text-black">Beschreibung: {{item.description}}</p>
-                  </div>
-                </UCard>
-
-
-              </template>
-            </UAccordion>
-          </UCard>
-        </div>
-        <div v-if="item.key === 'tasks'" class="space-y-3">
-          <UCard class="mt-5">
-            <Toolbar>
-              <UButton
-                  @click="router.push(`/tasks/create?project=${itemInfo.id}`)"
-              >
-                + Aufgabe
-              </UButton>
-            </Toolbar>
-
-            <UTable
-                :rows="dataStore.getTasksByProjectId(itemInfo.id)"
-                :columns="[{key: 'name',label: 'Name'},{key: 'categorie',label: 'Kategorie'},{key: 'user',label: 'Benutzer'}]"
-                @select="(row) => router.push(`/tasks/show/${row.id}`)"
-                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Aufgaben' }"
-
-            >
-              <template #user-data="{row}">
-                {{profileStore.profiles.find(i => i.id === row.user) ? profileStore.profiles.find(i => i.id === row.user).fullName : ""}}
-              </template>
-            </UTable>
-          </UCard>
-
-
-
-        </div>
-        <div v-else-if="item.key === 'documents'" class="space-y-3">
-          <UCard class="mt-5">
-            <Toolbar>
-              <DocumentUpload
-                  type="project"
-                  :element-id="itemInfo.id"
-              />
-              <UButton
-                  @click="router.push(`/createDocument/edit?project=${itemInfo.id}&customer=${itemInfo.customer.id}`)"
-              >
-                + Dokument
-              </UButton>
-              <UButton
-                @click="invoiceDeliveryNotes"
-              >
-                Lieferscheine abrechnen
-              </UButton>
-            </Toolbar>
-
-
-            <UTable
-                :rows="itemInfo.createddocuments"
-                :columns="[
-                {
-                  label: 'Typ',
-                  key: 'type'
-                }, {
-                  label: 'Status',
-                  key: 'state'
-                }, {
-                  label: 'Dokumentennummer',
-                  key: 'documentNumber'
-                }, {
-                  label: 'Ansprechpartner',
-                  key: 'createdBy'
-                }
-
-            ]"
-                @select="(row) => row.state === 'Entwurf' ? router.push(`/createDocument/edit/${row.id}`) : router.push(`/createDocument/show/${row.id}`)"
-                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen erstellten Dokumente' }"
-
-            >
-              <template #type-data="{row}">
-                <span v-if="row.type === 'invoices'">Rechnung</span>
-                <span v-if="row.type === 'quotes'">Angebot</span>
-                <span v-if="row.type === 'deliveryNotes'">Lieferschein</span>
-              </template>
-              <template #createdBy-data="{row}">
-                {{profileStore.getProfileById(row.createdBy).fullName}}
-              </template>
-            </UTable>
-
-            <DocumentList :documents="dataStore.getDocumentsByProjectId(itemInfo.id)"/>
-          </UCard>
-
-
-
-
-        </div>
-        <div v-else-if="item.key === 'timetracking'" class="space-y-3">
-          <UCard class="mt-5">
-            Projekt Zeit: {{String(projectHours()).replace(".",",")}} Stunden
-            <UTable
-                :rows="dataStore.getTimesByProjectId(itemInfo.id)"
-                :columns="timeTableRows"
-                :empty-state="{ icon: 'i-heroicons-clock', label: 'Noch keine Zeiten in diesem Projekt' }"
-            >
-              <template #user-data="{row}">
-                {{profileStore.profiles.find(profile => profile.id === row.user) ? profileStore.profiles.find(profile => profile.id === row.user).fullName : row.user }}
-              </template>
-              <template #duration-data="{row}">
-                {{(row.start && row.end) ? `${String(dayjs(row.end).diff(row.start,'hour',true).toFixed(2)).replace(".",",")} h` : ""}}
-              </template>
-              <template #start-data="{row}">
-                {{dayjs(row.start).format("DD.MM.YY HH:mm")}}
-              </template>
-              <template #end-data="{row}">
-                {{dayjs(row.end).format("DD.MM.YY HH:mm")}}
-              </template>
-
-            </UTable>
-          </UCard>
-
-
-        </div>
-        <div v-else-if="item.key === 'events'" class="space-y-3">
-          <UCard class="mt-5">
-            <Toolbar>
-              <UButton
-                  @click="router.push(`/events/edit`)"
-              >
-                + Termin
-              </UButton>
-            </Toolbar>
-            <UTable
-                :rows="dataStore.getEventsByProjectId(itemInfo.id)"
-                @select="(i) => router.push(`/events/show/${i.id}`)"
-                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Termine anzuzeigen' }"
-                :columns="[{key:'title',label:'Titel'},{key:'start',label:'Start'},{key:'end',label:'Ende'},{key:'type',label:'Typ'},{key:'resources',label:'Resourcen'}]"
-            >
-              <template #start-data="{row}">
-                {{dayjs(row.start).format("DD.MM.YY HH:mm")}}
-              </template>
-              <template #end-data="{row}">
-                {{dayjs(row.end).format("DD.MM.YY HH:mm")}}
-              </template>
-              <template #resources-data="{row}">
-                {{row.resources.map(i => i.title).join(", ")}}
-              </template>
-            </UTable>
-          </UCard>
-        </div>
-        <div v-else-if="item.key === 'material'" class="space-y-3">
-
-        </div>
-
-      </template>
-
-
-    </UTabs>
-
-    <UForm v-else-if="mode === 'edit' || mode === 'create'"  >
-      <UFormGroup
-          label="Name:"
-      >
-        <UInput
-            v-model="itemInfo.name"
-        />
-      </UFormGroup>
-
-      <UFormGroup
-          label="Projektnummer:"
-      >
-        <UInput
-            v-model="itemInfo.projectNumber"
-            placeholder="Leer lassen für automatisch generierte Nummer"
-        />
-      </UFormGroup>
-
-      <UFormGroup
-          label="Objekt:"
-      >
-        <USelectMenu
-            v-model="itemInfo.plant"
-            :options="itemInfo.customer ? plants.filter(i => i.customer === itemInfo.customer) : plants"
-            option-attribute="name"
-            value-attribute="id"
-            searchable
-            :search-attributes="['name']"
-            @change="itemInfo.customer = plants.find(i => i.id === itemInfo.plant).customer,
-                    disableCustomerSelection = true"
-        >
-          <template #label>
-            {{plants.find(i => i.id === itemInfo.plant) ? plants.find(i => i.id === itemInfo.plant).name : "Objekt auswählen"}}
-          </template>
-        </USelectMenu>
-      </UFormGroup>
-      <UFormGroup
-          label="Vertrag:"
-      >
-        <USelectMenu
-            v-model="itemInfo.contract"
-            :options="itemInfo.customer ? contracts.filter(i => i.customer === itemInfo.customer) : contracts"
-            option-attribute="name"
-            value-attribute="id"
-            searchable
-            :search-attributes="['name']"
-            @change="itemInfo.customer = contracts.find(i => i.id === itemInfo.contract).customer,
-                    disableCustomerSelection = true"
-        >
-          <template #label>
-            {{contracts.find(i => i.id === itemInfo.contract) ? contracts.find(i => i.id === itemInfo.contract).name : "Vertrag auswählen"}}
-          </template>
-        </USelectMenu>
-      </UFormGroup>
-
-      <UFormGroup
-          label="Kundennummer:"
-      >
-        <USelectMenu
-            v-model="itemInfo.customer"
-            :options="dataStore.customers"
-            option-attribute="name"
-            value-attribute="id"
-            searchable
-            :search-attributes="['name']"
-            :disabled="disableCustomerSelection"
-        >
-          <template #label>
-            {{dataStore.getCustomerById(itemInfo.customer) ? dataStore.getCustomerById(itemInfo.customer).name : "Kunde auswählen"}}
-          </template>
-        </USelectMenu>
-      </UFormGroup>
-
-      <UFormGroup
-          label="Typ:"
-      >
-        <USelectMenu
-            v-model="itemInfo.projecttype"
-            :options="projecttypes"
-            option-attribute="name"
-            value-attribute="id"
-            searchable
-            :search-attributes="['label']"
-            :disabled="oldItemInfo.projecttype"
-        >
-        </USelectMenu>
-      </UFormGroup>
-
-      <UFormGroup
-          label="Gewerk:"
-      >
-        <USelectMenu
-            v-model="itemInfo.measure"
-            :options="dataStore.getMeasures"
-            option-attribute="name"
-            value-attribute="short"
-            searchable
-            :search-attributes="['name']"
-        >
-
-        </USelectMenu>
-      </UFormGroup>
-
-
-      <UFormGroup
-          label="Berechtigte Benutzer:"
-      >
-        <USelectMenu
-            v-model="itemInfo.profiles"
-            :options="profileStore.profiles"
-            option-attribute="fullName"
-            value-attribute="id"
-            searchable
-            multiple
-            :search-attributes="['fullName']"
-        >
-          <template #label>
-            {{itemInfo.profiles.length > 0 ? itemInfo.profiles.map(i => profileStore.getProfileById(i).fullName).join(", ") : "Kein Benutzer ausgewählt"}}
-          </template>
-        </USelectMenu>
-      </UFormGroup>
-
-      <UFormGroup
-          label="Notizen:"
-      >
-        <UTextarea
-            v-model="itemInfo.notes"
-        />
-      </UFormGroup>
-    </UForm>
-  </UDashboardPanelContent>
-
-
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/projects/index.vue b/deprecated/entitys/projects/index.vue
deleted file mode 100644
index bbd665d..0000000
--- a/deprecated/entitys/projects/index.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <EntityList
-      type="projects"
-      :items="items"
-  ></EntityList>
-</template>
-
-<script setup>
-import EntityList from "~/components/EntityList.vue";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-
-const setupPage = async () => {
-  let profiles = (await useSupabaseSelect("profiles"))
-  items.value = (await useSupabaseSelect("projects","*, customer (name), plant(name), projecttype(name, id)","projectNumber")).map(project => {
-    return {
-      ...project,
-      //profiles: project.profiles.map(x => profiles.find(z => z.id === x).fullName).join(", "),
-      phase: getActivePhaseLabel(project)
-    }
-  })
-}
-
-const getActivePhaseLabel = (item) => {
-  if(item.phases) {
-    if(item.phases.length > 0) {
-
-      let activePhase = item.phases.find(i => i.active)
-
-      if(activePhase) {
-        return activePhase.label
-      } else {
-        return  ""
-      }
-    }
-  }
-}
-
-setupPage()
-
-</script>
\ No newline at end of file
diff --git a/deprecated/entitys/servicecategories/[mode]/[[id]].vue b/deprecated/entitys/servicecategories/[mode]/[[id]].vue
deleted file mode 100644
index 3698744..0000000
--- a/deprecated/entitys/servicecategories/[mode]/[[id]].vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<script setup>
-import HistoryDisplay from "~/components/HistoryDisplay.vue";
-import DocumentList from "~/components/DocumentList.vue";
-import DocumentUpload from "~/components/DocumentUpload.vue";
-import {useSupabaseSelect} from "~/composables/useSupabase.js";
-import dayjs from "dayjs";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/servicecategories")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({})
-const openTab = ref(0)
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show" || mode.value === "edit"){
-    itemInfo.value = await useSupabaseSelectSingle("servicecategories",route.params.id,"*")
-  }
-
-
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/servicecategories/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/servicecategories/`)
-  }
-}
-
-
-
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar
-      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
-  >
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/servicecategories`)"
-      >
-        Leistungskategorien
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          class="text-xl font-medium"
-      >{{itemInfo.name ? `Leistungskategorie: ${itemInfo.name}` : (mode === 'create' ? 'Leistungskategorie erstellen' : 'Leistungskategorie bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('servicecategories',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('servicecategories',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="  router.push(`/servicecategories/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UTabs
-    :items="[{label: 'Informationen'}]"
-    v-if="mode === 'show' && itemInfo"
-    class="p-5"
-    v-model="openTab"
-  >
-    <template #item="{item}">
-      <div v-if="item.label === 'Informationen'" class="mr-5 flex flex-row">
-        <div class="w-1/2 mr-5">
-          <UCard>
-            <table class="w-full">
-              <tr>
-                <td>Name: </td>
-                <td>{{itemInfo.name}}</td>
-              </tr>
-              <tr>
-                <td>Beschreibung:</td>
-                <td>{{itemInfo.description}}</td>
-              </tr>
-            </table>
-          </UCard>
-        </div>
-        <div class="w-1/2">
-          <UCard>
-            <HistoryDisplay
-                type="product"
-                v-if="itemInfo"
-                :element-id="itemInfo.id"
-                render-headline
-            />
-          </UCard>
-
-        </div>
-      </div>
-
-
-
-
-    </template>
-  </UTabs>
-  <UForm
-      v-else-if="mode == 'edit' || mode == 'create'"
-      class="p-5"
-  >
-    <UFormGroup
-        label="Name:"
-    >
-      <UInput
-          v-model="itemInfo.name"
-          autofocus
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Beschreibung:"
-    >
-      <UTextarea
-          v-model="itemInfo.description"
-      />
-    </UFormGroup>
-  </UForm>
-</template>
-
-<style scoped>
-td {
-  border-bottom: 1px solid lightgrey;
-  vertical-align: top;
-  padding-bottom: 0.15em;
-  padding-top: 0.15em;
-}
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/servicecategories/index.vue b/deprecated/entitys/servicecategories/index.vue
deleted file mode 100644
index 9fd03ea..0000000
--- a/deprecated/entitys/servicecategories/index.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <EntityList
-    :items="items"
-    type="servicecategories"
-  />
-</template>
-
-<script setup>
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("servicecategories","*")
-}
-
-setupPage()
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/services/[mode]/[[id]].vue b/deprecated/entitys/services/[mode]/[[id]].vue
deleted file mode 100644
index d0e4e32..0000000
--- a/deprecated/entitys/services/[mode]/[[id]].vue
+++ /dev/null
@@ -1,266 +0,0 @@
-<script setup>
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/services")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const supabase = useSupabaseClient()
-const id = ref(route.params.id ? route.params.id : null )
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-    unit: 1,
-    tags: [],
-    servicecategories: []
-})
-
-const openTab = ref(0)
-
-const servicecategories = ref([])
-const units = ref([])
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show"){
-    itemInfo.value = await useSupabaseSelectSingle("services",useRoute().params.id, "*")
-  } else if(mode.value === "edit") {
-    itemInfo.value = await useSupabaseSelectSingle("services",useRoute().params.id)
-  }
-
-  servicecategories.value = await useSupabaseSelect("servicecategories","*")
-  units.value = (await supabase.from("units").select()).data
-
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar :title="itemInfo ? itemInfo.name : (mode === 'create' ? 'Leistung erstellen' : 'Leistung bearbeiten')">
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/services`)"
-      >
-        Leistungen
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          class="text-xl font-medium"
-      >{{itemInfo.name ? `Leistung: ${itemInfo.name}` : (mode === 'create' ? 'Leistung erstellen' : 'Leistung bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('services',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('services',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="itemInfo.value ? router.push(`/services/show/${itemInfo.value.id}`) : router.push(`/services/`)"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="router.push(`/services/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UTabs
-    :items="[{label: 'Informationen'},{label: 'Dokumente'}]"
-    v-if="mode === 'show'"
-    class="p-5"
-    v-model="openTab"
-  >
-    <template #item="{item}">
-      <div v-if="item.label === 'Informationen'" class="mt-5 flex flex-row">
-        <div class="w-1/2 mr-5">
-          <UCard>
-            <table class="w-full">
-              <tr>
-                <td>Name:</td>
-                <td>{{itemInfo.name}}</td>
-              </tr>
-              <tr>
-                <td>Leistungsnummer:</td>
-                <td>{{itemInfo.serviceNumber}}</td>
-              </tr>
-              <tr>
-                <td>Verkaufpreis:</td>
-                <td>{{itemInfo.sellingPrice && itemInfo.sellingPrice.toFixed(2).replace(".", ",") + " €"}}</td>
-              </tr>
-              <tr>
-                <td>Einheit:</td>
-                <td>{{units.find(i => i.id === itemInfo.unit) ? units.find(i => i.id === itemInfo.unit).name : itemInfo.unit}}</td>
-              </tr>
-              <tr>
-                <td>Tags:</td>
-                <td>{{itemInfo.tags.join(", ")}}</td>
-              </tr>
-              <tr>
-                <td>Leistungskategorien:</td>
-                <td>{{itemInfo.servicecategories ? itemInfo.servicecategories.map(i => servicecategories.find(x => x.id === i).name).join(", ") : ""}}</td>
-              </tr>
-              <tr>
-                <td>Beschreibung:</td>
-                <td>{{itemInfo.description}}</td>
-              </tr>
-            </table>
-          </UCard>
-        </div>
-        <div class="w-1/2">
-          <UCard>
-            <HistoryDisplay
-                render-headline
-                type="product"
-                v-if="itemInfo"
-                :element-id="itemInfo.id"
-            />
-          </UCard>
-        </div>
-      </div>
-      <div
-          v-if="item.label === 'Dokumente'"
-          class="mt-5"
-      >
-        <UCard>
-          <Toolbar>
-            <DocumentUpload
-                type="product"
-                :element-id="itemInfo.id"
-            />
-          </Toolbar>
-
-
-          <DocumentList :documents="dataStore.getDocumentsByProductId(itemInfo.id)"/>
-        </UCard>
-
-      </div>
-    </template>
-  </UTabs>
-  <UForm
-      v-else-if="mode == 'edit' || mode == 'create'"
-    class="p-5"
-  >
-    <UFormGroup
-        label="Name:"
-    >
-      <UInput
-          v-model="itemInfo.name"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Leistungsnummer:"
-    >
-      <UInput
-          v-model="itemInfo.serviceNumber"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Einheit:"
-    >
-      <USelectMenu
-          v-model="itemInfo.unit"
-          :options="dataStore.units"
-          option-attribute="name"
-          value-attribute="id"
-      >
-        <template #label>
-          {{dataStore.units.find(unit => unit.id === itemInfo.unit) ? dataStore.units.find(unit => unit.id === itemInfo.unit).name : itemInfo.unit }}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Tags:"
-    >
-      <USelectMenu
-          v-model="itemInfo.tags"
-          :options="profileStore.ownTenant.tags.products"
-          multiple
-      />
-    </UFormGroup>
-
-    <UFormGroup
-      label="Leistungskategorie:"
-    >
-      <USelectMenu
-        :options="servicecategories"
-        option-attribute="name"
-        value-attribute="id"
-        v-model="itemInfo.servicecategories"
-        multiple
-      >
-        <template #label>
-          {{itemInfo.servicecategories && itemInfo.servicecategories.length > 0 ? itemInfo.servicecategories.map(i => servicecategories.find(x => x.id === i).name).join(", ") : "Keine Kategorien ausgewählt"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-
-    <UFormGroup
-        label="Verkaufspreis:"
-    >
-      <UInput
-          v-model="itemInfo.sellingPrice"
-          type="number"
-          steps="0.001"
-      >
-        <template #trailing>
-          <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
-        </template>
-      </UInput>
-    </UFormGroup>
-    <UFormGroup
-      label="Beschreibung:"
-    >
-      <UTextarea
-        v-model="itemInfo.description"
-        :rows="6"
-      />
-    </UFormGroup>
-  </UForm>
-</template>
-
-<style scoped>
-td {
-  border-bottom: 1px solid lightgrey;
-  vertical-align: top;
-  padding-bottom: 0.15em;
-  padding-top: 0.15em;
-}
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/services/index.vue b/deprecated/entitys/services/index.vue
deleted file mode 100644
index 14a8099..0000000
--- a/deprecated/entitys/services/index.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <EntityList
-    :items="items"
-    type="services"
-  />
-
-</template>
-
-<script setup>
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("services","*, unit(name)")
-}
-
-setupPage()
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/tasks/[mode]/[[id]].vue b/deprecated/entitys/tasks/[mode]/[[id]].vue
deleted file mode 100644
index 9b2cf1c..0000000
--- a/deprecated/entitys/tasks/[mode]/[[id]].vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<script setup>
-definePageMeta({
-  middleware: "auth"
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  profile: profileStore.activeProfile.id
-})
-const oldItemInfo = ref({})
-const categories = ["Offen", "In Bearbeitung", "Dringed", "Erledigt"]
-
-//Functions
-const setupPage = () => {
-  if(mode.value === "show" || mode.value === "edit"){
-    itemInfo.value = dataStore.getTaskById(Number(useRoute().params.id))
-  }
-
-  if(mode.value === "create") {
-    let query = route.query
-    if(query.project) itemInfo.value.project = Number(query.project)
-    if(query.plant) itemInfo.value.plant = Number(query.plant)
-
-  }
-
-  if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
-}
-
-
-const editItem = async () => {
-  router.push(`/tasks/edit/${itemInfo.value.id}`)
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/tasks/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/tasks/`)
-  }
-}
-
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar :title="itemInfo ? itemInfo.name : (mode === 'create' ? 'Aufgabe erstellen' : 'Aufgabe bearbeiten')">
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/tasks`)"
-      >
-        Aufgaben
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          :class="['text-xl','font-medium'/*, ... itemInfo.categorie === 'Erledigt' ? ['text-primary'] : ['text-rose-500']*/]"
-      >{{itemInfo ? `Aufgabe: ${itemInfo.name}` : (mode === 'create' ? 'Aufgabe erstellen' : 'Aufgabe bearbeiten')}}</h1>
-      
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('tasks',itemInfo,oldItemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('tasks',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="editItem"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UTabs
-      :items="[{label: 'Informationen'},{label: 'Logbuch'}]"
-      v-if="itemInfo && mode === 'show'"
-      class="p-5"
-  >
-    <template #item="{item}">
-      <UCard class="mt-5">
-        <div v-if="item.label === 'Informationen'">
-
-
-          <div class="truncate">
-            <p>Kategorie: {{itemInfo.categorie}}</p>
-            <p v-if="itemInfo.project">Projekt: <nuxt-link :to="`/projects/show/${itemInfo.project}`">{{dataStore.getProjectById(itemInfo.project).name}}</nuxt-link></p>
-            <p>Beschreibung: <br><pre v-html="itemInfo.description"></pre></p>
-          </div>
-
-        </div>
-        <div v-else-if="item.label === 'Logbuch'">
-          <HistoryDisplay
-              type="task"
-              v-if="itemInfo"
-              :element-id="itemInfo.id"
-          />
-        </div>
-      </UCard>
-    </template>
-  </UTabs>
-
-  <UForm v-else-if="mode === 'edit' || mode === 'create' " class="p-5">
-    <UFormGroup
-        label="Name:"
-    >
-      <UInput
-          v-model="itemInfo.name"
-      />
-    </UFormGroup>
-
-    <UFormGroup
-        label="Kategorie:"
-    >
-      <USelectMenu
-          v-model="itemInfo.categorie"
-          :options="categories"
-      />
-    </UFormGroup>
-
-    <UFormGroup
-        label="Benutzer:"
-    >
-      <USelectMenu
-          v-model="itemInfo.profile"
-          :options="profileStore.profiles"
-          option-attribute="fullName"
-          value-attribute="id"
-          searchable-placeholder="Suche..."
-          searchable
-          :search-attributes="['fullName']"
-      >
-        <template #label>
-          {{profileStore.getProfileById(itemInfo.profile) ? profileStore.getProfileById(itemInfo.profile).fullName : "Kein Benutzer ausgewählt"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Projekt:"
-    >
-      <USelectMenu
-          v-model="itemInfo.project"
-          :options="dataStore.projects"
-          option-attribute="name"
-          value-attribute="id"
-          searchable-placeholder="Suche..."
-          searchable
-          :search-attributes="['name']"
-      >
-        <template #label>
-          {{dataStore.getProjectById(itemInfo.project) ? dataStore.getProjectById(itemInfo.project).name : "Kein Projekt ausgewählt"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Objekt:"
-    >
-      <USelectMenu
-          v-model="itemInfo.plant"
-          :options="dataStore.plants"
-          option-attribute="name"
-          value-attribute="id"
-          searchable-placeholder="Suche..."
-          searchable
-          :search-attributes="['name']"
-      >
-        <template #label>
-          {{dataStore.getPlantById(itemInfo.plant) ? dataStore.getPlantById(itemInfo.plant).name : "Kein Objekt ausgewählt"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-
-    <UFormGroup
-        label="Beschreibung:"
-    >
-      <UTextarea
-          v-model="itemInfo.description"
-      />
-    </UFormGroup>
-  </UForm>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/tasks/index.vue b/deprecated/entitys/tasks/index.vue
deleted file mode 100644
index 072bea1..0000000
--- a/deprecated/entitys/tasks/index.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-  <UDashboardNavbar title="Aufgaben" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/tasks/create`)">+ Aufgabe</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #left>
-
-
-      <UCheckbox
-          label="Erledigte Anzeigen"
-          v-model="showDone"
-      />
-    </template>
-
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/tasks/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Aufgaben anzuzeigen' }"
-  >
-    <template #finish-data="{row}">
-      <UButton
-          icon="i-heroicons-check"
-          variant="ghost"
-          @click="markAsFinished(row)"
-      />
-    </template>
-    <template #created_at-data="{row}">
-      {{row.created_at ? dayjs(row.created_at).format("DD.MM.YY HH:mm") : ''}}
-    </template>
-    <template #user-data="{row}">
-      {{profileStore.profiles.find(i => i.id === row.user) ? profileStore.profiles.find(i => i.id === row.user).fullName : ""}}
-    </template>
-    <template #project-data="{row}">
-      {{dataStore.projects.find(i => i.id === row.project) ? dataStore.projects.find(i => i.id === row.project).name : ""}}
-    </template>
-    <template #customer-data="{row}">
-      {{dataStore.customers.find(customer => customer.id === row.customer) ? dataStore.customers.find(customer => customer.id === row.customer).name : "" }}
-    </template>
-    <template #plant-data="{row}">
-      {{dataStore.getPlantById(row.plant) ? dataStore.getPlantById(row.plant).name : "" }}
-    </template>
-  </UTable>
-</template>
-
-<script setup>
-import  dayjs from "dayjs";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const router = useRouter()
-
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/tasks/create")
-  }
-})
-
-const templateColumns = [
-
-  /*{
-    key:"finish"
-  },*/
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-const markAsFinished = (item) => {
-  dataStore.updateItem("tasks", {...item, categorie: "Erledigt"})
-}
-
-const searchString = ref('')
-const showDone = ref(false)
-const filteredRows = computed(() => {
-  let items = dataStore.tasks
-
-  items = items.filter(i => showDone.value === true ? i.categorie === "Erledigt" : i.categorie !== "Erledigt")
-
-  return useSearch(searchString.value, items)
-})
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/vehicles/[mode]/[[id]].vue b/deprecated/entitys/vehicles/[mode]/[[id]].vue
deleted file mode 100644
index e28b844..0000000
--- a/deprecated/entitys/vehicles/[mode]/[[id]].vue
+++ /dev/null
@@ -1,236 +0,0 @@
-<script setup>
-import dayjs from "dayjs";
-import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/vehicles")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-const openTab = ref(0)
-
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  name: "",
-  licensePlate: "",
-  type: "",
-  driver: null,
-  active: true
-})
-const oldItemInfo = ref({})
-
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show"){
-    itemInfo.value = await useSupabaseSelectSingle("vehicles",route.params.id,"*, checks(*)")
-  } else if(mode.value === "edit"){
-    itemInfo.value = await useSupabaseSelectSingle("vehicles",route.params.id,"*")
-  }
-
-  if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value.id) {
-    router.push(`/vehicles/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/vehicles`)
-  }
-
-}
-
-setupPage()
-</script>
-
-<template>
-  <EntityEdit
-    v-if="mode === 'edit' || mode === 'create'"
-    type="vehicles"
-    :item="itemInfo"
-  />
-
-
-<!--  <UDashboardNavbar
-      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
-  >
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/vehicles`)"
-      >
-        Fahrzeuge
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          :class="['text-xl','font-medium']"
-      >{{itemInfo ? `Fahrzeug: ${itemInfo.licensePlate}` : (mode === 'create' ? 'Fahrzeug erstellen' : 'Fahrzeug bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <ButtonWithConfirm
-          color="rose"
-          variant="outline"
-          @confirmed="dataStore.updateItem('vehicles',{...itemInfo, archived: true})"
-          v-if="mode === 'edit'"
-      >
-        <template #button>
-          Archivieren
-        </template>
-        <template #header>
-          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
-        </template>
-        Möchten Sie das Fahrzeug {{itemInfo.name}} wirklich archivieren?
-      </ButtonWithConfirm>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('vehicles',itemInfo, oldItemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('vehicles',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-    </template>
-  </UDashboardNavbar>-->
-
-<!--  <UForm
-      class="p-5"
-  >
-
-    <UFormGroup
-        label="Kennzeichen:"
-    >
-      <UInput
-          v-model="itemInfo.licensePlate"
-      />
-    </UFormGroup>
-
-
-
-    <UFormGroup
-        label="Fahrzeug aktiv:"
-    >
-      <UCheckbox
-          v-model="itemInfo.active"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Fahrgestellnummer:"
-    >
-      <UInput
-          v-model="itemInfo.vin"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Typ:"
-    >
-      <UTextarea
-          v-model="itemInfo.type"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Fahrer:"
-    >
-      <USelectMenu
-          v-model="itemInfo.driver"
-          :options="[{id: null, fullName: 'Kein Fahrer'},...profileStore.profiles]"
-          option-attribute="fullName"
-          value-attribute="id"
-
-      >
-        <template #label>
-          {{profileStore.profiles.find(profile => profile.id === itemInfo.driver) ? profileStore.profiles.find(profile => profile.id === itemInfo.driver).fullName : 'Kein Fahrer ausgewählt'}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Tankvolumen:"
-    >
-      <UInput
-          v-model="itemInfo.tankSize"
-          type="number"
-      >
-        <template #trailing>
-          L
-        </template>
-      </UInput>
-    </UFormGroup>
-    <UFormGroup
-        label="Baujahr:"
-    >
-      <UInput
-          v-model="itemInfo.buildYear"
-          type="number"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Anhängelast:"
-    >
-      <UInput
-          v-model="itemInfo.towingCapacity"
-          type="number"
-      >
-        <template #trailing>kg</template>
-      </UInput>
-    </UFormGroup>
-    <UFormGroup
-        label="Farbe:"
-    >
-      <UInput
-          v-model="itemInfo.color"
-          type="text"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Leistung:"
-    >
-      <UInput
-          v-model="itemInfo.powerInKW"
-          type="number"
-      >
-        <template #trailing>kW</template>
-      </UInput>
-    </UFormGroup>
-  </UForm>-->
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/vehicles/index.vue b/deprecated/entitys/vehicles/index.vue
deleted file mode 100644
index 486aedd..0000000
--- a/deprecated/entitys/vehicles/index.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <EntityList
-    :items="items"
-    type="vehicles"
-  />
-</template>
-
-<script setup>
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("vehicles","*")
-}
-
-setupPage()
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/vehicles/show/[id].vue b/deprecated/entitys/vehicles/show/[id].vue
deleted file mode 100644
index f108c7f..0000000
--- a/deprecated/entitys/vehicles/show/[id].vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<script setup>
-import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
-
-const route = useRoute()
-
-const itemInfo = ref({})
-
-const tabItems = [{
-  label: 'Informationen',
-}, {
-  label: 'Dokumente',
-}, {
-  label: 'Überprüfungen',
-}]
-
-const setupPage = async () => {
-  itemInfo.value = await useSupabaseSelectSingle("vehicles",route.params.id,"*, checks(*), documents(*)")
-  console.log(itemInfo.value)
-}
-
-setupPage()
-</script>
-
-<template>
-  <EntityShow
-    type="vehicles"
-    :item="itemInfo"
-  />
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/vendors/[mode]/[[id]].vue b/deprecated/entitys/vendors/[mode]/[[id]].vue
deleted file mode 100644
index 6a26558..0000000
--- a/deprecated/entitys/vendors/[mode]/[[id]].vue
+++ /dev/null
@@ -1,291 +0,0 @@
-<script setup>
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/vendors")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 1) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const route = useRoute()
-const router = useRouter()
-const openTab = ref(0)
-let currentItem = ref(null)
-
-
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  infoData: {},
-  profiles: [profileStore.activeProfile.id]
-})
-const oldItemInfo = ref({})
-
-//Functions
-const setupPage = () => {
-  if (mode.value === "show" || mode.value === "edit") {
-    currentItem.value = dataStore.getVendorById(Number(useRoute().params.id))
-  }
-
-  if (mode.value === "edit") itemInfo.value = currentItem.value
-  if(currentItem.value) oldItemInfo.value = JSON.parse(JSON.stringify(currentItem.value))
-
-}
-
-const setCityByZip = async () => {
-  itemInfo.value.infoData.city = await useZipCheck(itemInfo.value.infoData.zip)
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar
-      :title="currentItem ? `Lieferant: ${currentItem.name}` : (mode === 'create' ? 'Lieferant erstellen' : 'Lieferant bearbeiten')"
-      :ui="{center: 'flex items-stretch gap-1.5 min-w-0'}"
-  >
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/vendors`)"
-      >
-        Lieferanten
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="currentItem"
-          :class="['text-xl','font-medium']"
-      >{{currentItem ? `Lieferant: ${currentItem.name}` : (mode === 'create' ? 'Lieferant erstellen' : 'Lieferant bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('vendors',itemInfo,oldItemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('vendors',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="router.push(currentItem.id ? `/vendors/show/${currentItem.id}` : '/vendors/show')"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="router.push(`/vendors/edit/${currentItem.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UTabs
-    :items="[{label: 'Informationen'},{label: 'Dokumente'}]"
-    v-if="currentItem && mode == 'show'"
-    class="p-5"
-    v-model="openTab"
-  >
-    <template #item="{item}">
-      <div v-if="item.label === 'Informationen'" class="mt-5 flex">
-        <div class="w-1/2 mr-5">
-          <UCard>
-            <div v-if="currentItem.infoData" class="text-wrap">
-              <p>Straße + Hausnummer: {{currentItem.infoData.street ? currentItem.infoData.street : ""}}</p>
-              <p>PLZ + Ort: {{currentItem.infoData.zip}} {{currentItem.infoData.city}}</p>
-              <p>Telefon: {{currentItem.infoData.tel}}</p>
-              <p>E-Mail: {{currentItem.infoData.email}}</p>
-              <p>Web: {{currentItem.infoData.web}}</p>
-              <p>USt-Id: {{currentItem.infoData.ustid}}</p>
-              <p>SEPA Mandat: {{currentItem.hasSEPA ? "Ja" : "Nein"}}</p>
-              <p>Notizen:<br> {{currentItem.notes}}</p>
-            </div>
-          </UCard>
-          <UCard class="mt-5">
-            <Toolbar>
-              <UButton
-                  @click="router.push(`/contacts/create?vendor=${currentItem.id}`)"
-              >
-                + Ansprechpartner
-              </UButton>
-            </Toolbar>
-            <UTable
-                :rows="dataStore.getContactsByVendorId(currentItem.id)"
-                @select="(row) => router.push(`/contacts/show/${row.id}`)"
-                :columns="[{label: 'Anrede', key: 'salutation'},{label: 'Name', key: 'fullName'},{label: 'Rolle', key: 'role'}]"
-                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Ansprechpartner' }"
-
-            >
-
-            </UTable>
-          </UCard>
-        </div>
-        <div class="w-1/2">
-          <UCard class="h-full">
-            <HistoryDisplay
-                type="vendor"
-                v-if="currentItem"
-                :element-id="currentItem.id"
-                :render-headline="true"
-            />
-          </UCard>
-        </div>
-      </div>
-
-
-      <UCard class="mt-5" v-else>
-        <div v-if="item.label === 'Dokumente'">
-          <InputGroup>
-            <DocumentUpload
-                type="vendor"
-                :element-id="currentItem.id"
-            />
-          </InputGroup>
-
-          <DocumentList
-              :documents="dataStore.getDocumentsByVendorId(currentItem.id)"
-          />
-        </div>
-      </UCard>
-    </template>
-  </UTabs>
-  <UForm
-      v-else-if="mode === 'edit' || mode === 'create'"
-      class="p-5"
-  >
-    <UFormGroup
-        label="Name:"
-    >
-      <UInput
-          v-model="itemInfo.name"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Lieferantennr.:"
-    >
-      <UInput
-          v-model="itemInfo.vendorNumber"
-          placeholder="Leer lassen für automatisch generierte Nummer"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Straße + Hausnummer"
-    >
-      <UInput
-          v-model="itemInfo.infoData.street"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Postleitzahl"
-    >
-      <UInput
-          v-model="itemInfo.infoData.zip"
-          @focusout="setCityByZip"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Ort"
-    >
-      <UInput
-          v-model="itemInfo.infoData.city"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Land"
-    >
-      <USelectMenu
-          :options="['Deutschland','Niederlande','Belgien','Italien', 'Frankreich','Irland','USA','Spanien', 'Schweden']"
-          v-model="itemInfo.infoData.country"
-      />
-    </UFormGroup>
-
-    <UFormGroup
-        label="Telefon:"
-    >
-      <UInput
-          v-model="itemInfo.infoData.tel"
-      />
-    </UFormGroup>
-
-    <UFormGroup
-        label="Notizen:"
-    >
-      <UTextarea
-          v-model="itemInfo.notes"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="E-Mail:"
-    >
-      <UInput
-          v-model="itemInfo.infoData.email"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Webseite:"
-    >
-      <UInput
-          v-model="itemInfo.infoData.web"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="SEPA Mandat abgeschlossen:"
-    >
-      <UCheckbox
-          v-model="itemInfo.hasSEPA"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="USt-Id:"
-    >
-      <UInput
-          v-model="itemInfo.infoData.ustid"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Berechtigte Benutzer:"
-    >
-      <USelectMenu
-          v-model="itemInfo.profiles"
-          :options="profileStore.profiles"
-          option-attribute="fullName"
-          value-attribute="id"
-          searchable
-          multipledataStore
-          :search-attributes="['fullName']"
-      >
-        <template #label>
-          {{itemInfo.profiles.length > 0 ? itemInfo.profiles.map(i => profileStore.getProfileById(i).fullName).join(", ") : "Kein Benutzer ausgewählt"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-  </UForm>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/entitys/vendors/index.vue b/deprecated/entitys/vendors/index.vue
deleted file mode 100644
index 2b7943c..0000000
--- a/deprecated/entitys/vendors/index.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <EntityList
-    :items="items"
-    type="vendors"
-  />
-</template>
-
-<script setup>
-definePageMeta({
-  middleware: "auth"
-})
-
-const items = ref([])
-
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("vendors","*","vendorNumber")
-}
-
-setupPage()
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file

From 2bda15d264882b06152870f9e8c49195192cc4a8 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 27 Dec 2024 11:05:59 +0100
Subject: [PATCH 012/104] Deprecated Events as non Standard Entity Repaired
 query Reparied Document Show

---
 components/EntityEdit.vue  | 19 +++++++++--
 components/EntityShow.vue  | 37 +++++++++++++++------
 components/MainNav.vue     |  2 +-
 composables/useRole.js     | 12 +++++++
 composables/useSupabase.js | 46 ++++++++++++++++++++++++++
 stores/data.js             | 66 +++++++++++++++++++++++++++++++++-----
 6 files changed, 161 insertions(+), 21 deletions(-)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index 3f06527..3884fd8 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -32,6 +32,7 @@ defineShortcuts({
 
 
 const router = useRouter()
+const route = useRoute()
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
@@ -64,9 +65,23 @@ const setupCreate = () => {
 
   })
 }
-
 setupCreate()
 
+const setupQuery = () => {
+  if(route.query) {
+    console.log(route.query)
+
+    Object.keys(route.query).forEach(key => {
+      if(["customer","contract","plant","contact"].includes(key)){
+        props.item[key] = Number(route.query[key])
+      } else {
+        props.item[key] = route.query[key]
+      }
+    })
+  }
+}
+setupQuery()
+
 const loadedOptions = ref({})
 const loadOptions = async () => {
   let optionsToLoad = dataType.templateColumns.filter(i => i.selectDataType).map(i => {
@@ -315,7 +330,7 @@ const contentChanged = (content, datapoint) => {
         </div>
       </div>
       <UFormGroup
-          v-for="datapoint in dataType.templateColumns.filter(i => i.inputType && i.inputColumn === columnName)"
+          v-for="datapoint in dataType.templateColumns.filter(i => i.inputType)"
           :label="datapoint.label"
       >
         <template #help>
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 300dcde..41e0c62 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -1,5 +1,6 @@
 <script setup>
 import dayjs from "dayjs";
+import {useSupabaseSelectSomeDocuments} from "~/composables/useSupabase.js";
 
 const props = defineProps({
   type: {
@@ -37,6 +38,17 @@ const profileStore = useProfileStore()
 
 const dataType = dataStore.dataTypes[type]
 
+const documents = ref([])
+
+const setup = async () => {
+  if(props.item.documents) {
+    documents.value = await useSupabaseSelectSomeDocuments(props.item.documents.map(i => i.id)) || []
+  }
+}
+
+setup()
+
+
 const openTab = ref(0)
 
 const renderedPhases = computed(() => {
@@ -162,17 +174,16 @@ const renderedPhases = computed(() => {
       </div>
       <div v-else-if="item.label === 'Dokumente'">
         <UCard class="mt-5">
-          <!--          <Toolbar>
-                      <DocumentUpload
-                          type="vehicle"
-                          :element-id="item.id"
-                      />
-                    </Toolbar>
+          <Toolbar>
+            <DocumentUpload
+                :type="type.substring(0,type.length-1)"
+                :element-id="item.id"
+            />
+          </Toolbar>
 
-                    <DocumentList
-                        :documents="dataStore.getDocumentsByVehicleId(item.id)"
-                    />-->
-          {{props.item.documents}}
+          <DocumentList
+              :documents="documents"
+          />
         </UCard>
       </div>
       <div v-else-if="item.label === 'Projekte'">
@@ -206,6 +217,12 @@ const renderedPhases = computed(() => {
             >
               + Objekt
             </UButton>
+            <UButton
+                v-if="type === 'customers'"
+                @click="router.push(`/standardEntity/plants/create?${type.substring(0,type.length-1)}=${props.item.id}&name=${encodeURIComponent(`${props.item.infoData.street}, ${props.item.infoData.zip} ${props.item.infoData.city}`)}`)"
+            >
+              + Kundenadresse als Objekt
+            </UButton>
           </Toolbar>
           <UTable
               :rows="props.item.plants"
diff --git a/components/MainNav.vue b/components/MainNav.vue
index 25ee9a6..e752188 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -35,7 +35,7 @@ const links = computed(() => {
         }] : [],
         ... profileStore.ownTenant.features.calendar ? [{
           label: "Termine",
-          to: "/events",
+          to: "/standardEntity/events",
           icon: "i-heroicons-calendar-days"
         }] : [],
         {
diff --git a/composables/useRole.js b/composables/useRole.js
index f1248d3..ec39795 100644
--- a/composables/useRole.js
+++ b/composables/useRole.js
@@ -160,6 +160,18 @@ export const useRole = () => {
             label: "Abwesenheiten erstellen",
             parent: "absencerequests"
         },
+        events: {
+            label: "Termine",
+            showToAllUsers: false
+        },
+        "events-viewAll": {
+            label: "Alle Termine einsehen",
+            parent: "events"
+        },
+        "events-create": {
+            label: "Termine erstellen",
+            parent: "events"
+        },
         spaces: {
             label: "Lagerplätze",
             showToAllUsers: false
diff --git a/composables/useSupabase.js b/composables/useSupabase.js
index 86456ce..350d46f 100644
--- a/composables/useSupabase.js
+++ b/composables/useSupabase.js
@@ -67,6 +67,52 @@ export const useSupabaseSelectDocuments = async (select = '*', sortColumn = null
     return data
 }
 
+export const useSupabaseSelectSomeDocuments = async (documentIds, select = '*', sortColumn = null, folderPath = "_") => {
+    const supabase = useSupabaseClient()
+    const profileStore = useProfileStore()
+
+    let data = null
+
+    if(sortColumn !== null ) {
+        data = (await supabase
+            .from("documents")
+            .select(select)
+            .in("id",documentIds)
+            .eq("tenant", profileStore.currentTenant)
+            .order(sortColumn, {ascending: true})).data
+    } else {
+        data = (await supabase
+            .from("documents")
+            .select(select)
+            .in("id",documentIds)
+            .eq("tenant", profileStore.currentTenant)).data
+
+    }
+
+    if(data.length > 0){
+        let paths = []
+        data.forEach(doc => {
+            paths.push(doc.path)
+        })
+
+        const {data: supabaseData,error} = await supabase.storage.from('files').createSignedUrls(paths,3600)
+
+        data = data.map((doc,index) => {
+
+            return {
+                ...doc,
+                url: supabaseData[index].signedUrl
+            }
+        })
+
+
+    }
+
+    //console.log(data)
+
+    return data
+}
+
 export const useSupabaseSelectSingle = async (relation,idToEq,select = '*' ) => {
     const supabase = useSupabaseClient()
     const profileStore = useProfileStore()
diff --git a/stores/data.js b/stores/data.js
index f0a90a3..40a5d6d 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -73,7 +73,7 @@ export const useDataStore = defineStore('data', () => {
                     label: "Kategorie"
                 },{
                     key: "profile",
-                    label: "Benutzer",
+                    label: "Mitarbeiter",
                     component: profile,
                     inputType: "select",
                     selectDataType: "profiles",
@@ -151,7 +151,7 @@ export const useDataStore = defineStore('data', () => {
                     inputType: "bool"
                 },
                 {
-                    key: "infoData.streetNumber",
+                    key: "infoData.street",
                     label: "Straße + Hausnummer",
                     inputType: "text",
                     disabledInTable: true
@@ -1133,8 +1133,63 @@ export const useDataStore = defineStore('data', () => {
         events: {
             label: "Termine",
             labelSingle: "Termin",
+            isStandardEntity: true,
             historyItemHolder: "event",
-            redirect: true
+            supabaseSelectWithInformation: "*, project(id,name), vehicles(*), inventoryitems(*)",
+            redirect: true,
+            filters:[],
+            templateColumns: [
+                {
+                    key: 'name',
+                    label: "Name",
+                    title: true,
+                    inputType: "text"
+                },
+                {
+                    key: "startDate",
+                    label: "Start",
+                },
+                {
+                    key: "endDate",
+                    label: "Ende"
+                },/*{
+                    key: "eventtype",
+                    label: "Typ",
+                    inputType: "select",
+                    selectManualOptions: ["Umsetzung","Vor Ort Termin", "Büro", "Sonstiges"],
+                },*/{
+                    key: "link",
+                    label: "Link",
+                    inputType: "text"
+                },{
+                    key: "notes",
+                    label: "Notizen",
+                    inputType: "textarea"
+                },
+                {
+                    key: "project",
+                    label: "Projekt",
+                    component: project,
+                    inputType: "select",
+                    selectDataType: "projects",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },
+                {
+                    key: "profiles",
+                    label: "Beteiligte Benutzer",
+                    inputType: "select",
+                    selectDataType: "profiles",
+                    selectOptionAttribute: "fullName",
+                    selectSearchAttributes: ['fullName'],
+                    selectMultiple: true,
+                    component: profiles
+                },
+            ],
+            showTabs: [
+                {
+                    label: 'Informationen',}
+            ]
         },
         profiles: {
             label: "Mitarbeiter",
@@ -2138,10 +2193,6 @@ export const useDataStore = defineStore('data', () => {
         return (await supabase.from("contacts").select().eq("customer", itemId)).data
     }
 
-    async function getProjectsByCustomerId (itemId) {
-        return (await supabase.from("projects").select().eq("customer",itemId)).data
-    }
-
     const getPlantsByCustomerId = computed(() => (customerId) => {
         return plants.value.filter(item => item.customer === customerId)
     })
@@ -2637,7 +2688,6 @@ export const useDataStore = defineStore('data', () => {
         getOpenTasksCount,
         getMovementsBySpace,
         getContactsByCustomerId,
-        getProjectsByCustomerId,
         getPlantsByCustomerId,
         getContractsByCustomerId,
         getContactsByVendorId,

From a1e6061579cdbdea1c8b699273f653b6a103bed5 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 27 Dec 2024 11:37:32 +0100
Subject: [PATCH 013/104] Fixed Creation Error

---
 composables/useNumberRange.js                  |  3 +--
 {pages => deprecated}/events/[mode]/[[id]].vue |  0
 {pages => deprecated}/events/index.vue         |  0
 pages/settings/numberRanges.vue                |  2 +-
 stores/data.js                                 | 11 +++++++----
 5 files changed, 9 insertions(+), 7 deletions(-)
 rename {pages => deprecated}/events/[mode]/[[id]].vue (100%)
 rename {pages => deprecated}/events/index.vue (100%)

diff --git a/composables/useNumberRange.js b/composables/useNumberRange.js
index fc52a3b..27131e2 100644
--- a/composables/useNumberRange.js
+++ b/composables/useNumberRange.js
@@ -23,10 +23,9 @@ export const useNumberRange = (resourceType) => {
             .eq('id',profileStore.currentTenant)
 
 
-        dataStore.fetchOwnTenant()
+        await profileStore.fetchOwnTenant()
 
         return (numberRange.prefix ? numberRange.prefix : "") + nextNumber + (numberRange.suffix ? numberRange.suffix : "")
-
     }
 
     return { useNextNumber}
diff --git a/pages/events/[mode]/[[id]].vue b/deprecated/events/[mode]/[[id]].vue
similarity index 100%
rename from pages/events/[mode]/[[id]].vue
rename to deprecated/events/[mode]/[[id]].vue
diff --git a/pages/events/index.vue b/deprecated/events/index.vue
similarity index 100%
rename from pages/events/index.vue
rename to deprecated/events/index.vue
diff --git a/pages/settings/numberRanges.vue b/pages/settings/numberRanges.vue
index c27084a..3cf7e23 100644
--- a/pages/settings/numberRanges.vue
+++ b/pages/settings/numberRanges.vue
@@ -48,7 +48,7 @@ const updateNumberRanges = async (range) => {
       .update({numberRanges: numberRanges.value})
       .eq('id',profileStore.currentTenant)
 
-  await dataStore.fetchOwnTenant()
+  await profileStore.fetchOwnTenant()
 }
 
 
diff --git a/stores/data.js b/stores/data.js
index 40a5d6d..8f42620 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -135,7 +135,7 @@ export const useDataStore = defineStore('data', () => {
                 },
                 {
                     key: "isCompany",
-                    label: "Typ",
+                    label: "Firmenkunde",
                     component: isCompany,
                     inputType: "bool"
                 },
@@ -1863,7 +1863,10 @@ export const useDataStore = defineStore('data', () => {
             console.log(supabaseError)
             toast.add({title: "Es ist ein Fehler bei der Erstellung aufgetreten", color: "rose"})
         } else if (supabaseData) {
-            //console.log(supabaseData)
+            console.log(supabaseData)
+
+            let returnData = supabaseData[0]
+
             await generateHistoryItems(dataType, supabaseData[0])
 
             if(!["statementallocations", "productcategories", "projecttypes", "checks"].includes(dataType) ){
@@ -1874,9 +1877,9 @@ export const useDataStore = defineStore('data', () => {
             toast.add({title: `${dataTypes[dataType].labelSingle} hinzugefügt`})
             if(dataTypes[dataType].redirect) {
                 if(dataTypes[dataType].isStandardEntity) {
-                    await router.push(dataTypes[dataType].redirectToList ? `/standardEntity/${dataType}` : `/standardEntity/${dataType}/show/${data.id}`)
+                    await router.push(dataTypes[dataType].redirectToList ? `/standardEntity/${dataType}` : `/standardEntity/${dataType}/show/${returnData.id}`)
                 } else {
-                    await router.push(dataTypes[dataType].redirectToList ? `/${dataType}` : `/${dataType}/show/${data.id}`)
+                    await router.push(dataTypes[dataType].redirectToList ? `/${dataType}` : `/${dataType}/show/${returnData.id}`)
                 }
             }
             return supabaseData

From 42686efbe75ebd08c4b0fcdf4639111155b20caa Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 27 Dec 2024 12:14:27 +0100
Subject: [PATCH 014/104] Added PLZ Autocompletion & InputChangeFunctions

---
 components/EntityEdit.vue | 20 ++++++++++++++++++++
 stores/data.js            | 20 ++++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index 3884fd8..9efa358 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -191,6 +191,7 @@ const contentChanged = (content, datapoint) => {
             </template>
             <div v-if="datapoint.key.includes('.')">
               <UInput
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                   v-if="['text','number'].includes(datapoint.inputType)"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -198,11 +199,13 @@ const contentChanged = (content, datapoint) => {
                   :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
               />
               <UToggle
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                   v-else-if="datapoint.inputType === 'bool'"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
               <USelectMenu
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                   v-else-if="datapoint.inputType === 'select'"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -218,6 +221,7 @@ const contentChanged = (content, datapoint) => {
                 </template>
               </USelectMenu>
               <UTextarea
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                   v-else-if="datapoint.inputType === 'textarea'"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -234,6 +238,7 @@ const contentChanged = (content, datapoint) => {
 
                 <template #panel="{ close }">
                   <LazyDatePicker
+                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                       v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
                       :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
                   />
@@ -248,6 +253,7 @@ const contentChanged = (content, datapoint) => {
             </div>
             <div v-else>
               <UInput
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                   v-if="['text','number'].includes(datapoint.inputType)"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -255,11 +261,13 @@ const contentChanged = (content, datapoint) => {
                   :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
               />
               <UToggle
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                   v-else-if="datapoint.inputType === 'bool'"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
               <USelectMenu
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                   v-else-if="datapoint.inputType === 'select'"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -276,6 +284,7 @@ const contentChanged = (content, datapoint) => {
                 </template>
               </USelectMenu>
               <UTextarea
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                   v-else-if="datapoint.inputType === 'textarea'"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -291,6 +300,7 @@ const contentChanged = (content, datapoint) => {
 
                 <template #panel="{ close }">
                   <LazyDatePicker
+                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                       v-model="props.item[datapoint.key]" @close="close"
                       :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
                   />
@@ -342,6 +352,7 @@ const contentChanged = (content, datapoint) => {
         </template>
         <div v-if="datapoint.key.includes('.')">
           <UInput
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
               v-if="['text','number'].includes(datapoint.inputType)"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -349,11 +360,13 @@ const contentChanged = (content, datapoint) => {
               :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
           />
           <UToggle
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
               v-else-if="datapoint.inputType === 'bool'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
           />
           <USelectMenu
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
               v-else-if="datapoint.inputType === 'select'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -369,6 +382,7 @@ const contentChanged = (content, datapoint) => {
             </template>
           </USelectMenu>
           <UTextarea
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -385,6 +399,7 @@ const contentChanged = (content, datapoint) => {
 
             <template #panel="{ close }">
               <LazyDatePicker
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
@@ -399,6 +414,7 @@ const contentChanged = (content, datapoint) => {
         </div>
         <div v-else>
           <UInput
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
               v-if="['text','number'].includes(datapoint.inputType)"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -406,11 +422,13 @@ const contentChanged = (content, datapoint) => {
               :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
           />
           <UToggle
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
               v-else-if="datapoint.inputType === 'bool'"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
           />
           <USelectMenu
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
               v-else-if="datapoint.inputType === 'select'"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -427,6 +445,7 @@ const contentChanged = (content, datapoint) => {
             </template>
           </USelectMenu>
           <UTextarea
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -442,6 +461,7 @@ const contentChanged = (content, datapoint) => {
 
             <template #panel="{ close }">
               <LazyDatePicker
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
                   v-model="props.item[datapoint.key]" @close="close"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
diff --git a/stores/data.js b/stores/data.js
index 8f42620..27c2e7d 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -27,6 +27,7 @@ import vehicle from "~/components/columnRenderings/vehicle.vue"
 import usePlanning from "~/components/columnRenderings/usePlanning.vue"
 
 import quantity from "~/components/helpRenderings/quantity.vue"
+import {useZipCheck} from "~/composables/useZipCheck.js";
 
 // @ts-ignore
 export const useDataStore = defineStore('data', () => {
@@ -166,6 +167,11 @@ export const useDataStore = defineStore('data', () => {
                     key: "infoData.zip",
                     label: "Postleitzahl",
                     inputType: "number",
+                    inputChangeFunction: async function (row) {
+                        if(row.infoData.zip) {
+                            row.infoData.city = (await useZipCheck(row.infoData.zip))
+                        }
+                    },
                     disabledInTable: true
                 },
                 {
@@ -764,7 +770,12 @@ export const useDataStore = defineStore('data', () => {
                     key: "infoData.zip",
                     label: "Postleitzahl",
                     inputType: "number",
-                    disabledInTable: true
+                    disabledInTable: true,
+                    inputChangeFunction: async function (row) {
+                        if(row.infoData.zip) {
+                            row.infoData.city = (await useZipCheck(row.infoData.zip))
+                        }
+                    },
                 },
                 {
                     key: "infoData.city",
@@ -904,7 +915,12 @@ export const useDataStore = defineStore('data', () => {
                     label: "Postleitzahl",
                     inputType: "number",
                     disabledInTable: true,
-                    inputColumn: "Ort"
+                    inputColumn: "Ort",
+                    inputChangeFunction: async function (row) {
+                        if(row.infoData.zip) {
+                            row.infoData.city = (await useZipCheck(row.infoData.zip))
+                        }
+                    },
                 },
                 {
                     key: "infoData.city",

From d3c865a10fc20e99e00bc92067c221cbe416123d Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 27 Dec 2024 12:22:37 +0100
Subject: [PATCH 015/104] Minor Changes

---
 components/EntityEdit.vue  | 1 -
 composables/useZipCheck.js | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index 9efa358..937a416 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -69,7 +69,6 @@ setupCreate()
 
 const setupQuery = () => {
   if(route.query) {
-    console.log(route.query)
 
     Object.keys(route.query).forEach(key => {
       if(["customer","contract","plant","contact"].includes(key)){
diff --git a/composables/useZipCheck.js b/composables/useZipCheck.js
index 5dea80b..7251659 100644
--- a/composables/useZipCheck.js
+++ b/composables/useZipCheck.js
@@ -1,10 +1,7 @@
 
-
 export const useZipCheck = async (zip) => {
     const supabase = useSupabaseClient()
 
-    console.log((await supabase.from("citys").select().eq("zip",Number(zip)).maybeSingle()).data)
-
     const result = (await supabase.from("citys").select().eq("zip",Number(zip)).maybeSingle()).data
 
     return result ? result.short : null

From 8cfa5eaa43c32657e187b88a74340e2ee1828002 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 28 Dec 2024 14:33:36 +0100
Subject: [PATCH 016/104] Cleared Deprecated Folder

---
 deprecated/absenceRequests/[mode]/[[id]].vue | 209 -------
 deprecated/absenceRequests/index.vue         | 141 -----
 deprecated/checks/[mode]/[[id]].vue          | 337 -----------
 deprecated/checks/index.vue                  | 148 -----
 deprecated/email.vue                         | 580 -------------------
 deprecated/events/[mode]/[[id]].vue          | 260 ---------
 deprecated/events/index.vue                  | 127 ----
 deprecated/inventoryitems/[mode]/[[id]].vue  | 382 ------------
 deprecated/inventoryitems/index.vue          | 130 -----
 deprecated/spaces/[mode]/[[id]].vue          | 321 ----------
 deprecated/spaces/index.vue                  | 139 -----
 deprecated/users/[mode]/[[id]].vue           | 453 ---------------
 deprecated/users/index.vue                   |  43 --
 13 files changed, 3270 deletions(-)
 delete mode 100644 deprecated/absenceRequests/[mode]/[[id]].vue
 delete mode 100644 deprecated/absenceRequests/index.vue
 delete mode 100644 deprecated/checks/[mode]/[[id]].vue
 delete mode 100644 deprecated/checks/index.vue
 delete mode 100644 deprecated/email.vue
 delete mode 100644 deprecated/events/[mode]/[[id]].vue
 delete mode 100644 deprecated/events/index.vue
 delete mode 100644 deprecated/inventoryitems/[mode]/[[id]].vue
 delete mode 100644 deprecated/inventoryitems/index.vue
 delete mode 100644 deprecated/spaces/[mode]/[[id]].vue
 delete mode 100644 deprecated/spaces/index.vue
 delete mode 100644 deprecated/users/[mode]/[[id]].vue
 delete mode 100644 deprecated/users/index.vue

diff --git a/deprecated/absenceRequests/[mode]/[[id]].vue b/deprecated/absenceRequests/[mode]/[[id]].vue
deleted file mode 100644
index 6367720..0000000
--- a/deprecated/absenceRequests/[mode]/[[id]].vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<script setup>
-import dayjs from "dayjs";
-import HistoryDisplay from "~/components/HistoryDisplay.vue";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  approved: "Offen"
-})
-const states = ["Offen","Genehmigt", "Abgelehnt"]
-
-const absenceReasons = [
-    "Elternzeit",
-    "Kind krank - Kinderbetreuung",
-    "Krankheit",
-    "Krankheit 1 Tag (mit Attest)",
-    "Krankheit ab 2. Tag (mit Attest)",
-    "Mutterschutz",
-    "Sonderurlaub (bezahlt)",
-    "Überstundenausgleich",
-    "Unbezahlter Urlaub",
-    "Urlaub"
-]
-
-//Functions
-const setupPage = () => {
-  if(mode.value === "show" || mode.value === "edit"){
-    itemInfo.value = dataStore.getAbsenceRequestById(Number(useRoute().params.id))
-  }
-
-}
-
-const editItem = async () => {
-  router.push(`/absenceRequests/edit/${itemInfo.value.id}`)
-  setupPage()
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/absenceRequests/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/absenceRequests/`)
-  }
-}
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar :title="itemInfo ? itemInfo.name : (mode === 'create' ? 'Abwesenheit erstellen' : 'Abwesenheit bearbeiten')">
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('absencerequests',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('absencerequests',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="editItem"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-    <template #badge v-if="itemInfo">
-      <UBadge
-          v-if="itemInfo.approved === 'Offen'"
-          color="blue"
-      >{{itemInfo.approved}}</UBadge>
-      <UBadge
-          v-else-if="itemInfo.approved === 'Genehmigt'"
-          color="primary"
-      >{{itemInfo.approved}}</UBadge>
-      <UBadge
-          v-else-if="itemInfo.approved === 'Abgelehnt'"
-          color="rose"
-      >{{itemInfo.approved}}</UBadge>
-    </template>
-  </UDashboardNavbar>
-  <UTabs
-      :items="[{label: 'Informationen'}, {label: 'Logbuch'}]"
-      v-if="itemInfo && mode == 'show'"
-      class="p-5"
-  >
-    <template #item="{item}">
-      <UCard class="mt-5">
-        <div v-if="item.label === 'Informationen'">
-          <div class="truncate">
-            <p>Mitarbeiter: {{profileStore.profiles.find(item => item.id === itemInfo.user) ? profileStore.profiles.find(item => item.id === itemInfo.user).fullName : ""}}</p>
-            <p>Start: {{dayjs(itemInfo.start).format("DD.MM.YYYY")}}</p>
-            <p>Ende: {{dayjs(itemInfo.end).format("DD.MM.YYYY")}}</p>
-            <p>Grund: {{itemInfo.reason}}</p>
-            <p>Notizen: {{itemInfo.notes}}</p>
-          </div>
-        </div>
-        <div v-else-if="item.label === 'Logbuch'">
-          <HistoryDisplay
-              type="absencerequest"
-              v-if="itemInfo"
-              :element-id="itemInfo.id"
-          />
-        </div>
-      </UCard>
-    </template>
-  </UTabs>
-  <UForm v-else-if="mode == 'edit' || mode == 'create'" class="p-5" >
-    <UFormGroup
-        label="Status:"
-    >
-      <USelectMenu
-          v-model="itemInfo.approved"
-          :options="states"
-      />
-    </UFormGroup>
-
-    <UFormGroup
-        label="Grund:"
-    >
-      <USelectMenu
-          v-model="itemInfo.reason"
-          :options="absenceReasons"
-      />
-    </UFormGroup>
-
-    <UFormGroup
-        label="Mitarbeiter:"
-    >
-      <USelectMenu
-          v-model="itemInfo.user"
-          :options="profileStore.profiles"
-          option-attribute="fullName"
-          value-attribute="id"
-          searchable
-          :search-attributes="['fullName']"
-      >
-        <template #label>
-          {{profileStore.getProfileById(itemInfo.user) ? profileStore.getProfileById(itemInfo.user).fullName : "Mitarbeiter auswählen"}}
-        </template>
-      </USelectMenu>
-    </UFormGroup>
-
-    <UFormGroup label="Start:">
-      <UPopover :popper="{ placement: 'bottom-start' }">
-        <UButton
-            icon="i-heroicons-calendar-days-20-solid"
-            :label="itemInfo.start ? dayjs(itemInfo.start).format('DD.MM.YYYY') : 'Datum auswählen'"
-            variant="outline"
-        />
-
-        <template #panel="{ close }">
-          <LazyDatePicker v-model="itemInfo.start" @close="close" />
-        </template>
-      </UPopover>
-    </UFormGroup>
-
-    <UFormGroup label="Ende:">
-      <UPopover :popper="{ placement: 'bottom-start' }">
-        <UButton
-            variant="outline"
-            icon="i-heroicons-calendar-days-20-solid"
-            :label="itemInfo.end ? dayjs(itemInfo.end).format('DD.MM.YYYY') : 'Datum auswählen'"
-        />
-
-        <template #panel="{ close }">
-          <LazyDatePicker v-model="itemInfo.end" @close="close" />
-        </template>
-      </UPopover>
-    </UFormGroup>
-
-
-    <UFormGroup
-        label="Notizen:"
-    >
-      <UTextarea
-          v-model="itemInfo.note"
-      />
-    </UFormGroup>
-
-  </UForm>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/absenceRequests/index.vue b/deprecated/absenceRequests/index.vue
deleted file mode 100644
index 1992d76..0000000
--- a/deprecated/absenceRequests/index.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-  <UDashboardNavbar title="Abwesenheiten" :badge="filteredRows ? filteredRows.length : null">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/absenceRequests/create`)">+ Abwesenheit</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/absenceRequests/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Abwesenheiten anzuzeigen' }"
-  >
-    <template #approved-data="{row}">
-        <span v-if="!row.approved">
-          Genehmigung offen
-        </span>
-      <span
-          v-else-if="row.approved"
-          class="text-primary"
-      >
-          Genemigt
-        </span>
-      <span
-          v-else
-          class="text-rose"
-      >
-          Abgelehnt
-        </span>
-    </template>
-    <template #user-data="{row}">
-      {{profileStore.profiles.find(profile => profile.id === row.user) ? profileStore.profiles.find(profile => profile.id === row.user).fullName : ""}}
-    </template>
-  </UTable>
-</template>
-
-<script setup>
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/absenceRequests/create")
-  }
-})
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const router = useRouter()
-
-const templateColumns = [
-  {
-    key: "approved",
-    label: "Genehmigt",
-    sortable: true
-  },
-  {
-    key: "user",
-    label: "Mitarbeiter",
-    sortable: true
-  },{
-    key: "reason",
-    label: "Grund",
-    sortable: true
-  },{
-    key: "start",
-    label: "Start",
-    sortable: true
-  },{
-    key: "end",
-    label: "Ende",
-    sortable: true
-  },{
-    key: "note",
-    label: "Notizen",
-    sortable: true
-  }
-]
-
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-const searchString = ref('')
-const filteredRows = computed(() => {
-  let items = dataStore.absencerequests
-
-  if(!searchString.value) {
-    return items
-  }
-
-  return items.filter(item => {
-    return Object.values(item).some((value) => {
-      return String(value).toLowerCase().includes(searchString.value.toLowerCase())
-    })
-  })
-})
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/checks/[mode]/[[id]].vue b/deprecated/checks/[mode]/[[id]].vue
deleted file mode 100644
index 1092351..0000000
--- a/deprecated/checks/[mode]/[[id]].vue
+++ /dev/null
@@ -1,337 +0,0 @@
-<script setup>
-import HistoryDisplay from "~/components/HistoryDisplay.vue";
-import dayjs from "dayjs";
-import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  'backspace': () => {
-    router.push("/checks")
-  },
-  'arrowleft': () => {
-    if(openTab.value > 0){
-      openTab.value -= 1
-    }
-  },
-  'arrowright': () => {
-    if(openTab.value < 3) {
-      openTab.value += 1
-    }
-  },
-})
-
-const dataStore = useDataStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-const openTab = ref(0)
-
-const vehicles = ref([])
-const profiles = ref([])
-const inventoryitems = ref([])
-
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  name: "",
-  vehicle: null,
-  inventoryitem: null,
-  profile: null,
-  distance: 1,
-  distanceUnit: "days"
-})
-
-//Functions
-const setupPage = async () => {
-
-  profiles.value = await useSupabaseSelect("profiles")
-  vehicles.value = await useSupabaseSelect("vehicles")
-  inventoryitems.value = await useSupabaseSelect("inventoryitems")
-
-  if(mode.value === "show" ){
-    itemInfo.value = await useSupabaseSelectSingle("checks", route.params.id, "*, checkexecutions(*, executed_by(fullName)), vehicle(*), profile(*), inventoryitem(*)")
-  } else if (mode.value === "edit"){
-    itemInfo.value = await useSupabaseSelectSingle("checks", route.params.id, "*")
-  }
-
-  if(mode.value === "create") {
-    let query = route.query
-
-  }
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/checks/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/checks/`)
-  }
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar>
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/checks`)"
-      >
-        Überprüfungen
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          :class="['text-xl','font-medium']"
-      >{{itemInfo ? `Überprüfung: ${itemInfo.name}` : (mode === 'create' ? 'Überprüfung erstellen' : 'Überprüfung bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('checks',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('checks',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="router.push(`/checks/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UDashboardPanelContent>
-    <UTabs
-        v-if="itemInfo.id && mode === 'show'"
-        :items="[{label: 'Informationen'}, {label: 'Dokumente'}, {label: 'Ausführungen'}]"
-        class="p-5"
-        v-model="openTab"
-    >
-      <template #item="{item}">
-        <div v-if="item.label === 'Informationen'" class="flex mt-5">
-          <div class="w-1/2 mr-5">
-            <UCard>
-              <div class="text-wrap">
-                <table class="mb-3 w-full">
-                  <tr>
-                    <td>Name:</td>
-                    <td>{{itemInfo.name}}</td>
-                  </tr>
-                  <tr>
-                    <td>Rhythmus:</td>
-                    <td>
-                      {{itemInfo.distance}}
-                      <span v-if="itemInfo.distanceUnit === 'dayjs'">Tage</span>
-                      <span v-if="itemInfo.distanceUnit === 'years'">Jahre</span>
-                    </td>
-                  </tr>
-                  <tr v-if="itemInfo.vehicle">
-                    <td>Fahrzeug:</td>
-                    <td>{{itemInfo.vehicle.licensePlate}}</td>
-                  </tr>
-                  <tr v-if="itemInfo.profile">
-                    <td>Person:</td>
-                    <td>{{itemInfo.profile.fullName}}</td>
-                  </tr>
-                  <tr v-if="itemInfo.inventoryitem">
-                    <td>Inventarartikel:</td>
-                    <td>{{itemInfo.inventoryitem.name}}</td>
-                  </tr>
-                  <tr>
-                    <td>Beschreibung:</td>
-                    <td>{{itemInfo.description}}</td>
-                  </tr>
-
-                </table>
-
-              </div>
-            </UCard>
-          </div>
-          <div class="w-1/2">
-            <UCard class="h-full">
-              <HistoryDisplay
-                  type="check"
-                  v-if="itemInfo"
-                  :element-id="itemInfo.id"
-                  :render-headline="true"
-              />
-            </UCard>
-
-          </div>
-        </div>
-        <div v-else-if="item.label === 'Dokumente'">
-          <UCard class="mt-5">
-            <Toolbar>
-              <DocumentUpload
-                  type="check"
-                  :element-id="itemInfo.id"
-              />
-            </Toolbar>
-            <DocumentList
-                :documents="dataStore.getDocumentsByContractId(itemInfo.id)"
-            />
-          </UCard>
-
-        </div>
-        <div v-else-if="item.label === 'Ausführungen'">
-          <UCard class="mt-5">
-            <UTable
-                :rows="itemInfo.checkexecutions"
-                :columns="[{key:'created_at',label:'Ersellt am:'},{key:'executed_at',label:'Ausgeführt am:'},{key:'executed_by',label:'Ausgeführt von:'},{key:'description',label:'Beschreibung:'}]"
-                class="w-full"
-                :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Ausführungen anzuzeigen' }"
-            >
-              <template #created_at-data="{row}">
-                {{dayjs(row.created_at).format("DD.MM.YYYY HH:mm")}}
-              </template>
-              <template #executed_at-data="{row}">
-                {{dayjs(row.executed_at).format("DD.MM.YYYY HH:mm")}}
-              </template>
-              <template #executed_by-data="{row}">
-                {{row.executed_by.fullName}}
-              </template>
-            </UTable>
-          </UCard>
-        </div>
-
-
-      </template>
-    </UTabs>
-    <UForm v-else-if="mode === 'edit' || mode === 'create'" class="p-5" >
-      <div class="mx-auto w-4/5">
-        <div class="flex flex-row justify-around">
-          <div class="w-1/2">
-            <UDivider>Allgemeines</UDivider>
-            <UFormGroup
-                label="Name:"
-            >
-              <UInput
-                  v-model="itemInfo.name"
-              />
-            </UFormGroup>
-            <UFormGroup
-                label="Typ:"
-            >
-              <UInput
-                  v-model="itemInfo.type"
-              />
-            </UFormGroup>
-            <UFormGroup
-              label="Rhythmus"
-              class="w-full"
-            >
-              <InputGroup class="w-full">
-                <UInput
-                  v-model="itemInfo.distance"
-                  type="number"
-                  class="flex-auto"
-                ></UInput>
-                <USelectMenu
-                  :options="[{key: 'days', label: 'Tage'},{key:'years',label:'Jahre'}]"
-                  option-attribute="label"
-                  value-attribute="key"
-                  v-model="itemInfo.distanceUnit"
-                  class="w-40"
-                ></USelectMenu>
-              </InputGroup>
-            </UFormGroup>
-
-
-          </div>
-          <div class=" ml-5 w-1/2">
-            <UDivider>Verknüpftes Element</UDivider>
-            <UFormGroup
-                label="Fahrzeug:"
-            >
-              <USelectMenu
-                  :options="vehicles"
-                  option-attribute="licensePlate"
-                  value-attribute="id"
-                  v-model="itemInfo.vehicle"
-                  :disabled="itemInfo.inventoryitem || itemInfo.profile"
-
-              >
-
-              </USelectMenu>
-            </UFormGroup>
-            <UFormGroup
-                label="Person:"
-            >
-              <USelectMenu
-                  :options="profiles"
-                  option-attribute="fullName"
-                  value-attribute="id"
-                  v-model="itemInfo.profile"
-                  :disabled="itemInfo.vehicle || itemInfo.inventoryitem"
-
-              >
-
-              </USelectMenu>
-            </UFormGroup>
-            <UFormGroup
-                label="Inventarartikel:"
-            >
-              <USelectMenu
-                  :options="inventoryitems"
-                  option-attribute="name"
-                  value-attribute="id"
-                  v-model="itemInfo.inventoryitem"
-                  :disabled="itemInfo.vehicle || itemInfo.profile"
-              >
-
-              </USelectMenu>
-            </UFormGroup>
-
-          </div>
-        </div>
-        <UFormGroup
-            label="Beschreibung:"
-        >
-          <UTextarea
-              v-model="itemInfo.description"
-              rows="6"
-              maxrows="12"
-          />
-        </UFormGroup>
-      </div>
-
-
-
-
-
-    </UForm>
-  </UDashboardPanelContent>
-
-</template>
-
-<style scoped>
-td {
-  border-bottom: 1px solid lightgrey;
-  vertical-align: top;
-  padding-bottom: 0.15em;
-  padding-top: 0.15em;
-}
-</style>
\ No newline at end of file
diff --git a/deprecated/checks/index.vue b/deprecated/checks/index.vue
deleted file mode 100644
index 1697843..0000000
--- a/deprecated/checks/index.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <UDashboardNavbar title="Überprüfungen" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/checks/create`)">+ Überprüfung</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/checks/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Überprüfungen anzuzeigen' }"
-  >
-    <template #name-data="{row}">
-      <span v-if="row === filteredRows[selectedItem]" class="text-primary-500 font-bold">{{row.name}}</span>
-      <span v-else>{{row.name}}</span>
-    </template>
-    <template #vehicle-data="{row}">
-      <span v-if="row.vehicle">{{row.vehicle.licensePlate}}</span>
-    </template>
-    <template #profile-data="{row}">
-      <span v-if="row.profile">{{row.profile.fullName}}</span>
-    </template>
-    <template #inventoryitem-data="{row}">
-      <span v-if="row.inventoryitem">{{row.inventoryitem.name}}</span>
-    </template>
-
-  </UTable>
-</template>
-
-<script setup>
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/checks/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/checks/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if(selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-
-const items = ref([])
-const selectedItem = ref(0)
-
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("checks","*, vehicle(licensePlate), profile(fullName), inventoryitem(name)")
-}
-
-setupPage()
-
-const templateColumns = [
-  {
-    key: "name",
-    label: "Name",
-    sortable: true
-  },
-  {
-    key: "vehicle",
-    label: "Fahrzeug"
-  },
-  {
-    key: "profile",
-    label: "Person"
-  },
-  {
-    key: "inventoryitem",
-    label: "Inventarartikel"
-  },
-  {
-    key: "notes",
-    label: "Notizen"
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-
-const searchString = ref('')
-const filteredRows = computed(() => {
-  return useSearch(searchString.value, items.value)
-
-})
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/email.vue b/deprecated/email.vue
deleted file mode 100644
index 53038bb..0000000
--- a/deprecated/email.vue
+++ /dev/null
@@ -1,580 +0,0 @@
-<script setup>
-import axios from 'axios'
-import {sub} from 'date-fns'
-
-const dataStore = useDataStore()
-const accounts = ref([])
-
-//accounts.value = dataStore.emailAccounts.map(i => { return { label: i.emailAddress, emailEngingeId: i.emailEngineId }})
-
-const mailboxes = ref({})
-const messages = ref([])
-const selectedMailbox = ref("INBOX")
-const selectedAccount = ref(null)
-const selectedMessage = ref(null)
-const setup = async () => {
-  accounts.value = dataStore.emailAccounts.map((i,index) => {
-    let item = { label: i.emailAddress, emailEngineId: i.emailEngineId }
-    if(index === 0) {
-      item.defaultOpen = true
-    }
-    return item
-
-  })
-
-  for await (const account of accounts.value) {
-    console.log(account.emailEngineId)
-    const {data,error} = await axios.get(`http://157.90.231.142:3000/v1/account/${account.emailEngineId}/mailboxes`, {headers: { 'Authorization': 'Bearer dadb572465fba648590f31557f68028a750b47b278d87c1773e8fd09670eec59'}})
-    console.log(data)
-    console.log(error)
-    mailboxes.value[account.emailEngineId] = data.mailboxes
-  }
-}
-
-
-
-const selectMailbox = async (account, mailbox) => {
-  selectedMailbox.value = mailbox
-  const {data,error} = await axios.get(`http://157.90.231.142:3000/v1/account/${account}/messages?path=${ mailbox.path}`, {headers: { 'Authorization': 'Bearer dadb572465fba648590f31557f68028a750b47b278d87c1773e8fd09670eec59'}})
-  console.log(data)
-  console.log(error)
-  messages.value = data.messages
-  selectedAccount.value = account
-}
-const messageHTML = ref(null)
-const messageText = ref(null)
-const selectMessage = async (account, message) => {
-  console.log(message)
-  selectedMessage.value = message
-  const {data,error} = await axios.get(`http://157.90.231.142:3000/v1/account/${account}/text/${message.text.id}`, {headers: { 'Authorization': 'Bearer dadb572465fba648590f31557f68028a750b47b278d87c1773e8fd09670eec59'}})
-  messageHTML.value = data.html
-  messageText.value = data.plain
-}
-
-const addFlags = async (account, message, flags) => {
-  console.log(flags)
-  const {data,error} = await axios({
-    method: "PUT",
-    url: `http://157.90.231.142:3000/v1/account/${account}/message/${message.id}`,
-    headers: { 'Authorization': 'Bearer dadb572465fba648590f31557f68028a750b47b278d87c1773e8fd09670eec59'},
-    data: {
-      flags: {
-        add: flags
-      }
-    }
-  })
-
-  console.log(data)
-  console.log(error)
-}
-
-const removeFlags = async (account, message, flags) => {
-  console.log(flags)
-  const {data,error} = await axios({
-    method: "PUT",
-    url: `http://157.90.231.142:3000/v1/account/${account}/message/${message.id}`,
-    headers: { 'Authorization': 'Bearer dadb572465fba648590f31557f68028a750b47b278d87c1773e8fd09670eec59'},
-    data: {
-      flags: {
-        delete: flags
-      }
-    }
-  })
-
-  console.log(data)
-  console.log(error)
-}
-
-const setSeen = async (seen,message) => {
-  if(seen) {
-    await addFlags(selectedAccount.value,message, ["\\Seen"])
-    await selectMailbox(selectedAccount.value, selectedMailbox.value)
-  } else {
-    await removeFlags(selectedAccount.value,message, ["\\Seen"])
-    await selectMailbox(selectedAccount.value, selectedMailbox.value)
-  }
-}
-
-const moveTo = async (destinationPath) => {
-  const {data,error} = await axios({
-    method: "PUT",
-    url: `http://157.90.231.142:3000/v1/account/${selectedAccount.value}/message/${selectedMessage.value.id}/move`,
-    headers: { 'Authorization': 'Bearer dadb572465fba648590f31557f68028a750b47b278d87c1773e8fd09670eec59'},
-    data: {
-      path: destinationPath
-    }
-  })
-
-  console.log(data)
-  console.log(error)
-  selectedMessage.value = null
-  messageHTML.value = null
-  messageText.value = null
-  selectMailbox(selectedAccount.value, selectedMailbox.value)
-}
-
-const downloadAttachment = async (attachment) => {
-  const {data,error} = await axios({
-    method: "GET",
-    url:   `http://157.90.231.142:3000/v1/account/${selectedAccount.value}/attachment/${attachment.id}`,
-    headers: { 'Authorization': 'Bearer dadb572465fba648590f31557f68028a750b47b278d87c1773e8fd09670eec59'},
-    responseType: "blob"
-  })
-
-  const downloadURL = URL.createObjectURL(new Blob([data]))
-  const link = document.createElement('a')
-  link.href = downloadURL
-  link.setAttribute('download', attachment.filename)
-  document.body.appendChild(link)
-  link.click()
-  link.remove()
-    console.log(data)
-    console.log(error)
-}
-
-
-setup()
-
-const selectedTab = ref(0)
-
-const mails = ref([{
-  id: 1,
-  from: {
-    name: 'Alex Smith',
-    email: 'alex.smith@example.com',
-    avatar: {
-      src: 'https://i.pravatar.cc/128?u=1'
-    }
-  },
-  subject: 'Meeting Schedule',
-  body: 'Hi there, just a quick reminder about our meeting scheduled for 10 AM tomorrow. We\'ll be discussing the new marketing strategies and I would really appreciate your input on the matter. Looking forward to a productive session.',
-  date: new Date().toISOString()
-}, {
-  id: 2,
-  unread: true,
-  from: {
-    name: 'Jordan Brown',
-    email: 'jordan.brown@example.com',
-    avatar: {
-      src: 'https://i.pravatar.cc/128?u=2'
-    }
-  },
-  subject: 'Project Update',
-  body: 'I wanted to provide you with the latest update on the project. We\'ve made significant progress on the development front and I\'ve attached a detailed report for your review. Please let me know your thoughts and any areas for improvement.',
-  date: sub(new Date(), { minutes: 7 }).toISOString()
-}, {
-  id: 3,
-  unread: true,
-  from: {
-    name: 'Taylor Green',
-    email: 'taylor.green@example.com',
-    avatar: {
-      src: 'https://i.pravatar.cc/128?u=3'
-    }
-  },
-  subject: 'Lunch Plans',
-  body: 'Hey! I was wondering if you would like to grab lunch this Friday. I know a great spot downtown that serves the best Mexican cuisine. It would be a great opportunity for us to catch up and discuss the upcoming team event.',
-  date: sub(new Date(), { hours: 3 }).toISOString()
-}, {
-  id: 4,
-  from: {
-    name: 'Morgan White',
-    email: 'morgan.white@example.com',
-    avatar: {
-      src: 'https://i.pravatar.cc/128?u=4'
-    }
-  },
-  subject: 'New Proposal',
-  body: 'I\'ve attached the new proposal for our next project. It outlines all the objectives, timelines, and resource allocations. I\'m particularly excited about the innovative approach we\'re taking this time. Please have a look and let me know your thoughts.',
-  date: sub(new Date(), { days: 1 }).toISOString()
-}, {
-  id: 5,
-  from: {
-    name: 'Casey Gray',
-    email: 'casey.gray@example.com'
-  },
-  subject: 'Travel Itinerary',
-  body: 'Your travel itinerary for the upcoming business trip is ready. I\'ve included all flight details, hotel reservations, and meeting schedules. Please review and let me know if there are any changes you would like to make or any additional arrangements needed.',
-  date: sub(new Date(), { days: 1 }).toISOString()
-}, {
-  id: 6,
-  from: {
-    name: 'Jamie Johnson',
-    email: 'jamie.johnson@example.com'
-  },
-  subject: 'Budget Report',
-  body: 'I\'ve completed the budget report for this quarter. It includes a detailed analysis of our expenditures and revenue, along with projections for the next quarter. I believe there are some areas where we can optimize our spending. Let\'s discuss this in our next finance meeting.',
-  date: sub(new Date(), { days: 2 }).toISOString()
-}, {
-  id: 7,
-  from: {
-    name: 'Riley Davis',
-    email: 'riley.davis@example.com',
-    avatar: {
-      src: 'https://i.pravatar.cc/128?u=7'
-    }
-  },
-  subject: 'Training Session',
-  body: 'Just a reminder about the training session scheduled for next week. We\'ll be covering new software tools that are crucial for our workflow. It\'s important that everyone attends as this will greatly enhance our team\'s efficiency. Please confirm your availability.',
-  date: sub(new Date(), { days: 2 }).toISOString()
-}, {
-  id: 8,
-  unread: true,
-  from: {
-    name: 'Kelly Wilson',
-    email: 'kelly.wilson@example.com',
-    avatar: {
-      src: 'https://i.pravatar.cc/128?u=8'
-    }
-  },
-  subject: 'Happy Birthday!',
-  body: 'Happy Birthday! Wishing you a fantastic day filled with joy and laughter. Your dedication and hard work throughout the year have been invaluable to our team. Enjoy your day to the fullest!',
-  date: sub(new Date(), { days: 2 }).toISOString()
-}, {
-  id: 9,
-  from: {
-    name: 'Drew Moore',
-    email: 'drew.moore@example.com'
-  },
-  subject: 'Website Feedback',
-  body: 'We are in the process of revamping our company website and I would greatly appreciate your feedback on the new design. Your perspective is always insightful and could help us enhance the user experience significantly. Please let me know a convenient time for you to discuss this.',
-  date: sub(new Date(), { days: 5 }).toISOString()
-}, {
-  id: 10,
-  from: {
-    name: 'Jordan Taylor',
-    email: 'jordan.taylor@example.com'
-  },
-  subject: 'Gym Membership',
-  body: 'This is a friendly reminder that your gym membership is due for renewal at the end of this month. We\'ve added several new classes and facilities that I think you\'ll really enjoy. Let me know if you would like a tour of the new facilities.',
-  date: sub(new Date(), { days: 5 }).toISOString()
-}, {
-  id: 11,
-  unread: true,
-  from: {
-    name: 'Morgan Anderson',
-    email: 'morgan.anderson@example.com'
-  },
-  subject: 'Insurance Policy',
-  body: 'I\'m writing to inform you that your insurance policy details have been updated. The new document outlines the changes in coverage and premium rates. It\'s important to review these changes to ensure they meet your needs. Please don\'t hesitate to contact me if you have any questions.',
-  date: sub(new Date(), { days: 12 }).toISOString()
-}, {
-  id: 12,
-  from: {
-    name: 'Casey Thomas',
-    email: 'casey.thomas@example.com'
-  },
-  subject: 'Book Club Meeting',
-  body: 'I\'m excited to remind you about our next book club meeting scheduled for next Thursday. We\'ll be discussing \'The Great Gatsby,\' and I\'m looking forward to hearing everyone\'s perspectives. Also, we will be choosing our next book, so bring your suggestions!',
-  date: sub(new Date(), { months: 1 }).toISOString()
-}, {
-  id: 13,
-  from: {
-    name: 'Jamie Jackson',
-    email: 'jamie.jackson@example.com'
-  },
-  subject: 'Recipe Exchange',
-  body: 'Don\'t forget to send in your favorite recipe for our upcoming recipe exchange. It\'s a great opportunity to share and discover new and delicious meals. I\'m particularly excited to try out new dishes and add some variety to my cooking.',
-  date: sub(new Date(), { months: 1 }).toISOString()
-}, {
-  id: 14,
-  from: {
-    name: 'Riley White',
-    email: 'riley.white@example.com'
-  },
-  subject: 'Yoga Class Schedule',
-  body: 'The new schedule for yoga classes is now available. We\'ve added some new styles and adjusted the timings to accommodate more participants. I believe these classes are a great way to relieve stress and stay healthy. Hope to see you there!',
-  date: sub(new Date(), { months: 1 }).toISOString()
-}, {
-  id: 15,
-  from: {
-    name: 'Kelly Harris',
-    email: 'kelly.harris@example.com'
-  },
-  subject: 'Book Launch Event',
-  body: 'I\'m thrilled to invite you to my book launch event next month. It\'s been a journey writing this book    and I\'m eager to share it with you. The event will include a reading session, Q&A, and a signing opportunity. Your support would mean a lot to me.',
-  date: sub(new Date(), { months: 1 }).toISOString()
-}, {
-  id: 16,
-  from: {
-    name: 'Drew Martin',
-    email: 'drew.martin@example.com'
-  },
-  subject: 'Tech Conference',
-  body: 'Join us at the upcoming tech conference where we will be discussing the latest trends and innovations in technology. This is a great opportunity to network with industry leaders and learn about cutting-edge developments. Your participation would greatly contribute to our team\'s knowledge and growth.',
-  date: sub(new Date(), { months: 1, days: 4 }).toISOString()
-}, {
-  id: 17,
-  from: {
-    name: 'Alex Thompson',
-    email: 'alex.thompson@example.com'
-  },
-  subject: 'Art Exhibition',
-  body: 'I wanted to invite you to check out the new art exhibition this weekend. It features some amazing contemporary artists and their latest works. It\'s a great opportunity to immerse yourself in the local art scene and get inspired. Let me know if you\'re interested in going together.',
-  date: sub(new Date(), { months: 1, days: 15 }).toISOString()
-}, {
-  id: 18,
-  from: {
-    name: 'Jordan Garcia',
-    email: 'jordan.garcia@example.com'
-  },
-  subject: 'Networking Event',
-  body: 'I\'m looking forward to seeing you at the networking event next week. It\'s a great chance to connect with professionals from various industries and expand our professional network. There will also be guest speakers discussing key business trends. Your presence would add great value to the discussions.',
-  date: sub(new Date(), { months: 1, days: 18 }).toISOString()
-}, {
-  id: 19,
-  from: {
-    name: 'Taylor Rodriguez',
-    email: 'taylor.rodriguez@example.com'
-  },
-  subject: 'Volunteer Opportunity',
-  body: 'We\'re looking for volunteers for the upcoming community event. It\'s a great opportunity to give back and make a positive impact. There are various roles available, so you can choose something that aligns with your interests and skills. Let me know if you\'re interested and I\'ll provide more details.',
-  date: sub(new Date(), { months: 1, days: 25 }).toISOString()
-}, {
-  id: 20,
-  from: {
-    name: 'Morgan Lopez',
-    email: 'morgan.lopez@example.com'
-  },
-  subject: 'Car Service Reminder',
-  body: 'Just a reminder that your car is due for service next week. Regular maintenance is important to ensure your vehicle\'s longevity and performance. I\'ve included the details of the service center and the recommended services in this email. Feel free to contact them directly to schedule an appointment.',
-  date: sub(new Date(), { months: 2 }).toISOString()
-}])
-
-const dropdownItems = [[{
-  label: 'Mark as unread',
-  icon: 'i-heroicons-check-circle'
-}, {
-  label: 'Mark as important',
-  icon: 'i-heroicons-exclamation-circle'
-}], [{
-  label: 'Star thread',
-  icon: 'i-heroicons-star'
-}, {
-  label: 'Mute thread',
-  icon: 'i-heroicons-pause-circle'
-}]]
-
-// Filter mails based on the selected tab
-const filteredMails = computed(() => {
-  if (selectedTab.value === 1) {
-    return mails.value.filter(mail => !!mail.unread)
-  } else {
-    return mails.value
-  }
-
-
-})
-
-const selectedMail = ref(null)
-
-const isMailPanelOpen = computed({
-  get () {
-    return !!selectedMail.value
-  },
-  set (value) {
-    if (!value) {
-      selectedMail.value = null
-    }
-  }
-})
-
-
-</script>
-
-<template>
-
-<!--  <div class="flex flex-row">
-    <div id="mailboxlist">
-      <UAccordion
-        :items="accounts"
-      >
-        <template #default="{ item, index, open }">
-          <UButton variant="soft" class="mt-3">
-
-            <span class="truncate">{{ item.label }}</span>
-
-            <template #trailing>
-              <UIcon
-                  name="i-heroicons-chevron-right-20-solid"
-                  class="w-5 h-5 ms-auto transform transition-transform duration-200"
-                  :class="[open && 'rotate-90']"
-              />
-            </template>
-          </UButton>
-        </template>
-        <template #item="{ item }">
-          <div
-              v-for="mailbox in mailboxes[item.emailEngineId]"
-              class="my-3"
-          >
-            <UButton
-                @click="selectMailbox(item.emailEngineId, mailbox)"
-                variant="outline"
-            >
-              <span v-if="mailbox.name === 'Trash'">Papierkorb</span>
-              <span v-else-if="mailbox.name === 'INBOX'">Eingang</span>
-              <span v-else-if="mailbox.name === 'Sent'">Gesendet</span>
-              <span v-else-if="mailbox.name === 'Drafts'">Entwürfe</span>
-              <span v-else-if="mailbox.name === 'spambucket'">Spam</span>
-              <span v-else>{{mailbox.name}}</span>
-              <UBadge v-if="mailbox.messages > 0">{{mailbox.messages}}</UBadge>
-            </UButton>
-          </div>
-
-
-        </template>
-      </UAccordion>
-
-    </div>
-    <UDivider orientation="vertical" class="maiLDivider"/>
-    <div id="maillist">
-      <div
-          v-for="message in messages"
-          v-if="messages.length > 0"
-      >
-        <div
-            :class="message === selectedMessage ?  ['message','text-primary-500'] : ['message']"
-            @click="selectMessage(selectedAccount, message),
-                    !message.flags.includes('\\Seen') ? setSeen(true,message) : null"
-        >
-          <UChip
-            position="top-left"
-            :show="!message.flags.includes('\\Seen')"
-          >
-            <h1>{{message.from.name ||message.from.address}}</h1>
-          </UChip>
-
-          <h3>{{message.subject}}</h3>
-        </div>
-        <UDivider class="my-3"/>
-
-      </div>
-      <div
-        v-else
-      >
-        Keine E-Mails in diesem Postfach
-      </div>
-
-
-    </div>
-    <UDivider orientation="vertical" class="maiLDivider"/>
-
-    <div id="mailcontent" v-if="selectedMessage">
-      <Toolbar>
-        &lt;!&ndash;<UButton
-            @click="setup"
-        >Setup</UButton>
-        <UButton>+ Neu</UButton>
-        <UButton>Sync</UButton>
-        <UButton>Papierkorb</UButton>
-        <UButton>Weiterleiten</UButton>
-        <UButton>Antworten</UButton>&ndash;&gt;
-        <UButton
-          @click="setSeen(false,selectedMessage)"
-        >
-          Als Ungelesen markieren
-        </UButton>
-        <UButton
-          @click="moveTo('INBOX.Trash')"
-          icon="i-heroicons-trash"
-        >
-
-        </UButton>
-      </Toolbar>
-      <UAlert
-        v-if="selectedMessage"
-        :title="attachment.filename"
-        v-for="attachment in selectedMessage.attachments"
-        class="my-3"
-        :actions="[{label: 'Download', click:() => {downloadAttachment(attachment)}}]"
-      >
-
-      </UAlert>
-      <iframe
-          v-if="messageHTML"
-          style="width: 100%; height: 100%"
-          :srcdoc="messageHTML">
-      </iframe>
-      <pre
-          class="text-wrap"
-          v-else-if="messageText">
-        {{messageText}}
-      </pre>
-    </div>
-  </div>-->
-
-  <UDashboardPanel id="inbox" :width="400" :resizable="{ min: 300, max: 500 }">
-    <UDashboardNavbar title="Inbox" >
-      <template #right>
-        <UTabs v-model="selectedTab" :items="[{label: 'Alle'},{label: 'Ungelesen'}]" :ui="{ wrapper: '', list: { height: 'h-9', tab: { height: 'h-7', size: 'text-[13px]' } } }" />
-      </template>
-    </UDashboardNavbar>
-
-    <!-- ~/components/inbox/InboxList.vue -->
-    <InboxList v-model="selectedMail" :mails="filteredMails" />
-  </UDashboardPanel>
-
-  <UDashboardPanel v-model="isMailPanelOpen" collapsible grow side="right">
-    <template v-if="selectedMail">
-      <UDashboardNavbar>
-        <template #toggle>
-          <UDashboardNavbarToggle icon="i-heroicons-x-mark" />
-
-          <UDivider orientation="vertical" class="mx-1.5 lg:hidden" />
-        </template>
-
-        <template #left>
-          <UTooltip text="Archive">
-            <UButton icon="i-heroicons-archive-box" color="gray" variant="ghost" />
-          </UTooltip>
-
-          <UTooltip text="Move to junk">
-            <UButton icon="i-heroicons-archive-box-x-mark" color="gray" variant="ghost" />
-          </UTooltip>
-
-<!--          <UDivider orientation="vertical" class="mx-1.5" />-->
-
-<!--          <UPopover :popper="{ placement: 'bottom-start' }">
-            <template #default="{ open }">
-              <UTooltip text="Snooze" :prevent="open">
-                <UButton icon="i-heroicons-clock" color="gray" variant="ghost" :class="[open && 'bg-gray-50 dark:bg-gray-800']" />
-              </UTooltip>
-            </template>
-
-            <template #panel="{ close }">
-              <DatePicker @close="close" />
-            </template>
-          </UPopover>-->
-        </template>
-
-        <template #right>
-          <UTooltip text="Reply">
-            <UButton icon="i-heroicons-arrow-uturn-left" color="gray" variant="ghost" />
-          </UTooltip>
-
-          <UTooltip text="Forward">
-            <UButton icon="i-heroicons-arrow-uturn-right" color="gray" variant="ghost" />
-          </UTooltip>
-
-          <UDivider orientation="vertical" class="mx-1.5" />
-
-          <UDropdown :items="dropdownItems">
-            <UButton icon="i-heroicons-ellipsis-vertical" color="gray" variant="ghost" />
-          </UDropdown>
-        </template>
-      </UDashboardNavbar>
-
-      <!-- ~/components/inbox/InboxMail.vue -->
-      <InboxMail :mail="selectedMail" />
-    </template>
-    <div v-else class="flex-1 hidden lg:flex items-center justify-center">
-      <UIcon name="i-heroicons-inbox" class="w-32 h-32 text-gray-400 dark:text-gray-500" />
-    </div>
-  </UDashboardPanel>
-
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/events/[mode]/[[id]].vue b/deprecated/events/[mode]/[[id]].vue
deleted file mode 100644
index 411314b..0000000
--- a/deprecated/events/[mode]/[[id]].vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<script setup>
-import dayjs from "dayjs";
-
-const route = useRoute()
-const router = useRouter()
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-
-const mode = ref(route.params.mode || "show")
-
-
-const itemInfo = ref({
-  resources: []
-})
-const oldItemInfo = ref({})
-
-const resourceToAdd = ref(profileStore.activeProfile.id)
-/*const mapResources = () => {
-  console.log(itemInfo.value.resources)
-  itemInfo.value.resources.map(resource => {
-    console.log(resource)
-    return {
-      id: resource.id,
-      type: resource.type
-    }
-  })
-}*/
-
-
-const setupPage = async () => {
-  if(mode.value === "show"){
-    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,"*")
-
-  }
-
-  if(route.query.start) itemInfo.value.start = new Date(route.query.start.replace(" ", "+"))
-  if(route.query.end) itemInfo.value.end = new Date(route.query.end.replace(" ", "+"))
-  if(route.query.resources) {
-    itemInfo.value.resources = JSON.parse(route.query.resources).map(resource => {
-      return dataStore.getResourcesList.find(i => i.id === resource)
-    })
-  }
-  if(route.query.project) itemInfo.value.project = route.query.project
-  if(itemInfo.value.id) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
-
-
-
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar :title="mode === 'show' ? 'Termin: ' + itemInfo.title : 'Neuen Termin erstellen'">
-    <template #right>
-      <UButton
-        color="rose"
-        @click="router.push(route.params.id ? `/events/show/${route.params.id}` : `/events`)"
-        v-if="mode === 'edit'"
-      >
-        Abbrechen
-      </UButton>
-
-      <UButton
-        @click="dataStore.createNewItem('events',itemInfo)"
-        v-if="mode === 'edit' && !route.params.id"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-        @click="dataStore.updateItem('events',itemInfo,oldItemInfo)"
-        v-else-if="mode === 'edit' && route.params.id"
-      >
-        Speichern
-      </UButton>
-      <UButton
-        v-if="mode === 'show'"
-        @click="router.push(`/events/edit/${itemInfo.id}`)"
-      >
-          Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-<!--  <UDashboardToolbar>
-
-  </UDashboardToolbar>-->
-  <UTabs
-      v-if="mode === 'show'"
-      :items="[{label:'Informationen'},{label:'Logbuch'}]"
-      class="p-5"
-  >
-    <template #item="{item}">
-      <UCard class="mt-5">
-          <div v-if="item.label === 'Informationen'">
-            <div class="truncate" >
-              <p>Titel: {{itemInfo.title ? itemInfo.title : ''}}</p>
-              <p>Typ: {{itemInfo.type? itemInfo.type : ''}}</p>
-              <p>Start: {{dayjs(itemInfo.start).format("DD.MM.YY HH:mm")}}</p>
-              <p>Ende: {{dayjs(itemInfo.end).format("DD.MM.YY HH:mm")}}</p>
-              <p>Projekt: {{itemInfo.project ? itemInfo.project.name : ''}}</p>
-              <p>Link: <a v-if="itemInfo.link" :href="itemInfo.link">{{itemInfo.link }}</a></p>
-              <p>Resources: {{itemInfo.resources.map((x) => `${x.type} - ${x.title}`).join(",")}}</p>
-              <p>Notizen: {{itemInfo.notes ? itemInfo.notes : ''}}</p>
-            </div>
-
-          </div>
-          <div v-if="item.label === 'Logbuch'">
-            <HistoryDisplay
-                type="event"
-                v-if="itemInfo"
-                :element-id="itemInfo.id"
-            />
-          </div>
-      </UCard>
-    </template>
-  </UTabs>
-  <UForm class="p-5" v-if="mode === 'edit'">
-    <UFormGroup
-        label="Titel:"
-    >
-      <UInput
-          v-model="itemInfo.title"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Projekt:"
-    >
-      <USelectMenu
-          v-model="itemInfo.project"
-          :options="dataStore.projects"
-          option-attribute="name"
-          value-attribute="id"
-          searchable
-          searchable-placeholder="Suche..."
-          :search-attributes="['name']"
-      >
-        <template #label>
-          {{dataStore.getProjectById(itemInfo.project) ? dataStore.getProjectById(itemInfo.project).name : "Kein Projekt ausgewählt"}}
-        </template>
-
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-        label="Typ:"
-    >
-      <USelectMenu
-          v-model="itemInfo.type"
-          :options="dataStore.getEventTypes"
-          option-attribute="label"
-          value-attribute="label"
-      >
-
-      </USelectMenu>
-    </UFormGroup>
-    <UFormGroup
-      label="Link:"
-    >
-      <UInput
-        v-model="itemInfo.link"
-      />
-    </UFormGroup>
-    <UFormGroup
-      label="Notizen:"
-    >
-      <UTextarea
-        v-model="itemInfo.notes"
-        rows="3"
-      />
-    </UFormGroup>
-    <UFormGroup
-        label="Start:"
-    >
-      <UPopover :popper="{ placement: 'bottom-start' }">
-        <UButton
-            variant="outline"
-            icon="i-heroicons-calendar-days-20-solid"
-            :label="itemInfo.start ? dayjs(itemInfo.start).format('DD.MM.YYYY HH:mm') : 'Datum auswählen'"
-        />
-
-        <template #panel="{ close }">
-          <LazyDatePicker
-              v-model="itemInfo.start"
-              mode="dateTime"
-          />
-        </template>
-      </UPopover>
-    </UFormGroup>
-    <UFormGroup
-        label="Ende:"
-    >
-      <UPopover :popper="{ placement: 'bottom-start' }">
-        <UButton
-            variant="outline"
-            icon="i-heroicons-calendar-days-20-solid"
-            :label="itemInfo.end ? dayjs(itemInfo.end).format('DD.MM.YYYY HH:mm') : 'Datum auswählen'"
-        />
-
-        <template #panel="{ close }">
-          <LazyDatePicker
-              v-model="itemInfo.end"
-              mode="dateTime"
-          />
-        </template>
-      </UPopover>
-    </UFormGroup>
-    <UFormGroup
-        label="Resource:"
-        class="w-full"
-    >
-      <InputGroup class="w-full">
-        <USelectMenu
-            v-model="resourceToAdd"
-            :options="dataStore.getResourcesList"
-            option-attribute="title"
-            value-attribute="id"
-            class="w-full"
-        ></USelectMenu>
-        <UButton
-            @click="itemInfo.resources.push(dataStore.getResourcesList.find(i => i.id === resourceToAdd))"
-            :disabled="itemInfo.resources.find(i => i.id === resourceToAdd)"
-        >
-          + Hinzufügen
-        </UButton>
-      </InputGroup>
-    </UFormGroup>
-    <UTable
-        v-if="itemInfo.resources.length > 0"
-      :rows="itemInfo.resources"
-      :columns="[
-          {
-            key:'type',
-            label: 'Type'
-          }, {
-            key: 'title',
-            label: 'Name'
-          }, {
-            key: 'remove'
-          }
-      ]"
-    >
-      <template #remove-data="{row}">
-        <UButton
-          color="rose"
-          variant="outline"
-          @click="itemInfo.resources = itemInfo.resources.filter(i => i.id !== row.id)"
-        >
-          Entfernen
-        </UButton>
-      </template>
-    </UTable>
-
-
-  </UForm>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/events/index.vue b/deprecated/events/index.vue
deleted file mode 100644
index 28ddb68..0000000
--- a/deprecated/events/index.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<template>
-  <UDashboardNavbar title="Termine" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/events/edit`)">+ Termin</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/events/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Termine anzuzeigen' }"
-  >
-    <template #start-data="{row}">
-      {{dayjs(row.start).format("DD.MM.YY HH:mm")}}
-    </template>
-    <template #end-data="{row}">
-      {{dayjs(row.end).format("DD.MM.YY HH:mm")}}
-    </template>
-    <template #project-data="{row}">
-      {{row.project ? dataStore.getProjectById(row.project).name: ""}}
-    </template>
-    <template #resources-data="{row}">
-      {{row.resources ? row.resources.map(i => i.title).join(", ") : ""}}
-    </template>
-  </UTable>
-</template>
-
-<script setup>
-import dayjs from "dayjs";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/events/[mode]")
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-
-const templateColumns = [
-  {
-    key: 'title',
-    label: "Titel:",
-    sortable: true
-  },
-  {
-    key: "start",
-    label: "Start",
-    sortable: true
-  },
-  {
-    key: "end",
-    label: "Ende"
-  },
-  {
-    key: "resources",
-    label: "Resourcen"
-  },
-  {
-    key: "project",
-    label: "Projekt"
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-
-const searchString = ref('')
-const filteredRows = computed(() => {
-  if(!searchString.value) {
-    return dataStore.events
-  }
-
-  return dataStore.events.filter(item => {
-    return Object.values(item).some((value) => {
-      return String(value).toLowerCase().includes(searchString.value.toLowerCase())
-    })
-  })
-})
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/inventoryitems/[mode]/[[id]].vue b/deprecated/inventoryitems/[mode]/[[id]].vue
deleted file mode 100644
index f484dcb..0000000
--- a/deprecated/inventoryitems/[mode]/[[id]].vue
+++ /dev/null
@@ -1,382 +0,0 @@
-<script setup>
-import HistoryDisplay from "~/components/HistoryDisplay.vue";
-import dayjs from "dayjs";
-import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
-import DocumentUpload from "~/components/DocumentUpload.vue";
-import DocumentList from "~/components/DocumentList.vue";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-const dataStore = useDataStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-    name: null,
-    description: null,
-  quantity: 0
-})
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show"){
-    itemInfo.value = await useSupabaseSelectSingle("inventoryitems", route.params.id, "*, vendor(*), checks(*)")
-  } else if(mode.value === "edit") {
-    itemInfo.value = await useSupabaseSelectSingle("inventoryitems", route.params.id, "*")
-  }
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/inventoryitems/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/inventoryitems`)
-  }
-}
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar :title="itemInfo ? itemInfo.name : (mode === 'create' ? 'Inventartikel erstellen' : 'Inventartikel bearbeiten')">
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/inventoryitems`)"
-      >
-        Inventar
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          :class="['text-xl','font-medium']"
-      >{{itemInfo.id ? `Inventarartikel: ${itemInfo.name}` : (mode === 'create' ? 'Inventarartikel erstellen' : 'Inventarartikel bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <ButtonWithConfirm
-          color="rose"
-          variant="outline"
-          @confirmed="dataStore.updateItem('inventoryitems',{...itemInfo, archived: true})"
-          v-if="mode === 'edit'"
-      >
-        <template #button>
-          Archivieren
-        </template>
-        <template #header>
-          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
-        </template>
-        Möchten Sie den Inventarartikel {{itemInfo.name}} wirklich archivieren?
-      </ButtonWithConfirm>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('inventoryitems',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-if="mode === 'create'"
-          @click="dataStore.createNewItem('inventoryitems',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          v-if="mode === 'create'"
-          class="ml-2"
-          @click="dataStore.createNewItem('inventoryitems',itemInfo);
-          itemInfo = {
-    name: null,
-    description: null,
-  quantity: 0
-}"
-      >
-        Erstellen + Neu
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="  router.push(`/inventoryitems/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UTabs
-    :items="[{label: 'Informationen'},{label: 'Dokumente'},{label: 'Überprüfungen'}]"
-    v-if="itemInfo && mode === 'show'"
-    class="p-5"
-  >
-    <template #item="{item}">
-      <div v-if="item.label === 'Informationen'" class="flex-row flex mt-5">
-        <div class="w-1/2 mr-5">
-          <UCard>
-            <UAlert
-                v-if="itemInfo.archived"
-                color="rose"
-                variant="outline"
-                title="Objekt archiviert"
-                icon="i-heroicons-light-bulb"
-                class="mb-5"
-            />
-            <table class="w-full">
-              <tr>
-                <td>Name: </td>
-                <td>{{itemInfo.name}}</td>
-              </tr>
-              <tr v-if="itemInfo.currentSpace">
-                <td>Lagerplatz: </td>
-                <td>{{dataStore.getSpaceById(itemInfo.currentSpace).spaceNumber}} - {{dataStore.getSpaceById(itemInfo.currentSpace).description}}</td>
-              </tr>
-              <tr>
-                <td>Seriennummer:</td>
-                <td>{{itemInfo.serialNumber}}</td>
-              </tr>
-              <tr>
-                <td>Menge:</td>
-                <td>{{itemInfo.quantity > 0 ? itemInfo.quantity : 'Einzelarktikel'}}</td>
-              </tr>
-              <tr>
-                <td>Artikelnummer:</td>
-                <td>{{itemInfo.articleNumber}}</td>
-              </tr>
-              <tr>
-                <td>Hersteller:</td>
-                <td>{{itemInfo.manufacturer}}</td>
-              </tr>
-              <tr>
-                <td>Herstellernummer:</td>
-                <td>{{itemInfo.manufacturerNumber}}</td>
-              </tr>
-              <tr>
-                <td>Lieferant:</td>
-                <td>{{itemInfo.vendor ? itemInfo.vendor.name : ''}}</td>
-              </tr>
-              <tr>
-                <td>Kaufdatum:</td>
-                <td>{{itemInfo.purchaseDate ? dayjs(itemInfo.purchaseDate).format("DD.MM.YYYY") : ''}}</td>
-              </tr>
-              <tr>
-                <td>Wert bei Kauf:</td>
-                <td>{{itemInfo.purchasePrice ? itemInfo.purchasePrice.toFixed(2).replace(".",",") + " €" : ''}}</td>
-              </tr>
-              <tr>
-                <td>Aktueller Wert:</td>
-                <td>{{itemInfo.currentValue ? itemInfo.currentValue.toFixed(2).replace(".",",") + " €" : ''}}</td>
-              </tr>
-              <tr>
-                <td>Beschreibung:</td>
-                <td>{{itemInfo.description}}</td>
-              </tr>
-            </table>
-          </UCard>
-
-        </div>
-        <div class="w-1/2">
-          <UCard>
-            <HistoryDisplay
-                type="inventoryitem"
-                v-if="itemInfo"
-                render-headline
-                :element-id="itemInfo.id"
-            />
-          </UCard>
-
-        </div>
-      </div>
-      <div v-else-if="item.label === 'Dokumente'">
-        <UCard>
-          <DocumentUpload
-              type="inventoryitem"
-              :element-id="itemInfo.id"
-          />
-
-          <DocumentList :documents="dataStore.getDocumentsByProfileId(itemInfo.id)"/>
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Überprüfungen'">
-        <UCard>
-          <UTable
-              :rows="itemInfo.checks"
-              :columns="[{key:'name',label: 'Name'},{key:'rhythm',label: 'Rhythmus'},{key:'description',label: 'Beschreibung'}]"
-              class="w-full"
-              :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-              @select="(i) => router.push(`/checks/show/${i.id}`) "
-              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Überprüfungen anzuzeigen' }"
-          >
-            <template #rhythm-data="{row}">
-              {{row.distance}}
-              <span v-if="row.distanceUnit === 'dayjs'">Tage</span>
-              <span v-if="row.distanceUnit === 'years'">Jahre</span>
-            </template>
-          </UTable>
-        </UCard>
-      </div>
-    </template>
-  </UTabs>
-  <UForm
-      v-else-if="mode == 'edit' || mode == 'create'"
-      class="p-5"
-  >
-    <div class="flex flex-row">
-      <div class="w-1/2 mr-5">
-        <UDivider>
-          Allgemeines
-        </UDivider>
-        <UFormGroup
-          label="Name:"
-        >
-          <UInput
-              v-model="itemInfo.name"
-          />
-        </UFormGroup>
-
-        <UFormGroup
-            label="Artikelnummer:"
-        >
-          <UInput
-              v-model="itemInfo.articleNumber"
-              placeholder="Leer lassen für automatische generierte Nummer"
-          />
-        </UFormGroup>
-        <UFormGroup
-            label="Lagerplatz:"
-        >
-          <USelectMenu
-              :options="dataStore.spaces"
-              v-model="itemInfo.currentSpace"
-              value-attribute="id"
-          >
-            <template #option="{option}">
-              <span class="truncate">{{option.spaceNumber}} - {{option.description}}</span>
-            </template>
-            <template #label>
-              <span v-if="itemInfo.currentSpace">{{dataStore.getSpaceById(itemInfo.currentSpace).spaceNumber }} - {{dataStore.getSpaceById(itemInfo.currentSpace).description}}</span>
-              <span v-else>Kein Lagerplatz ausgewählt</span>
-            </template>
-          </USelectMenu>
-        </UFormGroup>
-        <UFormGroup
-            label="Seriennummer:"
-        >
-          <UInput
-              v-model="itemInfo.serialNumber"
-          />
-        </UFormGroup>
-        <UFormGroup
-            label="Menge:"
-            :help="itemInfo.serialNumber ? 'Menge deaktiviert durch Eingabe der Seriennummer' : 'Für Einzelartikel Menge gleich 0'"
-        >
-          <UInput
-              type="number"
-              v-model="itemInfo.quantity"
-              :disabled="itemInfo.serialNumber"
-          />
-        </UFormGroup>
-      </div>
-      <div class="w-1/2">
-        <UDivider>
-          Anschaffung
-        </UDivider>
-        <UFormGroup
-            label="Hersteller:"
-        >
-          <UInput
-              v-model="itemInfo.manufacturer"
-          />
-        </UFormGroup>
-        <UFormGroup
-            label="Herstellernr.:"
-        >
-          <UInput
-              v-model="itemInfo.manufacturerNumber"
-          />
-        </UFormGroup>
-        <UFormGroup
-            label="Lieferant:"
-        >
-          <USelectMenu
-              :options="dataStore.vendors"
-              option-attribute="name"
-              value-attribute="id"
-              searchable
-              :search-attributes="['name']"
-              v-model="itemInfo.vendor"
-          />
-        </UFormGroup>
-        <UFormGroup
-            label="Kaufdatum:"
-        >
-          <UPopover :popper="{ placement: 'bottom-start' }">
-            <UButton
-                icon="i-heroicons-calendar-days-20-solid"
-                :label="itemInfo.purchaseDate ? dayjs(itemInfo.purchaseDate).format('DD.MM.YYYY') : 'Datum auswählen'"
-                variant="outline"
-            />
-
-            <template #panel="{ close }">
-              <LazyDatePicker v-model="itemInfo.purchaseDate" @close="close" />
-            </template>
-          </UPopover>
-        </UFormGroup>
-        <UFormGroup
-            label="Wert bei Kauf:"
-        >
-          <UInput
-              v-model="itemInfo.purchasePrice"
-              type="number"
-              steps="0.01"
-          >
-            <template #trailing>
-              <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
-            </template>
-          </UInput>
-        </UFormGroup>
-        <UFormGroup
-            label="Aktueller Wert:"
-        >
-          <UInput
-              v-model="itemInfo.currentValue"
-              type="number"
-              steps="0.01"
-          >
-            <template #trailing>
-              <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
-            </template>
-          </UInput>
-        </UFormGroup>
-      </div>
-    </div>
-
-
-    <UFormGroup
-        label="Beschreibung:"
-    >
-      <UTextarea
-          v-model="itemInfo.description"
-      />
-    </UFormGroup>
-  </UForm>
-</template>
-
-<style scoped>
-td {
-  border-bottom: 1px solid lightgrey;
-  vertical-align: top;
-  padding-bottom: 0.15em;
-  padding-top: 0.15em;
-}
-</style>
\ No newline at end of file
diff --git a/deprecated/inventoryitems/index.vue b/deprecated/inventoryitems/index.vue
deleted file mode 100644
index 72e1bf4..0000000
--- a/deprecated/inventoryitems/index.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <UDashboardNavbar title="Inventar" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/inventoryitems/create`)">+ Inventarartikel</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/inventoryitems/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Inventarartikel anzuzeigen' }"
-      v-model:sort="sortConfig"
-      sort-mode="manual"
-      @update:sort="setupPage"
-  >
-
-
-  </UTable>
-</template>
-
-<script setup>
-import {sort} from "fast-sort"
-
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/tasks/create")
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-const items = ref([])
-
-const sortConfig = ref({
-  column: "articleNumber",
-  direction: "desc"
-})
-
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("inventoryitems","*")
-}
-
-setupPage()
-
-const templateColumns = [
-  {
-    key: "articleNumber",
-    label: "Artikelnummer",
-    sortable: true
-  },{
-    key: "name",
-    label: "Name",
-    sortable: true
-  },
-  {
-    key: "description",
-    label: "Beschreibung",
-    sortable: true
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-
-
-const searchString = ref('')
-const filteredRows = computed(() => {
-
-  let sorted = []
-
-  if(sortConfig.value.direction === "asc"){
-    sorted = sort(items.value).asc(i => i[sortConfig.value.column])
-  } else {
-    sorted = sort(items.value).desc(i => i[sortConfig.value.column])
-  }
-
-  return useListFilter(searchString.value, sorted)
-
-})
-
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/spaces/[mode]/[[id]].vue b/deprecated/spaces/[mode]/[[id]].vue
deleted file mode 100644
index c299068..0000000
--- a/deprecated/spaces/[mode]/[[id]].vue
+++ /dev/null
@@ -1,321 +0,0 @@
-<script setup>
-import axios from "axios";
-import ZebraBrowserPrintWrapper from "zebra-browser-print-wrapper"
-import HistoryDisplay from "~/components/HistoryDisplay.vue";
-definePageMeta({
-  middleware: "auth"
-})
-
-const dataStore = useDataStore()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({
-  spaceNumber: "",
-  address: {
-    streetNumber: "",
-    city: "",
-    zip:""
-  }
-})
-const spaceTypes = ["Standort","Regalplatz", "Kiste", "Palettenplatz", "Sonstiges"]
-const spaceProducts = ref([])
-const spaceMovements = ref([])
-
-const spaces = ref([])
-
-//Functions
-const setupPage = async () => {
-  if(mode.value === "show"){
-    itemInfo.value = await useSupabaseSelectSingle("spaces",route.params.id,"*, parentSpace(*), inventoryitems(*)")
-
-    spaceMovements.value = await dataStore.getMovementsBySpace(itemInfo.value.id)
-    spaceProducts.value = []
-    spaceMovements.value.forEach(movement => {
-      if(spaceProducts.value.filter(product => product.id === movement.productId).length === 0) spaceProducts.value.push(dataStore.getProductById(movement.productId))
-    })
-
-
-  } else if(mode.value === "edit") {
-    itemInfo.value = await useSupabaseSelectSingle("spaces",route.params.id,"*")
-  }
-
-  if(mode.value === "edit" || mode.value === "create"){
-    if(itemInfo.value){
-      spaces.value = (await useSupabaseSelect("spaces",'*')).filter(i => i.id !== itemInfo.value.id)
-    } else {
-      spaces.value = (await useSupabaseSelect("spaces",'*'))
-    }
-  }
-
-
-
-
-
-
-
-}
-
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/spaces/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/spaces/`)
-  }
-}
-
-function getSpaceProductCount(productId) {
-  let productMovements = spaceMovements.value.filter(movement => movement.productId === productId)
-  let count = 0;
-  productMovements.forEach(movement => count += movement.quantity)
-
-  return count
-}
-
-/*
-const printSpaceLabel = async () => {
-  axios
-      .post(`http://${profileStore.ownTenant.value.labelPrinterIp}/pstprnt`, `^XA^FO10,20^BCN,100^FD${itemInfo.value.spaceNumber}^XZ` )
-      .then(console.log)
-      .catch(console.log)
-}
-*/
-
-const cityLoading = ref(false)
-const setCityByZip = async () => {
-  cityLoading.value = true
-  itemInfo.value.address.city = await useZipCheck(itemInfo.value.address.zip)
-  cityLoading.value = false
-}
-
-
-setupPage()
-</script>
-
-<template>
-  <UDashboardNavbar :title="itemInfo ? itemInfo.name : (mode === 'create' ? 'Lagerplatz erstellen' : 'Lagerplatz bearbeiten')">
-    <template #left>
-      <UButton
-          icon="i-heroicons-chevron-left"
-          variant="outline"
-          @click="router.push(`/spaces`)"
-      >
-        Lagerplätze
-      </UButton>
-    </template>
-    <template #center>
-      <h1
-          v-if="itemInfo"
-          :class="['text-xl','font-medium']"
-      >{{itemInfo ? `Lagerplatz: ${itemInfo.spaceNumber} - ${itemInfo.description}` : (mode === 'create' ? 'Lagerplatz erstellen' : 'Lagerplatz bearbeiten')}}</h1>
-    </template>
-    <template #right>
-      <UButton
-          v-if="mode === 'edit'"
-          @click="dataStore.updateItem('spaces',itemInfo)"
-      >
-        Speichern
-      </UButton>
-      <UButton
-          v-else-if="mode === 'create'"
-          @click="dataStore.createNewItem('spaces',itemInfo)"
-      >
-        Erstellen
-      </UButton>
-      <UButton
-          @click="cancelEditorCreate"
-          color="red"
-          class="ml-2"
-          v-if="mode === 'edit' || mode === 'create'"
-      >
-        Abbrechen
-      </UButton>
-      <UButton
-          v-if="mode === 'show'"
-          @click="  router.push(`/spaces/edit/${itemInfo.id}`)"
-      >
-        Bearbeiten
-      </UButton>
-    </template>
-  </UDashboardNavbar>
-  <UDashboardPanelContent>
-    <UTabs
-        :items="[{label: 'Informationen'},{label: 'Bestand'},{label: 'Inventarartikel'}]"
-        v-if="itemInfo && mode === 'show'"
-        class="p-5"
-    >
-      <template #item="{item}">
-        <div v-if="item.label === 'Informationen'" class="flex mt-5">
-          <div class="w-1/2 mr-5">
-            <UCard>
-              <div class="truncate">
-                <table>
-                  <tr>
-                    <td>Typ:</td>
-                    <td>{{itemInfo.type}}</td>
-                  </tr>
-                  <tr v-if="itemInfo.type !== 'Standort'">
-                    <td>Übergeordneter Lagerplatz:</td>
-                    <td><router-link v-if="itemInfo.parentSpace" :to="`/spaces/show/${itemInfo.parentSpace.id}`">{{itemInfo.parentSpace.spaceNumber}} - {{itemInfo.parentSpace.description}}</router-link></td>
-                  </tr>
-                  <tr v-if="itemInfo.type === 'Standort'">
-                    <td>Adresse:</td>
-                    <td>{{`${itemInfo.address.streetNumber}, ${itemInfo.address.zip} ${itemInfo.address.city}`}}</td>
-                  </tr>
-                  <tr>
-                    <td>Beschreibung:</td>
-                    <td>{{itemInfo.description}}</td>
-                  </tr>
-                </table>
-              </div>
-            </UCard>
-
-          </div>
-          <div class="w-1/2">
-            <UCard>
-              <HistoryDisplay
-                  type="space"
-                  v-if="itemInfo"
-                  render-headline
-                  :element-id="itemInfo.id"
-              />
-            </UCard>
-          </div>
-
-
-
-        </div>
-        <div v-else-if="item.label === 'Bestand'">
-          <UCard>
-            <div v-if="spaceProducts.length > 0">
-
-              <table class="w-full">
-                <tr>
-                  <th class="text-left">Artikel in diesem Lagerplatz</th>
-                  <th>Anzahl</th>
-                  <th>Einheit</th>
-                </tr>
-                <tr v-for="product in spaceProducts">
-                  <td>{{product.name}}</td>
-                  <td>{{getSpaceProductCount(product.id)}}</td>
-                  <td>{{dataStore.units.find(unit => unit.id === product.unit).name}}</td>
-                </tr>
-
-              </table>
-            </div>
-            <p v-else>Es befinden sich keine Artikel in diesem Lagerplatz</p>
-          </UCard>
-
-        </div>
-        <div v-else-if="item.label === 'Inventarartikel'">
-          <UAlert
-              description="Hier werden alle Inventarartikel in diesem Lagerplatz aufgelistet"
-              color="primary"
-              variant="outline"
-          />
-          <UTable
-              :rows="itemInfo.inventoryitems"
-              :columns="[{label:'Name',key:'name'}]"
-              @select="(row) => router.push(`/inventoryitems/show/${row.id}`)"
-          >
-
-          </UTable>
-        </div>
-      </template>
-    </UTabs>
-    <UForm
-        v-else-if="mode === 'edit' || mode === 'create'"
-        class="p-5"
-    >
-      <div class="flex flex-row">
-        <div class="w-1/2 mr-5">
-          <UDivider>
-            Allgemeines
-          </UDivider>
-          <UFormGroup
-              label="Typ:"
-          >
-            <USelectMenu
-                :options="spaceTypes"
-                v-model="itemInfo.type"
-            >
-
-            </USelectMenu>
-          </UFormGroup>
-          <UFormGroup
-              label="Übergeordneter Lagerplatz:"
-              v-if="itemInfo.type !== 'Standort'"
-          >
-            <USelectMenu
-                :options="spaces"
-                option-attribute="spaceNumber"
-                value-attribute="id"
-                v-model="itemInfo.parentSpace"
-            >
-
-            </USelectMenu>
-          </UFormGroup>
-        </div>
-        <div class="w-1/2" v-if="itemInfo.type === 'Standort'">
-          <UDivider>
-            Ort
-          </UDivider>
-          <UFormGroup
-              label="Straße + Hausnummer:"
-          >
-            <UInput
-                v-model="itemInfo.address.streetNumber"
-            />
-          </UFormGroup>
-          <UFormGroup
-              label="PLZ + Ort:"
-          >
-            <InputGroup class="w-full">
-              <UInput
-                  v-model="itemInfo.address.zip"
-                  placeholder="PLZ"
-                  @focusout="setCityByZip"
-              />
-              <UInput
-                  v-model="itemInfo.address.city"
-                  placeholder="Ort"
-                  class="flex-auto"
-                  :disabled="cityLoading"
-
-              />
-            </InputGroup>
-
-          </UFormGroup>
-        </div>
-      </div>
-
-
-      <UFormGroup
-          label="Beschreibung:"
-      >
-        <UTextarea
-            v-model="itemInfo.description"
-        />
-      </UFormGroup>
-    </UForm>
-  </UDashboardPanelContent>
-
-</template>
-
-<style scoped>
-td,th {
-  padding-right: 2em;
-  text-align: left;
-}
-
-td {
-  border-bottom: 1px solid lightgrey;
-  vertical-align: top;
-  padding-bottom: 0.15em;
-  padding-top: 0.15em;
-}
-</style>
\ No newline at end of file
diff --git a/deprecated/spaces/index.vue b/deprecated/spaces/index.vue
deleted file mode 100644
index 159b087..0000000
--- a/deprecated/spaces/index.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <UDashboardNavbar title="Lagerplätze" :badge="filteredRows.length">
-    <template #right>
-      <UInput
-          id="searchinput"
-          v-model="searchString"
-          icon="i-heroicons-funnel"
-          autocomplete="off"
-          placeholder="Suche..."
-          class="hidden lg:block"
-          @keydown.esc="$event.target.blur()"
-      >
-        <template #trailing>
-          <UKbd value="/" />
-        </template>
-      </UInput>
-
-      <UButton @click="router.push(`/spaces/create`)">+ Lagerplatz</UButton>
-    </template>
-  </UDashboardNavbar>
-
-  <UDashboardToolbar>
-    <template #right>
-      <USelectMenu
-          v-model="selectedColumns"
-          icon="i-heroicons-adjustments-horizontal-solid"
-          :options="templateColumns"
-          multiple
-          class="hidden lg:block"
-          by="key"
-      >
-        <template #label>
-          Spalten
-        </template>
-      </USelectMenu>
-    </template>
-  </UDashboardToolbar>
-  <UTable
-      :rows="filteredRows"
-      :columns="columns"
-      class="w-full"
-      :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-      @select="(i) => router.push(`/spaces/show/${i.id}`) "
-      :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Lagerplätze anzuzeigen' }"
-  >
-    <template #spaceNumber-data="{row}">
-      <span v-if="row === filteredRows[selectedItem]" class="text-primary-500 font-bold">{{row.spaceNumber}}</span>
-      <span v-else>{{row.spaceNumber}}</span>
-    </template>
-    <template #address-data="{row}">
-      <span>{{row.address.streetNumber ? `${row.address.streetNumber}, ${row.address.zip}${row.address.city}` : ''}}</span>
-    </template>
-  </UTable>
-
-</template>
-
-<script setup>
-
-definePageMeta({
-  middleware: "auth"
-})
-
-defineShortcuts({
-  '/': () => {
-    //console.log(searchinput)
-    //searchinput.value.focus()
-    document.getElementById("searchinput").focus()
-  },
-  '+': () => {
-    router.push("/spaces/create")
-  },
-  'Enter': {
-    usingInput: true,
-    handler: () => {
-      router.push(`/spaces/show/${filteredRows.value[selectedItem.value].id}`)
-    }
-  },
-  'arrowdown': () => {
-    if(selectedItem.value < filteredRows.value.length - 1) {
-      selectedItem.value += 1
-    } else {
-      selectedItem.value = 0
-    }
-  },
-  'arrowup': () => {
-    if(selectedItem.value === 0) {
-      selectedItem.value = filteredRows.value.length - 1
-    } else {
-      selectedItem.value -= 1
-    }
-  }
-})
-
-const dataStore = useDataStore()
-const router = useRouter()
-
-const items = ref([])
-const selectedItem = ref(0)
-
-const setupPage = async () => {
-  items.value = await useSupabaseSelect("spaces","*","spaceNumber")
-}
-
-setupPage()
-
-const templateColumns = [
-  {
-    key: 'spaceNumber',
-    label: "Lagerplatznr.",
-    sortable: true
-  },
-  {
-    key: "type",
-    label: "Typ",
-    sortable: true
-  },
-  {
-    key: "description",
-    label: "Beschreibung",
-    sortable: true
-  },
-  {
-    key: "address",
-    label: "Adresse",
-    sortable: true
-  }
-]
-const selectedColumns = ref(templateColumns)
-const columns = computed(() => templateColumns.filter((column) => selectedColumns.value.includes(column)))
-
-const searchString = ref('')
-const filteredRows = computed(() => {
-  return useSearch(searchString.value, items.value)
-})
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/users/[mode]/[[id]].vue b/deprecated/users/[mode]/[[id]].vue
deleted file mode 100644
index 08f498a..0000000
--- a/deprecated/users/[mode]/[[id]].vue
+++ /dev/null
@@ -1,453 +0,0 @@
-<script setup>
-import dayjs from "dayjs";
-
-definePageMeta({
-  middleware: "auth"
-})
-
-
-//TODO: Build User Page
-
-
-
-const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const supabase = useSupabaseClient()
-const route = useRoute()
-const router = useRouter()
-const toast = useToast()
-const id = ref(route.params.id ? route.params.id : null )
-
-let currentItem = null
-
-//Working
-const mode = ref(route.params.mode || "show")
-const itemInfo = ref({})
-
-const tabItems = [
-  {
-    label: "Informationen"
-  },{
-    label: "Zeiterfassung"
-  },{
-    label: "Rechte"
-  },
-]
-
-const timeSelection = ref("Heute")
-const timeColumns = [
-  {
-    key: "state",
-    label: "Status"
-  },{
-    key: "user",
-    label: "Benutzer"
-  },{
-    key: "start",
-    label: "Start"
-  },{
-    key: "end",
-    label: "Ende"
-  },{
-    key: "notes",
-    label: "Notizen"
-  },{
-    key: "projectId",
-    label: "Projekt"
-  },{
-    key: "duration",
-    label: "Dauer"
-  },
-]
-
-const filteredTimes = computed(() => {
-  let rows = dataStore.times
-  rows = rows.filter(i => i.user === currentItem.id)
-
-  if(timeSelection.value === 'Heute') {
-    rows = rows.filter(i => dayjs().isSame(i.start,'day'))
-  } else if(timeSelection.value === 'Diese Woche') {
-    rows = rows.filter(i => dayjs().isSame(i.start,'week'))
-  } else if(timeSelection.value === 'Dieser Monat') {
-    rows = rows.filter(i => dayjs().isSame(i.start,'month'))
-  } else if(timeSelection.value === 'Dieses Jahr') {
-    rows = rows.filter(i => dayjs().isSame(i.start,'year'))
-  } else if(timeSelection.value === 'Letztes Jahr') {
-    rows = rows.filter(i => dayjs().subtract(1,'year').isSame(i.start,'year'))
-  }
-
-  return rows
-})
-
-//Functions
-const setupPage = () => {
-  if(mode.value === "show" || mode.value === "edit"){
-    currentItem = profileStore.getProfileById(useRoute().params.id)
-  }
-
-  itemInfo.value = currentItem
-}
-
-const editItem = async () => {
-  router.push(`/users/edit/${currentItem.id}`)
-  setupPage()
-}
-
-const cancelEditorCreate = () => {
-  mode.value = "show"
-  itemInfo.value = {
-    id: 0,
-    infoData: {}
-  }
-}
-
-
-
-const getDuration = (time) => {
-  const dez = dayjs(time.end).diff(time.start,'hour',true).toFixed(2)
-  const hours = Math.floor(dez)
-  const minutes = Math.floor((dez - hours) * 60)
-  return {
-    dezimal: dez,
-    hours: hours,
-    minutes: minutes,
-    composed: `${hours}:${minutes}`
-  }
-}
-
-const getSelectionSum = computed(() => {
-  let times = filteredTimes.value
-  let sum = 0
-  let sumEntwurf = 0
-  let sumEingereicht = 0
-  let sumBestaetigt = 0
-
-  times.forEach(time => {
-    let duration = getDuration(time)
-
-    sum += Number(duration.dezimal)
-
-    if(time.state === 'Entwurf') {
-      sumEntwurf += Number(duration.dezimal)
-    } else if(time.state === 'Eingereicht') {
-      sumEingereicht += Number(duration.dezimal)
-    } else if(time.state === 'Bestätigt') {
-      sumBestaetigt += Number(duration.dezimal)
-    }
-  })
-
-  sum = sum.toFixed(2)
-  sumEntwurf = sumEntwurf.toFixed(2)
-  sumEingereicht = sumEingereicht.toFixed(2)
-  sumBestaetigt = sumBestaetigt.toFixed(2)
-
-  return {
-    sum,
-    sumEntwurf,
-    sumEingereicht,
-    sumBestaetigt
-  }
-})
-
-
-
-
-setupPage()
-</script>
-
-<template>
-  <div>
-    <UCard v-if="currentItem && mode == 'show'" >
-      <template #header>
-        {{currentItem.fullName}}
-      </template>
-
-      <UTabs :items="tabItems">
-        <template #item="{item}">
-          <div
-            v-if="item.label === 'Informationen'"
-            class="w-full"
-          >
-            <InputGroup class="w-full">
-              <div class="w-1/2 mr-5">
-                <UFormGroup
-                  label="Anrede"
-                >
-                  <UInput/>
-                </UFormGroup>
-
-                <InputGroup>
-                  <UFormGroup
-                      label="Vorname:"
-                      class="flex-auto"
-                  >
-                    <UInput
-                      v-model="itemInfo.firstName"
-                    />
-                  </UFormGroup>
-                  <UFormGroup
-                      label="Nachnahme:"
-                      class="flex-auto"
-                  >
-                    <UInput
-                        v-model="itemInfo.lastName"
-                    />
-                  </UFormGroup>
-                </InputGroup>
-
-                <UFormGroup
-                  label="Geburtsdatum"
-                >
-                  <UInput/>
-                </UFormGroup>
-                <UFormGroup
-                  label="Benutzername"
-                >
-                  <UInput
-                      v-model="itemInfo.username"
-                      disabled
-                  />
-                </UFormGroup>
-              </div>
-              <div class="w-1/2">
-                <UFormGroup
-                  label="E-Mail"
-                >
-                  <UInput/>
-                </UFormGroup>
-
-                <InputGroup>
-                  <UFormGroup
-                      label="Telefonnummer:"
-                      class="w-1/2"
-                  >
-                    <UInput/>
-                  </UFormGroup>
-                  <UFormGroup
-                      label="Mobilfunknummer:"
-                      class="w-1/2"
-                  >
-                    <UInput/>
-                  </UFormGroup>
-                </InputGroup>
-
-                <UFormGroup
-                  label="Straße & Hausnummer"
-                >
-                  <UInput
-                    class="flex-auto"
-                  />
-                </UFormGroup>
-
-                <InputGroup>
-                  <UFormGroup
-                      label="Postleitzahl:"
-                      class="w-40"
-                  >
-                    <UInput/>
-                  </UFormGroup>
-                  <UFormGroup
-                      label="Ort:"
-                      class="flex-auto"
-                  >
-                    <UInput/>
-                  </UFormGroup>
-                </InputGroup>
-              </div>
-            </InputGroup>
-            <UButton
-              class="mt-5"
-              @click="dataStore.updateItem('users',itemInfo)"
-            >
-              Speichern
-            </UButton>
-
-          </div>
-          <div v-else-if="item.label === 'Zeiterfassung'">
-            <UButtonGroup>
-              <UButton
-                @click="timeSelection = 'Heute'"
-                :variant="timeSelection === 'Heute' ? 'solid' : 'outline'"
-              >
-                Heute
-              </UButton>
-              <UButton
-                  @click="timeSelection = 'Diese Woche'"
-                  :variant="timeSelection === 'Diese Woche' ? 'solid' : 'outline'"
-              >
-                Diese Woche
-              </UButton>
-              <UButton
-                  @click="timeSelection = 'Dieser Monat'"
-                  :variant="timeSelection === 'Dieser Monat' ? 'solid' : 'outline'"
-              >
-                Dieser Monat
-              </UButton>
-              <UButton
-                  @click="timeSelection = 'Dieses Jahr'"
-                  :variant="timeSelection === 'Dieses Jahr' ? 'solid' : 'outline'"
-              >
-                Dieses Jahr
-              </UButton>
-              <UButton
-                  @click="timeSelection = 'Letztes Jahr'"
-                  :variant="timeSelection === 'Letztes Jahr' ? 'solid' : 'outline'"
-                  color="rose"
-              >
-                Letztes Jahr
-              </UButton>
-            </UButtonGroup>
-            <UButton
-              class="ml-3"
-              to="/employees/timetracking"
-            >
-              Zur Zeiterfassung
-            </UButton>
-
-            <InputGroup class="w-full">
-              <div>
-                Summe: {{getSelectionSum.sum}}<br>
-                Summe Entwurf: {{getSelectionSum.sumEntwurf}}<br>
-                Summe Eingereicht: {{getSelectionSum.sumEingereicht}}<br>
-                Summe Bestätigt: {{getSelectionSum.sumBestaetigt}}<br>
-              </div>
-            </InputGroup>
-
-            <UTable
-              :rows="filteredTimes"
-              :columns="timeColumns"
-            >
-              <template #state-data="{row}">
-                <span
-                  v-if="row.state === 'Entwurf'"
-                  class="text-rose-500"
-                >{{row.state}}</span>
-                <span
-                  v-if="row.state === 'Eingereicht'"
-                  class="text-cyan-500"
-                >{{row.state}}</span>
-                <span
-                  v-if="row.state === 'Bestätigt'"
-                  class="text-primary-500"
-                >{{row.state}}</span>
-              </template>
-              <template #start-data="{row}">
-                <div class="text-right">{{dayjs(row.start).format("DD.MM.YY HH:mm")}}</div>
-              </template>
-              <template #end-data="{row}">
-                <div class="text-right">{{dayjs(row.end).format("HH:mm")}}</div>
-              </template>
-              <template #user-data="{row}">
-                {{profileStore.getProfileById(row.user) ? profileStore.getProfileById(row.user).fullName : ""}}
-              </template>
-              <template #duration-data="{row}">
-                <div class="text-right">{{ getDuration(row).composed}} Std</div>
-              </template>
-              <template #projectId-data="{row}">
-                {{dataStore.getProjectById(row.projectId) ? dataStore.getProjectById(row.projectId).name : ""}}
-              </template>
-            </UTable>
-
-
-          </div>
-        </template>
-      </UTabs>
-
-
-
-
-
-
-
-
-
-      <template #footer>
-        <UButton
-            v-if="mode == 'show' && currentItem.id"
-            @click="editItem"
-        >
-          Bearbeiten
-        </UButton>
-      </template>
-
-
-
-    </UCard>
-    <UCard v-else-if="mode == 'edit' || mode == 'create'" >
-      <template #header>
-        {{itemInfo.title}}
-      </template>
-
-      <UFormGroup
-          label="Titel:"
-      >
-        <UInput
-            v-model="itemInfo.title"
-        />
-      </UFormGroup>
-
-      <UFormGroup
-          label="Status:"
-      >
-        <USelectMenu
-            v-model="itemInfo.state"
-            :options="states"
-        />
-      </UFormGroup>
-
-      <UFormGroup
-          label="Kundennummer:"
-      >
-        <USelectMenu
-            v-model="itemInfo.customer"
-            :options="dataStore.customers"
-            option-attribute="name"
-            value-attribute="id"
-            searchable
-            :search-attributes="['name']"
-        >
-          <template #label>
-            {{dataStore.customers.find(customer => customer.id === itemInfo.customer) ? dataStore.customers.find(customer => customer.id === itemInfo.customer).name : "Kunde auswählen"}}
-          </template>
-        </USelectMenu>
-      </UFormGroup>
-
-
-      <UFormGroup
-          label="Beschreibung:"
-      >
-        <UTextarea
-            v-model="itemInfo.description"
-        />
-      </UFormGroup>
-
-
-      <template #footer>
-        <UButton
-            v-if="mode == 'edit'"
-            @click="dataStore.updateItem('users',{...itemInfo, fullName: `${itemInfo.firstName} ${itemInfo.lastName}`})"
-        >
-          Speichern
-        </UButton>
-<!--        <UButton
-            v-else-if="mode == 'create'"
-            @click="dataStore.createItem()"
-        >
-          Erstellen
-        </UButton>-->
-        <UButton
-            @click="cancelEditorCreate"
-            color="red"
-            class="ml-2"
-        >
-          Abbrechen
-        </UButton>
-      </template>
-
-    </UCard>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/deprecated/users/index.vue b/deprecated/users/index.vue
deleted file mode 100644
index 57272df..0000000
--- a/deprecated/users/index.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<script setup lang="ts">
-definePageMeta({
-  middleware: "auth"
-})
-const dataStore = useDataStore()
-const router = useRouter()
-
-const columns = [
-  {
-    key:"fullName",
-    label: "Name",
-  },/*
-  {
-    key: "username",
-    label: "Benutzername"
-  },*/
-  {
-    key: "role",
-    label: "Rolle"
-  }
-]
-
-
-</script>
-
-<template>
-
-  <UTable
-    :rows="dataStore.profiles"
-    :columns="columns"
-    @select="(item) => router.push(`/users/show/${item.id}`)"
-  >
-
-  </UTable>
-
-  <DevOnly>
-    {{dataStore.profiles}}
-  </DevOnly>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file

From 156ca348aa0e6ab8866a20a01488d88fb0695c8e Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 28 Dec 2024 14:34:07 +0100
Subject: [PATCH 017/104] Tidying and Datatype Changes

---
 stores/data.js | 301 ++++++-------------------------------------------
 1 file changed, 33 insertions(+), 268 deletions(-)

diff --git a/stores/data.js b/stores/data.js
index 27c2e7d..222ab71 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -1134,6 +1134,38 @@ export const useDataStore = defineStore('data', () => {
                     selectSearchAttributes: ['name'],
                     selectMultiple: true
                 },
+                {
+                    key: "sellingPriceComposed.worker",
+                    label: "Verkaufspreis Personal pro Einheit",
+                    inputType: "number",
+                    inputChangeFunction: function (row) {
+                        if(row.sellingPriceComposed.worker) {
+                            row.sellingPriceComposed.total = row.sellingPriceComposed.worker + (row.sellingPriceComposed.material || 0)
+                            row.sellingPrice = row.sellingPriceComposed.total
+                        }
+                    },
+                },
+                {
+                    key: "sellingPriceComposed.material",
+                    label: "Verkaufspreis Material pro Einheit",
+                    inputType: "number",
+                    inputChangeFunction: function (row) {
+                        if(row.sellingPriceComposed.material) {
+                            row.sellingPriceComposed.total = (row.sellingPriceComposed.worker || 0) + row.sellingPriceComposed.material
+                            row.sellingPrice = row.sellingPriceComposed.total
+                        }
+                    },
+                },
+                {
+                    key: "sellingPriceComposed.total",
+                    label: "Verkaufspreis Gesamt",
+                    inputType: "number",
+                    disabledFunction: function (item) {
+                        return item.sellingPriceComposed.worker || item.sellingPriceComposed.material
+                    },
+                },
+
+
                 {
                     key: "description",
                     label: "Beschreibung",
@@ -1417,11 +1449,9 @@ export const useDataStore = defineStore('data', () => {
     const bankrequisitions = ref([])
     const historyItems = ref([])
     const notifications = ref([])
-    const absencerequests = ref([])
     const accounts = ref([])
     const taxTypes = ref([])
     const plants = ref([])
-    const inventoryitems = ref([])
     const chats = ref([])
     const messages = ref([])
     const createddocuments = ref([])
@@ -1429,8 +1459,6 @@ export const useDataStore = defineStore('data', () => {
     const phasesTemplates = ref([])
     const emailAccounts = ref([])
     const texttemplates =ref([])
-    const services =ref([])
-    const servicecategories =ref([])
     const resources =ref([])
 
     async function fetchData () {
@@ -1456,11 +1484,9 @@ export const useDataStore = defineStore('data', () => {
         await fetchBankRequisitions()
         await fetchHistoryItems()
         await fetchNotifications()
-        await fetchAbsenceRequests()
         await fetchAccounts()
         await fetchTaxTypes()
         await fetchPlants()
-        await fetchInventoryItems()
         await fetchChats()
         await fetchMessages()
         await fetchCreatedDocuments()
@@ -1468,8 +1494,6 @@ export const useDataStore = defineStore('data', () => {
         await fetchPhasesTemplates()
         await fetchEmailAccounts()
         await fetchTextTemplates()
-        await fetchServices()
-        await fetchServiceCategories()
         await fetchResources()
     }
 
@@ -1496,11 +1520,9 @@ export const useDataStore = defineStore('data', () => {
         bankrequisitions.value= []
         historyItems.value = []
         notifications.value = []
-        absencerequests.value = []
         accounts.value = []
         taxTypes.value = []
         plants.value = []
-        inventoryitems.value = []
         chats.value = []
         messages.value = []
         createddocuments.value = []
@@ -1508,8 +1530,6 @@ export const useDataStore = defineStore('data', () => {
         phasesTemplates.value = []
         emailAccounts.value = []
         texttemplates.value = []
-        services.value = []
-        servicecategories.value = []
         resources.value = []
     }
 
@@ -1885,7 +1905,7 @@ export const useDataStore = defineStore('data', () => {
 
             await generateHistoryItems(dataType, supabaseData[0])
 
-            if(!["statementallocations", "productcategories", "projecttypes", "checks"].includes(dataType) ){
+            if(!["statementallocations", "productcategories", "projecttypes", "checks", "profiles"].includes(dataType) ){
                 await eval( dataType + '.value.push(' + JSON.stringify(...supabaseData) + ')')
             }
 
@@ -2094,9 +2114,6 @@ export const useDataStore = defineStore('data', () => {
     async function fetchNotifications () {
         notifications.value = (await supabase.from("notifications").select().eq('tenant', profileStore.currentTenant).order("created_at", {ascending: false})).data
     }
-    async function fetchAbsenceRequests () {
-        absencerequests.value = (await supabase.from("absencerequests").select().eq('tenant', profileStore.currentTenant)).data
-    }
     async function fetchAccounts () {
         accounts.value = (await supabase.from("accounts").select()).data
     }
@@ -2106,9 +2123,6 @@ export const useDataStore = defineStore('data', () => {
     async function fetchPlants () {
         plants.value = (await supabase.from("plants").select().eq('tenant', profileStore.currentTenant)).data
     }
-    async function fetchInventoryItems () {
-        inventoryitems.value = (await supabase.from("inventoryitems").select().eq('tenant', profileStore.currentTenant)).data
-    }
     async function fetchChats() {
         chats.value = (await supabase.from("chats").select()).data
     }
@@ -2135,14 +2149,6 @@ export const useDataStore = defineStore('data', () => {
         texttemplates.value = (await supabase.from("texttemplates").select().eq('tenant', profileStore.currentTenant)).data
     }
 
-    async function fetchServices() {
-        services.value = (await supabase.from("services").select().eq('tenant', profileStore.currentTenant)).data
-    }
-
-    async function fetchServiceCategories() {
-        servicecategories.value = (await supabase.from("servicecategories").select().eq('tenant', profileStore.currentTenant)).data
-    }
-
     async function fetchResources() {
         resources.value = (await supabase.from("resources").select().eq('tenant', profileStore.currentTenant)).data
     }
@@ -2200,94 +2206,10 @@ export const useDataStore = defineStore('data', () => {
 
     //Getters
 
-    const getOpenTasksCount = computed(() => {
-        return tasks.value.filter(task => task.categorie != "Erledigt").length
-    })
-
-    const getMovementsBySpace = computed(() => (spaceId) => {
-        return movements.value.filter(movement => movement.spaceId === spaceId)
-    })
-
-    async function getContactsByCustomerId (itemId) {
-        return (await supabase.from("contacts").select().eq("customer", itemId)).data
-    }
-
-    const getPlantsByCustomerId = computed(() => (customerId) => {
-        return plants.value.filter(item => item.customer === customerId)
-    })
-
-    const getContractsByCustomerId = computed(() => (customerId) => {
-        return contracts.value.filter(item => item.customer === customerId)
-    })
-
-    const getContactsByVendorId = computed(() => (vendorId) => {
-        return contacts.value.filter(item => item.vendor === vendorId)
-    })
-
-    const getDocumentsByProjectId = computed(() => (projectId) => {
-        return documents.value.filter(item => item.project === projectId && !item.tags.includes("Archiviert"))
-    })
-
     const getDocumentsByProfileId = computed(() => (profileId) => {
         return documents.value.filter(item => item.profile === profileId && !item.tags.includes("Archiviert"))
     })
 
-    const getDocumentsByInventoryItemId = computed(() => (itemId) => {
-        return documents.value.filter(item => item.inventoryitem === itemId && !item.tags.includes("Archiviert"))
-    })
-
-    const getDocumentsByPlantId = computed(() => (itemId) => {
-        return documents.value.filter(item => item.plant === itemId && !item.tags.includes("Archiviert"))
-    })
-
-    const getDocumentsByContractId = computed(() => (itemId) => {
-        return documents.value.filter(item => item.contract === itemId && !item.tags.includes("Archiviert"))
-    })
-
-    const getDocumentsByCheckId = computed(() => (itemId) => {
-        return documents.value.filter(item => item.check === itemId && !item.tags.includes("Archiviert"))
-    })
-
-    const getDocumentsByVehicleId = computed(() => (itemId) => {
-        return documents.value.filter(item => item.vehicle === itemId && !item.tags.includes("Archiviert"))
-    })
-
-    const getDocumentsByProductId = computed(() => (itemId) => {
-        return documents.value.filter(item => item.product === itemId && !item.tags.includes("Archiviert"))
-    })
-
-    const getDocumentsByVendorId = computed(() => (itemId) => {
-        return documents.value.filter(item => item.vendor === itemId && !item.tags.includes("Archiviert"))
-    })
-
-    const getEventsByProjectId = computed(() => (projectId) => {
-        return events.value.filter(item => item.project === projectId)
-    })
-
-    const getTimesByProjectId = computed(() => (projectId) => {
-        return times.value.filter(time => time.projectId === projectId)
-    })
-
-    const getTasksByProjectId = computed(() => (projectId) => {
-        return tasks.value.filter(item => item.project === projectId)
-    })
-
-    const getTasksByPlantId = computed(() => (plantId) => {
-        return tasks.value.filter(item => item.plant === plantId)
-    })
-
-    const getProjectsByPlantId = computed(() => (plantId) => {
-        return projects.value.filter(item => item.plant === plantId)
-    })
-
-    const getIncomingInvoicesByVehicleId = computed(() => (vehicleId) => {
-        return incominginvoices.value.filter(i => i.accounts.find(a => a.costCentre === vehicleId))
-    })
-
-    const getMovementsBySpaceId = computed(() => (spaceId) => {
-        return movements.value.filter(movement => movement.spaceId === spaceId)
-    })
-
     const getMessagesByChatId = computed(() => (chatId) => {
         return messages.value.filter(i => i.destination === chatId)
     })
@@ -2307,18 +2229,6 @@ export const useDataStore = defineStore('data', () => {
         return texttemplates.value.filter(i => i.documentType === type)
     })
 
-    const getCreatedDocumentsByProject = computed(() => (project) => {
-        return createddocuments.value.filter(i => i.project === project)
-    })
-
-    const getCreatedDocumentsByType = computed(() => (type) => {
-        return createddocuments.value.filter(i => i.type === type)
-    })
-
-    const getWorkingTimesByProfileId = computed(() => (profileId) => {
-        return workingtimes.value.filter(i => i.profile === profileId)
-    })
-
     const getStartedWorkingTimes = computed(() => () => {
         return workingtimes.value.filter(i => !i.endDate)
     })
@@ -2335,39 +2245,6 @@ export const useDataStore = defineStore('data', () => {
         return count
     })
 
-    const getStocksByProjectId = computed(() => (projectId) => {
-        let projectMovements = movements.value.filter(movement => movement.projectId === projectId)
-
-        let projectProducts = [... new Set(projectMovements.map(i => i.productId))]
-
-        console.log(projectProducts)
-
-        let productStocks = []
-
-        projectProducts.forEach(product => {
-            let count = 0
-            let productMovements = movements.value.filter(i => i.productId === product && i.projectId && projectId)
-
-            productMovements.forEach(movement => {
-                count += movement.quantity
-            })
-
-            productStocks.push({
-                productId: product,
-                stock: count
-            })
-
-        })
-
-        /*let count = 0
-
-        projectMovements.forEach(movement => {
-            count += movement.quantity
-        })*/
-
-        return productStocks
-    })
-
     const getEventTypes = computed(() => {
         return profileStore.ownTenant.calendarConfig.eventTypes
     })
@@ -2380,10 +2257,6 @@ export const useDataStore = defineStore('data', () => {
         return profileStore.ownTenant.tags.documents
     })
 
-    const getMeasures = computed(() => {
-        return profileStore.ownTenant.measures
-    })
-
     const getResources = computed(() => {
         return [
             ...profiles.value.filter(i => i.tenant === profileStore.currentTenant).map(profile => {
@@ -2410,32 +2283,6 @@ export const useDataStore = defineStore('data', () => {
         ]
     })
 
-    const getResourcesList = computed(() => {
-        return [
-            ...profiles.value.filter(i => i.tenant === profileStore.currentTenant).map(profile => {
-                return {
-                    type: 'Mitarbeiter',
-                    title: profile.fullName,
-                    id: profile.id
-                }
-            }),
-            ...vehicles.value.map(vehicle => {
-                return {
-                    type: 'Fahrzeug',
-                    title: vehicle.licensePlate,
-                    id: vehicle.id
-                }
-            }),
-            ...inventoryitems.value.filter(i=> i.usePlanning).map(item => {
-                return {
-                    type: 'Inventar',
-                    title: item.name,
-                    id: item.id
-                }
-            })
-        ]
-    })
-
     const getEvents = computed(() => {
         return [
             ...events.value.map(event => {
@@ -2549,12 +2396,6 @@ export const useDataStore = defineStore('data', () => {
         ]
     })
 
-
-    //Get Item By Id
-    const getProductById = computed(() => (itemId) => {
-        return products.value.find(item => item.id === itemId)
-    })
-
     const getServiceById = computed(() => (itemId) => {
         return services.value.find(item => item.id === itemId)
     })
@@ -2567,54 +2408,26 @@ export const useDataStore = defineStore('data', () => {
         return incominginvoices.value.find(item => item.id === itemId)
     })
 
-    const getContractById = computed(() => (itemId) => {
-        return contracts.value.find(item => item.id === itemId)
-    })
-
     const getContactById = computed(() => (itemId) => {
         return contacts.value.find(item => item.id === itemId)
     })
 
-    const getVehicleById = computed(() => (itemId) => {
-        return vehicles.value.find(item => item.id === itemId)
-    })
-
     const getDocumentById = computed(() => (itemId) => {
         return documents.value.find(item => item.id === itemId)
     })
 
-    const getSpaceById = computed(() => (itemId) => {
-        return spaces.value.find(item => item.id === itemId)
-    })
-
     const getCustomerById = computed(() => (itemId) => {
         return customers.value.find(item => item.id === itemId)
     })
 
-    const getTaskById = computed(() => (itemId) => {
-        return tasks.value.find(item => item.id === itemId)
-    })
-
-    const getAbsenceRequestById = computed(() => (itemId) => {
-        return absencerequests.value.find(item => item.id === itemId)
-    })
-
     const getAccountById = computed(() => (accountId) => {
         return accounts.value.find(item => item.id === accountId)
     })
 
-    const getPlantById = computed(() => (plantId) => {
-        return plants.value.find(item => item.id === plantId)
-    })
-
     const getCreatedDocumentById = computed(() => (documentId) => {
         return createddocuments.value.find(item => item.id === documentId)
     })
 
-    const getInventoryItemById = computed(() => (itemId) => {
-        return inventoryitems.value.find(item => item.id === itemId)
-    })
-
     const getBankAccountById = computed(() => (itemId) => {
         return bankAccounts.value.find(item => item.id === itemId)
     })
@@ -2622,13 +2435,6 @@ export const useDataStore = defineStore('data', () => {
     const getWorkingTimeById = computed(() => (itemId) => {
         return workingtimes.value.find(item => item.id === itemId)
     })
-    const getOpenIncomingInvoices = computed(() => (itemId) => {
-
-        return incominginvoices.value.filter(i => bankstatements.value.filter(x => x.assignments.find(y => y.type === 'incomingInvoice' && y.id === i.id)).length === 0)
-
-        //return incominginvoices.value.filter(i => !i.paid)
-
-    })
 
     const getProjectById = computed(() => (itemId) => {
         if(projects.value.find(i => i.id === itemId)) {
@@ -2656,7 +2462,6 @@ export const useDataStore = defineStore('data', () => {
         dataTypes,
 
         //Data
-        events,
         customers,
         tasks,
         projects,
@@ -2678,11 +2483,9 @@ export const useDataStore = defineStore('data', () => {
         bankrequisitions,
         historyItems,
         notifications,
-        absencerequests,
         accounts,
         taxTypes,
         plants,
-        inventoryitems,
         chats,
         messages,
         createddocuments,
@@ -2690,8 +2493,6 @@ export const useDataStore = defineStore('data', () => {
         phasesTemplates,
         emailAccounts,
         texttemplates,
-        services,
-        servicecategories,
         documentTypesForCreation,
 
         //Functions
@@ -2704,64 +2505,28 @@ export const useDataStore = defineStore('data', () => {
         fetchDocuments,
         fetchWorkingTimes,
         //Getters
-        getOpenTasksCount,
-        getMovementsBySpace,
-        getContactsByCustomerId,
-        getPlantsByCustomerId,
-        getContractsByCustomerId,
-        getContactsByVendorId,
-        getDocumentsByProjectId,
         getDocumentsByProfileId,
-        getDocumentsByInventoryItemId,
-        getDocumentsByPlantId,
-        getDocumentsByContractId,
-        getDocumentsByCheckId,
-        getDocumentsByVehicleId,
-        getDocumentsByProductId,
-        getDocumentsByVendorId,
-        getEventsByProjectId,
-        getTimesByProjectId,
-        getTasksByProjectId,
-        getTasksByPlantId,
-        getProjectsByPlantId,
-        getMovementsBySpaceId,
         getMessagesByChatId,
         getTextTemplatesByDocumentType,
-        getCreatedDocumentsByProject,
-        getCreatedDocumentsByType,
-        getWorkingTimesByProfileId,
         getStartedWorkingTimes,
         getStockByProductId,
-        getStocksByProjectId,
-        getIncomingInvoicesByVehicleId,
         getEventTypes,
         getTimeTypes,
         getDocumentTags,
-        getMeasures,
         getResources,
-        getResourcesList,
         getEvents,
         getEventsByResource,
         getCostCentresComposed,
-        getProductById,
         getServiceById,
         getVendorById,
         getIncomingInvoiceById,
-        getContractById,
         getContactById,
-        getVehicleById,
         getDocumentById,
-        getSpaceById,
         getCustomerById,
-        getTaskById,
-        getAbsenceRequestById,
         getProjectById,
         getAccountById,
-        getPlantById,
         getCreatedDocumentById,
-        getInventoryItemById,
         getBankAccountById,
         getWorkingTimeById,
-        getOpenIncomingInvoices
     }
 })
\ No newline at end of file

From 334ee2f8972189738de492eb7beaa304aeb329f1 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 28 Dec 2024 14:34:25 +0100
Subject: [PATCH 018/104] Removed Big Comment

---
 pages/index.vue | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index df0bf44..54ed7ba 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -21,31 +21,7 @@
           <p v-for="time in dataStore.getStartedWorkingTimes()"><UIcon name="i-heroicons-check"/>{{profileStore.getProfileById(time.profile).fullName}}</p>
         </UDashboardCard>
 
-<!--TODO: Fix Card Table overflowing        <UDashboardCard
-          title="Offene Aufgaben"
-          v-if="dataStore.getOpenTasksCount > 0"
-          class="w-1/2 h-1/2"
-        >
-          <UTable
-            :rows="dataStore.tasks.filter(i => i.categorie !== 'Erledigt' && (i.profile === profileStore.activeProfile.id ||!i.profile))"
-            @select="(row) => router.push(`/tasks/show/${row.id}`)"
-            :columns="[
-                {
-                  key: 'categorie',
-                  label: 'Kategorie'
-                },{
-                  key: 'name',
-                  label: 'Name'
-                },
-            ]"
-          >
-            <template #categorie-data="{row}">
-              <span v-if="row.categorie === 'Dringend'" class="text-rose-500">{{row.categorie}}</span>
-              <span v-else-if="row.categorie === 'In Bearbeitung'" class="text-primary-500">{{row.categorie}}</span>
-              <span v-else>{{row.categorie}}</span>
-            </template>
-          </UTable>
-        </UDashboardCard>-->
+
         <UDashboardCard
             :ui="{ body: { padding: '!pb-3 !px-5' }}"
         >

From 98619a9082d948854c913295eb95eccde46eaf92 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 28 Dec 2024 14:41:50 +0100
Subject: [PATCH 019/104] Fixed Profile Edit

---
 pages/profiles/show/[id].vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pages/profiles/show/[id].vue b/pages/profiles/show/[id].vue
index 298eec8..46f1758 100644
--- a/pages/profiles/show/[id].vue
+++ b/pages/profiles/show/[id].vue
@@ -97,6 +97,15 @@ const isLight = computed({
     colorMode.preference = colorMode.value === 'dark' ? 'light' : 'dark'
   }
 })
+
+const saveProfile = async () => {
+  let data = {...itemInfo.value, fullName: itemInfo.value.firstName + ' ' + itemInfo.value.lastName}
+  delete data.checks
+  delete data.documents
+
+  await dataStore.updateItem('profiles',data,oldItemInfo.value)
+}
+
 </script>
 
 <template>
@@ -144,7 +153,7 @@ const isLight = computed({
         <div v-if="item.label === 'Informationen'">
           <Toolbar>
             <UButton
-                @click="dataStore.updateItem('profiles',{...itemInfo, fullName: itemInfo.firstName + ' ' + itemInfo.lastName},oldItemInfo)"
+                @click="saveProfile"
             >
               Speichern
             </UButton>
@@ -280,7 +289,7 @@ const isLight = computed({
         <div v-if="item.label === 'Vertragsdaten'">
           <Toolbar>
             <UButton
-                @click="dataStore.updateItem('profiles',itemInfo)"
+                @click="saveProfile"
             >
               Speichern
             </UButton>

From 4dcce6238f446cd839d605ddc7c3f84fd8328cf2 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 28 Dec 2024 14:44:07 +0100
Subject: [PATCH 020/104] Fixed Profile Edit

---
 pages/profiles/show/[id].vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pages/profiles/show/[id].vue b/pages/profiles/show/[id].vue
index 46f1758..99a5ac5 100644
--- a/pages/profiles/show/[id].vue
+++ b/pages/profiles/show/[id].vue
@@ -38,7 +38,6 @@ const emailSignature = ref(profileStore.activeProfile.emailSignature)
 const tiptapLoaded = ref(false)
 const contentSaved = ref(true)
 const contentChanged = async (content) => {
-  console.log(tiptapLoaded)
   emailSignature.value = content.html
   if(tiptapLoaded.value === true) {
     contentSaved.value = false
@@ -74,7 +73,6 @@ const addToNewsletter = async () => {
     }
   })
 
-  console.log(data)
 }
 
 const calcWeeklyWorkingHours = () => {

From 92ec684066c4a539c1887ce4c07c2fd4308f0bf5 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 30 Dec 2024 09:30:14 +0100
Subject: [PATCH 021/104] Added Rendering Components

---
 components/columnRenderings/address.vue             |  2 +-
 .../sellingPriceComposedMaterial.vue                | 13 +++++++++++++
 .../columnRenderings/sellingPriceComposedTotal.vue  | 13 +++++++++++++
 .../columnRenderings/sellingPriceComposedWorker.vue | 13 +++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 components/columnRenderings/sellingPriceComposedMaterial.vue
 create mode 100644 components/columnRenderings/sellingPriceComposedTotal.vue
 create mode 100644 components/columnRenderings/sellingPriceComposedWorker.vue

diff --git a/components/columnRenderings/address.vue b/components/columnRenderings/address.vue
index ef7072d..d4528c7 100644
--- a/components/columnRenderings/address.vue
+++ b/components/columnRenderings/address.vue
@@ -9,7 +9,7 @@ const props = defineProps({
 </script>
 
 <template>
-  <span v-if="props.row.infoData.streetNumber">{{props.row.infoData.streetNumber}},</span>
+  <span v-if="props.row.infoData.street">{{props.row.infoData.street}},</span>
   <span v-if="props.row.infoData.special">{{props.row.infoData.special}},</span>
   <span v-if="props.row.infoData.zip">{{props.row.infoData.zip}},</span>
   <span v-if="props.row.infoData.city">{{props.row.infoData.city}}</span>
diff --git a/components/columnRenderings/sellingPriceComposedMaterial.vue b/components/columnRenderings/sellingPriceComposedMaterial.vue
new file mode 100644
index 0000000..1be80c7
--- /dev/null
+++ b/components/columnRenderings/sellingPriceComposedMaterial.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span v-if="props.row.sellingPriceComposed">{{ useCurrency(props.row.sellingPriceComposed.material)}}</span>
+</template>
diff --git a/components/columnRenderings/sellingPriceComposedTotal.vue b/components/columnRenderings/sellingPriceComposedTotal.vue
new file mode 100644
index 0000000..b61279a
--- /dev/null
+++ b/components/columnRenderings/sellingPriceComposedTotal.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span v-if="props.row.sellingPriceComposed">{{ useCurrency(props.row.sellingPriceComposed.total) }}</span>
+</template>
diff --git a/components/columnRenderings/sellingPriceComposedWorker.vue b/components/columnRenderings/sellingPriceComposedWorker.vue
new file mode 100644
index 0000000..24f6135
--- /dev/null
+++ b/components/columnRenderings/sellingPriceComposedWorker.vue
@@ -0,0 +1,13 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span v-if="props.row.sellingPriceComposed">{{ useCurrency(props.row.sellingPriceComposed.worker) }}</span>
+</template>

From ee5ebfe0b9ff9aeabdad5109f24ef385aba4354f Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 30 Dec 2024 09:30:30 +0100
Subject: [PATCH 022/104] Changes in Standard Entity Components

---
 components/EntityEdit.vue | 41 ++++++++++++++++++++-------------------
 components/EntityList.vue |  4 ++--
 components/EntityShow.vue | 36 +++++++++++++++++++++++++++++-----
 3 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index 937a416..a932fe6 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -163,6 +163,7 @@ const contentChanged = (content, datapoint) => {
     </template>
   </UDashboardNavbar>
   <UDashboardPanelContent>
+    {{props.item}}
     <UForm
         class="p-5"
     >
@@ -190,7 +191,7 @@ const contentChanged = (content, datapoint) => {
             </template>
             <div v-if="datapoint.key.includes('.')">
               <UInput
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-if="['text','number'].includes(datapoint.inputType)"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -198,13 +199,13 @@ const contentChanged = (content, datapoint) => {
                   :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
               />
               <UToggle
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'bool'"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
               <USelectMenu
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'select'"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -220,7 +221,7 @@ const contentChanged = (content, datapoint) => {
                 </template>
               </USelectMenu>
               <UTextarea
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'textarea'"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -237,7 +238,7 @@ const contentChanged = (content, datapoint) => {
 
                 <template #panel="{ close }">
                   <LazyDatePicker
-                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                       v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
                       :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
                   />
@@ -252,7 +253,7 @@ const contentChanged = (content, datapoint) => {
             </div>
             <div v-else>
               <UInput
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-if="['text','number'].includes(datapoint.inputType)"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -260,13 +261,13 @@ const contentChanged = (content, datapoint) => {
                   :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
               />
               <UToggle
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'bool'"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
               <USelectMenu
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'select'"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -283,7 +284,7 @@ const contentChanged = (content, datapoint) => {
                 </template>
               </USelectMenu>
               <UTextarea
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'textarea'"
                   v-model="props.item[datapoint.key]"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -299,7 +300,7 @@ const contentChanged = (content, datapoint) => {
 
                 <template #panel="{ close }">
                   <LazyDatePicker
-                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                       v-model="props.item[datapoint.key]" @close="close"
                       :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
                   />
@@ -351,7 +352,7 @@ const contentChanged = (content, datapoint) => {
         </template>
         <div v-if="datapoint.key.includes('.')">
           <UInput
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-if="['text','number'].includes(datapoint.inputType)"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -359,13 +360,13 @@ const contentChanged = (content, datapoint) => {
               :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
           />
           <UToggle
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'bool'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
           />
           <USelectMenu
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'select'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -381,7 +382,7 @@ const contentChanged = (content, datapoint) => {
             </template>
           </USelectMenu>
           <UTextarea
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -398,7 +399,7 @@ const contentChanged = (content, datapoint) => {
 
             <template #panel="{ close }">
               <LazyDatePicker
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
@@ -413,7 +414,7 @@ const contentChanged = (content, datapoint) => {
         </div>
         <div v-else>
           <UInput
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-if="['text','number'].includes(datapoint.inputType)"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -421,13 +422,13 @@ const contentChanged = (content, datapoint) => {
               :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
           />
           <UToggle
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'bool'"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
           />
           <USelectMenu
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'select'"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -444,7 +445,7 @@ const contentChanged = (content, datapoint) => {
             </template>
           </USelectMenu>
           <UTextarea
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="props.item[datapoint.key]"
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
@@ -460,7 +461,7 @@ const contentChanged = (content, datapoint) => {
 
             <template #panel="{ close }">
               <LazyDatePicker
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
                   v-model="props.item[datapoint.key]" @close="close"
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
               />
diff --git a/components/EntityList.vue b/components/EntityList.vue
index 3cd3bfb..6763f41 100644
--- a/components/EntityList.vue
+++ b/components/EntityList.vue
@@ -19,12 +19,12 @@ defineShortcuts({
     document.getElementById("searchinput").focus()
   },
   '+': () => {
-    router.push(`/${type}/create`)
+    router.push(`/standardEntity/${type}/create`)
   },
   'Enter': {
     usingInput: true,
     handler: () => {
-      router.push(`/${type}/show/${filteredRows.value[selectedItem.value].id}`)
+      router.push(`/standardEntity/${type}/show/${filteredRows.value[selectedItem.value].id}`)
     }
   },
   'arrowdown': () => {
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 41e0c62..8e93082 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -35,6 +35,7 @@ defineShortcuts({
 const router = useRouter()
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
+const supabase = useSupabaseClient()
 
 const dataType = dataStore.dataTypes[type]
 
@@ -52,7 +53,7 @@ setup()
 const openTab = ref(0)
 
 const renderedPhases = computed(() => {
-
+  console.log(props.item.phases)
   if(type === "projects" && props.item.phases) {
     return props.item.phases.map((phase,index,array) => {
 
@@ -81,7 +82,32 @@ const renderedPhases = computed(() => {
   }
 })
 
+const changeActivePhase = async (key) => {
+  let item = await useSupabaseSelectSingle("projects",props.item.id,'*')
 
+  let phaseLabel = ""
+
+  item.phases = item.phases.map(p => {
+    if(p.active) p.active = false
+
+    if(p.key === key) {
+      p.active = true
+      p.activated_at = dayjs().format()
+      p.activated_by = profileStore.activeProfile.id
+      phaseLabel = p.label
+    }
+
+    return p
+  })
+
+  await supabase.from("projects").update({phases: item.phases}).eq("id",item.id)
+  const {error} = await supabase.from("historyitems").insert({
+    createdBy: profileStore.activeProfile.id,
+    tenant: profileStore.currentTenant,
+    text: `Aktive Phase zu "${phaseLabel}" gewechselt`,
+    project: item.id
+  })
+}
 
 </script>
 
@@ -321,7 +347,7 @@ const renderedPhases = computed(() => {
             <template #item="{item, index}">
               <UCard class="mx-5">
                 <template #header>
-                  <span class="text-black">{{item.label}}</span>
+                  <span class="dark:text-white text-black">{{item.label}}</span>
                 </template>
                 <InputGroup>
                   <!-- TODO: Reactive Change Phase                  -->
@@ -341,9 +367,9 @@ const renderedPhases = computed(() => {
                 </InputGroup>
 
                 <div>
-                  <p v-if="item.activated_at" class="text-black">Aktiviert am: {{dayjs(item.activated_at).format("DD.MM.YY HH:mm")}} Uhr</p>
-                  <p v-if="item.activated_by" class="text-black">Aktiviert durch: {{profileStore.getProfileById(item.activated_by).fullName}}</p>
-                  <p v-if="item.description" class="text-black">Beschreibung: {{item.description}}</p>
+                  <p v-if="item.activated_at" class="dark:text-white text-black">Aktiviert am: {{dayjs(item.activated_at).format("DD.MM.YY HH:mm")}} Uhr</p>
+                  <p v-if="item.activated_by" class="dark:text-white text-black">Aktiviert durch: {{profileStore.getProfileById(item.activated_by).fullName}}</p>
+                  <p v-if="item.description" class="dark:text-white text-black">Beschreibung: {{item.description}}</p>
                 </div>
               </UCard>
 

From cd463bd1d1d276faac2123ba01de742841849fe2 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 30 Dec 2024 09:30:47 +0100
Subject: [PATCH 023/104] Added Billing to Nav

---
 components/MainNav.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/MainNav.vue b/components/MainNav.vue
index e752188..61cf0d8 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -230,6 +230,11 @@ const links = computed(() => {
       icon: "i-heroicons-cog-8-tooth",
       children: [
         {
+          label: "Abrechnung",
+          to: "https://billing.stripe.com/p/login/cN29Eb32Vdx0gOk288",
+          icon: "i-heroicons-clipboard-document-list",
+          target: "_blank"
+        },{
           label: "Nummernkreise",
           to: "/settings/numberRanges",
           icon: "i-heroicons-clipboard-document-list"
@@ -355,6 +360,7 @@ const links = computed(() => {
               v-for="child in item.children"
               class="ml-4"
               :to="child.to"
+              :target="child.target"
           >
             {{child.label}}
           </UButton>

From 9884a08e83235f74df8a2a9e2199072c93f08e70 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 30 Dec 2024 09:31:03 +0100
Subject: [PATCH 024/104] Tidying in Document Display

---
 components/DocumentDisplay.vue | 50 ----------------------------------
 1 file changed, 50 deletions(-)

diff --git a/components/DocumentDisplay.vue b/components/DocumentDisplay.vue
index e506a33..c7d1e2f 100644
--- a/components/DocumentDisplay.vue
+++ b/components/DocumentDisplay.vue
@@ -51,50 +51,11 @@ const updateDocument = async () => {
     console.log(error)
   } else {
     toast.add({title: "Dokument aktualisiert"})
-    dataStore.fetchDocuments()
     //openShowModal.value = false
   }
 
 }
 
-const createVendorInvoice = async () => {
-  const {data:vendorInvoiceData,error:vendorInvoiceError} = await supabase
-      .from("incominginvoices")
-      .insert([{
-        document: documentData.id,
-        tenant: profileStore.currentTenant
-      }])
-      .select()
-  if(vendorInvoiceError) {
-    console.log(vendorInvoiceError)
-  } else if(vendorInvoiceData) {
-
-    const {data:documentUpdateData,error:documentError} = await supabase
-        .from("documents")
-        .update({
-          vendorInvoice: vendorInvoiceData[0].id
-        })
-        .eq('id',documentData.id)
-        .select()
-
-    if(documentError) {
-      console.log(documentError)
-    } else {
-      toast.add({title: "Dokument aktualisiert"})
-      dataStore.fetchDocuments()
-      openShowModal.value = false
-    }
-
-
-
-
-    dataStore.fetchIncomingInvoices()
-    await router.push("/receipts")
-  }
-
-}
-
-
 const archiveDocument = () => {
   documentData.tags.push("Archiviert")
   updateDocument()
@@ -238,18 +199,7 @@ const updateDocumentAssignment = async () => {
           >
             Öffnen
           </UButton>
-<!--          <UButton
-              v-if="documentData.tags.includes('Eingangsrechnung')"
-              @click="createVendorInvoice"
-          >
-            Eingangsrechnung erstellen
-          </UButton>-->
         </UButtonGroup>
-<!--        <br>
-        <a
-          :href="documentData.url"
-          target="_blank"
-        >In neuen Tab anzeigen</a>-->
 
         <UFormGroup
           label="Tags ändern:"

From da3dc1e663a3a64411b5ef078137f2d8f2a50112 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 30 Dec 2024 09:31:28 +0100
Subject: [PATCH 025/104] DataType Changes

---
 stores/data.js | 120 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 91 insertions(+), 29 deletions(-)

diff --git a/stores/data.js b/stores/data.js
index 222ab71..0c615e1 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -25,6 +25,9 @@ import profile from "~/components/columnRenderings/profile.vue";
 import profiles from "~/components/columnRenderings/profiles.vue";
 import vehicle from "~/components/columnRenderings/vehicle.vue"
 import usePlanning from "~/components/columnRenderings/usePlanning.vue"
+import sellingPriceComposedMaterial from "~/components/columnRenderings/sellingPriceComposedMaterial.vue"
+import sellingPriceComposedWorker from "~/components/columnRenderings/sellingPriceComposedWorker.vue"
+import sellingPriceComposedTotal from "~/components/columnRenderings/sellingPriceComposedTotal.vue"
 
 import quantity from "~/components/helpRenderings/quantity.vue"
 import {useZipCheck} from "~/composables/useZipCheck.js";
@@ -230,48 +233,93 @@ export const useDataStore = defineStore('data', () => {
         contacts: {
             label: "Kontakte",
             labelSingle: "Kontakt",
+            isStandardEntity: true,
             redirect:true,
             historyItemHolder: "contact",
+            supabaseSelectWithInformation: "*, customer(*), vendor(*)",
             filters: [],
             templateColumns: [
                 {
                     key: "fullName",
                     label: "Name",
-                },
-                {
-                    key: "customer",
-                    label: "Kunde",
-                    component: customer
-                },
-                {
-                    key: "vendor",
-                    label: "Lieferant",
-                    component: vendor
-                },
-                {
-                    key: "role",
-                    label: "Rolle",
-                },
-                {
-                    key: "email",
-                    label: "E-Mail",
-                },
-                {
-                    key: "phoneMobile",
-                    label: "Mobil",
-                },
-                {
-                    key: "phoneHome",
-                    label: "Festnetz",
+                    title: true,
+                },{
+                    key: "salutation",
+                    label: "Anrede",
+                    inputType: "text",
+                },{
+                    key: "firstName",
+                    label: "Vorname",
+                    inputType: "text",
+                    inputChangeFunction: function (row) {
+                        row.fullName = `${row.firstName} ${row.lastName}`
+                    }
+                },{
+                    key: "lastName",
+                    label: "Nachname",
+                    inputType: "text",
+                    inputChangeFunction: function (row) {
+                        row.fullName = `${row.firstName} ${row.lastName}`
+                    }
                 },
                 {
                     key: "active",
                     label: "Aktiv",
-                    component: active
+                    component: active,
+                    inputType: "bool"
+                },
+                {
+                    key: "customer",
+                    label: "Kunde",
+                    component: customer,
+                    inputType: "select",
+                    selectDataType: "customers",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },
+                {
+                    key: "vendor",
+                    label: "Lieferant",
+                    component: vendor,
+                    inputType: "select",
+                    selectDataType: "vendors",
+                    selectOptionAttribute: "name",
+                    selectSearchAttributes: ['name'],
+                },
+                {
+                    key: "role",
+                    label: "Rolle",
+                    inputType: "text"
+                },
+                {
+                    key: "email",
+                    label: "E-Mail",
+                    inputType: "text",
+                },
+                {
+                    key: "phoneMobile",
+                    label: "Mobil",
+                    inputType: "text",
+                },
+                {
+                    key: "phoneHome",
+                    label: "Festnetz",
+                    inputType: "text",
                 },
                 {
                     key: "birtday",
                     label: "Geburtstag",
+                    inputType: "date",
+                },
+                {
+                    key: "notes",
+                    label: "Notizen",
+                    inputType: "textarea",
+                },
+            ],
+            showTabs:[
+                {
+                    label: 'Informationen',
                 }
             ]
         },
@@ -574,6 +622,9 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "projecttypes",
                     selectOptionAttribute: "name",
                     selectSearchAttributes: ['name'],
+                    inputChangeFunction: function (item,loadedOptions = {}) {
+                        item.phases = loadedOptions.projecttypes.find(i => i.id === item.projecttype).initialPhases
+                    }
                 },{
                     key: "phase",
                     label: "Phase"
@@ -1102,6 +1153,7 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect: true,
             supabaseSelectWithInformation: "*, unit(*)",
+            historyItemHolder: "service",
             filters: [],
             templateColumns: [
                 {
@@ -1144,6 +1196,7 @@ export const useDataStore = defineStore('data', () => {
                             row.sellingPrice = row.sellingPriceComposed.total
                         }
                     },
+                    component: sellingPriceComposedWorker
                 },
                 {
                     key: "sellingPriceComposed.material",
@@ -1155,14 +1208,23 @@ export const useDataStore = defineStore('data', () => {
                             row.sellingPrice = row.sellingPriceComposed.total
                         }
                     },
+                    component: sellingPriceComposedMaterial
                 },
                 {
                     key: "sellingPriceComposed.total",
                     label: "Verkaufspreis Gesamt",
                     inputType: "number",
-                    disabledFunction: function (item) {
+                    /*disabledFunction: function (item) {
                         return item.sellingPriceComposed.worker || item.sellingPriceComposed.material
+                    },*/
+                    inputChangeFunction: function (row) {
+                        if(row.sellingPriceComposed.worker) {
+                            row.sellingPriceComposed.material = row.sellingPriceComposed.total - row.sellingPriceComposed.worker
+                        } else if(row.sellingPriceComposed.material) {
+                            row.sellingPriceComposed.worker = row.sellingPriceComposed.total - row.sellingPriceComposed.material
+                        }
                     },
+                    component: sellingPriceComposedTotal
                 },
 
 
@@ -1905,7 +1967,7 @@ export const useDataStore = defineStore('data', () => {
 
             await generateHistoryItems(dataType, supabaseData[0])
 
-            if(!["statementallocations", "productcategories", "projecttypes", "checks", "profiles"].includes(dataType) ){
+            if(!["statementallocations", "productcategories", "projecttypes", "checks", "profiles","services"].includes(dataType) ){
                 await eval( dataType + '.value.push(' + JSON.stringify(...supabaseData) + ')')
             }
 

From a55d4817bd1313a9e08270405d165cbf9546b13b Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 30 Dec 2024 09:32:44 +0100
Subject: [PATCH 026/104] Changes in CreatedDocuments Edit

---
 pages/createDocument/edit/[[id]].vue | 731 +++++++++++++--------------
 1 file changed, 361 insertions(+), 370 deletions(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 8e64697..34ae996 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -6,7 +6,6 @@ import { v4 as uuidv4 } from 'uuid';
 
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
-const user = useSupabaseUser()
 const route = useRoute()
 const router = useRouter()
 const supabase = useSupabaseClient()
@@ -63,7 +62,6 @@ const itemInfo = ref({
 })
 
 
-
 const letterheads = ref([])
 const createdDocuments = ref([])
 const projects = ref([])
@@ -189,6 +187,7 @@ const setupPage = async () => {
 
 }
 
+setupPage()
 const openAdvanceInvoices = ref([])
 const checkForOpenAdvanceInvoices = async () => {
   const {data,error} = await supabase.from("createddocuments").select().eq("project", itemInfo.value.project).eq("advanceInvoiceResolved", false).eq("type","advanceInvoices")
@@ -473,8 +472,8 @@ const documentTotal = computed(() => {
 
 
   return {
-    totalNet: `${String(totalNet.toFixed(2)).replace(".",",")} €`,
-    total19: `${String(total19.toFixed(2)).replace(".",",")} €`,
+    totalNet: renderCurrency(totalNet),
+    total19: renderCurrency(total19),
     totalGross: renderCurrency(totalGross),
     totalGrossAlreadyPaid: renderCurrency(totalGrossAlreadyPaid),
     totalSumToPay: renderCurrency(sumToPay)
@@ -559,7 +558,7 @@ const getDocumentData = () => {
 
     if(!['pagebreak','title','text'].includes(row.mode)) {
       if(row.mode === 'normal') row.text = products.value.find(i => i.id === row.product).name
-      if(row.mode === 'service') row.text = dataStore.getServiceById(row.service).name
+      if(row.mode === 'service') row.text = services.value.find(i => i.id === row.service).name
 
 
       return {
@@ -636,13 +635,26 @@ const generateDocument = async () => {
   const ownTenant = profileStore.ownTenant
   const path = letterheads.value.find(i => i.id === itemInfo.value.letterhead).path
 
+  const {data,error} = await supabase.functions.invoke('create_pdf',{
+    body: {
+      invoiceData: getDocumentData(),
+      backgroundPath: path,
+      returnMode: "base64"
+    }
+  })
 
-  const {data,error} = await supabase.storage.from("files").download(path)
+
+
+  //const {data,error} = await supabase.storage.from("files").download(path)
 
   //console.log(data)
   //console.log(error)
 
-  uri.value = await useCreatePdf(getDocumentData(), await data.arrayBuffer())
+  //console.log(JSON.stringify(getDocumentData()))
+
+  uri.value = `data:${data.mimeType};base64,${data.base64}`
+
+  //uri.value = await useCreatePdf(getDocumentData(), await data.arrayBuffer())
   //alert(uri.value)
   showDocument.value = true
   //console.log(uri.value)
@@ -821,7 +833,23 @@ const closeDocument = async () => {
   //console.log(uri)
 }
 
-setupPage()
+const setRowData = (row) => {
+  if(row.service) {
+    row.unit = services.value.find(i => i.id === row.service).unit
+    row.price = services.value.find(i => i.id === row.service).sellingPriceComposed.total || services.value.find(i => i.id === row.service).sellingPrice
+    row.description = services.value.find(i => i.id === row.service).description
+  }
+
+  if(row.product) {
+    row.unit = services.value.find(i => i.id === row.service).unit
+    row.price = services.value.find(i => i.id === row.service).sellingPriceComposed.total || services.value.find(i => i.id === row.service).sellingPrice
+    row.description = services.value.find(i => i.id === row.service).description
+  }
+
+
+}
+
+
 </script>
 
 <template>
@@ -854,8 +882,6 @@ setupPage()
   <UDashboardPanelContent>
     <UTabs class="p-5" :items="tabItems" @change="onChangeTab" v-if="loaded">
       <template #item="{item}">
-
-
         <div v-if="item.label === 'Editor'">
 
           <UAlert
@@ -878,29 +904,6 @@ setupPage()
 
           <InputGroup>
             <div class="w-1/3 mr-5">
-              <UFormGroup
-                v-if="itemInfo.linkedDocument"
-                label="Verknüpftes Dokument:"
-              >
-                <InputGroup class="w-full">
-                  <USelectMenu
-                      class="flex-auto"
-                      :options="createdDocuments"
-                      v-model="itemInfo.linkedDocument"
-                      option-attribute="documentNumber"
-                      value-attribute="id"
-                      disabled
-                  />
-                  <UButton
-                      variant="outline"
-                      color="rose"
-                      v-if="itemInfo.linkedDocument"
-                      icon="i-heroicons-x-mark"
-                      @click="itemInfo.linkedDocument = null"
-                  />
-                </InputGroup>
-
-              </UFormGroup>
               <UFormGroup
                   label="Dokumenttyp:"
               >
@@ -910,7 +913,7 @@ setupPage()
                       v-model="itemInfo.type"
                       value-attribute="type"
                       option-attribute="label"
-                      @change="setDocumentTypeConfig"
+                      @input="setDocumentTypeConfig"
                       class="flex-auto"
                   >
                     <template #label>
@@ -1005,7 +1008,7 @@ setupPage()
                       searchable
                       searchable-placeholder="Suche..."
                       v-model="itemInfo.customer"
-                      @change="setCustomerData"
+                      @input="setCustomerData"
                       class="flex-auto mr-2"
                   >
                     <UButton
@@ -1013,14 +1016,10 @@ setupPage()
                         variant="outline"
                         class="w-full"
                     >
-<!--                      <span class="truncate text-left">{{dataStore.getCustomerById(itemInfo.customer) ? dataStore.getCustomerById(itemInfo.customer).name : "Kein Kunde ausgewählt"}}</span>-->
                       {{dataStore.getCustomerById(itemInfo.customer) ? dataStore.getCustomerById(itemInfo.customer).name : "Kein Kunde ausgewählt"}}
 
                       <UIcon name="i-heroicons-chevron-right-20-solid" class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500" :class="['transform rotate-90']" />
                     </UButton>
-                    <!--                    <template #label>
-                                          {{dataStore.getCustomerById(itemInfo.customer) ? dataStore.getCustomerById(itemInfo.customer).name : "Kein Kunde ausgewählt"}}
-                                        </template>-->
                   </USelectMenu>
                   <UButton
                       variant="outline"
@@ -1200,7 +1199,7 @@ setupPage()
                     v-model="itemInfo.contactPerson"
                     option-attribute="fullName"
                     value-attribute="id"
-                    @change="setContactPersonData"
+                    @input="setContactPersonData"
                 />
               </UFormGroup>
               <UFormGroup
@@ -1231,7 +1230,7 @@ setupPage()
                       :search-attributes="['name']"
                       class="w-full"
                       :disabled="!itemInfo.customer"
-                      @change="checkForOpenAdvanceInvoices"
+                      @input="checkForOpenAdvanceInvoices"
                   >
                     <template #label>
                       {{dataStore.getProjectById(itemInfo.project) ? dataStore.getProjectById(itemInfo.project).name : "Kein Projekt ausgewählt"}}
@@ -1401,366 +1400,360 @@ setupPage()
                 <th v-if="itemInfo.type !== 'deliveryNotes'">Gesamt</th>
               </tr>
             </thead>
-            <tbody>
-              <draggable
-                  v-model="itemInfo.rows"
-                  handle=".handle"
-                  tag="tbody"
-                  itemKey="pos"
-                  @end="setPosNumbers"
-              >
-                <template #item="{element: row}">
-                  <tr>
-                    <td>
-                      <UIcon
-                          class="handle"
-                          name="i-mdi-menu"
-                      />
-                    </td>
-                    <td
-                        v-if="row.mode === 'pagebreak'"
-                        colspan="9"
-                    >
-                      <UDivider/>
-                    </td>
-                    <td
-                        v-if="row.mode === 'text'"
-                        colspan="9"
-                    >
-                      <UInput
-                          v-model="row.text"
-                          placeholder="Titel"
-                          maxlength="60"
-                      />
-                      <UTextarea
-                          class="mt-2"
-                          v-model="row.description"
-                          placeholder="Text"
-                      />
-                    </td>
-                    <td
-                        v-if="!['pagebreak','text'].includes(row.mode)"
-                    >{{row.pos}}</td>
-                    <td
-                        class="w-120"
-                        v-if="row.mode === 'free'"
-                    >
-                      <UInput
-                          v-model="row.text"
-                          placeholder="Name"
-                          class="min-w-40"
-                      />
-                    </td>
-                    <td
-                        class="w-120"
-                        v-else-if="row.mode === 'normal'"
-                    >
-                      <InputGroup class="w-full">
-                        <USelectMenu
-                            class="flex-auto"
-                            :options="products"
-                            :color="row.product ? 'primary' : 'rose'"
-                            option-attribute="name"
-                            value-attribute="id"
-                            searchable
-                            searchable-placeholder="Suche ..."
-                            :search-attributes="['name']"
-                            v-model="row.product"
-                            @change="row.unit = products.find(i => i.id === row.product).unit,
+            <draggable
+                v-model="itemInfo.rows"
+                handle=".handle"
+                tag="tbody"
+                itemKey="pos"
+                @end="setPosNumbers"
+            >
+              <template #item="{element: row}">
+                <tr>
+                  <td>
+                    <UIcon
+                        class="handle"
+                        name="i-mdi-menu"
+                    />
+                  </td>
+                  <td
+                      v-if="row.mode === 'pagebreak'"
+                      colspan="9"
+                  >
+                    <UDivider/>
+                  </td>
+                  <td
+                      v-if="row.mode === 'text'"
+                      colspan="9"
+                  >
+                    <UInput
+                        v-model="row.text"
+                        placeholder="Titel"
+                        maxlength="60"
+                    />
+                    <UTextarea
+                        class="mt-2"
+                        v-model="row.description"
+                        placeholder="Text"
+                    />
+                  </td>
+                  <td
+                      v-if="!['pagebreak','text'].includes(row.mode)"
+                  >{{row.pos}}</td>
+                  <td
+                      class="w-120"
+                      v-if="row.mode === 'free'"
+                  >
+                    <UInput
+                        v-model="row.text"
+                        placeholder="Name"
+                        class="min-w-40"
+                    />
+                  </td>
+                  <td
+                      class="w-120"
+                      v-else-if="row.mode === 'normal'"
+                  >
+                    <InputGroup class="w-full">
+                      <USelectMenu
+                          class="flex-auto"
+                          :options="products"
+                          :color="row.product ? 'primary' : 'rose'"
+                          option-attribute="name"
+                          value-attribute="id"
+                          searchable
+                          searchable-placeholder="Suche ..."
+                          :search-attributes="['name']"
+                          v-model="row.product"
+                          @input="row.unit = products.find(i => i.id === row.product).unit,
                                row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
                                row.description = products.find(i => i.id === row.product).description"
-                        >
-                          <template #label>
-                            <span class="truncate">{{row.product ? products.find(i => i.id === row.product).name : "Kein Produkt ausgewählt" }}</span>
+                      >
+                        <template #label>
+                          <span class="truncate">{{row.product ? products.find(i => i.id === row.product).name : "Kein Produkt ausgewählt" }}</span>
+                        </template>
+                      </USelectMenu>
+                      <UButton
+                          icon="i-heroicons-magnifying-glass"
+                          @click="showProductSelectionModal = true"
+                      />
+                      <UModal v-model="showProductSelectionModal">
+                        <UCard>
+                          <template #header>
+                            Artikel Auswählen
                           </template>
-                        </USelectMenu>
-                        <UButton
-                            icon="i-heroicons-magnifying-glass"
-                            @click="showProductSelectionModal = true"
-                        />
-                        <UModal v-model="showProductSelectionModal">
-                          <UCard>
-                            <template #header>
-                              Artikel Auswählen
-                            </template>
 
-                            <InputGroup class="w-full">
-                              <UFormGroup label="Artikelkategorie:">
-                                <USelectMenu
-                                    v-if="productcategories.length > 0"
-                                    :options="[{name: 'Nicht zugeordnet',id:'not set'},...productcategories]"
-                                    value-attribute="id"
-                                    option-attribute="name"
-                                    v-model="selectedProductcategorie"
-                                />
-                              </UFormGroup>
-                            </InputGroup>
-                            <UTable
-                                :rows="selectedProductcategorie !== 'not set' ? products.filter(i => i.productcategories.includes(selectedProductcategorie)) : products.filter(i => i.productcategories.length === 0)"
-                                :columns="[
+                          <InputGroup class="w-full">
+                            <UFormGroup label="Artikelkategorie:">
+                              <USelectMenu
+                                  v-if="productcategories.length > 0"
+                                  :options="[{name: 'Nicht zugeordnet',id:'not set'},...productcategories]"
+                                  value-attribute="id"
+                                  option-attribute="name"
+                                  v-model="selectedProductcategorie"
+                              />
+                            </UFormGroup>
+                          </InputGroup>
+                          <UTable
+                              :rows="selectedProductcategorie !== 'not set' ? products.filter(i => i.productcategories.includes(selectedProductcategorie)) : products.filter(i => i.productcategories.length === 0)"
+                              :columns="[
                                   {key: 'name',label:'Name'},
                                   {key: 'manufacturer',label:'Hersteller'},
                                   {key: 'articleNumber',label:'Artikelnummer'},
                               ]"
-                                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
-                                @select=" (i) => {
+                              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Artikel anzuzeigen' }"
+                              @select=" (i) => {
                                row.product = i.id
                                row.unit = products.find(i => i.id === row.product).unit,
                                row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
                                row.description = products.find(i => i.id === row.product).description
                                 showProductSelectionModal = false}"
-                            >
+                          >
 
-                            </UTable>
-                          </UCard>
-                        </UModal>
-                      </InputGroup>
+                          </UTable>
+                        </UCard>
+                      </UModal>
+                    </InputGroup>
 
-                    </td>
-                    <td
-                        class="w-120"
-                        v-else-if="row.mode === 'service'"
-                    >
-                      <InputGroup class="w-full">
-                        <USelectMenu
-                            class="flex-auto"
-                            :options="services"
-                            :color="row.service ? 'primary' : 'rose'"
-                            option-attribute="name"
-                            value-attribute="id"
-                            searchable
-                            searchable-placeholder="Suche ..."
-                            :search-attributes="['name']"
-                            v-model="row.service"
-                            @change="row.unit = dataStore.getServiceById(row.service).unit,
-                                 row.price = dataStore.getServiceById(row.service).sellingPrice || 0,
-                                 row.description = dataStore.getServiceById(row.service).description"
-                        >
-                          <template #label>
-                            <span class="truncate">{{dataStore.getServiceById(row.service) ? dataStore.getServiceById(row.service).name : "Keine Leistung ausgewählt" }}</span>
+                  </td>
+                  <td
+                      class="w-120"
+                      v-else-if="row.mode === 'service'"
+                  >
+                    <InputGroup class="w-full">
+                      <USelectMenu
+                          class="flex-auto"
+                          :options="services"
+                          :color="row.service ? 'primary' : 'rose'"
+                          option-attribute="name"
+                          value-attribute="id"
+                          searchable
+                          searchable-placeholder="Suche ..."
+                          :search-attributes="['name']"
+                          v-model="row.service"
+                          @input="setRowData(row)"
+                      >
+                        <template #label>
+                          <span class="truncate">{{services.find(i => i.id === row.service) ? services.find(i => i.id === row.service).name : "Keine Leistung ausgewählt" }}</span>
+                        </template>
+                      </USelectMenu>
+                      <UButton
+                          icon="i-heroicons-magnifying-glass"
+                          @click="showServiceSelectionModal = true"
+                      />
+                      <UModal v-model="showServiceSelectionModal">
+                        <UCard>
+                          <template #header>
+                            Leistung Auswählen
                           </template>
-                        </USelectMenu>
-                        <UButton
-                            icon="i-heroicons-magnifying-glass"
-                            @click="showServiceSelectionModal = true"
-                        />
-                        <UModal v-model="showServiceSelectionModal">
-                          <UCard>
-                            <template #header>
-                              Leistung Auswählen
-                            </template>
 
-                            <InputGroup class="w-full">
-                              <UFormGroup label="Leistungskategorie:">
-                                <USelectMenu
-                                    v-if="servicecategories.length > 0"
-                                    :options="[{name: 'Nicht zugeordnet',id:'not set'},...servicecategories]"
-                                    value-attribute="id"
-                                    option-attribute="name"
-                                    v-model="selectedServicecategorie"
-                                />
-                              </UFormGroup>
-                            </InputGroup>
-                            <UTable
-                                :rows="selectedServicecategorie !== 'not set' ? services.filter(i => i.servicecategories.includes(selectedServicecategorie)) : services.filter(i => i.servicecategories.length === 0)"
-                                :columns="[
+                          <InputGroup class="w-full">
+                            <UFormGroup label="Leistungskategorie:">
+                              <USelectMenu
+                                  v-if="servicecategories.length > 0"
+                                  :options="[{name: 'Nicht zugeordnet',id:'not set'},...servicecategories]"
+                                  value-attribute="id"
+                                  option-attribute="name"
+                                  v-model="selectedServicecategorie"
+                              />
+                            </UFormGroup>
+                          </InputGroup>
+                          <UTable
+                              :rows="selectedServicecategorie !== 'not set' ? services.filter(i => i.servicecategories.includes(selectedServicecategorie)) : services.filter(i => i.servicecategories.length === 0)"
+                              :columns="[
                                     {key: 'name',label:'Name'},
                                     {key: 'serviceNumber',label:'Leistungsnummer'},
                                     {key: 'sellingPrice',label:'Verkaufspreis'},
                                 ]"
-                                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Leistungen anzuzeigen' }"
-                                @select=" (i) => {
+                              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Leistungen anzuzeigen' }"
+                              @select=" (i) => {
                                  row.service = i.id
-                                 row.unit = dataStore.getServiceById(row.service).unit,
-                                 row.price = dataStore.getServiceById(row.service).sellingPrice || 0,
-                                 row.description = dataStore.getServiceById(row.service).description
+                                 setRowData(row)
                                   showServiceSelectionModal = false}"
-                            >
-
-                            </UTable>
-                          </UCard>
-                        </UModal>
-                      </InputGroup>
-                    </td>
-                    <td
-                        class="w-20"
-                        v-if="!['pagebreak','title','text'].includes(row.mode)"
-                    >
-                      <UInput
-                          v-model="row.quantity"
-                          type="number"
-                          :step="dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).step : '1' "
-
-                      />
-                    </td>
-                    <td
-                        class="w-40"
-                        v-if="!['pagebreak','title','text'].includes(row.mode)"
-                    >
-                      <USelectMenu
-                          v-model="row.unit"
-                          :options="dataStore.units"
-                          option-attribute="name"
-                          value-attribute="id"
-                      >
-                        <template #label>
-                          {{dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).name : "Keine Einheit gewählt"}}
-                        </template>
-                      </USelectMenu>
-                    </td>
-                    <td
-                        class="w-40"
-                        v-if="!['pagebreak','title','text'].includes(row.mode) && itemInfo.type !== 'deliveryNotes'"
-                    >
-                      <UInput
-                          v-model="row.price"
-                          type="number"
-                          step="0.001"
-                          :color="getRowMargin(row) > 0 ? 'primary' : 'rose'"
-                      >
-                        <template #trailing>
-                          <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
-                        </template>
-                      </UInput>
-                    </td>
-                    <td
-                        class="w-40"
-                        v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
-
-                    >
-                      <USelectMenu
-                          :options="[19,7,0]"
-                          v-model="row.taxPercent"
-                      >
-                        <template #option="{option}">
-                          {{option}} %
-                        </template>
-                        <template #label>
-                          {{row.taxPercent}} %
-                        </template>
-                      </USelectMenu>
-
-                    </td>
-                    <td
-                        class="w-40"
-                        v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
-                    >
-                      <UInput
-                          v-model="row.discountPercent"
-                          type="number"
-                          step="0.01"
-                          placeholder="0"
-                      >
-                        <template #trailing>
-                          <span class="text-gray-500 dark:text-gray-400 text-xs">%</span>
-                        </template>
-                      </UInput>
-                    </td>
-                    <td
-                        class="w-40"
-                        v-if="!['pagebreak','title','text'].includes(row.mode)"
-                    >
-                      <UButton
-                          icon="i-heroicons-document-text"
-                          @click="row.showEdit = true"
-                      />
-                      <UButton
-                          icon="i-mdi-water-drop-outline"
-                          class="ml-3"
-                          v-if="row.agriculture"
-                          @click="row.showEditDiesel = true"
-                      />
-                      <UModal v-model="row.showEdit">
-                        <UCard>
-                          <template #header>
-                            Beschreibung bearbeiten
-                          </template>
-                          <UTextarea
-                              v-model="row.description"
-
                           >
 
-                          </UTextarea>
-                          <template #footer>
-                            <UButton
-                                @click="row.showEdit = false"
-                            >
-                              Speichern
-                            </UButton>
-                          </template>
+                          </UTable>
                         </UCard>
-
-
                       </UModal>
-                      <UModal v-model="row.showEditDiesel">
-                        <UCard>
-                          <template #header>
-                            Dieselverbrauch bearbeiten
-                          </template>
-                          <UFormGroup
-                              label="Menge:"
+                    </InputGroup>
+                  </td>
+                  <td
+                      class="w-20"
+                      v-if="!['pagebreak','title','text'].includes(row.mode)"
+                  >
+                    <UInput
+                        v-model="row.quantity"
+                        type="number"
+                        :step="dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).step : '1' "
+
+                    />
+                  </td>
+                  <td
+                      class="w-40"
+                      v-if="!['pagebreak','title','text'].includes(row.mode)"
+                  >
+                    <USelectMenu
+                        v-model="row.unit"
+                        :options="dataStore.units"
+                        option-attribute="name"
+                        value-attribute="id"
+                    >
+                      <template #label>
+                        {{dataStore.units.find(i => i.id === row.unit) ? dataStore.units.find(i => i.id === row.unit).name : "Keine Einheit gewählt"}}
+                      </template>
+                    </USelectMenu>
+                  </td>
+                  <td
+                      class="w-40"
+                      v-if="!['pagebreak','title','text'].includes(row.mode) && itemInfo.type !== 'deliveryNotes'"
+                  >
+                    <UInput
+                        v-model="row.price"
+                        type="number"
+                        step="0.001"
+                        :color="getRowMargin(row) > 0 ? 'primary' : 'rose'"
+                    >
+                      <template #trailing>
+                        <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
+                      </template>
+                    </UInput>
+                  </td>
+                  <td
+                      class="w-40"
+                      v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
+
+                  >
+                    <USelectMenu
+                        :options="[19,7,0]"
+                        v-model="row.taxPercent"
+                    >
+                      <template #option="{option}">
+                        {{option}} %
+                      </template>
+                      <template #label>
+                        {{row.taxPercent}} %
+                      </template>
+                    </USelectMenu>
+
+                  </td>
+                  <td
+                      class="w-40"
+                      v-if="!['pagebreak','title','text'].includes(row.mode)&& itemInfo.type !== 'deliveryNotes'"
+                  >
+                    <UInput
+                        v-model="row.discountPercent"
+                        type="number"
+                        step="0.01"
+                        placeholder="0"
+                    >
+                      <template #trailing>
+                        <span class="text-gray-500 dark:text-gray-400 text-xs">%</span>
+                      </template>
+                    </UInput>
+                  </td>
+                  <td
+                      class="w-40"
+                      v-if="!['pagebreak','title','text'].includes(row.mode)"
+                  >
+                    <UButton
+                        icon="i-heroicons-document-text"
+                        @click="row.showEdit = true"
+                    />
+                    <UButton
+                        icon="i-mdi-water-drop-outline"
+                        class="ml-3"
+                        v-if="row.agriculture"
+                        @click="row.showEditDiesel = true"
+                    />
+                    <UModal v-model="row.showEdit">
+                      <UCard>
+                        <template #header>
+                          Beschreibung bearbeiten
+                        </template>
+                        <UTextarea
+                            v-model="row.description"
+
+                        >
+
+                        </UTextarea>
+                        <template #footer>
+                          <UButton
+                              @click="row.showEdit = false"
                           >
-                            <UInput
-                                v-model="row.agriculture.dieselUsage"
-                            >
-                              <template #trailing>
-                                L
-                              </template>
-                            </UInput>
-                          </UFormGroup>
-                          <UFormGroup
-                              label="Preis:"
+                            Speichern
+                          </UButton>
+                        </template>
+                      </UCard>
+
+
+                    </UModal>
+                    <UModal v-model="row.showEditDiesel">
+                      <UCard>
+                        <template #header>
+                          Dieselverbrauch bearbeiten
+                        </template>
+                        <UFormGroup
+                            label="Menge:"
+                        >
+                          <UInput
+                              v-model="row.agriculture.dieselUsage"
                           >
-                            <UInput
-                                v-model="row.agriculture.dieselPrice"
-                                type="number"
-                                steps="0.01"
-                            >
-                              <template #trailing>
-                                €/L
-                              </template>
-                            </UInput>
-                          </UFormGroup>
-                          <template #footer>
-                            <UButton
-                                @click="row.showEditDiesel = false,
+                            <template #trailing>
+                              L
+                            </template>
+                          </UInput>
+                        </UFormGroup>
+                        <UFormGroup
+                            label="Preis:"
+                        >
+                          <UInput
+                              v-model="row.agriculture.dieselPrice"
+                              type="number"
+                              steps="0.01"
+                          >
+                            <template #trailing>
+                              €/L
+                            </template>
+                          </UInput>
+                        </UFormGroup>
+                        <template #footer>
+                          <UButton
+                              @click="row.showEditDiesel = false,
                                       processDieselPosition()"
-                            >
-                              Speichern
-                            </UButton>
-                          </template>
-                        </UCard>
+                          >
+                            Speichern
+                          </UButton>
+                        </template>
+                      </UCard>
 
 
-                      </UModal>
-                    </td>
-                    <td
-                        v-if="!['pagebreak','title','text'].includes(row.mode) && itemInfo.type !== 'deliveryNotes'"
-                    >
+                    </UModal>
+                  </td>
+                  <td
+                      v-if="!['pagebreak','title','text'].includes(row.mode) && itemInfo.type !== 'deliveryNotes'"
+                  >
 
-                      <p class="text-right font-bold whitespace-nowrap"><span v-if="row.discountPercent !== 0" class="line-through mr-2 text-rose-500">{{getRowAmountUndiscounted(row)}} €</span>{{getRowAmount(row)}} €</p>
-                    </td>
-                    <td
-                        v-if="row.mode === 'title'"
-                        colspan="8"
-                    >
-                      <UInput
-                          v-model="row.text"
-                          placeholder="Titel"
-                      />
-                    </td>
-                    <td>
-                      <UButton
-                          variant="ghost"
-                          color="rose"
-                          icon="i-heroicons-x-mark-16-solid"
-                          @click="removePosition(row.id)"
-                      />
-                    </td>
-                  </tr>
-                </template>
-              </draggable>
-            </tbody>
+                    <p class="text-right font-bold whitespace-nowrap"><span v-if="row.discountPercent !== 0" class="line-through mr-2 text-rose-500">{{getRowAmountUndiscounted(row)}} €</span>{{getRowAmount(row)}} €</p>
+                  </td>
+                  <td
+                      v-if="row.mode === 'title'"
+                      colspan="8"
+                  >
+                    <UInput
+                        v-model="row.text"
+                        placeholder="Titel"
+                    />
+                  </td>
+                  <td>
+                    <UButton
+                        variant="ghost"
+                        color="rose"
+                        icon="i-heroicons-x-mark-16-solid"
+                        @click="removePosition(row.id)"
+                    />
+                  </td>
+                </tr>
+              </template>
+            </draggable>
           </table>
           <UAlert
             v-else
@@ -1819,8 +1812,6 @@ setupPage()
             Noch nicht abgerechnete Abschlagsrechnungen
           </UDivider>
 
-          <!-- Abzurechnende Abschlagsrechnungen  -->
-
           <div
               v-for="advanceInvoice in openAdvanceInvoices"
               :key="advanceInvoice.id"

From 803b155f6500d7434eeef7270ab93cc1ee5c1459 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 30 Dec 2024 10:35:20 +0100
Subject: [PATCH 027/104] Changes

---
 pages/createDocument/edit/[[id]].vue | 12 ++++++------
 stores/data.js                       |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 34ae996..8263c4a 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -229,7 +229,7 @@ const setDocumentTypeConfig = (withTexts = false) => {
 
 const setCustomerData = () => {
 
-  let customer = dataStore.getCustomerById(itemInfo.value.customer)
+  let customer = customers.find(i => i.id === itemInfo.value.customer)
   itemInfo.value.contact = null
   if(customer) {
     itemInfo.value.address.street = customer.infoData.street
@@ -530,7 +530,7 @@ const processDieselPosition = () => {
 
 const getDocumentData = () => {
 
-  let customerData = dataStore.getCustomerById(itemInfo.value.customer)
+  let customerData = customers.find(i => i.id === itemInfo.value.customer)
   let contactData = dataStore.getContactById(itemInfo.value.contact)
   let businessInfo = profileStore.ownTenant.businessInfo
 
@@ -1016,7 +1016,7 @@ const setRowData = (row) => {
                         variant="outline"
                         class="w-full"
                     >
-                      {{dataStore.getCustomerById(itemInfo.customer) ? dataStore.getCustomerById(itemInfo.customer).name : "Kein Kunde ausgewählt"}}
+                      {{row.customer ?customers.find(i => i.id === row.customer).name : "Kein Kunde ausgewählt"}}
 
                       <UIcon name="i-heroicons-chevron-right-20-solid" class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500" :class="['transform rotate-90']" />
                     </UButton>
@@ -1040,9 +1040,9 @@ const setRowData = (row) => {
                   title="Info"
                 >
                   <template #description>
-                    Kundennr: {{dataStore.getCustomerById(itemInfo.customer).customerNumber}}<br>
-                    Typ: {{dataStore.getCustomerById(itemInfo.customer).isCompany ? 'Firma' : 'Privat'}}<br>
-                    Notizen: <span class="truncate">{{dataStore.getCustomerById(itemInfo.customer).notes}}</span>
+                    Kundennr: {{customers.find(i => i.id === row.customer).customerNumber}}<br>
+                    Typ: {{customers.find(i => i.id === row.customer).isCompany ? 'Firma' : 'Privat'}}<br>
+                    Notizen: <span class="truncate">{{customers.find(i => i.id === row.customer).notes}}</span>
                   </template>
 
                 </UAlert>
diff --git a/stores/data.js b/stores/data.js
index 0c615e1..b6900f7 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -1175,7 +1175,6 @@ export const useDataStore = defineStore('data', () => {
                     key: "sellingPrice",
                     label: "Verkaufspreis",
                     component: sellingPrice,
-                    inputType: "number",
                 },
                 {
                     key: "servicecategories",

From f44ac5960cc9ac5ec5528acd0931e6858bc3b7aa Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 30 Dec 2024 10:44:30 +0100
Subject: [PATCH 028/104] Changes

---
 pages/createDocument/edit/[[id]].vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 8263c4a..3032b07 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -1016,7 +1016,7 @@ const setRowData = (row) => {
                         variant="outline"
                         class="w-full"
                     >
-                      {{row.customer ?customers.find(i => i.id === row.customer).name : "Kein Kunde ausgewählt"}}
+                      {{itemInfo.customer ? customers.find(i => i.id === iteminfo.customer).name : "Kein Kunde ausgewählt"}}
 
                       <UIcon name="i-heroicons-chevron-right-20-solid" class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500" :class="['transform rotate-90']" />
                     </UButton>
@@ -1040,8 +1040,8 @@ const setRowData = (row) => {
                   title="Info"
                 >
                   <template #description>
-                    Kundennr: {{customers.find(i => i.id === row.customer).customerNumber}}<br>
-                    Typ: {{customers.find(i => i.id === row.customer).isCompany ? 'Firma' : 'Privat'}}<br>
+                    Kundennr: {{customers.find(i => i.id === itemInfo.customer).customerNumber}}<br>
+                    Typ: {{customers.find(i => i.id === itemInfo.customer).isCompany ? 'Firma' : 'Privat'}}<br>
                     Notizen: <span class="truncate">{{customers.find(i => i.id === row.customer).notes}}</span>
                   </template>
 

From d5ef6469bdc66a99906227f89bd724959b0f3f92 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 30 Dec 2024 10:44:55 +0100
Subject: [PATCH 029/104] Changes

---
 components/EntityEdit.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index a932fe6..49f4342 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -163,7 +163,6 @@ const contentChanged = (content, datapoint) => {
     </template>
   </UDashboardNavbar>
   <UDashboardPanelContent>
-    {{props.item}}
     <UForm
         class="p-5"
     >

From 9a708797785dd35cf0c6c23937b24352df39e59e Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 30 Dec 2024 11:22:58 +0100
Subject: [PATCH 030/104] Changes

---
 components/EntityShow.vue            |  2 +-
 pages/createDocument/edit/[[id]].vue | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 8e93082..5d7d55c 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -17,7 +17,7 @@ const {type} = props
 
 defineShortcuts({
   'backspace': () => {
-    router.push(`/${type}`)
+    router.push(`/standardEntity/${type}`)
   },
   'arrowleft': () => {
     if(openTab.value > 0){
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 3032b07..1a5cd39 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -86,6 +86,7 @@ const setupPage = async () => {
   products.value = (await useSupabaseSelect("products","*"))
   productcategories.value = (await useSupabaseSelect("productcategories","*"))
   customers.value = (await useSupabaseSelect("customers","*","customerNumber"))
+  console.log(customers.value)
   contacts.value = (await useSupabaseSelect("contacts","*"))
   texttemplates.value = (await useSupabaseSelect("texttemplates","*"))
   if(productcategories.value.length > 0) selectedProductcategorie.value = productcategories.value[0].id
@@ -229,7 +230,8 @@ const setDocumentTypeConfig = (withTexts = false) => {
 
 const setCustomerData = () => {
 
-  let customer = customers.find(i => i.id === itemInfo.value.customer)
+  let customer = customers.value.find(i => i.id === itemInfo.value.customer)
+  console.log(customer)
   itemInfo.value.contact = null
   if(customer) {
     itemInfo.value.address.street = customer.infoData.street
@@ -1008,7 +1010,7 @@ const setRowData = (row) => {
                       searchable
                       searchable-placeholder="Suche..."
                       v-model="itemInfo.customer"
-                      @input="setCustomerData"
+                      @change="setCustomerData"
                       class="flex-auto mr-2"
                   >
                     <UButton
@@ -1016,7 +1018,7 @@ const setRowData = (row) => {
                         variant="outline"
                         class="w-full"
                     >
-                      {{itemInfo.customer ? customers.find(i => i.id === iteminfo.customer).name : "Kein Kunde ausgewählt"}}
+                      {{itemInfo.customer ? customers.find(i => i.id === itemInfo.customer).name : "Kein Kunde ausgewählt"}}
 
                       <UIcon name="i-heroicons-chevron-right-20-solid" class="w-5 h-5 transition-transform text-gray-400 dark:text-gray-500" :class="['transform rotate-90']" />
                     </UButton>
@@ -1042,7 +1044,7 @@ const setRowData = (row) => {
                   <template #description>
                     Kundennr: {{customers.find(i => i.id === itemInfo.customer).customerNumber}}<br>
                     Typ: {{customers.find(i => i.id === itemInfo.customer).isCompany ? 'Firma' : 'Privat'}}<br>
-                    Notizen: <span class="truncate">{{customers.find(i => i.id === row.customer).notes}}</span>
+                    Notizen: <span class="truncate">{{customers.find(i => i.id === itemInfo.customer).notes}}</span>
                   </template>
 
                 </UAlert>

From cacdb442ca15e71fe74b66dee6e735a3a4a59a37 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 31 Dec 2024 16:07:15 +0100
Subject: [PATCH 031/104] Fixed Invoicing Problem and some other Changes

---
 components/EntityEdit.vue                     | 222 +++++----
 components/EntityShow.vue                     | 431 +++++++++---------
 pages/createDocument/edit/[[id]].vue          |  95 ++--
 .../standardEntity/[type]/[[mode]]/[[id]].vue |  13 +-
 stores/data.js                                |  34 +-
 5 files changed, 426 insertions(+), 369 deletions(-)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index 49f4342..e94fd53 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -12,6 +12,7 @@ const props = defineProps({
   }
 })
 
+
 const {type} = props
 
 defineShortcuts({
@@ -40,9 +41,12 @@ const supabase = useSupabaseClient()
 const dataType = dataStore.dataTypes[type]
 const openTab = ref(0)
 
+const item = ref(JSON.parse(props.item))
+console.log(item.value)
+
 const oldItem = ref(null)
 const generateOldItemData = () => {
-  oldItem.value = JSON.parse(JSON.stringify(props.item))
+  oldItem.value = JSON.parse(props.item)
 }
 generateOldItemData()
 
@@ -50,14 +54,14 @@ generateOldItemData()
 const setupCreate = () => {
   dataType.templateColumns.forEach(datapoint => {
     if(datapoint.key.includes(".")){
-      props.item[datapoint.key.split(".")[0]] = {}
+      !item.value[datapoint.key.split(".")[0]] ? item.value[datapoint.key.split(".")[0]] = {} : null
     }
 
     if(datapoint.inputType === "editor") {
       if(datapoint.key.includes(".")){
-        props.item[datapoint.key.split(".")[0]][datapoint.key.split(".")[1]] = {}
+        item[datapoint.key.split(".")[0]][datapoint.key.split(".")[1]] = {}
       } else {
-        props.item[datapoint.key] = {}
+        item[datapoint.key] = {}
       }
 
 
@@ -72,9 +76,9 @@ const setupQuery = () => {
 
     Object.keys(route.query).forEach(key => {
       if(["customer","contract","plant","contact"].includes(key)){
-        props.item[key] = Number(route.query[key])
+        item[key] = Number(route.query[key])
       } else {
-        props.item[key] = route.query[key]
+        item[key] = route.query[key]
       }
     })
   }
@@ -99,7 +103,7 @@ const loadOptions = async () => {
       loadedOptions.value[option.option] = (await useSupabaseSelect(option.option))
 
       if(dataType.templateColumns.find(x => x.key === option.key).selectDataTypeFilter){
-        loadedOptions.value[option.option] = loadedOptions.value[option.option].filter(i => dataType.templateColumns.find(x => x.key === option.key).selectDataTypeFilter(i, props.item))
+        loadedOptions.value[option.option] = loadedOptions.value[option.option].filter(i => dataType.templateColumns.find(x => x.key === option.key).selectDataTypeFilter(i, item))
       }
     }
   }
@@ -109,13 +113,13 @@ loadOptions()
 
 const contentChanged = (content, datapoint) => {
   if(datapoint.key.includes(".")){
-    props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html = content.html
-    props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].text = content.text
-    props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].json = content.json
+    item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html = content.html
+    item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].text = content.text
+    item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].json = content.json
   } else {
-    props.item[datapoint.key].html = content.html
-    props.item[datapoint.key].text = content.text
-    props.item[datapoint.key].json = content.json
+    item[datapoint.key].html = content.html
+    item[datapoint.key].text = content.text
+    item[datapoint.key].json = content.json
   }
 }
 
@@ -136,25 +140,25 @@ const contentChanged = (content, datapoint) => {
     </template>
     <template #center>
       <h1
-          v-if="props.item"
+          v-if="item"
           :class="['text-xl','font-medium']"
-      >{{props.item.id ? `${dataType.labelSingle} bearbeiten` : `${dataType.labelSingle} erstellen` }}</h1>
+      >{{item.id ? `${dataType.labelSingle} bearbeiten` : `${dataType.labelSingle} erstellen` }}</h1>
     </template>
     <template #right>
       <UButton
-          v-if="props.item.id"
-          @click="dataStore.updateItem(type,props.item, oldItem)"
+          v-if="item.id"
+          @click="dataStore.updateItem(type,item, oldItem)"
       >
         Speichern
       </UButton>
       <UButton
           v-else
-          @click="dataStore.createNewItem(type,props.item)"
+          @click="dataStore.createNewItem(type,item)"
       >
         Erstellen
       </UButton>
       <UButton
-          @click="router.push(props.item.id ? `/standardEntity/${type}/show/${props.item.id}` : `/standardEntity/${type}`)"
+          @click="router.push(item.id ? `/standardEntity/${type}/show/${item.id}` : `/standardEntity/${type}`)"
           color="red"
           class="ml-2"
       >
@@ -185,29 +189,33 @@ const contentChanged = (content, datapoint) => {
               <component
                   v-if="datapoint.helpComponent"
                   :is="datapoint.helpComponent"
-                  :item="props.item"
+                  :item="item"
               />
             </template>
             <div v-if="datapoint.key.includes('.')">
               <UInput
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-if="['text','number'].includes(datapoint.inputType)"
-                  v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
-                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
                   :type="datapoint.inputType"
                   :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
-              />
+              >
+                <template #trailing v-if="datapoint.inputTrailing">
+                  <span class="text-gray-500 dark:text-gray-400 text-xs">{{datapoint.inputTrailing}}</span>
+                </template>
+              </UInput>
               <UToggle
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'bool'"
-                  v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
-                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               />
               <USelectMenu
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'select'"
-                  v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
-                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
                   :option-attribute="datapoint.selectOptionAttribute"
                   :value-attribute="datapoint.selectValueAttribute || 'id'"
                   :options="datapoint.selectManualOptions || loadedOptions[datapoint.selectDataType]"
@@ -220,26 +228,26 @@ const contentChanged = (content, datapoint) => {
                 </template>
               </USelectMenu>
               <UTextarea
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'textarea'"
-                  v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
-                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
                   rows="4"
               />
               <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'date'">
                 <UButton
                     icon="i-heroicons-calendar-days-20-solid"
-                    :label="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] ? dayjs(props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]).format('DD.MM.YYYY') : 'Datum auswählen'"
+                    :label="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] ? dayjs(item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]).format('DD.MM.YYYY') : 'Datum auswählen'"
                     variant="outline"
-                    :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                    :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
 
                 />
 
                 <template #panel="{ close }">
                   <LazyDatePicker
-                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
-                      v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
-                      :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
+                      v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
+                      :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
                   />
                 </template>
               </UPopover>
@@ -247,29 +255,33 @@ const contentChanged = (content, datapoint) => {
               <Tiptap
                   v-else-if="datapoint.inputType === 'editor'"
                   @updateContent="(i) => contentChanged(i,datapoint)"
-                  :preloadedContent="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html"
+                  :preloadedContent="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html"
               />
             </div>
             <div v-else>
               <UInput
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-if="['text','number'].includes(datapoint.inputType)"
-                  v-model="props.item[datapoint.key]"
-                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  v-model="item[datapoint.key]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
                   :type="datapoint.inputType"
                   :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
-              />
+              >
+                <template #trailing v-if="datapoint.inputTrailing">
+                  {{datapoint.inputTrailing}}
+                </template>
+              </UInput>
               <UToggle
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'bool'"
-                  v-model="props.item[datapoint.key]"
-                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  v-model="item[datapoint.key]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               />
               <USelectMenu
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'select'"
-                  v-model="props.item[datapoint.key]"
-                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  v-model="item[datapoint.key]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
                   :option-attribute="datapoint.selectOptionAttribute"
                   :value-attribute="datapoint.selectValueAttribute || 'id'"
                   :options="datapoint.selectManualOptions || loadedOptions[datapoint.selectDataType]"
@@ -283,32 +295,32 @@ const contentChanged = (content, datapoint) => {
                 </template>
               </USelectMenu>
               <UTextarea
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'textarea'"
-                  v-model="props.item[datapoint.key]"
-                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  v-model="item[datapoint.key]"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
                   rows="4"
               />
               <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'date'">
                 <UButton
                     icon="i-heroicons-calendar-days-20-solid"
-                    :label="props.item[datapoint.key] ? dayjs(props.item[datapoint.key]).format('DD.MM.YYYY') : 'Datum auswählen'"
+                    :label="item[datapoint.key] ? dayjs(item[datapoint.key]).format('DD.MM.YYYY') : 'Datum auswählen'"
                     variant="outline"
-                    :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                    :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
                 />
 
                 <template #panel="{ close }">
                   <LazyDatePicker
-                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
-                      v-model="props.item[datapoint.key]" @close="close"
-                      :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
+                      v-model="item[datapoint.key]" @close="close"
+                      :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
                   />
                 </template>
               </UPopover>
               <Tiptap
                   v-else-if="datapoint.inputType === 'editor'"
                   @updateContent="(i) => contentChanged(i,datapoint)"
-                  :preloadedContent="props.item[datapoint.key].html"
+                  :preloadedContent="item[datapoint.key].html"
               />
             </div>
             <div
@@ -325,12 +337,12 @@ const contentChanged = (content, datapoint) => {
               >
                 <UInput
                     v-if="field.type === 'text'"
-                    v-model="props.item.ownFields[field.key]"
+                    v-model="item.ownFields[field.key]"
                 />
                 <USelectMenu
                     v-else-if="field.type === 'select'"
                     :options="field.options"
-                    v-model="props.item.ownFields[field.key]"
+                    v-model="item.ownFields[field.key]"
                 />
               </UFormGroup>
             </div>
@@ -346,29 +358,33 @@ const contentChanged = (content, datapoint) => {
           <component
               v-if="datapoint.helpComponent"
               :is="datapoint.helpComponent"
-              :item="props.item"
+              :item="item"
           />
         </template>
         <div v-if="datapoint.key.includes('.')">
           <UInput
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-if="['text','number'].includes(datapoint.inputType)"
-              v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
-              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               :type="datapoint.inputType"
               :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
-          />
+          >
+            <template #trailing v-if="datapoint.inputTrailing">
+              <span class="text-gray-500 dark:text-gray-400 text-xs">{{datapoint.inputTrailing}}</span>
+            </template>
+          </UInput>
           <UToggle
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'bool'"
-              v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
-              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
           />
           <USelectMenu
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'select'"
-              v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
-              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               :option-attribute="datapoint.selectOptionAttribute"
               :value-attribute="datapoint.selectValueAttribute || 'id'"
               :options="datapoint.selectManualOptions || loadedOptions[datapoint.selectDataType]"
@@ -381,26 +397,26 @@ const contentChanged = (content, datapoint) => {
             </template>
           </USelectMenu>
           <UTextarea
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'textarea'"
-              v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
-              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               rows="4"
           />
           <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'date'">
             <UButton
                 icon="i-heroicons-calendar-days-20-solid"
-                :label="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] ? dayjs(props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]).format('DD.MM.YYYY') : 'Datum auswählen'"
+                :label="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] ? dayjs(item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]).format('DD.MM.YYYY') : 'Datum auswählen'"
                 variant="outline"
-                :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
 
             />
 
             <template #panel="{ close }">
               <LazyDatePicker
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
-                  v-model="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
-                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
+                  v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               />
             </template>
           </UPopover>
@@ -408,29 +424,33 @@ const contentChanged = (content, datapoint) => {
           <Tiptap
               v-else-if="datapoint.inputType === 'editor'"
               @updateContent="(i) => contentChanged(i,datapoint)"
-              :preloadedContent="props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html"
+              :preloadedContent="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html"
           />
         </div>
         <div v-else>
           <UInput
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-if="['text','number'].includes(datapoint.inputType)"
-              v-model="props.item[datapoint.key]"
-              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              v-model="item[datapoint.key]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               :type="datapoint.inputType"
               :placeholder="datapoint.inputIsNumberRange ? 'Leer lassen für automatisch generierte Nummer' : ''"
-          />
+          >
+            <template #trailing v-if="datapoint.inputTrailing">
+              {{datapoint.inputTrailing}}
+            </template>
+          </UInput>
           <UToggle
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'bool'"
-              v-model="props.item[datapoint.key]"
-              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              v-model="item[datapoint.key]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
           />
           <USelectMenu
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'select'"
-              v-model="props.item[datapoint.key]"
-              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              v-model="item[datapoint.key]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               :option-attribute="datapoint.selectOptionAttribute"
               :value-attribute="datapoint.selectValueAttribute || 'id'"
               :options="datapoint.selectManualOptions || loadedOptions[datapoint.selectDataType]"
@@ -444,32 +464,32 @@ const contentChanged = (content, datapoint) => {
             </template>
           </USelectMenu>
           <UTextarea
-              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
+              @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'textarea'"
-              v-model="props.item[datapoint.key]"
-              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+              v-model="item[datapoint.key]"
+              :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               rows="4"
           />
           <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'date'">
             <UButton
                 icon="i-heroicons-calendar-days-20-solid"
-                :label="props.item[datapoint.key] ? dayjs(props.item[datapoint.key]).format('DD.MM.YYYY') : 'Datum auswählen'"
+                :label="item[datapoint.key] ? dayjs(item[datapoint.key]).format('DD.MM.YYYY') : 'Datum auswählen'"
                 variant="outline"
-                :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
             />
 
             <template #panel="{ close }">
               <LazyDatePicker
-                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(props.item,loadedOptions) : null"
-                  v-model="props.item[datapoint.key]" @close="close"
-                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(props.item) : false"
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
+                  v-model="item[datapoint.key]" @close="close"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               />
             </template>
           </UPopover>
           <Tiptap
               v-else-if="datapoint.inputType === 'editor'"
               @updateContent="(i) => contentChanged(i,datapoint)"
-              :preloadedContent="props.item[datapoint.key].html"
+              :preloadedContent="item[datapoint.key].html"
           />
         </div>
         <div
@@ -486,12 +506,12 @@ const contentChanged = (content, datapoint) => {
           >
             <UInput
                 v-if="field.type === 'text'"
-                v-model="props.item.ownFields[field.key]"
+                v-model="item.ownFields[field.key]"
             />
             <USelectMenu
                 v-else-if="field.type === 'select'"
                 :options="field.options"
-                v-model="props.item.ownFields[field.key]"
+                v-model="item.ownFields[field.key]"
             />
           </UFormGroup>
         </div>
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 5d7d55c..a93ea5c 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -151,6 +151,9 @@ const changeActivePhase = async (key) => {
       </UButton>
     </template>
   </UDashboardNavbar>
+  <UDashboardPanelContent>
+
+  </UDashboardPanelContent>
   <UTabs
       :items="dataType.showTabs"
       v-if="props.item.id"
@@ -158,227 +161,231 @@ const changeActivePhase = async (key) => {
       v-model="openTab"
   >
     <template #item="{item}">
-      <div v-if="item.label === 'Informationen'" class="flex flex-row mt-5">
-        <UCard class="w-1/2 mr-5">
-          <UAlert
-              v-if="item.archived"
-              color="rose"
-              variant="outline"
-              :title="`${dataType.labelSingle} archiviert`"
-              icon="i-heroicons-light-bulb"
-              class="mb-5"
-          />
-          <div class="text-wrap">
-            <table class="w-full">
-              <tbody>
-              <tr
-                  v-for="datapoint in dataType.templateColumns"
-              >
-                <td>{{datapoint.label}}:</td>
-                <td>
-                  <component v-if="datapoint.component" :is="datapoint.component" :row="props.item"></component>
-                  <div v-else>
-                    <span v-if="datapoint.key.includes('.')">{{props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]}}{{datapoint.unit}}</span>
-                    <span v-else>{{props.item[datapoint.key]}} {{datapoint.unit}}</span>
-                  </div>
-                </td>
-              </tr>
-              </tbody>
-
-            </table>
-          </div>
-
-        </UCard>
-        <UCard class="w-1/2">
-          <HistoryDisplay
-              :type="type.substring(0,type.length-1)"
-              v-if="props.item.id"
-              :element-id="props.item.id"
-              render-headline
-          />
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Dokumente'">
-        <UCard class="mt-5">
-          <Toolbar>
-            <DocumentUpload
-                :type="type.substring(0,type.length-1)"
-                :element-id="item.id"
+      <div class="scroll">
+        <div v-if="item.label === 'Informationen'" class="flex flex-row mt-5">
+          <UCard class="w-1/2 mr-5">
+            <UAlert
+                v-if="item.archived"
+                color="rose"
+                variant="outline"
+                :title="`${dataType.labelSingle} archiviert`"
+                icon="i-heroicons-light-bulb"
+                class="mb-5"
             />
-          </Toolbar>
+            <div class="text-wrap">
+              <table class="w-full">
+                <tbody>
+                <tr
+                    v-for="datapoint in dataType.templateColumns"
+                >
+                  <td>{{datapoint.label}}:</td>
+                  <td>
+                    <component v-if="datapoint.component" :is="datapoint.component" :row="props.item"></component>
+                    <div v-else>
+                      <span v-if="datapoint.key.includes('.')">{{props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]}}{{datapoint.unit}}</span>
+                      <span v-else>{{props.item[datapoint.key]}} {{datapoint.unit}}</span>
+                    </div>
+                  </td>
+                </tr>
+                </tbody>
 
-          <DocumentList
-              :documents="documents"
-          />
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Projekte'">
-        <UCard class="mt-5">
-          <Toolbar>
-            <UButton
-                @click="router.push(`/standardEntity/projects/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
-            >
-              + Projekt
-            </UButton>
-          </Toolbar>
-          <UTable
-              :rows="props.item.projects"
-              @select="(row) => router.push(`/standardEntity/projects/show/${row.id}`)"
-              :columns="[{label: 'Name', key: 'name'},{label: 'Phase', key: 'phase'}]"
-              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Projekte' }"
+              </table>
+            </div>
 
-          >
-            <template #phase-data="{row}">
-              {{row.phases ? row.phases.find(i => i.active).label : ""}}
-            </template>
-          </UTable>
+          </UCard>
+          <UCard class="w-1/2">
+            <HistoryDisplay
+                :type="type.substring(0,type.length-1)"
+                v-if="props.item.id"
+                :element-id="props.item.id"
+                render-headline
+            />
+          </UCard>
+        </div>
+        <div v-else-if="item.label === 'Dokumente'">
+          <UCard class="mt-5">
+            <Toolbar>
+              <DocumentUpload
+                  :type="type.substring(0,type.length-1)"
+                  :element-id="item.id"
+              />
+            </Toolbar>
 
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Objekte'">
-        <UCard class="mt-5">
-          <Toolbar>
-            <UButton
-                @click="router.push(`/standardEntity/plants/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
-            >
-              + Objekt
-            </UButton>
-            <UButton
-                v-if="type === 'customers'"
-                @click="router.push(`/standardEntity/plants/create?${type.substring(0,type.length-1)}=${props.item.id}&name=${encodeURIComponent(`${props.item.infoData.street}, ${props.item.infoData.zip} ${props.item.infoData.city}`)}`)"
-            >
-              + Kundenadresse als Objekt
-            </UButton>
-          </Toolbar>
-          <UTable
-              :rows="props.item.plants"
-              @select="(row) => router.push(`/standardEntity/plants/show/${row.id}`)"
-              :columns="[{label: 'Name', key: 'name'}]"
-              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Objekte' }"
-
-          >
-
-          </UTable>
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Aufgaben'">
-        <UCard class="mt-5">
-          <Toolbar>
-            <UButton
-                @click="router.push(`/standardEntity/tasks/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
-            >
-              + Aufgabe
-            </UButton>
-          </Toolbar>
-          <UTable
-              :rows="props.item.tasks"
-              @select="(row) => router.push(`/standardEntity/tasks/show/${row.id}`)"
-              :columns="[{label: 'Name', key: 'name'}]"
-              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Aufgaben' }"
-          />
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Verträge'">
-        <UCard class="mt-5">
-          <Toolbar>
-            <UButton
-                @click="router.push(`/standardEntity/contracts/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
-            >
-              + Vertrag
-            </UButton>
-          </Toolbar>
-          <UTable
-              :rows="props.item.contracts"
-              @select="(row) => router.push(`/standardEntity/contracts/show/${row.id}`)"
-              :columns="[{label: 'Name', key: 'name'},{label: 'Aktiv', key: 'active'}]"
-              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Verträge' }"
-
-          ></UTable>
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Überprüfungen'">
-        <UCard class="mt-5">
-          <UTable
-              :rows="props.item.checks"
-              :columns="[{key:'name',label: 'Name'},{key:'rhythm',label: 'Rhythmus'},{key:'description',label: 'Beschreibung'}]"
-              class="w-full"
-              :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
-              @select="(i) => router.push(`/checks/show/${i.id}`) "
-              :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Überprüfungen anzuzeigen' }"
-          >
-            <template #rhythm-data="{row}">
-              {{row.distance}}
-              <span v-if="row.distanceUnit === 'dayjs'">Tage</span>
-              <span v-if="row.distanceUnit === 'years'">Jahre</span>
-            </template>
-          </UTable>
-        </UCard>
-      </div>
-      <div v-else-if="item.label === 'Phasen'">
-        <UCard class="mt-5">
-          <UAccordion
-              :items="renderedPhases"
-          >
-            <template #default="{item,index,open}">
+            <DocumentList
+                :documents="documents"
+            />
+          </UCard>
+        </div>
+        <div v-else-if="item.label === 'Projekte'">
+          <UCard class="mt-5">
+            <Toolbar>
               <UButton
-                  variant="ghost"
-                  :color="item.active ? 'primary' : 'white'"
-                  class="mb-1"
-                  :disabled="true"
+                  @click="router.push(`/standardEntity/projects/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
               >
-                <template #leading>
-                  <div class="w-6 h-6  flex items-center justify-center -my-1">
-                    <UIcon :name="item.icon" class="w-4 h-4 " />
-                  </div>
-                </template>
-
-                <span class="truncate"> {{item.label}}</span>
-
-                <template #trailing>
-                  <UIcon
-                      name="i-heroicons-chevron-right-20-solid"
-                      class="w-5 h-5 ms-auto transform transition-transform duration-200"
-                      :class="[open && 'rotate-90']"
-                  />
-                </template>
-
+                + Projekt
               </UButton>
-            </template>
-            <template #item="{item, index}">
-              <UCard class="mx-5">
-                <template #header>
-                  <span class="dark:text-white text-black">{{item.label}}</span>
-                </template>
-                <InputGroup>
-                  <!-- TODO: Reactive Change Phase                  -->
-                  <UButton
-                      v-if="!item.activated_at && index !== 0 "
-                      @click="changeActivePhase(item.key)"
-                  >
-                    Phase aktivieren
-                  </UButton>
-                  <UButton
-                      v-if="item.active"
-                      v-for="button in item.quickactions"
-                      @click="router.push(`${button.link}&customer=${itemInfo.customer.id}&project=${itemInfo.id}`)"
-                  >
-                    {{button.label}}
-                  </UButton>
-                </InputGroup>
+            </Toolbar>
+            <UTable
+                :rows="props.item.projects"
+                @select="(row) => router.push(`/standardEntity/projects/show/${row.id}`)"
+                :columns="[{label: 'Name', key: 'name'},{label: 'Phase', key: 'phase'}]"
+                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Projekte' }"
 
-                <div>
-                  <p v-if="item.activated_at" class="dark:text-white text-black">Aktiviert am: {{dayjs(item.activated_at).format("DD.MM.YY HH:mm")}} Uhr</p>
-                  <p v-if="item.activated_by" class="dark:text-white text-black">Aktiviert durch: {{profileStore.getProfileById(item.activated_by).fullName}}</p>
-                  <p v-if="item.description" class="dark:text-white text-black">Beschreibung: {{item.description}}</p>
-                </div>
-              </UCard>
+            >
+              <template #phase-data="{row}">
+                {{row.phases ? row.phases.find(i => i.active).label : ""}}
+              </template>
+            </UTable>
+
+          </UCard>
+        </div>
+        <div v-else-if="item.label === 'Objekte'">
+          <UCard class="mt-5">
+            <Toolbar>
+              <UButton
+                  @click="router.push(`/standardEntity/plants/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
+              >
+                + Objekt
+              </UButton>
+              <UButton
+                  v-if="type === 'customers'"
+                  @click="router.push(`/standardEntity/plants/create?${type.substring(0,type.length-1)}=${props.item.id}&name=${encodeURIComponent(`${props.item.infoData.street}, ${props.item.infoData.zip} ${props.item.infoData.city}`)}`)"
+              >
+                + Kundenadresse als Objekt
+              </UButton>
+            </Toolbar>
+            <UTable
+                :rows="props.item.plants"
+                @select="(row) => router.push(`/standardEntity/plants/show/${row.id}`)"
+                :columns="[{label: 'Name', key: 'name'}]"
+                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Objekte' }"
+
+            >
+
+            </UTable>
+          </UCard>
+        </div>
+        <div v-else-if="item.label === 'Aufgaben'">
+          <UCard class="mt-5">
+            <Toolbar>
+              <UButton
+                  @click="router.push(`/standardEntity/tasks/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
+              >
+                + Aufgabe
+              </UButton>
+            </Toolbar>
+            <UTable
+                :rows="props.item.tasks"
+                @select="(row) => router.push(`/standardEntity/tasks/show/${row.id}`)"
+                :columns="[{label: 'Name', key: 'name'}]"
+                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Aufgaben' }"
+            />
+          </UCard>
+        </div>
+        <div v-else-if="item.label === 'Verträge'">
+          <UCard class="mt-5">
+            <Toolbar>
+              <UButton
+                  @click="router.push(`/standardEntity/contracts/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
+              >
+                + Vertrag
+              </UButton>
+            </Toolbar>
+            <UTable
+                :rows="props.item.contracts"
+                @select="(row) => router.push(`/standardEntity/contracts/show/${row.id}`)"
+                :columns="[{label: 'Name', key: 'name'},{label: 'Aktiv', key: 'active'}]"
+                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Verträge' }"
+
+            ></UTable>
+          </UCard>
+        </div>
+        <div v-else-if="item.label === 'Überprüfungen'">
+          <UCard class="mt-5">
+            <UTable
+                :rows="props.item.checks"
+                :columns="[{key:'name',label: 'Name'},{key:'rhythm',label: 'Rhythmus'},{key:'description',label: 'Beschreibung'}]"
+                class="w-full"
+                :ui="{ divide: 'divide-gray-200 dark:divide-gray-800' }"
+                @select="(i) => router.push(`/checks/show/${i.id}`) "
+                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine Überprüfungen anzuzeigen' }"
+            >
+              <template #rhythm-data="{row}">
+                {{row.distance}}
+                <span v-if="row.distanceUnit === 'dayjs'">Tage</span>
+                <span v-if="row.distanceUnit === 'years'">Jahre</span>
+              </template>
+            </UTable>
+          </UCard>
+        </div>
+        <div v-else-if="item.label === 'Phasen'">
+          <UCard class="mt-5">
+            <UAccordion
+                :items="renderedPhases"
+            >
+              <template #default="{item,index,open}">
+                <UButton
+                    variant="ghost"
+                    :color="item.active ? 'primary' : 'white'"
+                    class="mb-1"
+                    :disabled="true"
+                >
+                  <template #leading>
+                    <div class="w-6 h-6  flex items-center justify-center -my-1">
+                      <UIcon :name="item.icon" class="w-4 h-4 " />
+                    </div>
+                  </template>
+
+                  <span class="truncate"> {{item.label}}</span>
+
+                  <template #trailing>
+                    <UIcon
+                        name="i-heroicons-chevron-right-20-solid"
+                        class="w-5 h-5 ms-auto transform transition-transform duration-200"
+                        :class="[open && 'rotate-90']"
+                    />
+                  </template>
+
+                </UButton>
+              </template>
+              <template #item="{item, index}">
+                <UCard class="mx-5">
+                  <template #header>
+                    <span class="dark:text-white text-black">{{item.label}}</span>
+                  </template>
+                  <InputGroup>
+                    <!-- TODO: Reactive Change Phase                  -->
+                    <UButton
+                        v-if="!item.activated_at && index !== 0 "
+                        @click="changeActivePhase(item.key)"
+                    >
+                      Phase aktivieren
+                    </UButton>
+                    <UButton
+                        v-if="item.active"
+                        v-for="button in item.quickactions"
+                        @click="router.push(`${button.link}&customer=${itemInfo.customer.id}&project=${itemInfo.id}`)"
+                    >
+                      {{button.label}}
+                    </UButton>
+                  </InputGroup>
+
+                  <div>
+                    <p v-if="item.activated_at" class="dark:text-white text-black">Aktiviert am: {{dayjs(item.activated_at).format("DD.MM.YY HH:mm")}} Uhr</p>
+                    <p v-if="item.activated_by" class="dark:text-white text-black">Aktiviert durch: {{profileStore.getProfileById(item.activated_by).fullName}}</p>
+                    <p v-if="item.description" class="dark:text-white text-black">Beschreibung: {{item.description}}</p>
+                  </div>
+                </UCard>
 
 
-            </template>
-          </UAccordion>
-        </UCard>
+              </template>
+            </UAccordion>
+          </UCard>
+        </div>
       </div>
 
+
+
     </template>
 
   </UTabs>
@@ -392,4 +399,10 @@ td {
   padding-bottom: 0.15em;
   padding-top: 0.15em;
 }
+
+.scroll {
+  height: 80vh;
+  overflow-y: scroll;
+  padding: 1em;
+}
 </style>
\ No newline at end of file
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 1a5cd39..5795fe5 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -63,7 +63,7 @@ const itemInfo = ref({
 
 
 const letterheads = ref([])
-const createdDocuments = ref([])
+const createddocuments = ref([])
 const projects = ref([])
 const products = ref([])
 const productcategories = ref([])
@@ -79,14 +79,13 @@ const loaded = ref(false)
 const setupPage = async () => {
 
   letterheads.value = (await useSupabaseSelect("letterheads","*")).filter(i => i.documentTypes.length === 0 || i.documentTypes.includes(itemInfo.value.type))
-  createdDocuments.value = (await useSupabaseSelect("createddocuments","*"))
+  createddocuments.value = (await useSupabaseSelect("createddocuments","*"))
   projects.value = (await useSupabaseSelect("projects","*"))
   services.value = (await useSupabaseSelect("services","*"))
   servicecategories.value = (await useSupabaseSelect("servicecategories","*"))
   products.value = (await useSupabaseSelect("products","*"))
   productcategories.value = (await useSupabaseSelect("productcategories","*"))
   customers.value = (await useSupabaseSelect("customers","*","customerNumber"))
-  console.log(customers.value)
   contacts.value = (await useSupabaseSelect("contacts","*"))
   texttemplates.value = (await useSupabaseSelect("texttemplates","*"))
   if(productcategories.value.length > 0) selectedProductcategorie.value = productcategories.value[0].id
@@ -175,7 +174,6 @@ const setupPage = async () => {
 
     if(route.query.project) {
       itemInfo.value.project = Number(route.query.project)
-      checkForOpenAdvanceInvoices()
     }
     if(route.query.contact) itemInfo.value.contact = Number(route.query.contact)
     if(route.query.customer) {
@@ -184,6 +182,8 @@ const setupPage = async () => {
     }
   }
 
+  //if(itemInfo.value.project) checkForOpenAdvanceInvoices()
+
   loaded.value = true
 
 }
@@ -238,6 +238,9 @@ const setCustomerData = () => {
     itemInfo.value.address.zip = customer.infoData.zip
     itemInfo.value.address.city = customer.infoData.city
     itemInfo.value.address.special = customer.infoData.special
+
+    if(customer.customPaymentDays) itemInfo.value.paymentDays = customer.customPaymentDays
+
   }
 
 
@@ -458,7 +461,7 @@ const documentTotal = computed(() => {
   let totalGrossAlreadyPaid = 0
 
   itemInfo.value.usedAdvanceInvoices.forEach(advanceInvoiceId => {
-    let advanceInvoice = openAdvanceInvoices.value.find(i => i.id === advanceInvoiceId)
+    let advanceInvoice = createddocuments.value.find(i => i.id === advanceInvoiceId)
 
     let priceNet = advanceInvoice.rows.find(i => i.advanceInvoiceData).price
 
@@ -474,11 +477,11 @@ const documentTotal = computed(() => {
 
 
   return {
-    totalNet: renderCurrency(totalNet),
-    total19: renderCurrency(total19),
-    totalGross: renderCurrency(totalGross),
-    totalGrossAlreadyPaid: renderCurrency(totalGrossAlreadyPaid),
-    totalSumToPay: renderCurrency(sumToPay)
+    totalNet: totalNet,
+    total19: total19,
+    totalGross: totalGross,
+    totalGrossAlreadyPaid: totalGrossAlreadyPaid,
+    totalSumToPay: sumToPay
 
   }
 
@@ -532,7 +535,7 @@ const processDieselPosition = () => {
 
 const getDocumentData = () => {
 
-  let customerData = customers.find(i => i.id === itemInfo.value.customer)
+  let customerData = customers.value.find(i => i.id === itemInfo.value.customer)
   let contactData = dataStore.getContactById(itemInfo.value.contact)
   let businessInfo = profileStore.ownTenant.businessInfo
 
@@ -549,12 +552,14 @@ const getDocumentData = () => {
     let unit = dataStore.units.find(i => i.id === row.unit)
 
     if(!['pagebreak','title'].includes(row.mode)){
-      if(row.agriculture?.description) {
+      if(row.agriculture && row.agriculture.description) {
         console.log("Row has Agri")
         row.descriptionText = row.agriculture.description
       } else if(row.description) {
         console.log("Row has no Agri")
         row.descriptionText = row.description
+      } else {
+        delete row.descriptionText
       }
     }
 
@@ -591,6 +596,8 @@ const getDocumentData = () => {
     }
   }
 
+  let contactPerson = profileStore.getProfileById(itemInfo.value.contactPerson)
+
   const returnData = {
     type: itemInfo.value.type,
     adressLine: `${businessInfo.name}, ${businessInfo.street}, ${businessInfo.zip} ${businessInfo.city}`,
@@ -609,9 +616,9 @@ const getDocumentData = () => {
       documentDate: dayjs(itemInfo.value.documentDate).format("DD.MM.YYYY"),
       deliveryDate: dayjs(itemInfo.value.deliveryDate).format("DD.MM.YYYY"),
       deliveryDateType: itemInfo.value.deliveryDateType,
-      contactPerson: itemInfo.value.contactPersonName,
-      contactTel: itemInfo.value.contactTel,
-      contactEMail: itemInfo.value.contactEMail,
+      contactPerson: contactPerson.fullName,
+      contactTel: contactPerson.fixedTel || contactPerson.mobileTel,
+      contactEMail: contactPerson.email,
       project: dataStore.getProjectById(itemInfo.value.project) ? dataStore.getProjectById(itemInfo.value.project).name : null
     },
     title: itemInfo.value.title,
@@ -619,14 +626,20 @@ const getDocumentData = () => {
     endText: templateEndText(generateContext(itemInfo.value, contactData)),
     startText: templateStartText(generateContext(itemInfo.value, contactData)),
     rows: rows,
-    total: documentTotal.value,
+    total: {
+      totalNet: renderCurrency(documentTotal.value.totalNet),
+      total19: renderCurrency(documentTotal.value.total19),
+      totalGross: renderCurrency(documentTotal.value.totalGross),
+      totalGrossAlreadyPaid: renderCurrency(documentTotal.value.totalGrossAlreadyPaid),
+      totalSumToPay: renderCurrency(documentTotal.value.totalSumToPay)
+    },
     agriculture: itemInfo.value.agriculture,
     usedAdvanceInvoices: itemInfo.value.usedAdvanceInvoices.map(i => {
-      return openAdvanceInvoices.value.find(x => x.id === i)
+      return createddocuments.value.find(x => x.id === i)
     })
   }
 
-  //console.log(returnData)
+  console.log(returnData)
 
   return returnData
 }
@@ -715,7 +728,7 @@ const saveSerialInvoice = async () => {
   await router.push(`/createDocument/edit/${data[0].id}`)
 }
 
-const saveDocument = async (state) => {
+const saveDocument = async (state,resetup = false) => {
 
   itemInfo.value.state = state
 
@@ -788,21 +801,22 @@ const saveDocument = async (state) => {
   if(route.params.id) {
     await dataStore.updateItem("createddocuments", {...createData, id: itemInfo.value.id})
   } else {
-    const {data} = await dataStore.createNewItem("createddocuments", createData)
+    const data = await dataStore.createNewItem("createddocuments", createData)
+    console.log(data)
     await router.push(`/createDocument/edit/${data[0].id}`)
   }
 
-  await setupPage()
-
+  if(resetup) await setupPage()
 }
 
 const closeDocument = async () => {
 
+  loaded.value = false
+
   await saveDocument("Gebucht")
 
   await generateDocument()
 
-
   let fileData = {
     tags: [],
     project: null
@@ -828,14 +842,12 @@ const closeDocument = async () => {
 
   await dataStore.uploadFiles(fileData,  [file], true)
 
-
-
   await router.push(`/createDocument/show/${itemInfo.value.id}`)
 
-  //console.log(uri)
 }
 
 const setRowData = (row) => {
+  console.log(row)
   if(row.service) {
     row.unit = services.value.find(i => i.id === row.service).unit
     row.price = services.value.find(i => i.id === row.service).sellingPriceComposed.total || services.value.find(i => i.id === row.service).sellingPrice
@@ -859,7 +871,7 @@ const setRowData = (row) => {
     <template #right>
       <UButton
           icon="i-mdi-content-save"
-          @click="saveDocument('Entwurf')"
+          @click="saveDocument('Entwurf',true)"
           v-if="itemInfo.type !== 'serialInvoices' "
           :disabled="!itemInfo.customer"
       >
@@ -882,6 +894,7 @@ const setRowData = (row) => {
   </UDashboardNavbar>
 
   <UDashboardPanelContent>
+    {{itemInfo}}
     <UTabs class="p-5" :items="tabItems" @change="onChangeTab" v-if="loaded">
       <template #item="{item}">
         <div v-if="item.label === 'Editor'">
@@ -1028,7 +1041,7 @@ const setRowData = (row) => {
                       class="w-25"
                       v-if="itemInfo.customer"
                       icon="i-heroicons-arrow-right-end-on-rectangle"
-                      @click="router.push(`/customers/show/${itemInfo.customer}`)"
+                      @click="router.push(`/standardEntity/customers/show/${itemInfo.customer}`)"
                   >Kunde</UButton>
                 </div>
 
@@ -1084,7 +1097,7 @@ const setRowData = (row) => {
                       variant="outline"
                       v-if="itemInfo.contact"
                       icon="i-heroicons-arrow-right-end-on-rectangle"
-                      @click="router.push(`/contacts/show/${itemInfo.contact}`)"
+                      @click="router.push(`/standardEntity/contacts/show/${itemInfo.contact}`)"
                   >Kontakt</UButton>
                 </InputGroup>
 
@@ -1232,7 +1245,7 @@ const setRowData = (row) => {
                       :search-attributes="['name']"
                       class="w-full"
                       :disabled="!itemInfo.customer"
-                      @input="checkForOpenAdvanceInvoices"
+                      @change="checkForOpenAdvanceInvoices"
                   >
                     <template #label>
                       {{dataStore.getProjectById(itemInfo.project) ? dataStore.getProjectById(itemInfo.project).name : "Kein Projekt ausgewählt"}}
@@ -1252,7 +1265,7 @@ const setRowData = (row) => {
                       variant="outline"
                       v-if="itemInfo.project"
                     icon="i-heroicons-arrow-right-end-on-rectangle"
-                      @click="router.push(`/projects/show/${itemInfo.project}`)"
+                      @click="router.push(`/standardEntity/projects/show/${itemInfo.project}`)"
                   >Projekt</UButton>
                 </InputGroup>
 
@@ -1341,7 +1354,7 @@ const setRowData = (row) => {
           <UFormGroup
               label="Titel:"
           >
-            <UInput v-model="itemInfo.title"/>
+            <UInput v-model="itemInfo.title" disabled/>
           </UFormGroup>
           <UFormGroup
               label="Beschreibung:"
@@ -1532,7 +1545,7 @@ const setRowData = (row) => {
                           searchable-placeholder="Suche ..."
                           :search-attributes="['name']"
                           v-model="row.service"
-                          @input="setRowData(row)"
+                          @change="setRowData(row)"
                       >
                         <template #label>
                           <span class="truncate">{{services.find(i => i.id === row.service) ? services.find(i => i.id === row.service).name : "Keine Leistung ausgewählt" }}</span>
@@ -1612,7 +1625,6 @@ const setRowData = (row) => {
                         v-model="row.price"
                         type="number"
                         step="0.001"
-                        :color="getRowMargin(row) > 0 ? 'primary' : 'rose'"
                     >
                       <template #trailing>
                         <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
@@ -1847,29 +1859,24 @@ const setRowData = (row) => {
             <table class="w-1/3" v-if="itemInfo.rows.length > 0">
               <tr>
                 <td class="font-bold">Netto:</td>
-                <td class="text-right">{{documentTotal.totalNet}}</td>
+                <td class="text-right">{{renderCurrency(documentTotal.totalNet)}}</td>
               </tr>
               <tr>
                 <td class="font-bold">zzgl. 19 % USt:</td>
-                <td class="text-right">{{documentTotal.total19}}</td>
+                <td class="text-right">{{renderCurrency(documentTotal.total19)}}</td>
               </tr>
               <tr>
                 <td class="font-bold">Brutto:</td>
-                <td class="text-right">{{documentTotal.totalGross}}</td>
+                <td class="text-right">{{renderCurrency(documentTotal.totalGross)}}</td>
               </tr>
-
-
               <tr v-if="documentTotal.totalGrossAlreadyPaid !== '0,00 €'">
                 <td class="font-bold">Bereits bezahlt:</td>
-                <td class="text-right">{{documentTotal.totalGrossAlreadyPaid}}</td>
+                <td class="text-right">{{renderCurrency(documentTotal.totalGrossAlreadyPaid)}}</td>
               </tr>
-
-
               <tr v-if="documentTotal.totalGrossAlreadyPaid !== '0,00 €'">
                 <td class="font-bold">Offene Summe:</td>
-                <td class="text-right">{{documentTotal.totalSumToPay}}</td>
+                <td class="text-right">{{renderCurrency(documentTotal.totalSumToPay)}}</td>
               </tr>
-
             </table>
           </div>
 
diff --git a/pages/standardEntity/[type]/[[mode]]/[[id]].vue b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
index ee8828b..cb3af67 100644
--- a/pages/standardEntity/[type]/[[mode]]/[[id]].vue
+++ b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
@@ -1,6 +1,7 @@
 <script setup>
 const route = useRoute()
 const dataStore = useDataStore()
+const supabase = useSupabaseClient()
 
 const type = route.params.type
 
@@ -19,7 +20,17 @@ const setupPage = async () => {
     item.value = await useSupabaseSelectSingle(type, route.params.id, dataType.supabaseSelectWithInformation || "*")
   } else if(mode.value === "edit") {
     //Load Data for Edit
-    item.value = await useSupabaseSelectSingle(type, route.params.id)
+    const data = JSON.stringify((await supabase.from(type).select().eq("id", route.params.id).single()).data)
+        //await useSupabaseSelectSingle(type, route.params.id)
+    console.log(JSON.parse(data))
+    item.value = data
+
+    console.log(item.value)
+  }  else if(mode.value === "create") {
+    //Load Data for Create
+    item.value = JSON.stringify({})
+
+    console.log(item.value)
   } else if(mode.value === "list") {
     //Load Data for List
     items.value = await useSupabaseSelect(type, dataType.supabaseSelectWithInformation || "*", dataType.supabaseSortColumn)
diff --git a/stores/data.js b/stores/data.js
index b6900f7..4528f5c 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -130,31 +130,26 @@ export const useDataStore = defineStore('data', () => {
                     label: "Kundennummer",
                     inputIsNumberRange: true,
                     inputType: "text"
-                },
-                {
+                }, {
                     key: "name",
                     label: "Name",
                     title: true,
                     inputType: "text"
-                },
-                {
+                }, {
                     key: "isCompany",
                     label: "Firmenkunde",
                     component: isCompany,
                     inputType: "bool"
-                },
-                {
-                    key: "notes",
-                    label: "Notizen",
-                    inputType: "textarea"
-                },
-                {
+                },{
                     key: "active",
                     label: "Aktiv",
                     component: active,
                     inputType: "bool"
-                },
-                {
+                }, {
+                    key: "customPaymentDays",
+                    label: "Zahlungsziel in Tagen",
+                    inputType: "number"
+                }, {
                     key: "infoData.street",
                     label: "Straße + Hausnummer",
                     inputType: "text",
@@ -217,6 +212,11 @@ export const useDataStore = defineStore('data', () => {
                     label: "USt-Id",
                     inputType: "text"
                 },
+                {
+                    key: "notes",
+                    label: "Notizen",
+                    inputType: "textarea"
+                },
                 {
                     key: "profiles",
                     label: "Berechtigte Benutzer",
@@ -1189,6 +1189,7 @@ export const useDataStore = defineStore('data', () => {
                     key: "sellingPriceComposed.worker",
                     label: "Verkaufspreis Personal pro Einheit",
                     inputType: "number",
+                    inputTrailing: "EUR",
                     inputChangeFunction: function (row) {
                         if(row.sellingPriceComposed.worker) {
                             row.sellingPriceComposed.total = row.sellingPriceComposed.worker + (row.sellingPriceComposed.material || 0)
@@ -1201,6 +1202,7 @@ export const useDataStore = defineStore('data', () => {
                     key: "sellingPriceComposed.material",
                     label: "Verkaufspreis Material pro Einheit",
                     inputType: "number",
+                    inputTrailing: "EUR",
                     inputChangeFunction: function (row) {
                         if(row.sellingPriceComposed.material) {
                             row.sellingPriceComposed.total = (row.sellingPriceComposed.worker || 0) + row.sellingPriceComposed.material
@@ -1211,8 +1213,9 @@ export const useDataStore = defineStore('data', () => {
                 },
                 {
                     key: "sellingPriceComposed.total",
-                    label: "Verkaufspreis Gesamt",
+                    label: "Verkaufspreis Gesamt pro Einheit",
                     inputType: "number",
+                    inputTrailing: "EUR",
                     /*disabledFunction: function (item) {
                         return item.sellingPriceComposed.worker || item.sellingPriceComposed.material
                     },*/
@@ -1816,6 +1819,8 @@ export const useDataStore = defineStore('data', () => {
                     name = "Anhängelast"
                 }else if(key === "color") {
                     name = "Farbe"
+                }else if(key === "customPaymentDays") {
+                    name = "Zahlungsziel in Tagen"
                 }else if(key === "powerInKW") {
                     name = "Leistung"
                 } else if(key === "driver") {
@@ -1979,6 +1984,7 @@ export const useDataStore = defineStore('data', () => {
                     await router.push(dataTypes[dataType].redirectToList ? `/${dataType}` : `/${dataType}/show/${returnData.id}`)
                 }
             }
+
             return supabaseData
         }
     }

From 4ef7d410f47c4e0a8950aaa3fb42906da9132954 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 31 Dec 2024 18:02:15 +0100
Subject: [PATCH 032/104] Changes

---
 components/EntityEdit.vue                | 82 ++++++++++++++++++++++--
 components/EntityShow.vue                | 49 +++++++++++++-
 components/columnRenderings/contact.vue  | 10 ++-
 components/columnRenderings/customer.vue |  9 ++-
 components/columnRenderings/plant.vue    |  9 ++-
 components/columnRenderings/profiles.vue | 11 +++-
 components/columnRenderings/project.vue  | 10 ++-
 components/columnRenderings/vehicle.vue  | 11 +++-
 components/columnRenderings/vendor.vue   |  9 ++-
 stores/data.js                           | 26 ++++----
 10 files changed, 198 insertions(+), 28 deletions(-)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index e94fd53..b62eab5 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -59,9 +59,9 @@ const setupCreate = () => {
 
     if(datapoint.inputType === "editor") {
       if(datapoint.key.includes(".")){
-        item[datapoint.key.split(".")[0]][datapoint.key.split(".")[1]] = {}
+        item.value[datapoint.key.split(".")[0]][datapoint.key.split(".")[1]] = {}
       } else {
-        item[datapoint.key] = {}
+        item.value[datapoint.key] = {}
       }
 
 
@@ -76,9 +76,9 @@ const setupQuery = () => {
 
     Object.keys(route.query).forEach(key => {
       if(["customer","contract","plant","contact"].includes(key)){
-        item[key] = Number(route.query[key])
+        item.value[key] = Number(route.query[key])
       } else {
-        item[key] = route.query[key]
+        item.value[key] = route.query[key]
       }
     })
   }
@@ -251,6 +251,24 @@ const contentChanged = (content, datapoint) => {
                   />
                 </template>
               </UPopover>
+              <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'datetime'">
+                <UButton
+                    icon="i-heroicons-calendar-days-20-solid"
+                    :label="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] ? dayjs(item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]).format('DD.MM.YY HH:mm') : 'Datum auswählen'"
+                    variant="outline"
+                    :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
+
+                />
+
+                <template #panel="{ close }">
+                  <LazyDatePicker
+                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
+                      v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
+                      :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
+                      mode="datetime"
+                  />
+                </template>
+              </UPopover>
               <!-- TODO: DISABLED FOR TIPTAP -->
               <Tiptap
                   v-else-if="datapoint.inputType === 'editor'"
@@ -317,6 +335,24 @@ const contentChanged = (content, datapoint) => {
                   />
                 </template>
               </UPopover>
+              <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'datetime'">
+                <UButton
+                    icon="i-heroicons-calendar-days-20-solid"
+                    :label="item[datapoint.key] ? dayjs(item[datapoint.key]).format('DD.MM.YY HH:mm') : 'Datum auswählen'"
+                    variant="outline"
+                    :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
+                />
+
+                <template #panel="{ close }">
+                  <LazyDatePicker
+                      @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
+                      v-model="item[datapoint.key]"
+                      @close="close"
+                      :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
+                      mode="datetime"
+                  />
+                </template>
+              </UPopover>
               <Tiptap
                   v-else-if="datapoint.inputType === 'editor'"
                   @updateContent="(i) => contentChanged(i,datapoint)"
@@ -351,7 +387,7 @@ const contentChanged = (content, datapoint) => {
         </div>
       </div>
       <UFormGroup
-          v-for="datapoint in dataType.templateColumns.filter(i => i.inputType)"
+          v-for="datapoint in dataType.templateColumns.filter(i => i.inputType && i.inputColumn === columnName)"
           :label="datapoint.label"
       >
         <template #help>
@@ -420,6 +456,24 @@ const contentChanged = (content, datapoint) => {
               />
             </template>
           </UPopover>
+          <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'datetime'">
+            <UButton
+                icon="i-heroicons-calendar-days-20-solid"
+                :label="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] ? dayjs(item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]).format('DD.MM.YY HH:mm') : 'Datum auswählen'"
+                variant="outline"
+                :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
+
+            />
+
+            <template #panel="{ close }">
+              <LazyDatePicker
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
+                  v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]" @close="close"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
+                  mode="datetime"
+              />
+            </template>
+          </UPopover>
           <!-- TODO: DISABLED FOR TIPTAP -->
           <Tiptap
               v-else-if="datapoint.inputType === 'editor'"
@@ -486,6 +540,24 @@ const contentChanged = (content, datapoint) => {
               />
             </template>
           </UPopover>
+          <UPopover :popper="{ placement: 'bottom-start' }" v-else-if="datapoint.inputType === 'datetime'">
+            <UButton
+                icon="i-heroicons-calendar-days-20-solid"
+                :label="item[datapoint.key] ? dayjs(item[datapoint.key]).format('DD.MM.YY HH:mm') : 'Datum auswählen'"
+                variant="outline"
+                :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
+            />
+
+            <template #panel="{ close }">
+              <LazyDatePicker
+                  @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
+                  v-model="item[datapoint.key]"
+                  @close="close"
+                  :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
+                  mode="datetime"
+              />
+            </template>
+          </UPopover>
           <Tiptap
               v-else-if="datapoint.inputType === 'editor'"
               @updateContent="(i) => contentChanged(i,datapoint)"
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index a93ea5c..2435368 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -180,7 +180,7 @@ const changeActivePhase = async (key) => {
                 >
                   <td>{{datapoint.label}}:</td>
                   <td>
-                    <component v-if="datapoint.component" :is="datapoint.component" :row="props.item"></component>
+                    <component v-if="datapoint.component" :is="datapoint.component" :row="props.item" :in-show="true"></component>
                     <div v-else>
                       <span v-if="datapoint.key.includes('.')">{{props.item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]}}{{datapoint.unit}}</span>
                       <span v-else>{{props.item[datapoint.key]}} {{datapoint.unit}}</span>
@@ -381,6 +381,51 @@ const changeActivePhase = async (key) => {
               </template>
             </UAccordion>
           </UCard>
+        </div><div v-else-if="item.label === 'Ausgangsbelege'">
+          <UCard class="mt-5">
+
+            <Toolbar>
+              <UButton
+                @click="router.push('/createDocument/edit/?type=quotes')"
+              >
+                + Angebot
+              </UButton>
+              <UButton
+                @click="router.push('/createDocument/edit/?type=confirmationOrders')"
+              >
+                + Auftragsbestätigung
+              </UButton>
+              <UButton
+                @click="router.push('/createDocument/edit/?type=deliveryNotes')"
+              >
+                + Lieferschein
+              </UButton>
+              <UButton
+                @click="router.push('/createDocument/edit/?type=advanceInvoices')"
+              >
+                + Abschlagsrechnung
+              </UButton>
+              <UButton
+                @click="router.push('/createDocument/edit/?type=invoices')"
+              >
+                + Rechnung
+              </UButton>
+            </Toolbar>
+
+            <UTable
+              :rows="props.item.createddocuments"
+              :columns="[{key:'documentNumber',label: 'Nummer'},{key:'documentDate',label: 'Datum'},{key:'type',label: 'Typ'},{key:'state',label: 'Status'}]"
+              @select="(i) => router.push(i.state === 'Entwurf' ? `/createDocument/edit/${i.id}`:`/createDocument/show/${i.id}`)"
+            >
+              <template #documentDate-data="{row}">
+                {{dayjs(row.documentDate).format("DD.MM.YY HH:mm")}}
+              </template>
+              <template #type-data="{row}">
+                {{dataStore.documentTypesForCreation[row.type].labelSingle}}
+              </template>
+            </UTable>
+
+          </UCard>
         </div>
       </div>
 
@@ -403,6 +448,6 @@ td {
 .scroll {
   height: 80vh;
   overflow-y: scroll;
-  padding: 1em;
+  padding: 0.3em;
 }
 </style>
\ No newline at end of file
diff --git a/components/columnRenderings/contact.vue b/components/columnRenderings/contact.vue
index 7b83524..44c889d 100644
--- a/components/columnRenderings/contact.vue
+++ b/components/columnRenderings/contact.vue
@@ -4,10 +4,16 @@ const props = defineProps({
     type: Object,
     required: true,
     default: {}
+  },
+  inShow: {
+    type: Boolean,
+    default: false
   }
 })
 </script>
 
 <template>
-  <span>{{props.row.contact ? props.row.contact.name : ''}}</span>
-</template>
+  <div v-if="props.row.contact">
+    <nuxt-link v-if="props.inShow" :to="`/standardEntity/contacts/show/${props.row.contact.id}`">{{props.row.contact ? props.row.contact.name : ''}}</nuxt-link>
+    <span v-else>{{props.row.contact ? props.row.contact.name : ''}}</span>
+  </div></template>
diff --git a/components/columnRenderings/customer.vue b/components/columnRenderings/customer.vue
index 139b2ea..5c6d131 100644
--- a/components/columnRenderings/customer.vue
+++ b/components/columnRenderings/customer.vue
@@ -4,10 +4,17 @@ const props = defineProps({
     type: Object,
     required: true,
     default: {}
+  },
+  inShow: {
+    type: Boolean,
+    default: false
   }
 })
 </script>
 
 <template>
-  <span>{{props.row.customer ? props.row.customer.name : ''}}</span>
+  <div v-if="props.row.customer">
+    <nuxt-link v-if="props.inShow" :to="`/standardEntity/customers/show/${props.row.customer.id}`">{{props.row.customer ? props.row.customer.name : ''}}</nuxt-link>
+    <span v-else>{{props.row.customer ? props.row.customer.name : ''}}</span>
+  </div>
 </template>
diff --git a/components/columnRenderings/plant.vue b/components/columnRenderings/plant.vue
index 3467c70..5b9358a 100644
--- a/components/columnRenderings/plant.vue
+++ b/components/columnRenderings/plant.vue
@@ -4,10 +4,17 @@ const props = defineProps({
     type: Object,
     required: true,
     default: {}
+  },
+  inShow: {
+    type: Boolean,
+    default: false
   }
 })
 </script>
 
 <template>
-  <span>{{props.row.plant ? props.row.plant.name : ''}}</span>
+  <div v-if="props.row.plant">
+    <nuxt-link v-if="props.inShow " :to="`/standardEntity/plants/show/${props.row.plant.id}`">{{props.row.plant ? props.row.plant.name : ''}}</nuxt-link>
+    <span v-else>{{props.row.plant ? props.row.plant.name : ''}}</span>
+  </div>
 </template>
diff --git a/components/columnRenderings/profiles.vue b/components/columnRenderings/profiles.vue
index 617c3a0..e3f4e07 100644
--- a/components/columnRenderings/profiles.vue
+++ b/components/columnRenderings/profiles.vue
@@ -4,6 +4,10 @@ const props = defineProps({
     type: Object,
     required: true,
     default: {}
+  },
+  inShow: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -14,5 +18,10 @@ const profiles = computed(() => props.row.profiles.map(id => profileStore.getPro
 </script>
 
 <template>
-  <span>{{props.row.profiles ? profiles : ''}}</span>
+  <div v-if="props.row.profiles">
+    <div v-if="props.inShow">
+      <nuxt-link v-for="(profileId, index) in props.row.profiles" :to="`/profiles/show/${profileId}`">{{profileStore.getProfileById(profileId).fullName}}{{index < props.row.profiles.length - 1 ? "," : ""}}</nuxt-link>
+    </div>
+    <span v-else>{{props.row.profiles ? profiles : ''}}</span>
+  </div>
 </template>
diff --git a/components/columnRenderings/project.vue b/components/columnRenderings/project.vue
index d3cdb50..ec15cb9 100644
--- a/components/columnRenderings/project.vue
+++ b/components/columnRenderings/project.vue
@@ -4,10 +4,16 @@ const props = defineProps({
     type: Object,
     required: true,
     default: {}
+  },
+  inShow: {
+    type: Boolean,
+    default: false
   }
 })
 </script>
 
 <template>
-  <span>{{props.row.project ? props.row.project.name : ''}}</span>
-</template>
+  <div v-if="props.row.project">
+    <nuxt-link v-if="props.inShow" :to="`/standardEntity/projects/show/${props.row.project.id}`">{{props.row.project ? props.row.project.name : ''}}</nuxt-link>
+    <span v-else>{{props.row.project ? props.row.project.name : ''}}</span>
+  </div></template>
diff --git a/components/columnRenderings/vehicle.vue b/components/columnRenderings/vehicle.vue
index fab74bb..6b60fd3 100644
--- a/components/columnRenderings/vehicle.vue
+++ b/components/columnRenderings/vehicle.vue
@@ -4,10 +4,19 @@ const props = defineProps({
     type: Object,
     required: true,
     default: {}
+  },
+  inShow: {
+    type: Boolean,
+    default: false
   }
 })
 </script>
 
 <template>
-  <span v-if="props.row.vehicle">{{props.row.vehicle.id ? props.row.vehicle.licensePlate : ''}}</span>
+  <div v-if="props.row.vehicle">
+    <nuxt-link v-if="props.inShow" :to="`/standardEntity/vehicles/show/${props.row.vehicle.id}`">
+      {{ props.row.vehicle ? props.row.vehicle.name : '' }}
+    </nuxt-link>
+    <span v-else>{{ props.row.vehicle ? props.row.vehicle.name : '' }}</span>
+  </div>
 </template>
diff --git a/components/columnRenderings/vendor.vue b/components/columnRenderings/vendor.vue
index 92601dc..d6bb60e 100644
--- a/components/columnRenderings/vendor.vue
+++ b/components/columnRenderings/vendor.vue
@@ -4,10 +4,17 @@ const props = defineProps({
     type: Object,
     required: true,
     default: {}
+  },
+  inShow: {
+    type: Boolean,
+    default: false
   }
 })
 </script>
 
 <template>
-  <span>{{props.row.vendor ? props.row.vendor.name : ''}}</span>
+  <div v-if="props.row.vendor">
+    <nuxt-link v-if="props.inShow" :to="`/standardEntity/vendors/show/${props.row.vendor.id}`">{{props.row.vendor ? props.row.vendor.name : ''}}</nuxt-link>
+    <span v-else>{{props.row.vendor ? props.row.vendor.name : ''}}</span>
+  </div>
 </template>
diff --git a/stores/data.js b/stores/data.js
index 4528f5c..9dc41e2 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -122,7 +122,7 @@ export const useDataStore = defineStore('data', () => {
             numberRangeHolder: "customerNumber",
             historyItemHolder: "customer",
             supabaseSortColumn: "customerNumber",
-            supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*)",
+            supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*)",
             filters: [],
             templateColumns: [
                 {
@@ -228,7 +228,7 @@ export const useDataStore = defineStore('data', () => {
                     component: profiles
                 },
             ],
-            showTabs: [{label: 'Informationen'},{label: 'Dokumente'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]
+            showTabs: [{label: 'Informationen'},{label: 'Dokumente'},{label: 'Ausgangsbelege'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]
         },
         contacts: {
             label: "Kontakte",
@@ -307,7 +307,7 @@ export const useDataStore = defineStore('data', () => {
                     inputType: "text",
                 },
                 {
-                    key: "birtday",
+                    key: "birthday",
                     label: "Geburtstag",
                     inputType: "date",
                 },
@@ -593,7 +593,7 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             historyItemHolder: "project",
             numberRangeHolder: "projectNumber",
-            supabaseSelectWithInformation: "*, customer(name), plant(name), projecttype(name, id), tasks(*), documents(*)",
+            supabaseSelectWithInformation: "*, customer(id,name), plant(id,name), projecttype(name, id), tasks(*), documents(*), createddocuments(*)",
             supabaseSortColumn: "projectNumber",
             filters: [
                 {
@@ -642,13 +642,7 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "customers",
                     selectOptionAttribute: "name",
                     selectSearchAttributes: ['name'],
-                },
-                {
-                    key: "notes",
-                    label: "Notizen",
-                    inputType: "textarea"
-                },
-                {
+                },{
                     key: "plant",
                     label: "Objekt",
                     component: plant,
@@ -656,6 +650,10 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "plants",
                     selectOptionAttribute: "name",
                     selectSearchAttributes: ['name'],
+                },{
+                    key: "notes",
+                    label: "Notizen",
+                    inputType: "textarea"
                 },
                 {
                     key: "profiles",
@@ -681,6 +679,8 @@ export const useDataStore = defineStore('data', () => {
                 },{
                     key: "documents",
                     label: "Dokumente"
+                },{
+                    label: "Ausgangsbelege"
                 }/*,{
                     key: "timetracking",
                     label: "Zeiterfassung"
@@ -1260,10 +1260,12 @@ export const useDataStore = defineStore('data', () => {
                 {
                     key: "startDate",
                     label: "Start",
+                    inputType: "datetime",
                 },
                 {
                     key: "endDate",
-                    label: "Ende"
+                    label: "Ende",
+                    inputType: "datetime",
                 },/*{
                     key: "eventtype",
                     label: "Typ",

From 6989dd61f7bbffee1b670d5bb286a2fd1f8b52c0 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 31 Dec 2024 23:40:12 +0100
Subject: [PATCH 033/104] Fixed Calendar & Timeline Fixed AbsenceRequest Manual
 Selects

---
 components/EntityShow.vue |   2 +-
 components/MainNav.vue    |   2 +-
 pages/calendar/[mode].vue | 371 ++++++++++++++++++++++++++++++--------
 stores/data.js            |  38 ++--
 4 files changed, 326 insertions(+), 87 deletions(-)

diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 2435368..e82495d 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -414,7 +414,7 @@ const changeActivePhase = async (key) => {
 
             <UTable
               :rows="props.item.createddocuments"
-              :columns="[{key:'documentNumber',label: 'Nummer'},{key:'documentDate',label: 'Datum'},{key:'type',label: 'Typ'},{key:'state',label: 'Status'}]"
+              :columns="[{key:'state',label: 'Status'},{key:'documentNumber',label: 'Nummer'},{key:'documentDate',label: 'Datum'},{key:'type',label: 'Typ'}]"
               @select="(i) => router.push(i.state === 'Entwurf' ? `/createDocument/edit/${i.id}`:`/createDocument/show/${i.id}`)"
             >
               <template #documentDate-data="{row}">
diff --git a/components/MainNav.vue b/components/MainNav.vue
index 61cf0d8..0358f79 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -167,7 +167,7 @@ const links = computed(() => {
       children: [
         ... role.checkRight("vehicles") ? [{
           label: "Fahrzeuge",
-          to: "/vehicles",
+          to: "/standardEntity/vehicles",
           icon: "i-heroicons-truck"
         }] : [],{
           label: "Fahrten",
diff --git a/pages/calendar/[mode].vue b/pages/calendar/[mode].vue
index 9223c4f..af6f71e 100644
--- a/pages/calendar/[mode].vue
+++ b/pages/calendar/[mode].vue
@@ -6,6 +6,7 @@ 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"
@@ -17,9 +18,10 @@ 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 resources = dataStore.getResources
+//const eventTypes = dataStore.getEventTypes
 
+const profileStore = useProfileStore()
 
 //Working
 const newEventData = ref({
@@ -36,66 +38,40 @@ const showEventModal = ref(false)
 const selectedEvent = ref({})
 const selectedResources = ref([])
 
+const events = ref([])
+const calendarOptionsGrid = computed(() => {
+  return {
+    locale: deLocale,
+    plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin],
+    headerToolbar: {
+      left: 'prev,next today',
+      center: 'title',
+      right: 'dayGridMonth,timeGridWeek,timeGridDay'
+    },
+    initialView: "timeGridWeek",
+    initialEvents: events.value,
+    nowIndicator: true,
+    height: "80vh",
+    selectable: true,
+    weekNumbers: true,
+    select: function (info) {
+      console.log(info)
 
-//Functions
-const convertResourceIds = () => {
-
-  newEventData.value.resources = selectedResources.value.map(i => {
-    /*if(i.type !== 'Mitarbeiter') {
-      return {id: Number(i.id.split('-')[1]), type: i.type}
-    } else {
-      return {id: i.id, type: i.type}
-    }*/
-
-    if((String(i).match(/-/g) || []).length > 1) {
-      return {type: "Mitarbeiter", id: i}
-    } else {
-
-      if(i.split('-')[0] === 'I') {
-        return {id: Number(i.split('-')[1]), type: "Inventar"}
-      } else if(i.split('-')[0] === 'F') {
-        return {id: Number(i.split('-')[1]), type: "Fahrzeug"}
+      router.push(`/standardEntity/events/edit/?start=${info.startStr}&end=${info.endStr}&source=grid`)
+    },
+    eventClick: function (info) {
+      console.log(info)
+      if (info.event.title.startsWith("Abw.:")) {
+        router.push(`/standardEntity/absencerequests/show/${info.event.id}`)
+      } else {
+        router.push(`/standardEntity/events/show/${info.event.id}`)
       }
-    }
 
-
-  })
-}
-
-//Calendar Config
-const calendarOptionsGrid = reactive({
-  locale: deLocale,
-  plugins: [dayGridPlugin, interactionPlugin, timeGridPlugin],
-  headerToolbar: {
-    left: 'prev,next today',
-    center: 'title',
-    right: 'dayGridMonth,timeGridWeek,timeGridDay'
-  },
-  initialView: "dayGridMonth",
-  initialEvents: dataStore.getEvents,
-  nowIndicator: true,
-  height: "80vh",
-  selectable: true,
-  weekNumbers: true,
-  select: function(info) {
-    console.log(info)
-
-
-    router.push(`/events/edit/?start=${info.startStr}&end=${info.endStr}&source=grid`)
-
-  },
-  eventClick: function (info){
-    console.log(info)
-    if(info.event.title.startsWith("Abw.:")){
-      router.push(`/absencerequests/show/${info.event.id}`)
-    } else {
-      router.push(`/events/show/${info.event.id}`)
-    }
-
-  },
+    },
+  }
 })
 
-const calendarOptionsTimeline = reactive({
+const calendarOptionsTimeline = ref({
   schedulerLicenseKey: "CC-Attribution-NonCommercial-NoDerivatives",
   locale: deLocale,
   plugins: [resourceTimelinePlugin, interactionPlugin],
@@ -106,7 +82,11 @@ const calendarOptionsTimeline = reactive({
     center: 'title',
     right: 'resourceTimelineDay,resourceTimeline3Hours,resourceTimelineMonth'
   },
-  initialEvents: dataStore.getEventsByResource,
+  initialEvents: [{
+    title:"Test",
+    resourceId:"F-27",
+    start:"2025-01-01"
+  }],
   selectable: true,
   select: function (info) {
     router.push(`/events/edit/?start=${info.startStr}&end=${info.endStr}&resources=${JSON.stringify([info.resource.id])}&source=timeline`)
@@ -115,12 +95,12 @@ const calendarOptionsTimeline = reactive({
     if(info.event.title.startsWith("Abw.:")){
       router.push(`/absencerequests/show/${info.event.id}`)
     } else {
-      router.push(`/events/show/${info.event.id}`)
+      router.push(`/standardEntity/events/show/${info.event.id}`)
     }
   },
   resourceGroupField: "type",
   resourceOrder: "-type",
-  resources: resources,
+  resources: [],
   nowIndicator:true,
   views: {
     resourceTimeline3Hours: {
@@ -146,25 +126,274 @@ const calendarOptionsTimeline = reactive({
   height: '80vh',
 })
 
+const loaded = ref(false)
+const setupPage = async () => {
+  let tempData = await useSupabaseSelect("events", "*, vehicles(*), inventoryitems(*)")
+  let absencerequests = await useSupabaseSelect("absencerequests", "*")
+  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,
+      }
+    })
+  ]*/
+
+  calendarOptionsGrid.value.initialEvents = [
+    ...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,
+      }
+    })
+  ]
+
+  calendarOptionsTimeline.value.resources = [
+    ...profiles.filter(i => i.tenant === profileStore.currentTenant).map(profile => {
+      return {
+        type: 'Mitarbeiter',
+        title: profile.fullName,
+        id: profile.id
+      }
+    }),
+    ...vehicles.map(vehicle => {
+      return {
+        type: 'Fahrzeug',
+        title: vehicle.licensePlate,
+        id: `F-${vehicle.id}`
+      }
+    }),
+    ...inventoryitems.filter(i=> i.usePlanning).map(item => {
+      return {
+        type: 'Inventar',
+        title: item.name,
+        id: `I-${item.id}`
+      }
+    })
+  ]
+  console.log(calendarOptionsTimeline.value.resources)
+
+/*
+  calendarOptionsTimeline.value.initialEvents = [
+      ...events.value.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 : ""
+        }
+
+        let resource = ""
+        let resourceType = ""
+
+
+
+        return {
+          ...event,
+          start: event.startDate,
+          end: event.endDate,
+          title: title,
+          borderColor: eventColor,
+          textColor: eventColor,
+          backgroundColor: "black"
+        }
+      })
+  ]
+*/
+
+  let tempEvents = []
+
+  tempData.forEach(event => {
+    console.log(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 : ""
+    }
+
+    let returnData = {
+      title: title,
+      borderColor: eventColor,
+      textColor: eventColor,
+      backgroundColor: "black",
+      start: event.startDate,
+      end: event.endDate,
+      resourceIds: [],
+      entrytype: "event"
+    }
+
+
+    if(event.profiles.length > 0) {
+      console.log("Profiles found")
+      event.profiles.forEach(profile => {
+        returnData.resourceIds.push(profile)
+      })
+    }
+
+    if(event.vehicles.length > 0) {
+      console.log("Vehicles found")
+      event.vehicles.forEach(vehicle => {
+        returnData.resourceIds.push(`F-${vehicle.id}`)
+      })
+    }
+
+    if(event.inventoryitems.length > 0) {
+      console.log("Inventoryitems found")
+      event.inventoryitems.forEach(inventoryitem => {
+        returnData.resourceIds.push(`I-${inventoryitem.id}`)
+      })
+    }
+
+    tempEvents.push(returnData)
+
+  })
+
+  absencerequests.forEach(absencerequest => {
+    let returnData = {
+      title: absencerequest.name,
+      backgroundColor: "black",
+      start: absencerequest.startDate,
+      end: absencerequest.endDate,
+      resourceIds: [absencerequest.profile],
+      entrytype: "absencerequest",
+      allDay: true,
+    }
+
+    tempEvents.push(returnData)
+  })
+
+  calendarOptionsTimeline.value.initialEvents = tempEvents
+  console.log(calendarOptionsTimeline.value)
+
+  loaded.value = true
+
+}
+
+setupPage()
+
+
+//Functions
+/*
+const convertResourceIds = () => {
+
+  newEventData.value.resources = selectedResources.value.map(i => {
+    /!*if(i.type !== 'Mitarbeiter') {
+      return {id: Number(i.id.split('-')[1]), type: i.type}
+    } else {
+      return {id: i.id, type: i.type}
+    }*!/
+
+    if((String(i).match(/-/g) || []).length > 1) {
+      return {type: "Mitarbeiter", id: i}
+    } else {
+
+      if(i.split('-')[0] === 'I') {
+        return {id: Number(i.split('-')[1]), type: "Inventar"}
+      } else if(i.split('-')[0] === 'F') {
+        return {id: Number(i.split('-')[1]), type: "Fahrzeug"}
+      }
+    }
+
+
+  })
+}
+*/
+
+
+
+
+//Calendar Config
+
+
+
 </script>
 
 <template>
-  <UDashboardNavbar :title="currentItem ? currentItem.name : ''">
-    <template #right>
+    <UDashboardNavbar title="Kalender">
+      <template #center>
+        <h1
+            :class="['text-xl','font-medium']"
+        >Kalender</h1>
+      </template>
+      <template #right>
 
-    </template>
-  </UDashboardNavbar>
-
-  <div v-if="mode === 'grid'" class="p-5">
-    <FullCalendar
-        :options="calendarOptionsGrid"
-    />
-  </div>
-  <div v-else-if="mode === 'timeline'" class="p-5">
+      </template>
+    </UDashboardNavbar>
+  <UDashboardPanelContent>
+    <div v-if="mode === 'grid' && loaded" class="p-5">
+      <FullCalendar
+          :options="calendarOptionsGrid"
+      />
+    </div>
+    <div v-else-if="mode === 'timeline' && loaded"  class="p-5">
     <FullCalendar
         :options="calendarOptionsTimeline"
     />
   </div>
+  </UDashboardPanelContent>
+
+
+
 </template>
 
 <style scoped>
diff --git a/stores/data.js b/stores/data.js
index 9dc41e2..4bd5a73 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -436,7 +436,12 @@ export const useDataStore = defineStore('data', () => {
                     key: "approved",
                     label: "Genehmigt",
                     inputType: "select",
-                    selectManualOptions: ["Offen","Genehmigt", "Abgelehnt"]
+                    selectValueAttribute: "label",
+                    selectManualOptions: [
+                        {label:"Offen"},
+                        {label:"Genehmigt"},
+                        {label:"Abgelehnt"}
+                    ]
                 },{
                     key: "name",
                     label: "Name",
@@ -455,16 +460,19 @@ export const useDataStore = defineStore('data', () => {
                     key: "reason",
                     label: "Grund",
                     inputType: "select",
-                    selectManualOptions: ["Elternzeit",
-                        "Kind krank - Kinderbetreuung",
-                        "Krankheit",
-                        "Krankheit 1 Tag (mit Attest)",
-                        "Krankheit ab 2. Tag (mit Attest)",
-                        "Mutterschutz",
-                        "Sonderurlaub (bezahlt)",
-                        "Überstundenausgleich",
-                        "Unbezahlter Urlaub",
-                        "Urlaub"]
+                    selectValueAttribute: "label",
+                    selectManualOptions: [
+                        {label:"Urlaub"},
+                        {label:"unbezahlter Urlaub"},
+                        {label:"Überstundenausgleich"},
+                        {label:"Sonderurlaub(bezahlt)"},
+                        {label:"Mutterschutz"},
+                        {label:"Krankheit ab 2. Tag (mit Attest)"},
+                        {label:"Krankheit 1 Tag (mit Attest)"},
+                        {label:"Krankheit"},
+                        {label:"Kind krank - Kinderbetreuung"},
+                        {label:"Elternzeit"},
+                    ]
                 },{
                     key: "startDate",
                     label: "Start",
@@ -742,7 +750,7 @@ export const useDataStore = defineStore('data', () => {
                 {
                     key: "towingCapacity",
                     label: "Anhängelast",
-                    unit: "kG",
+                    unit: "Kg",
                     inputType: "number"
                 },
                 {
@@ -1109,7 +1117,7 @@ export const useDataStore = defineStore('data', () => {
                     inputColumn: "Anschaffung"
                 },
                 {
-                    key: "maunfacturer",
+                    key: "manufacturer",
                     label: "Hersteller",
                     inputType: "text",
                     inputColumn: "Anschaffung"
@@ -1817,6 +1825,8 @@ export const useDataStore = defineStore('data', () => {
                     name = "Wöchentliche Arbeitszeit"
                 } else if(key === "licensePlate") {
                     name = "Kennzeichen"
+                }else if(key === "tankSize") {
+                    name = "Tankvolumen"
                 }else if(key === "towingCapacity") {
                     name = "Anhängelast"
                 }else if(key === "color") {
@@ -1973,7 +1983,7 @@ export const useDataStore = defineStore('data', () => {
 
             await generateHistoryItems(dataType, supabaseData[0])
 
-            if(!["statementallocations", "productcategories", "projecttypes", "checks", "profiles","services"].includes(dataType) ){
+            if(!["statementallocations", "productcategories", "projecttypes", "checks", "profiles","services", "inventoryitems"].includes(dataType) ){
                 await eval( dataType + '.value.push(' + JSON.stringify(...supabaseData) + ')')
             }
 

From 595531683b451086a52f1ca8c4f05a39260f8453 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 31 Dec 2024 23:56:54 +0100
Subject: [PATCH 034/104] Fixed Calendar Link

---
 pages/calendar/[mode].vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pages/calendar/[mode].vue b/pages/calendar/[mode].vue
index af6f71e..fc671df 100644
--- a/pages/calendar/[mode].vue
+++ b/pages/calendar/[mode].vue
@@ -92,10 +92,11 @@ const calendarOptionsTimeline = ref({
     router.push(`/events/edit/?start=${info.startStr}&end=${info.endStr}&resources=${JSON.stringify([info.resource.id])}&source=timeline`)
   },
   eventClick: function (info){
-    if(info.event.title.startsWith("Abw.:")){
-      router.push(`/absencerequests/show/${info.event.id}`)
+    console.log(info.event)
+    if(info.event.extendedProps.entrytype === "absencerequest"){
+      router.push(`/standardEntity/absencerequests/show/${info.event.extendedProps.absencerequestId}`)
     } else {
-      router.push(`/standardEntity/events/show/${info.event.id}`)
+      router.push(`/standardEntity/events/show/${info.event.extendedProps.eventId}`)
     }
   },
   resourceGroupField: "type",
@@ -279,7 +280,8 @@ const setupPage = async () => {
       start: event.startDate,
       end: event.endDate,
       resourceIds: [],
-      entrytype: "event"
+      entrytype: "event",
+      eventId: event.id
     }
 
 
@@ -310,13 +312,14 @@ const setupPage = async () => {
 
   absencerequests.forEach(absencerequest => {
     let returnData = {
-      title: absencerequest.name,
+      title: `${absencerequest.reason} - ${absencerequest.name}`,
       backgroundColor: "black",
       start: absencerequest.startDate,
       end: absencerequest.endDate,
       resourceIds: [absencerequest.profile],
       entrytype: "absencerequest",
       allDay: true,
+      absencerequestId: absencerequest.id
     }
 
     tempEvents.push(returnData)

From b877d5f91b1c937a04c089122dfc213de5dc0955 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Thu, 2 Jan 2025 14:04:55 +0100
Subject: [PATCH 035/104] Changes in Timetracking Added Lieferscheine Button to
 EntityShow DataType Changes Fixed Loading Errors in createDocument Added
 Telephone to profile show

---
 components/EntityShow.vue            | 10 ++++++
 pages/createDocument/edit/[[id]].vue | 36 +++++++++++++++----
 pages/employees/timetracking.vue     | 54 ++++++++++++++--------------
 pages/profiles/show/[id].vue         | 18 ++++++++++
 pages/settings/numberRanges.vue      |  3 ++
 stores/data.js                       |  5 ++-
 6 files changed, 89 insertions(+), 37 deletions(-)

diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index e82495d..012e800 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -109,6 +109,10 @@ const changeActivePhase = async (key) => {
   })
 }
 
+const invoiceDeliveryNotes = () => {
+  router.push(`/createDocument/edit?type=invoices&linkedDocuments=[${props.item.createddocuments.filter(i => i.type === "deliveryNotes").map(i => i.id)}]`)
+}
+
 </script>
 
 <template>
@@ -410,6 +414,12 @@ const changeActivePhase = async (key) => {
               >
                 + Rechnung
               </UButton>
+              <UButton
+                @click="invoiceDeliveryNotes"
+                v-if="type === 'projects'"
+              >
+                Lieferscheine abrechnen
+              </UButton>
             </Toolbar>
 
             <UTable
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 5795fe5..f1deb89 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -136,7 +136,7 @@ const setupPage = async () => {
         itemInfo.value.rows.push(...[
           {
             id:uuidv4(),
-            mode: "text",
+            mode: "title",
             text: doc.title
           },
             ...doc.rows
@@ -144,6 +144,16 @@ const setupPage = async () => {
 
       })
 
+      itemInfo.value.rows.forEach(row => {
+
+        row.discountPercent = 0
+
+        setRowData(row)
+
+      })
+
+      setPosNumbers()
+
       if(linkedDocuments.find(i => i.agriculture)){
         itemInfo.value.rows = itemInfo.value.rows.filter(i => i.key !== "dieselPos")
 
@@ -155,6 +165,8 @@ const setupPage = async () => {
 
         processDieselPosition()
       }
+
+
     }
 
     if(route.query.linkedDocument) {
@@ -219,8 +231,10 @@ const setDocumentTypeConfig = (withTexts = false) => {
   }
 
   if(withTexts) {
-    itemInfo.value.startText = texttemplates.value.find(i => i.documentType === itemInfo.value.type && i.default && i.pos === "startText").text
-    itemInfo.value.endText = texttemplates.value.find(i => i.documentType === itemInfo.value.type && i.default && i.pos === "endText").text
+    itemInfo.value.startText = getTextTemplateByType(itemInfo.value.type).find(i => i.default && i.pos === "startText").text
+    itemInfo.value.endText = getTextTemplateByType(itemInfo.value.type).find(i => i.default && i.pos === "endText").text
+    //itemInfo.value.startText = texttemplates.value.find(i => i.documentType === itemInfo.value.type && i.default && i.pos === "startText").text
+    //itemInfo.value.endText = texttemplates.value.find(i => i.documentType === itemInfo.value.type && i.default && i.pos === "endText").text
   }
 
   itemInfo.value.letterhead = letterheads.value[0].id
@@ -846,6 +860,17 @@ const closeDocument = async () => {
 
 }
 
+const getTextTemplateByType = (type) => {
+
+  let finalType = type
+
+  if(type === "serialInvoices") {
+    finalType = "invoices"
+  }
+
+  return texttemplates.value.filter(i => i.documentType === finalType)
+}
+
 const setRowData = (row) => {
   console.log(row)
   if(row.service) {
@@ -894,7 +919,6 @@ const setRowData = (row) => {
   </UDashboardNavbar>
 
   <UDashboardPanelContent>
-    {{itemInfo}}
     <UTabs class="p-5" :items="tabItems" @change="onChangeTab" v-if="loaded">
       <template #item="{item}">
         <div v-if="item.label === 'Editor'">
@@ -1371,7 +1395,7 @@ const setRowData = (row) => {
               label="Vorlage auswählen"
           >
             <USelectMenu
-                :options="dataStore.getTextTemplatesByDocumentType(itemInfo.type)"
+                :options="getTextTemplateByType(itemInfo.type)"
                 v-model="itemInfo.startText"
                 option-attribute="text"
                 value-attribute="text"
@@ -1888,7 +1912,7 @@ const setRowData = (row) => {
               label="Vorlage auswählen"
           >
             <USelectMenu
-                :options="dataStore.getTextTemplatesByDocumentType(itemInfo.type)"
+                :options="getTextTemplateByType(itemInfo.type)"
                 v-model="itemInfo.endText"
                 option-attribute="text"
                 value-attribute="text"
diff --git a/pages/employees/timetracking.vue b/pages/employees/timetracking.vue
index 88d2c4a..3bbd807 100644
--- a/pages/employees/timetracking.vue
+++ b/pages/employees/timetracking.vue
@@ -17,22 +17,29 @@ const toast = useToast()
 
 const timeTypes = dataStore.getTimeTypes
 const timeInfo = ref({
-  user: "",
-  start: "",
-  end: null,
+  profile: "",
+  startDate: "",
+  endDate: null,
   notes: null,
-  projectId: null,
+  project: null,
   type: null
 })
 
-const filterUser = ref(user.value.id || "")
+const filterUser = ref(profileStore.activeProfile.id || "")
 
+const times = ref([])
+
+const setup = async () => {
+  times.value = await useSupabaseSelect("times","*, profile(*)")
+}
+
+setup()
 
 const filteredRows = computed(() => {
 
-  let times = dataStore.times
+  //let times = times.value
 
-  if(dataStore.hasRight('viewTimes')) {
+  /*if(dataStore.hasRight('viewTimes')) {
     if(filterUser.value !== "") {
       times = times.filter(i => i.user === filterUser.value)
     }
@@ -40,9 +47,9 @@ const filteredRows = computed(() => {
     times = times.filter(i => i.user === user.value.id)
   } else {
     times  = []
-  }
+  }*/
 
-  return times
+  return times.value
 
 })
 
@@ -63,42 +70,34 @@ const columns = [
   {
     key:"state",
     label: "Status",
-    sortable:true
   },
   {
     key: "user",
     label: "Benutzer",
-    sortable:true
   },
   {
-    key:"start",
+    key:"startDate",
     label:"Start",
-    sortable:true
+  },
+  {
+    key: "endDate",
+    label: "Ende",
   },
   {
     key:"type",
     label:"Typ",
-    sortable:true
-  },
-  {
-    key: "end",
-    label: "Ende",
-    sortable:true
   },
   {
     key: "duration",
     label: "Dauer",
-    sortable:true
   },
   {
-    key: "projectId",
+    key: "project",
     label: "Projekt",
-    sortable:true
   },
   {
     key: "notes",
     label: "Notizen",
-    sortable:true
   }
 ]
 
@@ -110,7 +109,7 @@ const configTimeMode = ref("create")
 
 const startTime = async () => {
   console.log("started")
-  timeInfo.value.user = user.value.id
+  timeInfo.value.profile = profileStore.activeProfile.id
   timeInfo.value.start = new Date().toISOString()
   timeInfo.value.tenant = profileStore.currentTenant
 
@@ -124,7 +123,7 @@ const startTime = async () => {
   } else if(data) {
     //timeInfo.value = data[0]
     await dataStore.fetchTimes()
-    runningTimeInfo.value = dataStore.times.find(time => time.user === user.value.id && !time.end)
+    runningTimeInfo.value = dataStore.times.find(time => time.profile === profileStore.activeProfile.id && !time.end)
   }
 
 }
@@ -155,8 +154,8 @@ const stopStartedTime = async () => {
   }
 }
 
-if(dataStore.times.find(time => time.user == user.value.id && !time.end)) {
-  runningTimeInfo.value = dataStore.times.find(time => time.user == user.value.id && !time.end)
+if(times.value.find(time => time.profile == profileStore.activeProfile.id && !time.end)) {
+  runningTimeInfo.value = times.value.find(time => time.profile == profileStore.activeProfile.id && !time.end)
 }
 
 
@@ -241,7 +240,6 @@ const setState = async (newState) => {
         Erstellen
       </UButton>
       <USelectMenu
-          v-if="dataStore.hasRight('viewTimes')"
           :options="profileStore.profiles"
           option-attribute="fullName"
           value-attribute="id"
diff --git a/pages/profiles/show/[id].vue b/pages/profiles/show/[id].vue
index 99a5ac5..6b208d0 100644
--- a/pages/profiles/show/[id].vue
+++ b/pages/profiles/show/[id].vue
@@ -208,6 +208,24 @@ const saveProfile = async () => {
               />
             </UFormGroup>
           </InputGroup>
+          <InputGroup class="w-full">
+            <UFormGroup
+              label="Festnetz Telefon"
+              class="w-60"
+            >
+              <UInput
+                v-model="itemInfo.fixedTel"
+              />
+            </UFormGroup>
+            <UFormGroup
+              label="Handy"
+              class="flex-auto"
+            >
+              <UInput
+                v-model="itemInfo.mobileTel"
+              />
+            </UFormGroup>
+          </InputGroup>
           <InputGroup class="w-full">
             <UFormGroup
               label="Kleidergröße Oberteil"
diff --git a/pages/settings/numberRanges.vue b/pages/settings/numberRanges.vue
index 3cf7e23..67de159 100644
--- a/pages/settings/numberRanges.vue
+++ b/pages/settings/numberRanges.vue
@@ -36,6 +36,9 @@ const resources = {
   },
   confirmationOrders: {
     label: "Auftragsbestätigungen"
+  },
+  deliveryNotes: {
+    label: "Lieferscheine"
   }
 }
 
diff --git a/stores/data.js b/stores/data.js
index 4bd5a73..b65e899 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -122,7 +122,7 @@ export const useDataStore = defineStore('data', () => {
             numberRangeHolder: "customerNumber",
             historyItemHolder: "customer",
             supabaseSortColumn: "customerNumber",
-            supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*)",
+            supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*), documents(*)",
             filters: [],
             templateColumns: [
                 {
@@ -1296,8 +1296,7 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "projects",
                     selectOptionAttribute: "name",
                     selectSearchAttributes: ['name'],
-                },
-                {
+                },{
                     key: "profiles",
                     label: "Beteiligte Benutzer",
                     inputType: "select",

From 4f395a01d33317bd171fc6dddf6bc65d23c1815f Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Thu, 2 Jan 2025 19:08:14 +0100
Subject: [PATCH 036/104] Added Link to MAWEBFORM Only for Tenant 21

---
 components/MainNav.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/MainNav.vue b/components/MainNav.vue
index 0358f79..7299f50 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -7,6 +7,12 @@ const route = useRoute()
 const role = useRole()
 const links = computed(() => {
   return [
+    ... profileStore.currentTenant === 21 ? [{
+      label: "Lieferschein Formular",
+      to: "https://loar.ma-agrarservice.de/erfassung",
+      icon: "i-heroicons-rectangle-stack",
+      target: "_blank",
+    }] : [],
     {
       id: 'dashboard',
       label: "Dashboard",

From 8723540b0d8edf9d9a99f83e1b89d90e6079f5bb Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Thu, 2 Jan 2025 19:23:31 +0100
Subject: [PATCH 037/104] Added GetAvailableStringVars

---
 components/EntityShow.vue | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 012e800..d74f5b7 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -113,6 +113,25 @@ const invoiceDeliveryNotes = () => {
   router.push(`/createDocument/edit?type=invoices&linkedDocuments=[${props.item.createddocuments.filter(i => i.type === "deliveryNotes").map(i => i.id)}]`)
 }
 
+const getAvailableQueryStringData = () => {
+  let returnString =""
+
+  if(props.item.customer) {
+    returnString += `&customer=${props.item.customer.id}`
+  } else if(type === "customers") {
+    returnString += `&customer=${props.item.id}`
+  }
+
+  if(props.item.project) {
+    returnString += `&project=${props.item.project.id}`
+  } else if(type === "projects") {
+    returnString += `&project=${props.item.id}`
+  }
+
+  return returnString
+
+}
+
 </script>
 
 <template>
@@ -390,27 +409,27 @@ const invoiceDeliveryNotes = () => {
 
             <Toolbar>
               <UButton
-                @click="router.push('/createDocument/edit/?type=quotes')"
+                @click="router.push(`/createDocument/edit/?type=quotes${getAvailableQueryStringData()}`)"
               >
                 + Angebot
               </UButton>
               <UButton
-                @click="router.push('/createDocument/edit/?type=confirmationOrders')"
+                @click="router.push(`/createDocument/edit/?type=confirmationOrders${getAvailableQueryStringData()}`)"
               >
                 + Auftragsbestätigung
               </UButton>
               <UButton
-                @click="router.push('/createDocument/edit/?type=deliveryNotes')"
+                @click="router.push(`/createDocument/edit/?type=deliveryNotes${getAvailableQueryStringData()}`)"
               >
                 + Lieferschein
               </UButton>
               <UButton
-                @click="router.push('/createDocument/edit/?type=advanceInvoices')"
+                @click="router.push(`/createDocument/edit/?type=advanceInvoices${getAvailableQueryStringData()}`)"
               >
                 + Abschlagsrechnung
               </UButton>
               <UButton
-                @click="router.push('/createDocument/edit/?type=invoices')"
+                @click="router.push(`/createDocument/edit/?type=invoices${getAvailableQueryStringData()}`)"
               >
                 + Rechnung
               </UButton>

From cbdf3edd8d50fa49ec2a861c3fe4bf64a5dc3df2 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 3 Jan 2025 09:32:32 +0100
Subject: [PATCH 038/104] Added Birthday & EntryDate

---
 pages/profiles/show/[id].vue | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/pages/profiles/show/[id].vue b/pages/profiles/show/[id].vue
index 6b208d0..5862e93 100644
--- a/pages/profiles/show/[id].vue
+++ b/pages/profiles/show/[id].vue
@@ -225,6 +225,21 @@ const saveProfile = async () => {
                 v-model="itemInfo.mobileTel"
               />
             </UFormGroup>
+            <UFormGroup
+                label="Geburtstag:"
+            >
+              <UPopover :popper="{ placement: 'bottom-start' }">
+                <UButton
+                    icon="i-heroicons-calendar-days-20-solid"
+                    :label="itemInfo.birthday ? dayjs(itemInfo.birthday).format('DD.MM.YYYY') : 'Datum auswählen'"
+                    variant="outline"
+                />
+
+                <template #panel="{ close }">
+                  <LazyDatePicker v-model="itemInfo.birthday" />
+                </template>
+              </UPopover>
+            </UFormGroup>
           </InputGroup>
           <InputGroup class="w-full">
             <UFormGroup
@@ -310,6 +325,23 @@ const saveProfile = async () => {
               Speichern
             </UButton>
           </Toolbar>
+          <InputGroup class="w-full">
+            <UFormGroup
+                label="Eintrittsdatum:"
+            >
+              <UPopover :popper="{ placement: 'bottom-start' }">
+                <UButton
+                    icon="i-heroicons-calendar-days-20-solid"
+                    :label="itemInfo.entryDate ? dayjs(itemInfo.entryDate).format('DD.MM.YYYY') : 'Datum auswählen'"
+                    variant="outline"
+                />
+
+                <template #panel="{ close }">
+                  <LazyDatePicker v-model="itemInfo.entryDate" />
+                </template>
+              </UPopover>
+            </UFormGroup>
+          </InputGroup>
           <InputGroup class="w-full">
             <UFormGroup
               label="Wöchentliche Arbeitszeit"

From cae33c92c96bb62e933e09efe35441c76baea235 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 3 Jan 2025 09:32:49 +0100
Subject: [PATCH 039/104] Added Scroll to createDocument Show

---
 pages/createDocument/show/[id].vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue
index 00bd902..2b52db2 100644
--- a/pages/createDocument/show/[id].vue
+++ b/pages/createDocument/show/[id].vue
@@ -74,11 +74,14 @@ const openEmail = () => {
       </UButton>
     </template>
   </UDashboardToolbar>
+  <UDashboardPanelContent>
+    <object
+        :data="dataStore.documents.find(i => i.id === linkedDocument.id) ? dataStore.documents.find(i => i.id === linkedDocument.id).url : ''"
+        class="h-full"
+    />
+  </UDashboardPanelContent>
+
 
-  <object
-    :data="dataStore.documents.find(i => i.id === linkedDocument.id) ? dataStore.documents.find(i => i.id === linkedDocument.id).url : ''"
-    class="h-full"
-  />
 
 
 

From 159b77334b92c5b3dc75a8c2d17b1f01f59c0215 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 3 Jan 2025 10:50:20 +0100
Subject: [PATCH 040/104] Corrected

---
 components/EntityShow.vue            | 2 +-
 pages/createDocument/edit/[[id]].vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index d74f5b7..970a3c0 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -443,7 +443,7 @@ const getAvailableQueryStringData = () => {
 
             <UTable
               :rows="props.item.createddocuments"
-              :columns="[{key:'state',label: 'Status'},{key:'documentNumber',label: 'Nummer'},{key:'documentDate',label: 'Datum'},{key:'type',label: 'Typ'}]"
+              :columns="[{key:'state',label: 'Status'},{key:'type',label: 'Typ'},{key:'documentNumber',label: 'Nummer'},{key:'documentDate',label: 'Datum'}]"
               @select="(i) => router.push(i.state === 'Entwurf' ? `/createDocument/edit/${i.id}`:`/createDocument/show/${i.id}`)"
             >
               <template #documentDate-data="{row}">
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index f1deb89..69a4c11 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -880,9 +880,9 @@ const setRowData = (row) => {
   }
 
   if(row.product) {
-    row.unit = services.value.find(i => i.id === row.service).unit
-    row.price = services.value.find(i => i.id === row.service).sellingPriceComposed.total || services.value.find(i => i.id === row.service).sellingPrice
-    row.description = services.value.find(i => i.id === row.service).description
+    row.unit = products.value.find(i => i.id === row.product).unit
+    row.price = products.value.find(i => i.id === row.product).sellingPriceComposed.total || products.value.find(i => i.id === row.product).sellingPrice
+    row.description = products.value.find(i => i.id === row.product).description
   }
 
 

From 1c6c6e4a337817ccd36772d47c2dfa661893480c Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 3 Jan 2025 11:01:06 +0100
Subject: [PATCH 041/104] Corrected

---
 pages/createDocument/edit/[[id]].vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 69a4c11..af85e66 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -881,7 +881,7 @@ const setRowData = (row) => {
 
   if(row.product) {
     row.unit = products.value.find(i => i.id === row.product).unit
-    row.price = products.value.find(i => i.id === row.product).sellingPriceComposed.total || products.value.find(i => i.id === row.product).sellingPrice
+    row.price = products.value.find(i => i.id === row.product).sellingPrice
     row.description = products.value.find(i => i.id === row.product).description
   }
 

From efbb97967afd7dfa6bdee11c4631918f98b2ba21 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sun, 5 Jan 2025 18:23:44 +0100
Subject: [PATCH 042/104] Many Changes

---
 app.vue                                  |   2 +
 components/DocumentDisplay.vue           |  24 +-
 components/DocumentDisplayModal.vue      | 196 +++++++++++++++
 components/EntityEdit.vue                |  79 +++++-
 components/EntityShow.vue                |  55 ++---
 components/HistoryDisplay.vue            |  47 +---
 components/MainNav.vue                   | 104 +++-----
 composables/useFiles.js                  | 210 ++++++++++++++++
 composables/useSupabase.js               |  91 -------
 layouts/default.vue                      |  10 -
 pages/createDocument/edit/[[id]].vue     |  45 ++--
 pages/createDocument/show/[id].vue       |  23 +-
 pages/{documents.vue => files/index.vue} | 295 +++++++++++++++++------
 pages/historyitems/index.vue             |  20 ++
 pages/settings/emailAccounts.vue         |  14 +-
 stores/data.js                           | 196 +++++++++------
 16 files changed, 970 insertions(+), 441 deletions(-)
 create mode 100644 components/DocumentDisplayModal.vue
 create mode 100644 composables/useFiles.js
 rename pages/{documents.vue => files/index.vue} (53%)
 create mode 100644 pages/historyitems/index.vue

diff --git a/app.vue b/app.vue
index ab7ec7b..d4950eb 100644
--- a/app.vue
+++ b/app.vue
@@ -50,6 +50,8 @@ useSeoMeta({
   </NuxtLayout>
 
   <UNotifications/>
+  <USlideovers />
+  <UModals />
   <VitePwaManifest/>
 
 
diff --git a/components/DocumentDisplay.vue b/components/DocumentDisplay.vue
index c7d1e2f..729b5d0 100644
--- a/components/DocumentDisplay.vue
+++ b/components/DocumentDisplay.vue
@@ -57,8 +57,8 @@ const updateDocument = async () => {
 }
 
 const archiveDocument = () => {
-  documentData.tags.push("Archiviert")
-  updateDocument()
+  //documentData.tags.push("Archiviert")
+  //updateDocument()
 }
 
 const resourceOptions = ref([
@@ -106,7 +106,7 @@ const updateDocumentAssignment = async () => {
     <iframe
         :src="`${documentData.url}#toolbar=0&navpanes=0&scrollbar=0`"
         class="previewEmbed"
-        v-if="!documentData.tags.includes('Bild')"
+        v-if="!documentData.filetags.includes('Bild')"
         loading="lazy"
     />
     <img
@@ -121,9 +121,9 @@ const updateDocumentAssignment = async () => {
 
     <InputGroup class="mt-3 flex-wrap">
       <UBadge
-        v-for="tag in documentData.tags"
+        v-for="tag in documentData.filetags"
 
-      ><span class="text-nowrap">{{ tag }}</span></UBadge>
+      ><span class="text-nowrap">{{ tag.name }}</span></UBadge>
     </InputGroup>
 
 
@@ -157,9 +157,9 @@ const updateDocumentAssignment = async () => {
         <div class="flex flex-row justify-between">
           <div class="flex items-center gap-2">
             <UBadge
-                v-for="tag in documentData.tags"
+                v-for="tag in documentData.filetags"
             >
-              {{tag}}
+              {{tag.name}}
             </UBadge>
           </div>
           <UButton color="gray" variant="ghost" icon="i-heroicons-x-mark-20-solid" class="-my-1" @click="openShowModal = false" />
@@ -172,7 +172,7 @@ const updateDocumentAssignment = async () => {
             class="bigPreview"
             :data="`${documentData.url}#toolbar=0&navpanes=0&scrollbar=0`"
             type="application/pdf"
-            v-if="!documentData.tags.includes('Bild')"
+            v-if="!documentData.filetags.includes('Bild')"
 
         />
         <img
@@ -186,11 +186,11 @@ const updateDocumentAssignment = async () => {
       <template #footer>
 
         <UButtonGroup>
-          <UButton
+<!--          <UButton
             @click="archiveDocument"
           >
             Archivieren
-          </UButton>
+          </UButton>-->
           <UButton
             :to="documentData.url"
             variant="outline"
@@ -206,12 +206,12 @@ const updateDocumentAssignment = async () => {
         >
           <USelectMenu
               :options="tags"
-              v-model="documentData.tags"
+              v-model="documentData.filetags"
               @change="updateDocument"
               multiple
           >
             <template #label>
-              {{documentData.tags.length}} ausgewählt
+              {{documentData.filetags.length}} ausgewählt
             </template>
           </USelectMenu>
         </UFormGroup>
diff --git a/components/DocumentDisplayModal.vue b/components/DocumentDisplayModal.vue
new file mode 100644
index 0000000..97e7fc0
--- /dev/null
+++ b/components/DocumentDisplayModal.vue
@@ -0,0 +1,196 @@
+<script setup>
+
+const toast = useToast()
+const supabase = useSupabaseClient()
+const dataStore = useDataStore()
+const profileStore = useProfileStore()
+const router = useRouter()
+const modal = useModal()
+const props = defineProps({
+  documentData: {
+    type: Object,
+    required: true
+  },
+  openShowModal: {
+    type: Boolean,
+    required: false,
+  },
+  returnEmit: {
+    type: Boolean
+  }
+
+})
+
+const emits = defineEmits("close")
+
+const showSlideover = ref(props.openShowModal)
+
+
+
+
+//Functions
+const openDocument = async () => {
+  //selectedDocument.value = doc
+  openShowModal.value = true
+  console.log("open")
+}
+
+const updateDocument = async () => {
+  console.log("Update")
+
+  const {url, ...objData} = props.documentData
+  delete objData.url
+  delete objData.filetags
+
+
+  const {data,error} = await supabase
+      .from("files")
+      .update(objData)
+      .eq('id',objData.id)
+      .select()
+
+  if(error) {
+    console.log(error)
+  } else {
+    toast.add({title: "Datei aktualisiert"})
+    //openShowModal.value = false
+  }
+
+}
+
+const archiveDocument = () => {
+  //documentData.tags.push("Archiviert")
+  //updateDocument()
+}
+
+const resourceOptions = ref([
+    {label: 'Projekt', value: 'project', optionAttr: "name"},
+  {label: 'Kunde', value: 'customer', optionAttr: "name"},
+  {label: 'Lieferant', value: 'vendor', optionAttr: "name"},
+  {label: 'Fahrzeug', value: 'vehicle', optionAttr: "licensePlate"},
+  {label: 'Objekt', value: 'plant', optionAttr: "name"},
+  {label: 'Vertrag', value: 'contract', optionAttr: "name"},
+  {label: 'Produkt', value: 'product', optionAttr: "name"}
+])
+const resourceToAssign = ref("project")
+const itemOptions = ref([])
+const idToAssign = ref(null)
+const getItemsBySelectedResource = () => {
+  if(resourceToAssign.value === "project") {
+    itemOptions.value = dataStore.projects
+  } else if(resourceToAssign.value === "customer") {
+    itemOptions.value = dataStore.customers
+  } else if(resourceToAssign.value === "vendor") {
+    itemOptions.value = dataStore.vendors
+  } else if(resourceToAssign.value === "vehicle") {
+    itemOptions.value = dataStore.vehicles
+  } else if(resourceToAssign.value === "product") {
+    itemOptions.value = dataStore.products
+  } else if(resourceToAssign.value === "plant") {
+    itemOptions.value = dataStore.plants
+  } else if(resourceToAssign.value === "contract") {
+    itemOptions.value = dataStore.contracts
+  } else {
+    itemOptions.value =  []
+  }
+}
+getItemsBySelectedResource()
+
+const updateDocumentAssignment = async () => {
+  props.documentData[resourceToAssign.value] = idToAssign.value
+  await updateDocument()
+}
+
+</script>
+
+<template>
+  <UModal >
+    <UCard :ui="{ body: { base: 'flex-1' }, ring: '', divide: 'divide-y divide-gray-100 dark:divide-gray-800' }">
+      <template #header>
+        <div class="flex flex-row justify-between">
+          <div class="flex items-center gap-2">
+            <UBadge
+                v-for="tag in props.documentData.filetags"
+            >
+              {{tag.name}}
+            </UBadge>
+          </div>
+          <UButton color="gray" variant="ghost" icon="i-heroicons-x-mark-20-solid" class="-my-1" @click="modal.close()" />
+        </div>
+
+      </template>
+      <div class="flex flex-row">
+        <div class="w-1/2">
+          <object
+              class="bigPreview"
+              :data="`${props.documentData.url}#toolbar=0&navpanes=0&scrollbar=0`"
+              type="application/pdf"
+              v-if="!props.documentData.filetags.includes('Bild')"
+
+          />
+          <img
+              class=" w-full"
+              :src="props.documentData.url"
+              alt=""
+              v-else
+          />
+        </div>
+        <div class="w-1/2 p-5">
+          <UButtonGroup>
+            <!--          <UButton
+                        @click="archiveDocument"
+                      >
+                        Archivieren
+                      </UButton>-->
+            <UButton
+                :to="props.documentData.url"
+                variant="outline"
+                icon="i-heroicons-arrow-top-right-on-square"
+                target="_blank"
+            >
+              Öffnen
+            </UButton>
+          </UButtonGroup>
+
+
+          <p>Dokument zuweisen:</p>
+          <UFormGroup
+              label="Resource auswählen"
+          >
+            <USelectMenu
+                :options="resourceOptions"
+                v-model="resourceToAssign"
+                value-attribute="value"
+                option-attribute="label"
+                @change="getItemsBySelectedResource"
+            >
+
+            </USelectMenu>
+          </UFormGroup>
+          <UFormGroup
+              label="Eintrag auswählen:"
+          >
+
+          </UFormGroup>
+
+          <USelectMenu
+              :options="itemOptions"
+              v-model="idToAssign"
+              :option-attribute="resourceOptions.find(i => i.value === resourceToAssign)? resourceOptions.find(i => i.value === resourceToAssign).optionAttr : 'name'"
+              value-attribute="id"
+              @change="updateDocumentAssignment"
+          ></USelectMenu>
+        </div>
+      </div>
+    </UCard>
+  </UModal>
+</template>
+
+<style scoped>
+
+.bigPreview {
+  width: 100%;
+  aspect-ratio: 1/ 1.414;
+}
+
+</style>
\ No newline at end of file
diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index b62eab5..366abf5 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -145,6 +145,19 @@ const contentChanged = (content, datapoint) => {
       >{{item.id ? `${dataType.labelSingle} bearbeiten` : `${dataType.labelSingle} erstellen` }}</h1>
     </template>
     <template #right>
+      <ButtonWithConfirm
+          color="rose"
+          variant="outline"
+          @confirmed="dataStore.updateItem(type,{...item,archived: true}, oldItem)"
+      >
+        <template #button>
+          Archivieren
+        </template>
+        <template #header>
+          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
+        </template>
+        Möchten Sie das {{dataType.labelSingle}} {{item[dataType.templateColumns.find(i => i.title).key]}} wirklich archivieren?
+      </ButtonWithConfirm>
       <UButton
           v-if="item.id"
           @click="dataStore.updateItem(type,item, oldItem)"
@@ -172,8 +185,8 @@ const contentChanged = (content, datapoint) => {
     >
       <div class="flex flex-row">
         <div
-            v-for="columnName in dataType.inputColumns"
-            class="w-1/2 mr-5"
+            v-for="(columnName,index) in dataType.inputColumns"
+            :class="['w-1/2', ... index < dataType.inputColumns.length -1 ? ['mr-5'] : []]"
         >
           <UDivider>{{columnName}}</UDivider>
 
@@ -192,8 +205,9 @@ const contentChanged = (content, datapoint) => {
                   :item="item"
               />
             </template>
-            <div v-if="datapoint.key.includes('.')">
+            <InputGroup class="w-full" v-if="datapoint.key.includes('.')">
               <UInput
+                  class="flex-auto"
                   @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-if="['text','number'].includes(datapoint.inputType)"
                   v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
@@ -212,6 +226,7 @@ const contentChanged = (content, datapoint) => {
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               />
               <USelectMenu
+                  class="flex-auto"
                   @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'select'"
                   v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
@@ -228,6 +243,7 @@ const contentChanged = (content, datapoint) => {
                 </template>
               </USelectMenu>
               <UTextarea
+                  class="flex-auto"
                   @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'textarea'"
                   v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
@@ -275,9 +291,18 @@ const contentChanged = (content, datapoint) => {
                   @updateContent="(i) => contentChanged(i,datapoint)"
                   :preloadedContent="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html"
               />
-            </div>
-            <div v-else>
+
+              <UButton
+                  v-if="['text','number','select','date','datetime','textarea'].includes(datapoint.inputType)"
+                  @click="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] = null"
+                  variant="outline"
+                  color="white"
+                  icon="i-heroicons-x-mark"
+              />
+            </InputGroup>
+            <InputGroup class="w-full" v-else>
               <UInput
+                  class="flex-auto"
                   @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-if="['text','number'].includes(datapoint.inputType)"
                   v-model="item[datapoint.key]"
@@ -296,6 +321,7 @@ const contentChanged = (content, datapoint) => {
                   :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
               />
               <USelectMenu
+                  class="flex-auto"
                   @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'select'"
                   v-model="item[datapoint.key]"
@@ -313,6 +339,7 @@ const contentChanged = (content, datapoint) => {
                 </template>
               </USelectMenu>
               <UTextarea
+                  class="flex-auto"
                   @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
                   v-else-if="datapoint.inputType === 'textarea'"
                   v-model="item[datapoint.key]"
@@ -358,7 +385,15 @@ const contentChanged = (content, datapoint) => {
                   @updateContent="(i) => contentChanged(i,datapoint)"
                   :preloadedContent="item[datapoint.key].html"
               />
-            </div>
+
+              <UButton
+                  v-if="['text','number','select','date','datetime','textarea'].includes(datapoint.inputType)"
+                  @click="item[datapoint.key] = null"
+                  variant="outline"
+                  color="white"
+                  icon="i-heroicons-x-mark"
+              />
+            </InputGroup>
             <div
                 v-if="profileStore.ownTenant.ownFields"
             >
@@ -387,7 +422,7 @@ const contentChanged = (content, datapoint) => {
         </div>
       </div>
       <UFormGroup
-          v-for="datapoint in dataType.templateColumns.filter(i => i.inputType && i.inputColumn === columnName)"
+          v-for="datapoint in dataType.templateColumns.filter(i => i.inputType && !i.inputColumn)"
           :label="datapoint.label"
       >
         <template #help>
@@ -397,8 +432,9 @@ const contentChanged = (content, datapoint) => {
               :item="item"
           />
         </template>
-        <div v-if="datapoint.key.includes('.')">
+        <InputGroup class="w-full" v-if="datapoint.key.includes('.')">
           <UInput
+              class="flex-auto"
               @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-if="['text','number'].includes(datapoint.inputType)"
               v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
@@ -417,6 +453,7 @@ const contentChanged = (content, datapoint) => {
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
           />
           <USelectMenu
+              class="flex-auto"
               @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'select'"
               v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
@@ -433,6 +470,7 @@ const contentChanged = (content, datapoint) => {
             </template>
           </USelectMenu>
           <UTextarea
+              class="flex-auto"
               @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]]"
@@ -480,9 +518,18 @@ const contentChanged = (content, datapoint) => {
               @updateContent="(i) => contentChanged(i,datapoint)"
               :preloadedContent="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]].html"
           />
-        </div>
-        <div v-else>
+
+          <UButton
+              v-if="['text','number','select','date','datetime','textarea'].includes(datapoint.inputType)"
+              @click="item[datapoint.key.split('.')[0]][datapoint.key.split('.')[1]] = null"
+              variant="outline"
+              color="white"
+              icon="i-heroicons-x-mark"
+          />
+        </InputGroup>
+        <InputGroup class="w-full" v-else>
           <UInput
+              class="flex-auto"
               @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-if="['text','number'].includes(datapoint.inputType)"
               v-model="item[datapoint.key]"
@@ -501,6 +548,7 @@ const contentChanged = (content, datapoint) => {
               :disabled="datapoint.disabledFunction ? datapoint.disabledFunction(item) : false"
           />
           <USelectMenu
+              class="flex-auto"
               @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'select'"
               v-model="item[datapoint.key]"
@@ -518,6 +566,7 @@ const contentChanged = (content, datapoint) => {
             </template>
           </USelectMenu>
           <UTextarea
+              class="flex-auto"
               @change="datapoint.inputChangeFunction ? datapoint.inputChangeFunction(item,loadedOptions) : null"
               v-else-if="datapoint.inputType === 'textarea'"
               v-model="item[datapoint.key]"
@@ -563,7 +612,15 @@ const contentChanged = (content, datapoint) => {
               @updateContent="(i) => contentChanged(i,datapoint)"
               :preloadedContent="item[datapoint.key].html"
           />
-        </div>
+
+          <UButton
+              v-if="['text','number','select','date','datetime','textarea'].includes(datapoint.inputType)"
+              @click="item[datapoint.key] = null"
+              variant="outline"
+              color="white"
+              icon="i-heroicons-x-mark"
+          />
+        </InputGroup>
         <div
             v-if="profileStore.ownTenant.ownFields"
         >
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 970a3c0..ad072ff 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -1,6 +1,5 @@
 <script setup>
 import dayjs from "dayjs";
-import {useSupabaseSelectSomeDocuments} from "~/composables/useSupabase.js";
 
 const props = defineProps({
   type: {
@@ -36,14 +35,15 @@ const router = useRouter()
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
+const files = useFiles()
 
 const dataType = dataStore.dataTypes[type]
 
-const documents = ref([])
+const availableFiles = ref([])
 
 const setup = async () => {
-  if(props.item.documents) {
-    documents.value = await useSupabaseSelectSomeDocuments(props.item.documents.map(i => i.id)) || []
+  if(props.item.files) {
+    availableFiles.value = await files.selectSomeDocuments(props.item.files.map(i => i.id)) || []
   }
 }
 
@@ -154,19 +154,6 @@ const getAvailableQueryStringData = () => {
       >{{item ? `${dataType.labelSingle}${props.item[dataType.templateColumns.find(i => i.title).key] ? ': ' + props.item[dataType.templateColumns.find(i => i.title).key] : ''}`: '' }}</h1>
     </template>
     <template #right>
-      <ButtonWithConfirm
-          color="rose"
-          variant="outline"
-          @confirmed="dataStore.updateItem(type,{...item, archived: true})"
-      >
-        <template #button>
-          Archivieren
-        </template>
-        <template #header>
-          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
-        </template>
-        Möchten Sie das Fahrzeug {{item.name}} wirklich archivieren?
-      </ButtonWithConfirm>
       <UButton
           @click="router.push(`/standardEntity/${type}/edit/${item.id}`)"
       >
@@ -174,25 +161,22 @@ const getAvailableQueryStringData = () => {
       </UButton>
     </template>
   </UDashboardNavbar>
-  <UDashboardPanelContent>
-
-  </UDashboardPanelContent>
   <UTabs
       :items="dataType.showTabs"
       v-if="props.item.id"
       class="p-5"
       v-model="openTab"
   >
-    <template #item="{item}">
+    <template #item="{item:tab}">
       <div class="scroll">
-        <div v-if="item.label === 'Informationen'" class="flex flex-row mt-5">
+        <div v-if="tab.label === 'Informationen'" class="flex flex-row mt-5">
           <UCard class="w-1/2 mr-5">
             <UAlert
                 v-if="item.archived"
                 color="rose"
                 variant="outline"
                 :title="`${dataType.labelSingle} archiviert`"
-                icon="i-heroicons-light-bulb"
+                icon="i-heroicons-archive-box"
                 class="mb-5"
             />
             <div class="text-wrap">
@@ -225,7 +209,7 @@ const getAvailableQueryStringData = () => {
             />
           </UCard>
         </div>
-        <div v-else-if="item.label === 'Dokumente'">
+        <div v-else-if="tab.label === 'Dateien'">
           <UCard class="mt-5">
             <Toolbar>
               <DocumentUpload
@@ -235,11 +219,17 @@ const getAvailableQueryStringData = () => {
             </Toolbar>
 
             <DocumentList
-                :documents="documents"
+                :documents="availableFiles"
+                v-if="availableFiles.length > 0"
+            />
+            <UAlert
+              v-else
+              icon="i-heroicons-x-mark"
+              title="Keine Dateien verfügbar"
             />
           </UCard>
         </div>
-        <div v-else-if="item.label === 'Projekte'">
+        <div v-else-if="tab.label === 'Projekte'">
           <UCard class="mt-5">
             <Toolbar>
               <UButton
@@ -262,7 +252,7 @@ const getAvailableQueryStringData = () => {
 
           </UCard>
         </div>
-        <div v-else-if="item.label === 'Objekte'">
+        <div v-else-if="tab.label === 'Objekte'">
           <UCard class="mt-5">
             <Toolbar>
               <UButton
@@ -288,7 +278,7 @@ const getAvailableQueryStringData = () => {
             </UTable>
           </UCard>
         </div>
-        <div v-else-if="item.label === 'Aufgaben'">
+        <div v-else-if="tab.label === 'Aufgaben'">
           <UCard class="mt-5">
             <Toolbar>
               <UButton
@@ -305,7 +295,7 @@ const getAvailableQueryStringData = () => {
             />
           </UCard>
         </div>
-        <div v-else-if="item.label === 'Verträge'">
+        <div v-else-if="tab.label === 'Verträge'">
           <UCard class="mt-5">
             <Toolbar>
               <UButton
@@ -323,7 +313,7 @@ const getAvailableQueryStringData = () => {
             ></UTable>
           </UCard>
         </div>
-        <div v-else-if="item.label === 'Überprüfungen'">
+        <div v-else-if="tab.label === 'Überprüfungen'">
           <UCard class="mt-5">
             <UTable
                 :rows="props.item.checks"
@@ -341,7 +331,7 @@ const getAvailableQueryStringData = () => {
             </UTable>
           </UCard>
         </div>
-        <div v-else-if="item.label === 'Phasen'">
+        <div v-else-if="tab.label === 'Phasen'">
           <UCard class="mt-5">
             <UAccordion
                 :items="renderedPhases"
@@ -404,7 +394,8 @@ const getAvailableQueryStringData = () => {
               </template>
             </UAccordion>
           </UCard>
-        </div><div v-else-if="item.label === 'Ausgangsbelege'">
+        </div>
+        <div v-else-if="tab.label === 'Ausgangsbelege'">
           <UCard class="mt-5">
 
             <Toolbar>
diff --git a/components/HistoryDisplay.vue b/components/HistoryDisplay.vue
index feab0fd..c9aa5c9 100644
--- a/components/HistoryDisplay.vue
+++ b/components/HistoryDisplay.vue
@@ -2,11 +2,9 @@
 import dayjs from "dayjs"
 const props = defineProps({
   type: {
-    required: true,
     type: String
   },
   elementId: {
-    required: true,
     type: String
   },
   renderHeadline: {
@@ -26,43 +24,12 @@ const items = ref([])
 
 const setup = async () => {
 
-  items.value = (await supabase.from("historyitems").select().eq(type,elementId).order("created_at",{ascending: true})).data || []
+  if(type && elementId){
+    items.value = (await supabase.from("historyitems").select().eq(type,elementId).order("created_at",{ascending: true})).data || []
+  } else {
+    items.value = (await supabase.from("historyitems").select().order("created_at",{ascending: true})).data || []
 
-  /*if(type === "customer") {
-    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 || []
-  } else if(type === "project") {
-    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 || []
-  } else if(type === "incomingInvoice") {
-    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 || []
-  } else if(type === "contact") {
-    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 || []
-  } else if(type === "inventoryitem") {
-    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 || []
-  } else if(type === "profile") {
-    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 || []
-  } else if(type === "event") {
-    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 || []
-  } else if(type === "vehicle") {
-    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 || []
-  } else if(type === "trackingtrip") {
-    items.value = (await supabase.from("historyitems").select().eq("trackingtrip",elementId)).data || []
-  }*/
+  }
 }
 
 setup()
@@ -162,7 +129,7 @@ const renderText = (text) => {
     </UCard>
   </UModal>
   <Toolbar
-      v-if="!renderHeadline"
+      v-if="!renderHeadline && elementId && type"
   >
     <UButton
         @click="showAddHistoryItemModal = true"
@@ -170,7 +137,7 @@ const renderText = (text) => {
       + Eintrag
     </UButton>
   </Toolbar>
-  <div v-else>
+  <div v-else-if="renderHeadline && elementId && type">
     <div :class="`flex justify-between`">
       <p class=""><span class="text-xl">Logbuch</span> <UBadge variant="outline">{{items.length}}</UBadge></p>
       <UButton
diff --git a/components/MainNav.vue b/components/MainNav.vue
index 7299f50..8e19e00 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -18,6 +18,11 @@ const links = computed(() => {
       label: "Dashboard",
       to: "/",
       icon: "i-heroicons-home"
+    }, {
+      id: 'historyitems',
+      label: "Logbuch",
+      to: "/historyitems",
+      icon: "i-heroicons-book-open"
     },
     {
       label: "Organisation",
@@ -46,7 +51,7 @@ const links = computed(() => {
         }] : [],
         {
           label: "Dateien",
-          to: "/documents",
+          to: "/files",
           icon: "i-heroicons-document"
         },
       ]
@@ -113,6 +118,11 @@ const links = computed(() => {
           to: "/standardEntity/absencerequests",
           icon: "i-heroicons-document-text"
         }] : [],
+        {
+          label: "Fahrten",
+          to: "/trackingTrips",
+          icon: "i-heroicons-map"
+        },
       ]
     },
     ... profileStore.ownTenant.features.accounting ? [{
@@ -156,30 +166,9 @@ const links = computed(() => {
         },
         ... role.checkRight("spaces") ? [{
           label: "Lagerplätze",
-          to: "/spaces",
+          to: "/standardEntity/spaces",
           icon: "i-heroicons-square-3-stack-3d"
         }] : [],
-        ... role.checkRight("inventoryitems") ? [{
-          label: "Inventar",
-          to: "/standardEntity/inventoryitems",
-          icon: "i-heroicons-puzzle-piece"
-        }] : [],
-      ]
-    },] : [],
-    ... role.checkRight("vehicles") ? [{
-      label: "Fuhrpark",
-      defaultOpen: false,
-      icon: "i-heroicons-truck",
-      children: [
-        ... role.checkRight("vehicles") ? [{
-          label: "Fahrzeuge",
-          to: "/standardEntity/vehicles",
-          icon: "i-heroicons-truck"
-        }] : [],{
-          label: "Fahrten",
-          to: "/trackingTrips",
-          icon: "i-heroicons-map"
-        },
       ]
     },] : [],
     {
@@ -200,11 +189,26 @@ const links = computed(() => {
         ... role.checkRight("services") ? [{
           label: "Leistungen",
           to: "/standardEntity/services",
-          icon: "i-heroicons-puzzle-piece"
+          icon: "i-heroicons-wrench-screwdriver"
         }] : [],
         ... role.checkRight("servicecategories") ? [{
           label: "Leistungskategorien",
           to: "/standardEntity/servicecategories",
+          icon: "i-heroicons-wrench-screwdriver"
+        }] : [],
+        {
+          label: "Mitarbeiter",
+          to: "/profiles",
+          icon: "i-heroicons-user-group"
+        },
+        ... role.checkRight("vehicles") ? [{
+          label: "Fahrzeuge",
+          to: "/standardEntity/vehicles",
+          icon: "i-heroicons-truck"
+        }] : [],
+        ... role.checkRight("inventoryitems") ? [{
+          label: "Inventar",
+          to: "/standardEntity/inventoryitems",
           icon: "i-heroicons-puzzle-piece"
         }] : [],
       ]
@@ -244,10 +248,6 @@ const links = computed(() => {
           label: "Nummernkreise",
           to: "/settings/numberRanges",
           icon: "i-heroicons-clipboard-document-list"
-        },{
-          label: "Mitarbeiter",
-          to: "/profiles",
-          icon: "i-heroicons-clipboard-document-list"
         },{
           label: "Rollen",
           to: "/roles",
@@ -276,63 +276,15 @@ const links = computed(() => {
           label: "Projekttypen",
           to: "/projecttypes",
           icon: "i-heroicons-clipboard-document-list"
-        }/*,{
-          label: "Integrationen",
-          to: "/settings/integrations",
-          icon: "i-heroicons-clipboard-document-list"
-        }*/,{
-          label: "Labels",
-          to: "/settings/labels/",
-          icon: "i-heroicons-bars-3-solid"
         }
       ]
     }
   ]
 })
-
-/*const setOpen = (index,open) => {
-  console.log(!open)
-}*/
-
-
 </script>
 
 <template>
-<!--
-  <UAccordion :items="links" :ui="{ wrapper: 'flex flex-col w-full' }">
-    <template #default="{ item, index, open }">
-      <UButton color="gray" variant="ghost" class="border-b border-gray-200 dark:border-gray-700" :ui="{ rounded: 'rounded-none', padding: { sm: 'p-3' } }">
-        <template #leading>
-&lt;!&ndash;          <div class="w-6 h-6 rounded-full bg-primary-500 dark:bg-primary-400 flex items-center justify-center -my-1">
-            <UIcon :name="item.icon" class="w-4 h-4 text-white dark:text-gray-900" />
-          </div>&ndash;&gt;
-          <UIcon :name="item.icon" class="w-4 h-4 dark:text-white text-gray-900" />
-        </template>
 
-        <span class="truncate">{{ item.label }}</span>
-
-        <template #trailing>
-          <UIcon
-              name="i-heroicons-chevron-right-20-solid"
-              class="w-5 h-5 ms-auto transform transition-transform duration-200"
-              :class="[open && 'rotate-90']"
-          />
-        </template>
-      </UButton>
-    </template>
-    <template #item="{item}">
-      <div v-if="item.children" class="flex flex-col">
-        <UButton
-          v-for="child in item.children"
-          variant="ghost"
-          color="gray"
-        >
-          {{child.label}}
-        </UButton>
-      </div>
-    </template>
-  </UAccordion>
--->
   <div
     v-for="item in links"
   >
diff --git a/composables/useFiles.js b/composables/useFiles.js
new file mode 100644
index 0000000..b79346a
--- /dev/null
+++ b/composables/useFiles.js
@@ -0,0 +1,210 @@
+import index from "v-calendar";
+
+export const useFiles = () => {
+    const supabase = useSupabaseClient()
+    const toast = useToast()
+
+    let bucket = "filesdev"
+
+    const profileStore = useProfileStore()
+
+    const uploadFiles = async (formData, files,tags, upsert) => {
+        const uploadSingleFile = async (file) => {
+            //Create File Entry to Get ID for Folder
+            const {data:createdFileData,error:createdFileError} = await supabase
+                .from("files")
+                .insert({
+                    tenant: profileStore.currentTenant,
+                })
+                .select()
+                .single()
+
+            if(createdFileError){
+                console.log(createdFileError)
+                toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+            } else if(createdFileData) {
+                //Upload File to ID Folder
+                const {data:uploadData, error: uploadError} = await supabase
+                    .storage
+                    .from(bucket)
+                    .upload(`${profileStore.currentTenant}/filesbyid/${createdFileData.id}/${file.name}`, file, {upsert: upsert})
+
+                if(uploadError) {
+                    console.log(uploadError)
+                    console.log(uploadError.statusCode)
+
+                    if(uploadError.statusCode === '400') {
+                        console.log("is 400")
+                        toast.add({title: "Hochladen fehlgeschlagen", description: "Die Datei enthält ungültige Zeichen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+                    } else if(uploadError.statusCode === '409') {
+                        console.log("is 409")
+                        toast.add({title: "Hochladen fehlgeschlagen", description: "Es existiert bereits eine Datei mit diesem Namen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+                    } else {
+                        toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+
+                    }
+                } else if(uploadData) {
+                    //Update File with Corresponding Path
+                    const {data:updateFileData, error:updateFileError} = await supabase
+                        .from("files")
+                        .update({
+                            ...formData,
+                            path: uploadData.path,
+                        })
+                        .eq("id", createdFileData.id)
+
+                    if(updateFileError) {
+                        console.log(updateFileError)
+                        toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+                    } else {
+                        const {data:tagData, error:tagError} = await supabase
+                            .from("filetagmembers")
+                            .insert(tags.map(tag => {
+                                return {
+                                    file_id: createdFileData.id,
+                                    tag_id: tag
+                                }
+                            }))
+
+
+
+                        toast.add({title: "Hochladen erfolgreich"})
+
+                    }
+                }
+            }
+        }
+
+        if(files.length === 1) {
+            await uploadSingleFile(files[0])
+        } else if( files.length > 1) {
+
+            for(let i = 0; i < files.length; i++){
+                await uploadSingleFile(files[i])
+            }
+
+        }
+    }
+
+    const selectDocuments = async (sortColumn = null, folder = null) => {
+        let data = null
+
+        if(sortColumn !== null ) {
+            data = (await supabase
+                .from("files")
+                .select('*, filetags(*)')
+                .eq("tenant", profileStore.currentTenant)
+                .not("path","is",null)
+                .order(sortColumn, {ascending: true})).data
+        } else {
+            data = (await supabase
+                .from("files")
+                .select('*, filetags(*)')
+                .eq("tenant", profileStore.currentTenant)
+                .not("path","is",null)).data
+
+        }
+
+        if(data.length > 0){
+            let paths = []
+            data.forEach(doc => {
+                paths.push(doc.path)
+            })
+
+            const {data: supabaseData,error} = await supabase.storage.from(bucket).createSignedUrls(paths,3600)
+
+            data = data.map((doc,index) => {
+
+                return {
+                    ...doc,
+                    url: supabaseData[index].signedUrl
+                }
+            })
+        }
+
+        //console.log(data)
+
+        return data
+    }
+
+    const selectSomeDocuments = async (documentIds, sortColumn = null, folder = null) => {
+        let data = null
+
+        if(sortColumn !== null ) {
+            data = (await supabase
+                .from("files")
+                .select('*, filetags(*)')
+                .in("id",documentIds)
+                .eq("tenant", profileStore.currentTenant)
+                .not("path","is",null)
+                .order(sortColumn, {ascending: true})).data
+        } else {
+            data = (await supabase
+                .from("files")
+                .select('*, filetags(*)')
+                .in("id",documentIds)
+                .not("path","is",null)
+                .eq("tenant", profileStore.currentTenant)).data
+
+        }
+
+        if(data.length > 0){
+            let paths = []
+            data.forEach(doc => {
+                paths.push(doc.path)
+            })
+
+            const {data: supabaseData,error} = await supabase.storage.from(bucket).createSignedUrls(paths,3600)
+
+            data = data.map((doc,index) => {
+
+                return {
+                    ...doc,
+                    url: supabaseData[index].signedUrl
+                }
+            })
+        }
+
+        //console.log(data)
+
+        return data
+    }
+
+    const selectDocument = async (id) => {
+        const {data,error} = await supabase
+            .from("files")
+            .select('*, filetags(*)')
+            .eq("id",id)
+            .single()
+
+        const {data: supabaseData,error:supabaseError} = await supabase.storage.from(bucket).createSignedUrl(data.path,3600)
+
+        return {
+            ...data,
+            url: supabaseData.signedUrl
+        }
+/*
+        if(data.length > 0){
+            let paths = []
+            data.forEach(doc => {
+                paths.push(doc.path)
+            })
+
+            const {data: supabaseData,error} = await supabase.storage.from(bucket).createSignedUrls(paths,3600)
+
+            data = data.map((doc,index) => {
+
+                return {
+                    ...doc,
+                    url: supabaseData[index].signedUrl
+                }
+            })
+        }
+
+        //console.log(data)
+
+        return data[0]*/
+    }
+
+    return {uploadFiles, selectDocuments, selectSomeDocuments, selectDocument}
+}
\ No newline at end of file
diff --git a/composables/useSupabase.js b/composables/useSupabase.js
index 350d46f..b45e94e 100644
--- a/composables/useSupabase.js
+++ b/composables/useSupabase.js
@@ -22,97 +22,6 @@ export const useSupabaseSelect = async (relation,select = '*', sortColumn = null
     return data
 }
 
-export const useSupabaseSelectDocuments = async (select = '*', sortColumn = null, folderPath = "_") => {
-    const supabase = useSupabaseClient()
-    const profileStore = useProfileStore()
-
-    let data = null
-
-
-    if(sortColumn !== null ) {
-        data = (await supabase
-            .from("documents")
-            .select(select)
-            .eq("tenant", profileStore.currentTenant)
-            .order(sortColumn, {ascending: true})).data
-    } else {
-        data = (await supabase
-            .from("documents")
-            .select(select)
-            .eq("tenant", profileStore.currentTenant)).data
-
-    }
-
-    if(data.length > 0){
-        let paths = []
-        data.forEach(doc => {
-            paths.push(doc.path)
-        })
-
-        const {data: supabaseData,error} = await supabase.storage.from('files').createSignedUrls(paths,3600)
-
-        data = data.map((doc,index) => {
-
-            return {
-                ...doc,
-                url: supabaseData[index].signedUrl
-            }
-        })
-
-
-    }
-
-    //console.log(data)
-
-    return data
-}
-
-export const useSupabaseSelectSomeDocuments = async (documentIds, select = '*', sortColumn = null, folderPath = "_") => {
-    const supabase = useSupabaseClient()
-    const profileStore = useProfileStore()
-
-    let data = null
-
-    if(sortColumn !== null ) {
-        data = (await supabase
-            .from("documents")
-            .select(select)
-            .in("id",documentIds)
-            .eq("tenant", profileStore.currentTenant)
-            .order(sortColumn, {ascending: true})).data
-    } else {
-        data = (await supabase
-            .from("documents")
-            .select(select)
-            .in("id",documentIds)
-            .eq("tenant", profileStore.currentTenant)).data
-
-    }
-
-    if(data.length > 0){
-        let paths = []
-        data.forEach(doc => {
-            paths.push(doc.path)
-        })
-
-        const {data: supabaseData,error} = await supabase.storage.from('files').createSignedUrls(paths,3600)
-
-        data = data.map((doc,index) => {
-
-            return {
-                ...doc,
-                url: supabaseData[index].signedUrl
-            }
-        })
-
-
-    }
-
-    //console.log(data)
-
-    return data
-}
-
 export const useSupabaseSelectSingle = async (relation,idToEq,select = '*' ) => {
     const supabase = useSupabaseClient()
     const profileStore = useProfileStore()
diff --git a/layouts/default.vue b/layouts/default.vue
index 68f5edb..9448b76 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -125,18 +125,8 @@ const footerLinks = [/*{
           <UDashboardSearchButton label="Suche..."/>
         </template>
 
-<!--        <UDashboardSidebarLinks :links="links">
-
-        </UDashboardSidebarLinks>-->
         <MainNav/>
 
-<!--        <UAccordion
-          :items="links"
-        >
-
-        </UAccordion>-->
-
-
         <div class="flex-1" />
 
         <UDashboardSidebarLinks :links="footerLinks" />
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index af85e66..73ad84e 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -457,7 +457,7 @@ const renderCurrency = (value, currency = "€") => {
 const documentTotal = computed(() => {
   let totalNet = 0
   let total19 = 0
-  let totalGross = 0
+  let total7 = 0
 
   itemInfo.value.rows.forEach(row => {
     if(!['pagebreak','title','text'].includes(row.mode)){
@@ -466,11 +466,13 @@ const documentTotal = computed(() => {
 
       if(row.taxPercent === 19) {
         total19 = total19 + Number(rowPrice * 0.19)
+      } else if(row.taxPercent === 7) {
+        total7 = total7 + Number(rowPrice * 0.07)
       }
     }
   })
 
-  totalGross = totalNet + total19
+  let totalGross = Number(totalNet.toFixed(2)) + Number(total19.toFixed(2)) + Number(total7.toFixed(2))
 
   let totalGrossAlreadyPaid = 0
 
@@ -488,19 +490,14 @@ const documentTotal = computed(() => {
 
   let sumToPay = totalGross - totalGrossAlreadyPaid
 
-
-
   return {
     totalNet: totalNet,
     total19: total19,
+    total7: total7,
     totalGross: totalGross,
     totalGrossAlreadyPaid: totalGrossAlreadyPaid,
     totalSumToPay: sumToPay
-
   }
-
-
-
 })
 
 const processDieselPosition = () => {
@@ -831,14 +828,13 @@ const closeDocument = async () => {
 
   await generateDocument()
 
-  let fileData = {
-    tags: [],
-    project: null
-  }
+  let fileData = {}
 
   fileData.project = itemInfo.value.project
-  fileData.createdDocument = itemInfo.value.id
-  fileData.tags.push(dataStore.documentTypesForCreation[itemInfo.value.type].labelSingle)
+  fileData.createddocument = itemInfo.value.id
+  fileData.folder = (await supabase.from("folders").select("id").eq("tenant", profileStore.currentTenant).eq("function", itemInfo.value.type).eq("year",dayjs().format("YYYY")).single()).data.id
+
+  let tag  = (await supabase.from("filetags").select("id").eq("tenant", profileStore.currentTenant).eq("createddocumenttype", itemInfo.value.type).single()).data
 
   function dataURLtoFile(dataurl, filename) {
     var arr = dataurl.split(","),
@@ -854,7 +850,7 @@ const closeDocument = async () => {
 
   let file = dataURLtoFile(uri.value, `${itemInfo.value.documentNumber}.pdf`)
 
-  await dataStore.uploadFiles(fileData,  [file], true)
+  await dataStore.uploadFiles(fileData,  [file],[tag.id], true)
 
   await router.push(`/createDocument/show/${itemInfo.value.id}`)
 
@@ -894,13 +890,28 @@ const setRowData = (row) => {
 <template>
   <UDashboardNavbar>
     <template #right>
+<!--      <ButtonWithConfirm
+          v-if="itemInfo.state === 'Entwurf'"
+          color="rose"
+          variant="outline"
+          @confirmed="dataStore.updateItem('createddocuments',{id:itemInfo.id,archived: true}),
+                      router.push('/createDocument')"
+      >
+        <template #button>
+          Archivieren
+        </template>
+        <template #header>
+          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
+        </template>
+        Möchten Sie diesen Ausgangsbeleg wirklich archivieren?
+      </ButtonWithConfirm>-->
       <UButton
           icon="i-mdi-content-save"
           @click="saveDocument('Entwurf',true)"
           v-if="itemInfo.type !== 'serialInvoices' "
           :disabled="!itemInfo.customer"
       >
-        Entwurf
+        Entwurf speichern
       </UButton>
       <UButton
           @click="closeDocument"
@@ -952,7 +963,7 @@ const setRowData = (row) => {
                       v-model="itemInfo.type"
                       value-attribute="type"
                       option-attribute="label"
-                      @input="setDocumentTypeConfig"
+                      @change="setDocumentTypeConfig"
                       class="flex-auto"
                   >
                     <template #label>
diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue
index 2b52db2..9e058c0 100644
--- a/pages/createDocument/show/[id].vue
+++ b/pages/createDocument/show/[id].vue
@@ -21,9 +21,16 @@ const linkedDocument =ref({})
 const currentTenant = ref({})
 const setupPage = async () => {
   if(route.params) {
-    if(route.params.id) itemInfo.value = await useSupabaseSelectSingle("createddocuments",route.params.id,"*")
-    const {data,error} = await supabase.from("documents").select("id").eq("createdDocument", route.params.id).order("id",{ascending:true})
-    linkedDocument.value = data[data.length -1]
+    if(route.params.id) itemInfo.value = await useSupabaseSelectSingle("createddocuments",route.params.id,"*, files(*)")
+
+    console.log(itemInfo.value)
+
+    linkedDocument.value = await useFiles().selectDocument(itemInfo.value.files[0].id)
+
+
+
+    //const {data,error} = await supabase.from("files").select("id").eq("createddocument", route.params.id).order("id",{ascending:true})
+    //linkedDocument.value = data[data.length -1]
 
   }
 
@@ -72,11 +79,19 @@ const openEmail = () => {
       >
         E-Mail
       </UButton>
+      <UButton
+          v-if="itemInfo.project"
+        @click="router.push(`/standardEntity/projects/show/${itemInfo.project}`)"
+        icon="i-heroicons-arrow-right-end-on-rectangle"
+          variant="outline"
+      >
+        Projekt
+      </UButton>
     </template>
   </UDashboardToolbar>
   <UDashboardPanelContent>
     <object
-        :data="dataStore.documents.find(i => i.id === linkedDocument.id) ? dataStore.documents.find(i => i.id === linkedDocument.id).url : ''"
+        :data="linkedDocument.url"
         class="h-full"
     />
   </UDashboardPanelContent>
diff --git a/pages/documents.vue b/pages/files/index.vue
similarity index 53%
rename from pages/documents.vue
rename to pages/files/index.vue
index 9753c16..a461500 100644
--- a/pages/documents.vue
+++ b/pages/files/index.vue
@@ -2,22 +2,66 @@
 
 
 import {BlobReader, BlobWriter, ZipWriter} from "@zip.js/zip.js";
-import {useSupabaseSelectDocuments, useSupabaseSelectSingle} from "~/composables/useSupabase.js";
+import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
+import DocumentDisplayModal from "~/components/DocumentDisplayModal.vue";
+import dayjs from "dayjs";
 
 definePageMeta({
   middleware: "auth"
 })
+
+defineShortcuts({
+  /*'/': () => {
+    //console.log(searchinput)
+    //searchinput.value.focus()
+    document.getElementById("searchinput").focus()
+  },*/
+  '+': () => {
+    //Hochladen
+    uploadModalOpen.value = true
+  },
+  'Enter': {
+    usingInput: true,
+    handler: () => {
+      let entry = renderedFileList.value[selectedFileIndex.value]
+
+      if(entry.type === "file") {
+        showFile(entry.id)
+        console.log(entry)
+      } else {
+        changeFolder(currentFolders.value.find(i => i.id === entry.id))
+      }
+
+    }
+  },
+  'arrowdown': () => {
+    if(selectedFileIndex.value < renderedFileList.value.length - 1) {
+      selectedFileIndex.value += 1
+    } else {
+      selectedFileIndex.value = 0
+    }
+  },
+  'arrowup': () => {
+    if(selectedFileIndex.value === 0) {
+      selectedFileIndex.value = renderedFileList.value.length - 1
+    } else {
+      selectedFileIndex.value -= 1
+    }
+  }
+})
+
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
-const user = useSupabaseUser()
-const toast = useToast()
 const router = useRouter()
 const route = useRoute()
+const slideover = useSlideover()
+const modal = useModal()
 
 dataStore.fetchDocuments()
 
 const uploadModalOpen = ref(false)
+const createFolderModalOpen = ref(false)
 const uploadInProgress = ref(false)
 const fileUploadFormData = ref({
   tags: ["Eingang"],
@@ -26,11 +70,18 @@ const fileUploadFormData = ref({
   folder: null
 })
 
+const files = useFiles()
 
 let tags = dataStore.getDocumentTags
 
+const displayMode = ref("list")
+const displayModes = ref([{label: 'Liste',key:'list', icon: 'i-heroicons-list-bullet'},{label: 'Kacheln',key:'rectangles', icon: 'i-heroicons-squares-2x2'}])
+
+
+
 const documents = ref([])
 const folders = ref([])
+const filetags = ref([])
 
 const currentFolder = ref(null)
 
@@ -39,11 +90,12 @@ const isDragTarget = ref(false)
 const setupPage = async () => {
   folders.value = await useSupabaseSelect("folders")
 
-  documents.value = await useSupabaseSelectDocuments("*",null)
+  documents.value = await files.selectDocuments()
+
+  filetags.value = await useSupabaseSelect("filetags")
 
   if(route.query) {
     if(route.query.folder) {
-      console.log(route.query.folder)
       currentFolder.value = await useSupabaseSelectSingle("folders", route.query.folder)
     }
   }
@@ -135,10 +187,6 @@ const breadcrumbLinks = computed(() => {
   }
 })
 
-
-
-
-
 const filteredDocuments = computed(() => {
 
   return documents.value.filter(i => currentFolder.value ? i.folder === currentFolder.value.id : !i.folder)
@@ -151,20 +199,38 @@ const changeFolder = async (newFolder) => {
 
   if(newFolder) {
     fileUploadFormData.value.folder = newFolder.id
-    await router.push(`/documents?folder=${newFolder.id}`)
+    await router.push(`/files?folder=${newFolder.id}`)
   } else {
     fileUploadFormData.value.folder = null
-    await router.push(`/documents`)
+    await router.push(`/files`)
   }
 
   setupPage()
 }
 
+const createFolderData = ref({})
+const createFolder = async () => {
+  const {data,error} = await supabase
+      .from("folders")
+      .insert({
+        tenant: profileStore.currentTenant,
+        parent: currentFolder.value ? currentFolder.value.id : undefined,
+        name: createFolderData.value.name,
+
+      })
+
+  createFolderModalOpen.value = false
+
+  setupPage()
+
+}
+
 const uploadFiles = async (files) => {
   uploadInProgress.value = true;
 
   if(files) {
-    await dataStore.uploadFiles({tags: ["Ablage"],tenant: profileStore.currentTenant,folder: currentFolder.value.id}, files, true)
+    //await dataStore.uploadFiles({tags: ["Ablage"],tenant: profileStore.currentTenant,folder: currentFolder.value.id}, files, true)
+    await dataStore.uploadFiles({tags: ["Ablage"],tenant: profileStore.currentTenant}, files, true)
 
   } else {
     await dataStore.uploadFiles(fileUploadFormData.value, document.getElementById("fileUploadInput").files, true)
@@ -237,37 +303,46 @@ const downloadSelected = async () => {
   link.click();
 }
 
+const renderedFileList = computed(() => {
+    let files = filteredDocuments.value.map(i => {
+      return {
+        label: i.path.split("/")[i.path.split("/").length -1],
+        id: i.id,
+        type: "file"
+      }
+    })
+
+    let folders = currentFolders.value.map(i => {
+      return {
+        label: i.name,
+        id: i.id,
+        type: "folder"
+      }
+    })
+
+    return [...folders,...files]
+
+})
+const selectedFileIndex = ref(0)
+
+const showFile = (fileId) => {
+  console.log(fileId)
+  modal.open(DocumentDisplayModal,{
+    documentData: documents.value.find(i => i.id === fileId),
+  })
+}
+
 
 
 </script>
 
 <template>
+
   <UDashboardNavbar
       title="Dateien"
   >
 
   </UDashboardNavbar>
-<!--  <UDashboardToolbar>
-    <template #right>
-      <UButton @click="uploadModalOpen = true">Hochladen</UButton>
-&lt;!&ndash;      <UButton
-          @click="downloadSelected"
-          :disabled="dataStore.documents.filter(doc => doc.selected).length === 0"
-      >Herunterladen</UButton>&ndash;&gt;
-    </template>
-&lt;!&ndash;    <template #right>
-      <USelectMenu
-          :options="tags"
-          v-model="selectedTags"
-          class="w-40"
-      >
-        <template #label>
-          {{selectedTags}}
-        </template>
-      </USelectMenu>
-    </template>&ndash;&gt;
-
-  </UDashboardToolbar>-->
   <UDashboardToolbar>
     <template #left>
       <UBreadcrumb
@@ -275,49 +350,125 @@ const downloadSelected = async () => {
       />
     </template>
     <template #right>
-      <UButton @click="uploadModalOpen = true">Hochladen</UButton>
+      <USelectMenu
+        :options="displayModes"
+        value-attribute="key"
+        option-attribute="label"
+        v-model="displayMode"
+        :ui-menu="{ width: 'min-w-max'}"
+      >
+        <template #label>
+          <UIcon class="w-5 h-5" :name="displayModes.find(i => i.key === displayMode).icon"/>
+        </template>
+      </USelectMenu>
+
+      <UButton @click="uploadModalOpen = true">+ Hochladen</UButton>
+      <UButton
+          @click="createFolderModalOpen = true"
+          variant="outline"
+      >+ Ordner</UButton>
+      <UModal
+          v-model="createFolderModalOpen"
+      >
+        <UCard>
+          <template #header>
+            Ordner Erstellen
+          </template>
+
+
+
+          <UFormGroup
+              label="Ordner erstellen"
+          >
+            <UInput
+                v-model="createFolderData.name"
+            />
+          </UFormGroup>
+
+          <template #footer>
+            <UButton
+              @click="createFolder"
+            >
+              Erstellen
+            </UButton>
+          </template>
+        </UCard>
+
+      </UModal>
+
     </template>
   </UDashboardToolbar>
   <div id="drop_zone" class="h-full scrollList">
     <UDashboardPanelContent v-if="!isDragTarget" >
-      <div class="flex flex-row w-full flex-wrap" v-if="currentFolders.length > 0">
-        <a
-            class="w-1/6 folderIcon flex flex-col p-5 m-2"
-            v-for="folder in currentFolders"
-            @click="changeFolder(folder)"
-        >
+      <div v-if="displayMode === 'list'">
+        <table class="w-full">
+          <thead>
+            <td class="font-bold">Name</td>
+            <td class="font-bold">Erstellt am</td>
+          </thead>
+          <tr v-for="(entry,index) in renderedFileList">
+            <td>
+              <UIcon :name="entry.type === 'folder' ? 'i-heroicons-folder' : 'i-heroicons-document'"/>
+              <a
+                  :class="[...index === selectedFileIndex ? ['text-primary'] : ['dark:text-white','text-black']]"
+                  @click="entry.type === 'folder' ? changeFolder(currentFolders.find(i => i.id === entry.id)) : showFile(entry.id)"
+              >{{entry.label}}</a>
 
-          <UIcon
-              name="i-heroicons-folder"
-              class="w-20 h-20"
+            </td>
+            <td>
+              <span v-if="entry.type === 'file'">{{dayjs(documents.find(i => i.id === entry.id).created_at).format("DD.MM.YY HH:mm")}}</span>
+              <span v-if="entry.type === 'folder'">{{dayjs(currentFolders.find(i => i.id === entry.id).created_at).format("DD.MM.YY HH:mm")}}</span>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div v-else-if="displayMode === 'rectangles'">
+        <div class="flex flex-row w-full flex-wrap" v-if="currentFolders.length > 0">
+          <a
+              class="w-1/6 folderIcon flex flex-col p-5 m-2"
+              v-for="folder in currentFolders"
+              @click="changeFolder(folder)"
+          >
+
+            <UIcon
+                name="i-heroicons-folder"
+                class="w-20 h-20"
+            />
+            <span class="text-center truncate">{{folder.name}}</span>
+          </a>
+        </div>
+
+        <UDivider class="my-5" v-if="currentFolder">{{currentFolder.name}}</UDivider>
+        <UDivider class="my-5" v-else>Ablage</UDivider>
+
+        <div v-if="!loadingDocs">
+          <DocumentList
+              v-if="filteredDocuments.length > 0"
+              :documents="filteredDocuments"
+              @selectDocument="(info) => console.log(info)"
           />
-          <span class="text-center truncate">{{folder.name}}</span>
-        </a>
-      </div>
-
-      <UDivider class="my-5" v-if="currentFolder">{{currentFolder.name}}</UDivider>
-      <UDivider class="my-5" v-else>Ablage</UDivider>
-
-      <div v-if="!loadingDocs">
-        <DocumentList
-            v-if="filteredDocuments.length > 0"
-            :documents="filteredDocuments"
-            @selectDocument="(info) => console.log(info)"
-        />
-        <UAlert
+          <UAlert
+              v-else
+              class="mt-5 w-1/2 mx-auto"
+              icon="i-heroicons-light-bulb"
+              title="Keine Dokumente vorhanden"
+              color="primary"
+              variant="outline"
+          />
+        </div>
+        <UProgress
+            animation="carousel"
             v-else
-            class="mt-5 w-1/2 mx-auto"
-            icon="i-heroicons-light-bulb"
-            title="Keine Dokumente vorhanden"
-            color="primary"
-            variant="outline"
+            class="w-2/3 my-5 mx-auto"
         />
       </div>
-      <UProgress
-          animation="carousel"
-          v-else
-          class="w-2/3 my-5 mx-auto"
-      />
+
+
+
+
+
+
+
 
     </UDashboardPanelContent>
     <UCard
@@ -361,7 +512,9 @@ const downloadSelected = async () => {
               multiple
               searchable
               searchable-placeholder="Suchen..."
-              :options="tags"
+              option-attribute="name"
+              value-attribute="id"
+              :options="filetags"
               v-model="fileUploadFormData.tags"
           />
         </UFormGroup>
@@ -382,8 +535,6 @@ const downloadSelected = async () => {
   </USlideover>
 </template>
 
-
-
 <style scoped>
 .folderIcon {
   border: 1px solid lightgrey;
@@ -396,4 +547,8 @@ const downloadSelected = async () => {
   color: #69c350;
 }
 
+tr:nth-child(odd) {
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
 </style>
\ No newline at end of file
diff --git a/pages/historyitems/index.vue b/pages/historyitems/index.vue
new file mode 100644
index 0000000..b44d9dd
--- /dev/null
+++ b/pages/historyitems/index.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  <UDashboardNavbar>
+    <template #center>
+      <h1
+          :class="['text-xl','font-medium']"
+      >Zentrales Logbuch</h1>
+    </template>
+  </UDashboardNavbar>
+  <UDashboardPanelContent>
+    <HistoryDisplay/>
+  </UDashboardPanelContent>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/pages/settings/emailAccounts.vue b/pages/settings/emailAccounts.vue
index 37357c4..1911a44 100644
--- a/pages/settings/emailAccounts.vue
+++ b/pages/settings/emailAccounts.vue
@@ -96,11 +96,15 @@ const columns = computed(() => templateColumns.filter((column) => selectedColumn
   </UModal>
   <UDashboardNavbar title="E-Mail Konten">
       <template #right>
-        <UButton
-          @click="showEmailAddressModal = true"
-        >
-          + E-Mail Konto
-        </UButton>
+        <UTooltip title="In der Beta nicht verfügbar">
+          <UButton
+              :disabled="true"
+              @click="showEmailAddressModal = true"
+          >
+            + E-Mail Konto
+          </UButton>
+        </UTooltip>
+
       </template>
   </UDashboardNavbar>
   <UTable
diff --git a/stores/data.js b/stores/data.js
index b65e899..181b3be 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -122,7 +122,7 @@ export const useDataStore = defineStore('data', () => {
             numberRangeHolder: "customerNumber",
             historyItemHolder: "customer",
             supabaseSortColumn: "customerNumber",
-            supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*), documents(*)",
+            supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*), files(*)",
             filters: [],
             templateColumns: [
                 {
@@ -228,7 +228,7 @@ export const useDataStore = defineStore('data', () => {
                     component: profiles
                 },
             ],
-            showTabs: [{label: 'Informationen'},{label: 'Dokumente'},{label: 'Ausgangsbelege'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]
+            showTabs: [{label: 'Informationen'},{label: 'Dateien'},{label: 'Ausgangsbelege'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]
         },
         contacts: {
             label: "Kontakte",
@@ -329,23 +329,30 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect:true,
             filters:[],
-            supabaseSelectWithInformation: "*, customer(*), documents(*)",
+            inputColumns: [
+                "Allgemeines",
+                "Abrechnung"
+            ],
+            supabaseSelectWithInformation: "*, customer(*), files(*)",
             templateColumns: [
                 {
                     key: "name",
                     label: "Name",
                     title: true,
-                    inputType: "text"
+                    inputType: "text",
+                    inputColumn: "Allgemeines"
                 },{
                     key: "active",
                     label: "Aktiv",
                     component: active,
-                    inputType: "bool"
+                    inputType: "bool",
+                    inputColumn: "Allgemeines"
                 },{
                     key: "recurring",
                     label: "Wiederkehrend",
                     component: recurring,
-                    inputType: "bool"
+                    inputType: "bool",
+                    inputColumn: "Allgemeines"
                 },{
                     key: 'customer',
                     label: "Kunde",
@@ -354,6 +361,7 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "customers",
                     selectOptionAttribute: "name",
                     selectSearchAttributes: ['name'],
+                    inputColumn: "Allgemeines"
                 },{
                     key: 'contact',
                     label: "Ansprechpartner",
@@ -365,64 +373,91 @@ export const useDataStore = defineStore('data', () => {
                     },
                     selectOptionAttribute: "fullName",
                     selectSearchAttributes: ['fullName'],
+                    inputColumn: "Allgemeines"
                 },{
                     key: 'duration',
                     label: "mindest Vertragslaufzeit",
                     inputType: "select",
-                    selectManualOptions: ['12 Monate','24 Monate','36 Monate','48 Monate']
+                    selectValueAttribute:"label",
+                    selectManualOptions: [
+                        {label:'12 Monate'},
+                        {label:'24 Monate'},
+                        {label:'36 Monate'},
+                        {label:'48 Monate'},
+                        ],
+                    inputColumn: "Allgemeines"
                 },{
                     key: 'invoiceDispatch',
                     label: "Rechnungsversand",
                     inputType: "select",
-                    selectManualOptions: ['E-Mail','Post']
+                    selectValueAttribute: "label",
+                    selectManualOptions: [
+                        {label:'E-Mail'},
+                        {label:'Post'}
+                    ],
+                    inputColumn: "Abrechnung"
                 },{
                     key: 'paymentType',
                     label: "Zahlungsart",
                     inputType: "select",
-                    selectManualOptions: ['Einzug','Überweisung']
+                    selectValueAttribute: "label",
+                    selectManualOptions: [
+                        {label:'Einzug'},
+                        {label:'Überweisung'}
+                    ],
+                    inputColumn: "Abrechnung"
                 },{
                     key: 'startDate',
                     label: "Vertragsstart",
                     inputType: "date",
+                    inputColumn: "Allgemeines"
                 },{
                     key: 'endDate',
                     label: "Vertragsende",
                     inputType: "date",
+                    inputColumn: "Allgemeines"
                 },{
                     key: 'signDate',
                     label: "Unterschrieben am",
                     inputType: "date",
+                    inputColumn: "Allgemeines"
                 },{
                     key: 'sepaDate',
                     label: "SEPA Datum",
                     inputType: "date",
+                    inputColumn: "Abrechnung"
                 },{
                     key: 'sepaRef',
                     label: "Mandatsreferenz",
                     inputType: "text",
+                    inputColumn: "Abrechnung"
                 },{
                     key: 'bankingIban',
                     label: "IBAN",
                     inputType: "text",
+                    inputColumn: "Abrechnung"
                 },{
                     key: 'bankingOwner',
                     label: "Inhaber",
                     inputType: "text",
+                    inputColumn: "Abrechnung"
                 },{
                     key: 'bankingName',
                     label: "Bank",
                     inputType: "text",
+                    inputColumn: "Abrechnung"
                 },{
                     key: 'bankinBIC',
                     label: "BIC",
                     inputType: "text",
+                    inputColumn: "Abrechnung"
                 },{
                     key: "notes",
                     label: "Notizen",
-                    inputType: "textarea"
+                    inputType: "textarea",
                 }
             ],
-            showTabs: [{label: 'Informationen'},{label: 'Dokumente'}]
+            showTabs: [{label: 'Informationen'},{label: 'Dateien'}]
         },
         absencerequests: {
             label: "Abwesenheitsanträge",
@@ -527,7 +562,7 @@ export const useDataStore = defineStore('data', () => {
             },{
                 label: "Aufgaben"
             },{
-                label: "Dokumente"
+                label: "Dateien"
             }]
         },
         products: {
@@ -536,6 +571,7 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect:true,
             supabaseSelectWithInformation: "*, unit(name)",
+            historyItemHolder: "product",
             filters: [],
             templateColumns: [
                 {
@@ -568,6 +604,16 @@ export const useDataStore = defineStore('data', () => {
                     label: "Verkaufpreispreis",
                     component: sellingPrice,
                     inputType: "number"
+                },{
+                    key: "taxPercentage",
+                    label: "Umsatzsteuer",
+                    inputType: "select",
+                    selectOptionAttribute: "label",
+                    selectValueAttribute: 'key',
+                    selectManualOptions: [
+                        {label: "19 %", key: 19},
+                        {label: "7 %", key: 7},
+                        {label: "0 %", key: 0}]
                 },
                 /*{
                     key: "tags",
@@ -601,7 +647,7 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             historyItemHolder: "project",
             numberRangeHolder: "projectNumber",
-            supabaseSelectWithInformation: "*, customer(id,name), plant(id,name), projecttype(name, id), tasks(*), documents(*), createddocuments(*)",
+            supabaseSelectWithInformation: "*, customer(id,name), plant(id,name), projecttype(name, id), tasks(*), files(*), createddocuments(*)",
             supabaseSortColumn: "projectNumber",
             filters: [
                 {
@@ -685,8 +731,8 @@ export const useDataStore = defineStore('data', () => {
                     key: "tasks",
                     label: "Aufgaben"
                 },{
-                    key: "documents",
-                    label: "Dokumente"
+                    key: "files",
+                    label: "Dateien"
                 },{
                     label: "Ausgangsbelege"
                 }/*,{
@@ -706,7 +752,7 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect:true,
             historyItemHolder: "vehicle",
-            supabaseSelectWithInformation: "*, checks(*), documents(*)",
+            supabaseSelectWithInformation: "*, checks(*), files(*)",
             filters:[],
             templateColumns:[
                 {
@@ -779,7 +825,7 @@ export const useDataStore = defineStore('data', () => {
                 {
                     label: 'Informationen',
                 }, {
-                    label: 'Dokumente',
+                    label: 'Dateien',
                 }, {
                     label: 'Überprüfungen',
                 }
@@ -902,7 +948,7 @@ export const useDataStore = defineStore('data', () => {
                 {
                     label: 'Informationen',
                 }, {
-                    label: 'Dokumente',
+                    label: 'Dateien',
                 }
             ]
         },
@@ -914,7 +960,7 @@ export const useDataStore = defineStore('data', () => {
             label: "Lagerplätze",
             labelSingle: "Lagerplatz",
             isStandardEntity: true,
-            supabaseSelectWithInformation: "*, documents(*)",
+            supabaseSelectWithInformation: "*, files(*)",
             supabaseSortColumn: "spaceNumber",
             redirect: true,
             numberRangeHolder: "spaceNumber",
@@ -943,7 +989,14 @@ export const useDataStore = defineStore('data', () => {
                     key: "type",
                     label: "Typ",
                     inputType: "select",
-                    selectManualOptions: ["Standort","Regalplatz", "Kiste", "Palettenplatz", "Sonstiges"],
+                    selectValueAttribute: "label",
+                    selectManualOptions: [
+                        {label:"Standort"},
+                        {label:"Regalplatz"},
+                        {label:"Kiste"},
+                        {label:"Palettenplatz"},
+                        {label:"Sonstiges"}
+                    ],
                     inputColumn: "Allgemeines"
                 },
                 {
@@ -1013,7 +1066,7 @@ export const useDataStore = defineStore('data', () => {
                 {
                     label: 'Informationen',
                 }, {
-                    label: 'Dokumente',
+                    label: 'Dateien',
                 },{label: 'Inventarartikel'}
             ]
         },
@@ -1034,7 +1087,7 @@ export const useDataStore = defineStore('data', () => {
             label: "Inventarartikel",
             labelSingle: "Inventarartikel",
             isStandardEntity: true,
-            supabaseSelectWithInformation: "*, documents(*), vendor(id,name), currentSpace(id,name)",
+            supabaseSelectWithInformation: "*, files(*), vendor(id,name), currentSpace(id,name)",
             redirect: true,
             numberRangeHolder: "articleNumber",
             inputColumns: [
@@ -1151,7 +1204,7 @@ export const useDataStore = defineStore('data', () => {
                 {
                     label: 'Informationen',
                 }, {
-                    label: 'Dokumente',
+                    label: 'Dateien',
                 }
             ]
         },
@@ -1405,7 +1458,7 @@ export const useDataStore = defineStore('data', () => {
             label: "Überprüfungen",
             labelSingle: "Überprüfung",
             isStandardEntity: true,
-            supabaseSelectWithInformation: "*, vehicle(id,licensePlate), profile(id, fullName), inventoryitem(name), documents(*)",
+            supabaseSelectWithInformation: "*, vehicle(id,licensePlate), profile(id, fullName), inventoryitem(name), files(*)",
             redirect: true,
             historyItemHolder: "check",
             filters: [],
@@ -1451,7 +1504,7 @@ export const useDataStore = defineStore('data', () => {
             showTabs: [
                 {
                 label: 'Informationen',
-            }, {label: 'Dokumente'}, {label: 'Ausführungen'}]
+            }, {label: 'Dateien'}, {label: 'Ausführungen'}]
         },
         roles: {
             label: "Rollen",
@@ -2060,44 +2113,60 @@ export const useDataStore = defineStore('data', () => {
     }
 
     const uploadFiles = async (formData, files, upsert) => {
-        //console.log(files)
-        //console.log(formData)
-        let documentsToInsert = []
-
         const uploadSingleFile = async (file) => {
 
-            const {data, error} = await supabase
-                .storage
+            const {data:createdFileData,error:createdFileError} = await supabase
                 .from("files")
-                .upload(`${profileStore.currentTenant}/${file.name}`, file, {upsert: upsert})
+                .insert({
+                    tenant: profileStore.currentTenant,
+                })
+                .select()
+                .single()
 
-            if (error) {
-                console.log(error)
-                console.log(error.statusCode)
+            if(createdFileError){
+                console.log(createdFileError)
+                toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+            } else if(createdFileData) {
+                console.log(createdFileData)
+                const {data:uploadData, error: uploadError} = await supabase
+                    .storage
+                    .from("filesdev")
+                    .upload(`${profileStore.currentTenant}/filesbyid/${createdFileData.id}/${file.name}`, file, {upsert: upsert})
 
-                if(error.statusCode === '400') {
-                    console.log("is 400")
-                    toast.add({title: "Hochladen fehlgeschlagen", description: "Die Datei enthält ungültige Zeichen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-                } else if(error.statusCode === '409') {
-                    console.log("is 409")
-                    toast.add({title: "Hochladen fehlgeschlagen", description: "Es existiert bereits eine Datei mit diesem Namen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
-                } else {
-                    toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+                if(uploadError) {
+                    console.log(uploadError)
+                    console.log(uploadError.statusCode)
 
+                    if(uploadError.statusCode === '400') {
+                        console.log("is 400")
+                        toast.add({title: "Hochladen fehlgeschlagen", description: "Die Datei enthält ungültige Zeichen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+                    } else if(uploadError.statusCode === '409') {
+                        console.log("is 409")
+                        toast.add({title: "Hochladen fehlgeschlagen", description: "Es existiert bereits eine Datei mit diesem Namen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+                    } else {
+                        toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+
+                    }
+                } else if(uploadData) {
+                    const {data:updateFileData, error:updateFileError} = await supabase
+                        .from("files")
+                        .update({
+                            ...formData,
+                            path: uploadData.path,
+                        })
+                        .eq("id", createdFileData.id)
+
+                    if(updateFileError) {
+                        console.log(updateFileError)
+                        toast.add({title: "Hochladen fehlgeschlagen", icon: "i-heroicons-x-circle", color: "rose", timeout: 10000})
+                    } else {
+                        toast.add({title: "Hochladen erfolgreich"})
+
+                    }
                 }
-
-            } else if (data) {
-                const returnPath = data.path
-
-                documentsToInsert.push({...formData, path: returnPath, tenant: profileStore.currentTenant})
             }
-
-            //console.log(data)
         }
 
-        //uploadInProgress.value = true
-
-
         if(files.length === 1) {
             await uploadSingleFile(files[0])
         } else if( files.length > 1) {
@@ -2107,25 +2176,6 @@ export const useDataStore = defineStore('data', () => {
             }
 
         }
-
-        //console.log(documentsToInsert)
-
-        const {data, error} = await supabase
-            .from("documents")
-            .insert(documentsToInsert)
-            .select()
-        if(error) console.log(error)
-        else {
-            //console.log(data)
-
-            await fetchDocuments()
-
-            //documents.value.push(...data)
-        }
-        //uploadModalOpen.value = false;
-        //uploadInProgress.value = false;
-
-
     }
 
     async function fetchBankAccounts () {
@@ -2177,7 +2227,7 @@ export const useDataStore = defineStore('data', () => {
         vehicles.value = (await supabase.from("vehicles").select().eq('tenant', profileStore.currentTenant)).data
     }
     async function fetchTimes () {
-        times.value = (await supabase.from("times").select().eq('tenant', profileStore.currentTenant).order("start", {ascending:false})).data
+        times.value = (await supabase.from("times").select().eq('tenant', profileStore.currentTenant).order("startDate", {ascending:false})).data
     }
     async function fetchHistoryItems () {
 

From a326c6ab3acdef00581aeeca53d4fe994770a21e Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sun, 5 Jan 2025 21:15:51 +0100
Subject: [PATCH 043/104] Fix in Calendar

---
 pages/calendar/[mode].vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pages/calendar/[mode].vue b/pages/calendar/[mode].vue
index fc671df..362509e 100644
--- a/pages/calendar/[mode].vue
+++ b/pages/calendar/[mode].vue
@@ -60,11 +60,11 @@ const calendarOptionsGrid = computed(() => {
       router.push(`/standardEntity/events/edit/?start=${info.startStr}&end=${info.endStr}&source=grid`)
     },
     eventClick: function (info) {
-      console.log(info)
-      if (info.event.title.startsWith("Abw.:")) {
-        router.push(`/standardEntity/absencerequests/show/${info.event.id}`)
+      console.log(info.event)
+      if(info.event.extendedProps.entrytype === "absencerequest"){
+        router.push(`/standardEntity/absencerequests/show/${info.event.extendedProps.absencerequestId}`)
       } else {
-        router.push(`/standardEntity/events/show/${info.event.id}`)
+        router.push(`/standardEntity/events/show/${info.event.extendedProps.eventId}`)
       }
 
     },
@@ -188,7 +188,9 @@ const setupPage = async () => {
         title: title,
         borderColor: eventColor,
         textColor: eventColor,
-        backgroundColor: "black"
+        backgroundColor: "black",
+        entrytype: "event",
+        eventId: event.id
       }
     }),
     ...absencerequests.map(absence => {
@@ -196,10 +198,12 @@ const setupPage = async () => {
         id: absence.id,
         resourceId: absence.user,
         resourceType: "person",
-        title: `Abw.: ${absence.reason}`,
+        title: `${absence.reason} - ${absence.name}`,
         start: dayjs(absence.start).toDate(),
         end: dayjs(absence.end).add(1, 'day').toDate(),
         allDay: true,
+        absencerequestId: absence.id,
+        entrytype: "absencerequest",
       }
     })
   ]

From c103e9402ae4d436a5b7486b54e34684883e654a Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sun, 5 Jan 2025 21:16:13 +0100
Subject: [PATCH 044/104] Corrected Show File Modal

---
 components/DocumentDisplayModal.vue | 2 +-
 pages/files/index.vue               | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/components/DocumentDisplayModal.vue b/components/DocumentDisplayModal.vue
index 97e7fc0..c99053b 100644
--- a/components/DocumentDisplayModal.vue
+++ b/components/DocumentDisplayModal.vue
@@ -104,7 +104,7 @@ const updateDocumentAssignment = async () => {
 </script>
 
 <template>
-  <UModal >
+  <UModal fullscreen >
     <UCard :ui="{ body: { base: 'flex-1' }, ring: '', divide: 'divide-y divide-gray-100 dark:divide-gray-800' }">
       <template #header>
         <div class="flex flex-row justify-between">
diff --git a/pages/files/index.vue b/pages/files/index.vue
index a461500..cb9a3de 100644
--- a/pages/files/index.vue
+++ b/pages/files/index.vue
@@ -462,14 +462,6 @@ const showFile = (fileId) => {
             class="w-2/3 my-5 mx-auto"
         />
       </div>
-
-
-
-
-
-
-
-
     </UDashboardPanelContent>
     <UCard
         class=" m-5"

From 3a4b1a7a56f9ecb4174e1a315bf75d16e206cc79 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sun, 5 Jan 2025 21:16:31 +0100
Subject: [PATCH 045/104] Corrected Tabs

---
 components/EntityShow.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index ad072ff..48f0255 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -24,7 +24,7 @@ defineShortcuts({
     }
   },
   'arrowright': () => {
-    if(openTab.value < 3) {
+    if(openTab.value < dataType.showTabs.length - 1) {
       openTab.value += 1
     }
   },

From 639cdb4c1fe86d59a3d8015d0975f71907a75984 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sun, 5 Jan 2025 21:59:04 +0100
Subject: [PATCH 046/104] Added File Moving

---
 components/DocumentDisplayModal.vue | 72 +++++++++++++++++++++++++----
 pages/files/index.vue               |  2 +-
 2 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/components/DocumentDisplayModal.vue b/components/DocumentDisplayModal.vue
index c99053b..b54ac97 100644
--- a/components/DocumentDisplayModal.vue
+++ b/components/DocumentDisplayModal.vue
@@ -3,8 +3,6 @@
 const toast = useToast()
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
-const profileStore = useProfileStore()
-const router = useRouter()
 const modal = useModal()
 const props = defineProps({
   documentData: {
@@ -17,15 +15,45 @@ const props = defineProps({
   },
   returnEmit: {
     type: Boolean
-  }
+  },
 
 })
 
-const emits = defineEmits("close")
+const folders = ref([])
+const setup = async () => {
+  const {data} = await supabase.from("folders").select().eq("tenant",useProfileStore().currentTenant)
 
-const showSlideover = ref(props.openShowModal)
+  data.forEach(folder => {
+    let name = folder.name
 
+    console.log(folder)
 
+    const addParent = (folder) => {
+      console.log(folder)
+      name = `${folder.name} > ${name}`
+
+      if(folder.parent){
+        addParent(folder)
+      } else {
+        folders.value.push({
+          id: folder.id,
+          name: name,
+        })
+      }
+    }
+
+    if(folder.parent) {
+      addParent(data.find(i => i.id === folder.parent))
+    } else {
+      folders.value.push({
+        id: folder.id,
+        name: folder.name,
+      })
+    }
+  })
+}
+
+setup()
 
 
 //Functions
@@ -42,7 +70,6 @@ const updateDocument = async () => {
   delete objData.url
   delete objData.filetags
 
-
   const {data,error} = await supabase
       .from("files")
       .update(objData)
@@ -55,7 +82,6 @@ const updateDocument = async () => {
     toast.add({title: "Datei aktualisiert"})
     //openShowModal.value = false
   }
-
 }
 
 const archiveDocument = () => {
@@ -101,6 +127,22 @@ const updateDocumentAssignment = async () => {
   await updateDocument()
 }
 
+const folderToMoveTo = ref(null)
+const moveFile = async () => {
+  const {data,error} = await supabase
+    .from("files")
+    .update({folder: folderToMoveTo.value})
+    .eq("id",props.documentData.id)
+
+  if(error) {
+    console.log(error)
+    toast.add({title: "Fehler beim verschieben", color:"rose"})
+  } else {
+    toast.add({title: "Datei verschoben"})
+  }
+  modal.close()
+}
+
 </script>
 
 <template>
@@ -120,7 +162,7 @@ const updateDocumentAssignment = async () => {
 
       </template>
       <div class="flex flex-row">
-        <div class="w-1/2">
+        <div class="w-1/3">
           <object
               class="bigPreview"
               :data="`${props.documentData.url}#toolbar=0&navpanes=0&scrollbar=0`"
@@ -135,7 +177,7 @@ const updateDocumentAssignment = async () => {
               v-else
           />
         </div>
-        <div class="w-1/2 p-5">
+        <div class="w-2/3 p-5">
           <UButtonGroup>
             <!--          <UButton
                         @click="archiveDocument"
@@ -152,8 +194,8 @@ const updateDocumentAssignment = async () => {
             </UButton>
           </UButtonGroup>
 
+          <UDivider class="my-3">Datei zuweisen</UDivider>
 
-          <p>Dokument zuweisen:</p>
           <UFormGroup
               label="Resource auswählen"
           >
@@ -180,6 +222,16 @@ const updateDocumentAssignment = async () => {
               value-attribute="id"
               @change="updateDocumentAssignment"
           ></USelectMenu>
+
+          <UDivider class="my-5">Datei verschieben</UDivider>
+
+          <USelectMenu
+            v-model="folderToMoveTo"
+            value-attribute="id"
+            option-attribute="name"
+            @change="moveFile"
+            :options="folders"
+          />
         </div>
       </div>
     </UCard>
diff --git a/pages/files/index.vue b/pages/files/index.vue
index cb9a3de..b7c6035 100644
--- a/pages/files/index.vue
+++ b/pages/files/index.vue
@@ -408,7 +408,7 @@ const showFile = (fileId) => {
           </thead>
           <tr v-for="(entry,index) in renderedFileList">
             <td>
-              <UIcon :name="entry.type === 'folder' ? 'i-heroicons-folder' : 'i-heroicons-document'"/>
+              <UIcon class="mr-1" :name="entry.type === 'folder' ? 'i-heroicons-folder' : 'i-heroicons-document'"/>
               <a
                   :class="[...index === selectedFileIndex ? ['text-primary'] : ['dark:text-white','text-black']]"
                   @click="entry.type === 'folder' ? changeFolder(currentFolders.find(i => i.id === entry.id)) : showFile(entry.id)"

From 7f23d8efd89612508c121ce76b0fac99669ded34 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sun, 5 Jan 2025 22:11:42 +0100
Subject: [PATCH 047/104] Added File Moving

---
 components/DocumentDisplayModal.vue | 36 ++++++++++++++++++-----------
 pages/files/index.vue               | 10 ++++----
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/components/DocumentDisplayModal.vue b/components/DocumentDisplayModal.vue
index b54ac97..e03bdf4 100644
--- a/components/DocumentDisplayModal.vue
+++ b/components/DocumentDisplayModal.vue
@@ -26,14 +26,11 @@ const setup = async () => {
   data.forEach(folder => {
     let name = folder.name
 
-    console.log(folder)
+    const addParent = (item) => {
+      name = `${item.name} > ${name}`
 
-    const addParent = (folder) => {
-      console.log(folder)
-      name = `${folder.name} > ${name}`
-
-      if(folder.parent){
-        addParent(folder)
+      if(item.parent){
+        addParent(data.find(i => i.id === item.parent))
       } else {
         folders.value.push({
           id: folder.id,
@@ -129,16 +126,19 @@ const updateDocumentAssignment = async () => {
 
 const folderToMoveTo = ref(null)
 const moveFile = async () => {
+  console.log(folderToMoveTo.value)
   const {data,error} = await supabase
     .from("files")
     .update({folder: folderToMoveTo.value})
     .eq("id",props.documentData.id)
+    .select()
 
   if(error) {
     console.log(error)
     toast.add({title: "Fehler beim verschieben", color:"rose"})
   } else {
     toast.add({title: "Datei verschoben"})
+    console.log(data)
   }
   modal.close()
 }
@@ -225,13 +225,21 @@ const moveFile = async () => {
 
           <UDivider class="my-5">Datei verschieben</UDivider>
 
-          <USelectMenu
-            v-model="folderToMoveTo"
-            value-attribute="id"
-            option-attribute="name"
-            @change="moveFile"
-            :options="folders"
-          />
+          <InputGroup class="w-full">
+            <USelectMenu
+                class="flex-auto"
+                v-model="folderToMoveTo"
+                value-attribute="id"
+                option-attribute="name"
+                :options="folders"
+            />
+            <UButton
+              @click="moveFile"
+              variant="outline"
+            >Verschieben</UButton>
+          </InputGroup>
+
+
         </div>
       </div>
     </UCard>
diff --git a/pages/files/index.vue b/pages/files/index.vue
index b7c6035..70f84e8 100644
--- a/pages/files/index.vue
+++ b/pages/files/index.vue
@@ -144,7 +144,7 @@ const breadcrumbLinks = computed(() => {
     const addParent = (parent) => {
       parents.push(parent)
       if(parent.parent) {
-        addParent(folders.value.find(i => i.id === currentFolder.value.parent))
+        addParent(folders.value.find(i => i.id === parent.parent))
       }
     }
 
@@ -167,7 +167,7 @@ const breadcrumbLinks = computed(() => {
         },
         icon: "i-heroicons-folder"
       }
-    }),
+    }).reverse(),
     {
       label: currentFolder.value.name,
       click: () => {
@@ -403,8 +403,10 @@ const showFile = (fileId) => {
       <div v-if="displayMode === 'list'">
         <table class="w-full">
           <thead>
-            <td class="font-bold">Name</td>
-            <td class="font-bold">Erstellt am</td>
+            <tr>
+              <td class="font-bold">Name</td>
+              <td class="font-bold">Erstellt am</td>
+            </tr>
           </thead>
           <tr v-for="(entry,index) in renderedFileList">
             <td>

From 5ee5e671e79e546411c7b1b8ad593f06323f6a54 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 10:16:36 +0100
Subject: [PATCH 048/104] Added start/enddate rendering

---
 components/columnRenderings/endDate.vue   | 15 +++++++++++++++
 components/columnRenderings/startDate.vue | 15 +++++++++++++++
 stores/data.js                            | 14 +++++++++++---
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 components/columnRenderings/endDate.vue
 create mode 100644 components/columnRenderings/startDate.vue

diff --git a/components/columnRenderings/endDate.vue b/components/columnRenderings/endDate.vue
new file mode 100644
index 0000000..984152e
--- /dev/null
+++ b/components/columnRenderings/endDate.vue
@@ -0,0 +1,15 @@
+<script setup>
+import dayjs from "dayjs";
+
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span v-if="props.row.endDate">{{dayjs(props.row.endDate).format("DD.MM.YYYY")}}</span>
+</template>
diff --git a/components/columnRenderings/startDate.vue b/components/columnRenderings/startDate.vue
new file mode 100644
index 0000000..19db5f4
--- /dev/null
+++ b/components/columnRenderings/startDate.vue
@@ -0,0 +1,15 @@
+<script setup>
+import dayjs from "dayjs";
+
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+</script>
+
+<template>
+  <span v-if="props.row.startDate">{{dayjs(props.row.startDate).format("DD.MM.YYYY")}}</span>
+</template>
diff --git a/stores/data.js b/stores/data.js
index 181b3be..b67f95d 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -28,6 +28,8 @@ import usePlanning from "~/components/columnRenderings/usePlanning.vue"
 import sellingPriceComposedMaterial from "~/components/columnRenderings/sellingPriceComposedMaterial.vue"
 import sellingPriceComposedWorker from "~/components/columnRenderings/sellingPriceComposedWorker.vue"
 import sellingPriceComposedTotal from "~/components/columnRenderings/sellingPriceComposedTotal.vue"
+import startDate from "~/components/columnRenderings/startDate.vue"
+import endDate from "~/components/columnRenderings/endDate.vue"
 
 import quantity from "~/components/helpRenderings/quantity.vue"
 import {useZipCheck} from "~/composables/useZipCheck.js";
@@ -464,6 +466,7 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Abwesenheitsantrag",
             isStandardEntity: true,
             supabaseSelectWithInformation: "*",
+            historyItemHolder: "absencerequest",
             redirect:true,
             filters:[],
             templateColumns:[
@@ -498,6 +501,7 @@ export const useDataStore = defineStore('data', () => {
                     selectValueAttribute: "label",
                     selectManualOptions: [
                         {label:"Urlaub"},
+                        {label:"Berufsschule"},
                         {label:"unbezahlter Urlaub"},
                         {label:"Überstundenausgleich"},
                         {label:"Sonderurlaub(bezahlt)"},
@@ -511,11 +515,13 @@ export const useDataStore = defineStore('data', () => {
                 },{
                     key: "startDate",
                     label: "Start",
-                    inputType: "date"
+                    inputType: "date",
+                    component: startDate
                 },{
                     key: "endDate",
                     label: "Ende",
-                    inputType: "date"
+                    inputType: "date",
+                    component: endDate
                 },{
                     key: "note",
                     label: "Notizen",
@@ -1846,6 +1852,8 @@ export const useDataStore = defineStore('data', () => {
                     name = "Nachname"
                 } else if(key === "name") {
                     name = "Name"
+                } else if(key === "approved") {
+                    name = "Genehmigt"
                 } else if(key === "customer") {
                     name = "Kunde"
                     if(prop.data.o) oldVal = customers.value.find(i => i.id === prop.data.o).name
@@ -2035,7 +2043,7 @@ export const useDataStore = defineStore('data', () => {
 
             await generateHistoryItems(dataType, supabaseData[0])
 
-            if(!["statementallocations", "productcategories", "projecttypes", "checks", "profiles","services", "inventoryitems"].includes(dataType) ){
+            if(!["statementallocations","absencerequests", "productcategories", "projecttypes", "checks", "profiles","services", "inventoryitems"].includes(dataType) ){
                 await eval( dataType + '.value.push(' + JSON.stringify(...supabaseData) + ')')
             }
 

From 778308940aa783bf72b417bceb835fa0caddd10c Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 10:17:03 +0100
Subject: [PATCH 049/104] Corrected absencerequests Corrected RecreationDays to
 2025

---
 pages/workingtimes/evaluate/[id].vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/workingtimes/evaluate/[id].vue b/pages/workingtimes/evaluate/[id].vue
index d534dd1..47ea2ee 100644
--- a/pages/workingtimes/evaluate/[id].vue
+++ b/pages/workingtimes/evaluate/[id].vue
@@ -31,7 +31,7 @@ const setupPage = async () => {
   if(route.params.id) itemInfo.value = profileStore.getProfileById(route.params.id)
   if(itemInfo.value.id) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
   workingtimes.value = (await supabase.from("workingtimes").select().eq("profile",itemInfo.value.id).order("startDate",{ascending:false})).data
-  absencerequests.value = (await supabase.from("absencerequests").select().eq("user",itemInfo.value.id).order("start",{ascending: false})).data
+  absencerequests.value = (await supabase.from("absencerequests").select().eq("profile",itemInfo.value.id).order("startDate",{ascending: false})).data
 }
 
 const selectedPresetRange = ref("Dieser Monat")
@@ -103,13 +103,13 @@ const workingTimeInfo = computed(() => {
   //console.log(times.filter(i => i.approved).length)
   //console.log(sumWorkingMinutesApproved)
 
-  let recreationDays = ["2024-01-01","2024-05-01","2024-10-03","2024-10-31","2024-12-25","2024-12-26"]
+  let recreationDays = ["2025-01-01","2025-04-18","2025-04-21","2025-05-01","2025-05-29","2025-06-09","2024-10-03","2024-10-31","2024-12-25","2024-12-26"]
 
   //Feiertagsausgleich
   let sumWorkingMinutesRecreationDays = 0
   let sumRecreationDays = 0
   recreationDays.filter(i => dayjs(i).isSameOrAfter(selectedStartDay.value) && dayjs(i).isSameOrBefore(selectedEndDay.value)).forEach(day => {
-    let compensationTime = itemInfo.value.weeklyRegularWorkingHours[dayjs(day).day()]
+    let compensationTime = itemInfo.value.weeklyRegularWorkingHours[dayjs(day).day()] || 0
     sumWorkingMinutesRecreationDays += compensationTime * 60
     sumRecreationDays++
   })

From 308e9629b51dcda3ed648a01c3b31760b7c3348a Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 10:17:28 +0100
Subject: [PATCH 050/104] Corrected Event Handler for ContactPerson

---
 pages/createDocument/edit/[[id]].vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 73ad84e..6dc9421 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -1249,7 +1249,7 @@ const setRowData = (row) => {
                     v-model="itemInfo.contactPerson"
                     option-attribute="fullName"
                     value-attribute="id"
-                    @input="setContactPersonData"
+                    @change="setContactPersonData"
                 />
               </UFormGroup>
               <UFormGroup

From 8d9aed0ee1ab28e7e6ca8af240a7e028ca08a772 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 10:28:28 +0100
Subject: [PATCH 051/104] Added Drafts Tidying in displayOpenBalances.vue

---
 components/displayOpenBalances.vue | 41 ++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/components/displayOpenBalances.vue b/components/displayOpenBalances.vue
index a3cd278..cc7c7d6 100644
--- a/components/displayOpenBalances.vue
+++ b/components/displayOpenBalances.vue
@@ -1,15 +1,28 @@
 <script setup>
 
-let unpaidCreatedDocumentsSum = ref(0)
+let unpaidInvoicesSum = ref(0)
+let unpaidInvoicesCount = ref(0)
+let draftInvoicesSum = ref(0)
+let draftInvoicesCount = ref(0)
 let unallocatedStatements = ref(0)
 const setupPage = async () => {
   let documents = (await useSupabaseSelect("createddocuments","*, statementallocations(*), customer(id,name)")).filter(i => i.type === "invoices" ||i.type === "advanceInvoices")
 
-  documents = documents.filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getDocumentSum(i).toFixed(2))
+  let draftDocuments = documents.filter(i => i.state === "Entwurf")
+  let finalizedDocuments = documents.filter(i => i.state === "Gebucht")
 
-  documents.forEach(i => {
-    unpaidCreatedDocumentsSum.value += getDocumentSum(i) - i.statementallocations.reduce((n,{amount}) => n + amount, 0)
+
+  finalizedDocuments = finalizedDocuments.filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getDocumentSum(i).toFixed(2))
+
+  finalizedDocuments.forEach(i => {
+    unpaidInvoicesSum.value += getDocumentSum(i) - i.statementallocations.reduce((n,{amount}) => n + amount, 0)
   })
+  unpaidInvoicesCount.value = finalizedDocuments.length
+
+  draftDocuments.forEach(i => {
+    draftInvoicesSum.value += getDocumentSum(i) - i.statementallocations.reduce((n,{amount}) => n + amount, 0)
+  })
+  draftInvoicesCount.value = draftDocuments.length
 
   let bankstatements = await useSupabaseSelect("bankstatements","*, statementallocations(*)","date",true)
   unallocatedStatements.value = bankstatements.filter(i => calculateOpenSum(i) !== 0).length
@@ -40,12 +53,6 @@ const calculateOpenSum = (statement) => {
 
   return startingAmount.toFixed(2)
 }
-
-const displayCurrency = (value, currency = "€") => {
-  return `${Number(value).toFixed(2).replace(".",",")} ${currency}`
-}
-
-
 </script>
 
 <template>
@@ -53,10 +60,18 @@ const displayCurrency = (value, currency = "€") => {
     <tr>
       <td>Offene Ausgangsbelege:</td>
       <td
-          v-if="unpaidCreatedDocumentsSum > 0"
+          v-if="unpaidInvoicesSum > 0"
           class="text-rose-600 font-bold text-nowrap"
-      >{{displayCurrency(unpaidCreatedDocumentsSum)}}</td>
-      <td v-else class="text-primary-500 font-bold text-no-wrap">0,00€</td>
+      >{{unpaidInvoicesCount}} Stk / {{useCurrency(unpaidInvoicesSum)}}</td>
+      <td v-else class="text-primary-500 font-bold text-no-wrap">0 Stk / 0,00€</td>
+    </tr>
+    <tr>
+      <td>Angelegte Entwürfe:</td>
+      <td
+          v-if="draftInvoicesSum > 0"
+          class="text-rose-600 font-bold text-nowrap"
+      >{{draftInvoicesCount}} Stk / {{useCurrency(draftInvoicesSum)}}</td>
+      <td v-else class="text-primary-500 font-bold text-no-wrap">0 Stk / 0,00€</td>
     </tr>
     <tr>
       <td>Nicht zugewiesene Bankbuchungen:</td>

From ceed45e409fb67e0265111d8183484d4d31998dc Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 11:21:37 +0100
Subject: [PATCH 052/104] Added Filters for Archived

---
 stores/data.js | 198 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 184 insertions(+), 14 deletions(-)

diff --git a/stores/data.js b/stores/data.js
index b67f95d..149220b 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -62,6 +62,16 @@ export const useDataStore = defineStore('data', () => {
                             return false
                         }
                     }
+                },{
+                    name: "Archivierte ausblenden",
+                    default: true,
+                    "filterFunction": function (row) {
+                        if(!row.archived) {
+                            return true
+                        } else {
+                            return false
+                        }
+                    }
                 }
             ],
             templateColumns: [
@@ -125,7 +135,17 @@ export const useDataStore = defineStore('data', () => {
             historyItemHolder: "customer",
             supabaseSortColumn: "customerNumber",
             supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*), files(*)",
-            filters: [],
+            filters: [,{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns: [
                 {
                     key: 'customerNumber',
@@ -239,7 +259,17 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             historyItemHolder: "contact",
             supabaseSelectWithInformation: "*, customer(*), vendor(*)",
-            filters: [],
+            filters: [,{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns: [
                 {
                     key: "fullName",
@@ -330,7 +360,17 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Vertrag",
             isStandardEntity: true,
             redirect:true,
-            filters:[],
+            filters:[,{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             inputColumns: [
                 "Allgemeines",
                 "Abrechnung"
@@ -468,7 +508,17 @@ export const useDataStore = defineStore('data', () => {
             supabaseSelectWithInformation: "*",
             historyItemHolder: "absencerequest",
             redirect:true,
-            filters:[],
+            filters:[,{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns:[
                 {
                     key: "approved",
@@ -537,7 +587,17 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             historyItemHolder: "plant",
             supabaseSelectWithInformation: "*, customer(id,name)",
-            filters: [],
+            filters: [,{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns: [
                 {
                     key: "name",
@@ -578,7 +638,17 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             supabaseSelectWithInformation: "*, unit(name)",
             historyItemHolder: "product",
-            filters: [],
+            filters: [,{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns: [
                 {
                     key: "name",
@@ -667,6 +737,16 @@ export const useDataStore = defineStore('data', () => {
                         }
 
                     }
+                }, {
+                    name: "Archivierte ausblenden",
+                    default: true,
+                    "filterFunction": function (row) {
+                        if(!row.archived) {
+                            return true
+                        } else {
+                            return false
+                        }
+                    }
                 }
             ],
             templateColumns: [
@@ -759,7 +839,17 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             historyItemHolder: "vehicle",
             supabaseSelectWithInformation: "*, checks(*), files(*)",
-            filters:[],
+            filters:[,{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns:[
                 {
                     key: 'active',
@@ -850,6 +940,16 @@ export const useDataStore = defineStore('data', () => {
                 name: "SEPA nicht erteilt",
                 "filterFunction": function (row) {
                     return !row.hasSEPA
+                },
+            },{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
                 }
             }],
             templateColumns: [
@@ -971,7 +1071,17 @@ export const useDataStore = defineStore('data', () => {
             redirect: true,
             numberRangeHolder: "spaceNumber",
             historyItemHolder: "space",
-            filters:[],
+            filters:[,{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             inputColumns: [
                 "Allgemeines",
                 "Ort"
@@ -1100,7 +1210,17 @@ export const useDataStore = defineStore('data', () => {
                 "Allgemeines",
                 "Anschaffung"
             ],
-            filters:[],
+            filters:[{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns: [
                 {
                     key: "name",
@@ -1221,7 +1341,17 @@ export const useDataStore = defineStore('data', () => {
             redirect: true,
             supabaseSelectWithInformation: "*, unit(*)",
             historyItemHolder: "service",
-            filters: [],
+            filters: [{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns: [
                 {
                     key: "name",
@@ -1316,7 +1446,17 @@ export const useDataStore = defineStore('data', () => {
             historyItemHolder: "event",
             supabaseSelectWithInformation: "*, project(id,name), vehicles(*), inventoryitems(*)",
             redirect: true,
-            filters:[],
+            filters:[{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns: [
                 {
                     key: 'name',
@@ -1402,7 +1542,17 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect: true,
             supabaseSelectWithInformation: "*",
-            filters: [],
+            filters: [{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns: [
                 {
                     key: "name",
@@ -1428,7 +1578,17 @@ export const useDataStore = defineStore('data', () => {
             isStandardEntity: true,
             redirect: true,
             supabaseSelectWithInformation: "*",
-            filters: [],
+            filters: [{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns: [
                 {
                     key: "name",
@@ -1467,7 +1627,17 @@ export const useDataStore = defineStore('data', () => {
             supabaseSelectWithInformation: "*, vehicle(id,licensePlate), profile(id, fullName), inventoryitem(name), files(*)",
             redirect: true,
             historyItemHolder: "check",
-            filters: [],
+            filters: [{
+                name: "Archivierte ausblenden",
+                default: true,
+                "filterFunction": function (row) {
+                    if(!row.archived) {
+                        return true
+                    } else {
+                        return false
+                    }
+                }
+            }],
             templateColumns: [
                 {
                     key: "name",

From 46fb5de260ef2087f2b15dd8e12b4cddca7ad2c2 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 11:21:55 +0100
Subject: [PATCH 053/104] Added tenant log when no role is Present

---
 composables/useRole.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composables/useRole.js b/composables/useRole.js
index ec39795..8437974 100644
--- a/composables/useRole.js
+++ b/composables/useRole.js
@@ -5,6 +5,7 @@
 
 export const useRole = () => {
     const profileStore = useProfileStore()
+    console.log(profileStore.currentTenant)
 
 
     const generalAvailableRights = ref({

From 96184e48531ede269135a2a9f17efbc489f7f3ef Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 11:22:03 +0100
Subject: [PATCH 054/104] Fixed Document Upload

---
 components/DocumentUpload.vue | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/components/DocumentUpload.vue b/components/DocumentUpload.vue
index a7ba1bb..0acdf6d 100644
--- a/components/DocumentUpload.vue
+++ b/components/DocumentUpload.vue
@@ -13,15 +13,21 @@ const {type, elementId} = props
 
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
-const tags = dataStore.getDocumentTags
 
 const uploadModalOpen = ref(false)
 const uploadInProgress = ref(false)
 const fileUploadFormData = ref({
-  tags: ["Dokument"],
   project: null,
   tenant: profileStore.currentTenant
 })
+const availableTags = ref([])
+const selectedTags = ref([])
+const setup = async () => {
+  availableTags.value = await useSupabaseSelect("filetags")
+}
+
+setup()
+
 
 const openModal = () => {
   uploadModalOpen.value = true
@@ -33,7 +39,7 @@ const uploadFiles = async () => {
   let fileData = fileUploadFormData.value
   fileData[type] = elementId
 
-  await dataStore.uploadFiles(fileData,  document.getElementById("fileUploadInput").files,true)
+  await useFiles().uploadFiles(fileData,  document.getElementById("fileUploadInput").files,selectedTags.value,true)
 
   uploadModalOpen.value = false;
   uploadInProgress.value = false;
@@ -44,7 +50,7 @@ const uploadFiles = async () => {
   <USlideover
       v-model="uploadModalOpen"
   >
-    <UCard :ui="{ ring: '', divide: 'divide-y divide-gray-100 dark:divide-gray-800' }">
+    <UCard :ui="{ ring: '', divide: 'divide-y divide-gray-100 dark:divide-gray-800' }" class="h-full">
       <template #header>
         <div class="flex items-center justify-between">
           <h3 class="text-base font-semibold leading-6 text-gray-900 dark:text-white">
@@ -76,13 +82,15 @@ const uploadFiles = async () => {
       >
         <USelectMenu
             multiple
+            option-attribute="name"
+            value-attribute="id"
             searchable
             searchable-placeholder="Suchen..."
-            :options="tags"
-            v-model="fileUploadFormData.tags"
+            :options="availableTags"
+            v-model="selectedTags"
         >
           <template #label>
-            <span v-if="fileUploadFormData.tags.length > 0">{{fileUploadFormData.tags.join(", ")}}</span>
+            <span v-if="selectedTags.length > 0">{{selectedTags.map(i => availableTags.find(x => x.id === i).name).join(", ")}}</span>
             <span v-else>Keine Tags ausgewählt</span>
           </template>
         </USelectMenu>

From af38afc5b5ba71821b7f284988adcab6a7deee98 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 12:03:14 +0100
Subject: [PATCH 055/104] Added Reloaded after File Upload Change selection for
 Images

---
 components/DocumentDisplay.vue                  | 6 +++++-
 components/DocumentDisplayModal.vue             | 2 +-
 components/DocumentUpload.vue                   | 4 ++++
 components/EntityShow.vue                       | 3 +++
 pages/standardEntity/[type]/[[mode]]/[[id]].vue | 3 +++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/components/DocumentDisplay.vue b/components/DocumentDisplay.vue
index 729b5d0..cdb2702 100644
--- a/components/DocumentDisplay.vue
+++ b/components/DocumentDisplay.vue
@@ -106,7 +106,7 @@ const updateDocumentAssignment = async () => {
     <iframe
         :src="`${documentData.url}#toolbar=0&navpanes=0&scrollbar=0`"
         class="previewEmbed"
-        v-if="!documentData.filetags.includes('Bild')"
+        v-if="documentData.path.includes('pdf')"
         loading="lazy"
     />
     <img
@@ -337,4 +337,8 @@ const updateDocumentAssignment = async () => {
   aspect-ratio: 1/ 1.414;
 }
 
+.previewImg {
+  object-fit: contain;
+}
+
 </style>
\ No newline at end of file
diff --git a/components/DocumentDisplayModal.vue b/components/DocumentDisplayModal.vue
index e03bdf4..67aefd5 100644
--- a/components/DocumentDisplayModal.vue
+++ b/components/DocumentDisplayModal.vue
@@ -167,7 +167,7 @@ const moveFile = async () => {
               class="bigPreview"
               :data="`${props.documentData.url}#toolbar=0&navpanes=0&scrollbar=0`"
               type="application/pdf"
-              v-if="!props.documentData.filetags.includes('Bild')"
+              v-if="props.documentData.path.includes('pdf')"
 
           />
           <img
diff --git a/components/DocumentUpload.vue b/components/DocumentUpload.vue
index 0acdf6d..92ab72d 100644
--- a/components/DocumentUpload.vue
+++ b/components/DocumentUpload.vue
@@ -11,6 +11,8 @@ const props = defineProps({
 
 const {type, elementId} = props
 
+const emit = defineEmits(["uploadFinished"])
+
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
 
@@ -43,6 +45,7 @@ const uploadFiles = async () => {
 
   uploadModalOpen.value = false;
   uploadInProgress.value = false;
+  emit("uploadFinished")
 }
 </script>
 
@@ -74,6 +77,7 @@ const uploadFiles = async () => {
             type="file"
             id="fileUploadInput"
             multiple
+            accept="image/jpeg, image/png, image/gif, application/pdf"
         />
       </UFormGroup>
       <UFormGroup
diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 48f0255..9995f98 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -30,6 +30,7 @@ defineShortcuts({
   },
 })
 
+const emit = defineEmits(["updateNeeded"])
 
 const router = useRouter()
 const dataStore = useDataStore()
@@ -215,10 +216,12 @@ const getAvailableQueryStringData = () => {
               <DocumentUpload
                   :type="type.substring(0,type.length-1)"
                   :element-id="item.id"
+                  @uploadFinished="emit('updateNeeded')"
               />
             </Toolbar>
 
             <DocumentList
+                :key="props.item.files.length"
                 :documents="availableFiles"
                 v-if="availableFiles.length > 0"
             />
diff --git a/pages/standardEntity/[type]/[[mode]]/[[id]].vue b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
index cb3af67..0a5d969 100644
--- a/pages/standardEntity/[type]/[[mode]]/[[id]].vue
+++ b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
@@ -13,6 +13,7 @@ const items = ref([])
 const item = ref({})
 
 const setupPage = async () => {
+  console.log('setupPage')
   if(route.params.mode) mode.value = route.params.mode
 
   if(mode.value === "show") {
@@ -48,6 +49,8 @@ setupPage()
       v-if="loaded && mode === 'show'"
       :type="route.params.type"
       :item="item"
+      @updateNeeded="setupPage"
+      :key="item"
   />
   <EntityEdit
       v-else-if="loaded && (mode === 'edit' || mode === 'create')"

From 0bab558c759e528c2a03643e3f029efa9f2713d5 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 12:42:00 +0100
Subject: [PATCH 056/104] Updated in Files and Archiving

---
 components/ButtonWithConfirm.vue    |  30 ++--
 components/DocumentDisplay.vue      | 268 ++--------------------------
 components/DocumentDisplayModal.vue | 123 +++++++++++--
 components/DocumentList.vue         |   2 +
 composables/useFiles.js             |  14 +-
 5 files changed, 151 insertions(+), 286 deletions(-)

diff --git a/components/ButtonWithConfirm.vue b/components/ButtonWithConfirm.vue
index fb17fb5..fe10c44 100644
--- a/components/ButtonWithConfirm.vue
+++ b/components/ButtonWithConfirm.vue
@@ -18,6 +18,7 @@ const {color,variant} = props
 const showModal = ref(false)
 
 const emitConfirm = () => {
+  showModal.value = false
   emit('confirmed')
 }
 </script>
@@ -38,19 +39,22 @@ const emitConfirm = () => {
       <slot/>
       <template #footer>
         <div class="text-right">
-          <UButton
-              color="rose"
-              variant="outline"
-              @click="showModal = false"
-          >
-            Abbrechen
-          </UButton>
-          <UButton
-              @click="emitConfirm"
-              class="ml-2"
-          >
-            Bestätigen
-          </UButton>
+          <UButtonGroup>
+            <UButton
+                color="rose"
+                variant="outline"
+                @click="showModal = false"
+            >
+              Abbrechen
+            </UButton>
+            <UButton
+                @click="emitConfirm"
+                class="ml-2"
+            >
+              Bestätigen
+            </UButton>
+          </UButtonGroup>
+
         </div>
       </template>
     </UCard>
diff --git a/components/DocumentDisplay.vue b/components/DocumentDisplay.vue
index cdb2702..d88a3ba 100644
--- a/components/DocumentDisplay.vue
+++ b/components/DocumentDisplay.vue
@@ -1,8 +1,11 @@
 <script setup>
 
+import DocumentDisplayModal from "~/components/DocumentDisplayModal.vue";
+
 const toast = useToast()
 const supabase = useSupabaseClient()
 const dataStore = useDataStore()
+const modal = useModal()
 const profileStore = useProfileStore()
 const router = useRouter()
 const props = defineProps({
@@ -20,89 +23,22 @@ const props = defineProps({
 
 })
 
-let {documentData, openShowModal:openShowModalProp, returnEmit } = props;
-const tags = dataStore.getDocumentTags
-const openShowModal = ref(false)
+let {documentData, returnEmit } = props;
 
 
-
-
-//Functions
-const openDocument = async () => {
-  //selectedDocument.value = doc
-  openShowModal.value = true
-  console.log("open")
+const showFile = (file) => {
+  console.log(file)
+  modal.open(DocumentDisplayModal,{
+    documentData: file
+  })
 }
 
-const updateDocument = async () => {
-  console.log("Update")
 
-  const {url, ...objData} = documentData
-  delete objData.url
-
-
-  const {data,error} = await supabase
-      .from("documents")
-      .update(objData)
-      .eq('id',objData.id)
-      .select()
-
-  if(error) {
-    console.log(error)
-  } else {
-    toast.add({title: "Dokument aktualisiert"})
-    //openShowModal.value = false
-  }
-
-}
-
-const archiveDocument = () => {
-  //documentData.tags.push("Archiviert")
-  //updateDocument()
-}
-
-const resourceOptions = ref([
-    {label: 'Projekt', value: 'project', optionAttr: "name"},
-  {label: 'Kunde', value: 'customer', optionAttr: "name"},
-  {label: 'Lieferant', value: 'vendor', optionAttr: "name"},
-  {label: 'Fahrzeug', value: 'vehicle', optionAttr: "licensePlate"},
-  {label: 'Objekt', value: 'plant', optionAttr: "name"},
-  {label: 'Vertrag', value: 'contract', optionAttr: "name"},
-  {label: 'Produkt', value: 'product', optionAttr: "name"}
-])
-const resourceToAssign = ref("project")
-const itemOptions = ref([])
-const idToAssign = ref(null)
-const getItemsBySelectedResource = () => {
-  if(resourceToAssign.value === "project") {
-    itemOptions.value = dataStore.projects
-  } else if(resourceToAssign.value === "customer") {
-    itemOptions.value = dataStore.customers
-  } else if(resourceToAssign.value === "vendor") {
-    itemOptions.value = dataStore.vendors
-  } else if(resourceToAssign.value === "vehicle") {
-    itemOptions.value = dataStore.vehicles
-  } else if(resourceToAssign.value === "product") {
-    itemOptions.value = dataStore.products
-  } else if(resourceToAssign.value === "plant") {
-    itemOptions.value = dataStore.plants
-  } else if(resourceToAssign.value === "contract") {
-    itemOptions.value = dataStore.contracts
-  } else {
-    itemOptions.value =  []
-  }
-}
-getItemsBySelectedResource()
-
-const updateDocumentAssignment = async () => {
-  documentData[resourceToAssign.value] = idToAssign.value
-  await updateDocument()
-}
 
 </script>
 
 <template>
-  <div :id="`docDisplay-${documentData.id}`"  class="documentListItem" @click="returnEmit ? $emit('clicked', documentData.id) : openShowModal = true">
+  <div :id="`docDisplay-${documentData.id}`"  class="documentListItem" @click="returnEmit ? $emit('clicked', documentData.id) : showFile(documentData)">
     <iframe
         :src="`${documentData.url}#toolbar=0&navpanes=0&scrollbar=0`"
         class="previewEmbed"
@@ -125,182 +61,7 @@ const updateDocumentAssignment = async () => {
 
       ><span class="text-nowrap">{{ tag.name }}</span></UBadge>
     </InputGroup>
-
-
-<!--    <UButton
-        @click="openDocument"
-        class="mt-3"
-        icon=""
-    >
-      <UIcon name="i-heroicons-eye-solid" />
-    </UButton>-->
-<!--    <UToggle
-        v-model="documentData.selected"
-        class="ml-2"
-    />-->
-<!--    <UBadge
-      v-if="documentData.vendorInvoice"
-    >{{dataStore.incominginvoices.find(item => item.id === documentData.vendorInvoice) ? dataStore.incominginvoices.find(item => item.id === documentData.vendorInvoice).reference : ''}}</UBadge>
-    <UBadge
-      v-if="documentData.inDatev"
-    >DATEV</UBadge>-->
   </div>
-
-
-
-  <USlideover
-      v-model="openShowModal"
-      fullscreen
-  >
-    <UCard class="flex flex-col flex-1" :ui="{ body: { base: 'flex-1' }, ring: '', divide: 'divide-y divide-gray-100 dark:divide-gray-800' }">
-      <template #header>
-        <div class="flex flex-row justify-between">
-          <div class="flex items-center gap-2">
-            <UBadge
-                v-for="tag in documentData.filetags"
-            >
-              {{tag.name}}
-            </UBadge>
-          </div>
-          <UButton color="gray" variant="ghost" icon="i-heroicons-x-mark-20-solid" class="-my-1" @click="openShowModal = false" />
-        </div>
-
-      </template>
-
-      <UContainer class="h-full" :ui="{padding: 'px-1 sm:px-1 lg:px-1'}">
-        <object
-            class="bigPreview"
-            :data="`${documentData.url}#toolbar=0&navpanes=0&scrollbar=0`"
-            type="application/pdf"
-            v-if="!documentData.filetags.includes('Bild')"
-
-        />
-        <img
-          class=" w-full"
-          :src="documentData.url"
-          alt=""
-          v-else
-        />
-      </UContainer>
-
-      <template #footer>
-
-        <UButtonGroup>
-<!--          <UButton
-            @click="archiveDocument"
-          >
-            Archivieren
-          </UButton>-->
-          <UButton
-            :to="documentData.url"
-            variant="outline"
-            icon="i-heroicons-arrow-top-right-on-square"
-            target="_blank"
-          >
-            Öffnen
-          </UButton>
-        </UButtonGroup>
-
-        <UFormGroup
-          label="Tags ändern:"
-        >
-          <USelectMenu
-              :options="tags"
-              v-model="documentData.filetags"
-              @change="updateDocument"
-              multiple
-          >
-            <template #label>
-              {{documentData.filetags.length}} ausgewählt
-            </template>
-          </USelectMenu>
-        </UFormGroup>
-
-        <p>Dokument zuweisen:</p>
-        <UFormGroup
-          label="Resource auswählen"
-        >
-          <USelectMenu
-              :options="resourceOptions"
-              v-model="resourceToAssign"
-              value-attribute="value"
-              option-attribute="label"
-              @change="getItemsBySelectedResource"
-          >
-
-          </USelectMenu>
-        </UFormGroup>
-        <UFormGroup
-          label="Eintrag auswählen:"
-        >
-
-        </UFormGroup>
-
-        <USelectMenu
-          :options="itemOptions"
-          v-model="idToAssign"
-          :option-attribute="resourceOptions.find(i => i.value === resourceToAssign)? resourceOptions.find(i => i.value === resourceToAssign).optionAttr : 'name'"
-          value-attribute="id"
-          @change="updateDocumentAssignment"
-        ></USelectMenu>
-
-
-<!--        <UFormGroup
-            label="Projekt zuweisen:"
-        >
-          <USelectMenu
-              :options="dataStore.projects"
-              option-attribute="name"
-              value-attribute="id"
-              v-model="documentData.project"
-              @change="updateDocument"
-              searchable
-              :search-attributes="['name']"
-          >
-            <template #label>
-              {{dataStore.projects.find(item => item.id === documentData.project) ? dataStore.projects.find(item => item.id === documentData.project).name : "Kein Projekt ausgewählt" }}
-            </template>
-          </USelectMenu>
-        </UFormGroup>
-
-        <UFormGroup
-            label="Kunde zuweisen:"
-        >
-          <USelectMenu
-              :options="dataStore.customers"
-              option-attribute="name"
-              value-attribute="id"
-              v-model="documentData.customer"
-              @change="updateDocument"
-              searchable
-              :search-attributes="['name']"
-          >
-            <template #label>
-              {{dataStore.customers.find(item => item.id === documentData.customer) ? dataStore.customers.find(item => item.id === documentData.customer).name : "Kein Kunde ausgewählt" }}
-            </template>
-          </USelectMenu>
-        </UFormGroup>-->
-
-
-      </template>
-    </UCard>
-
-
-<!--    <UCard class="h-full">
-
-
-
-
-
-
-
-
-
-
-
-
-    </UCard>-->
-  </USlideover>
 </template>
 
 <style scoped>
@@ -332,13 +93,4 @@ const updateDocumentAssignment = async () => {
   display: none;
 }
 
-.bigPreview {
-  width: 100%;
-  aspect-ratio: 1/ 1.414;
-}
-
-.previewImg {
-  object-fit: contain;
-}
-
 </style>
\ No newline at end of file
diff --git a/components/DocumentDisplayModal.vue b/components/DocumentDisplayModal.vue
index 67aefd5..a22210c 100644
--- a/components/DocumentDisplayModal.vue
+++ b/components/DocumentDisplayModal.vue
@@ -19,6 +19,8 @@ const props = defineProps({
 
 })
 
+const emit = defineEmits(["updateNeeded"])
+
 const folders = ref([])
 const setup = async () => {
   const {data} = await supabase.from("folders").select().eq("tenant",useProfileStore().currentTenant)
@@ -61,12 +63,23 @@ const openDocument = async () => {
 }
 
 const updateDocument = async () => {
-  console.log("Update")
-
   const {url, ...objData} = props.documentData
   delete objData.url
   delete objData.filetags
 
+  if(objData.project) objData.project = objData.project.id
+  if(objData.customer) objData.customer = objData.customer.id
+  if(objData.contract) objData.contract = objData.contract.id
+  if(objData.vendor) objData.vendor = objData.vendor.id
+  if(objData.plant) objData.plant = objData.plant.id
+  if(objData.createddocument) objData.createddocument = objData.createddocument.id
+  if(objData.vehicle) objData.vehicle = objData.vehicle.id
+  if(objData.product) objData.product = objData.product.id
+  if(objData.profile) objData.profile = objData.profile.id
+  if(objData.check) objData.check = objData.check.id
+  if(objData.inventoryitem) objData.inventoryitem = objData.inventoryitem.id
+
+
   const {data,error} = await supabase
       .from("files")
       .update(objData)
@@ -81,9 +94,19 @@ const updateDocument = async () => {
   }
 }
 
-const archiveDocument = () => {
-  //documentData.tags.push("Archiviert")
-  //updateDocument()
+const archiveDocument = async () => {
+  props.documentData.archived = true
+  await updateDocument()
+
+  const {data,error} = await supabase.from("historyitems").insert({
+    createdBy: useProfileStore().activeProfile.id,
+    tenant: useProfileStore().currentTenant,
+    text: "Datei archiviert",
+    file: props.documentData.id
+  })
+
+  modal.close()
+  emit("update")
 }
 
 const resourceOptions = ref([
@@ -179,11 +202,20 @@ const moveFile = async () => {
         </div>
         <div class="w-2/3 p-5">
           <UButtonGroup>
-            <!--          <UButton
-                        @click="archiveDocument"
-                      >
-                        Archivieren
-                      </UButton>-->
+            <ButtonWithConfirm
+                color="rose"
+                variant="outline"
+                @confirmed="archiveDocument"
+            >
+              <template #button>
+                Archivieren
+              </template>
+              <template #header>
+                <span class="text-md text-black font-bold">Archivieren bestätigen</span>
+              </template>
+              Möchten Sie die Datei wirklich archivieren?
+            </ButtonWithConfirm>
+
             <UButton
                 :to="props.documentData.url"
                 variant="outline"
@@ -194,6 +226,77 @@ const moveFile = async () => {
             </UButton>
           </UButtonGroup>
 
+          <UDivider>Zuweisungen</UDivider>
+
+          <table class="w-full">
+            <tr v-if="props.documentData.project">
+              <td>Projekt</td>
+              <td>
+                <nuxt-link :to="`/standardEntity/projects/show/${props.documentData.project.id}`">{{props.documentData.project.name}}</nuxt-link>
+              </td>
+            </tr>
+            <tr v-if="props.documentData.customer">
+              <td>Kunde</td>
+              <td>
+                <nuxt-link :to="`/standardEntity/customers/show/${props.documentData.customer.id}`">{{props.documentData.customer.name}}</nuxt-link>
+              </td>
+            </tr>
+            <tr v-if="props.documentData.vendor">
+              <td>Lieferant</td>
+              <td>
+                <nuxt-link :to="`/standardEntity/vendors/show/${props.documentData.vendor.id}`">{{props.documentData.vendor.name}}</nuxt-link>
+              </td>
+            </tr>
+            <tr v-if="props.documentData.createddocument">
+              <td>Ausgangsbeleg</td>
+              <td>
+                <nuxt-link :to="`/createddocuments/show/${props.documentData.createddocument.id}`">{{props.documentData.createddocument.documentNumber}}</nuxt-link>
+              </td>
+            </tr>
+            <tr v-if="props.documentData.plant">
+              <td>Objekt</td>
+              <td>
+                <nuxt-link :to="`/standardEntity/plants/show/${props.documentData.plant.id}`">{{props.documentData.plant.name}}</nuxt-link>
+              </td>
+            </tr>
+            <tr v-if="props.documentData.contract">
+              <td>Vertrag</td>
+              <td>
+                <nuxt-link :to="`/standardEntity/contracts/show/${props.documentData.contract.id}`">{{props.documentData.contract.name}}</nuxt-link>
+              </td>
+            </tr>
+            <tr v-if="props.documentData.vehicle">
+              <td>Fahrzeug</td>
+              <td>
+                <nuxt-link :to="`/standardEntity/vehicles/show/${props.documentData.vehicle.id}`">{{props.documentData.vehicle.licensePlate}}</nuxt-link>
+              </td>
+            </tr>
+            <tr v-if="props.documentData.product">
+              <td>Artikel</td>
+              <td>
+                <nuxt-link :to="`/standardEntity/products/show/${props.documentData.product.id}`">{{props.documentData.product.name}}</nuxt-link>
+              </td>
+            </tr>
+            <tr v-if="props.documentData.inventoryitem">
+              <td>Inventarartikel</td>
+              <td>
+                <nuxt-link :to="`/standardEntity/inventoryitem/show/${props.documentData.inventoryitem.id}`">{{props.documentData.inventoryitem.name}}</nuxt-link>
+              </td>
+            </tr>
+            <tr v-if="props.documentData.check">
+              <td>Überprüfung</td>
+              <td>
+                <nuxt-link :to="`/standardEntity/checks/show/${props.documentData.check.id}`">{{props.documentData.check.name}}</nuxt-link>
+              </td>
+            </tr>
+            <tr v-if="props.documentData.profile">
+              <td>Mitarbeiter</td>
+              <td>
+                <nuxt-link :to="`/profiles/show/${props.documentData.profile.id}`">{{props.documentData.profile.fullName}}</nuxt-link>
+              </td>
+            </tr>
+          </table>
+
           <UDivider class="my-3">Datei zuweisen</UDivider>
 
           <UFormGroup
diff --git a/components/DocumentList.vue b/components/DocumentList.vue
index b52ddf9..69709bf 100644
--- a/components/DocumentList.vue
+++ b/components/DocumentList.vue
@@ -10,6 +10,7 @@ const props = defineProps({
 })
 const dataStore = useDataStore()
 
+const emit = defineEmits(["updateNeeded"])
 
 </script>
 
@@ -21,6 +22,7 @@ const dataStore = useDataStore()
         :key="item.id"
         @clicked="(info) => $emit('selectDocument', info)"
         :return-emit="returnDocumentId"
+        @updatedNeeded="emit('updatedNeeded')"
     />
   </div>
 </template>
diff --git a/composables/useFiles.js b/composables/useFiles.js
index b79346a..a64dafc 100644
--- a/composables/useFiles.js
+++ b/composables/useFiles.js
@@ -92,16 +92,18 @@ export const useFiles = () => {
         if(sortColumn !== null ) {
             data = (await supabase
                 .from("files")
-                .select('*, filetags(*)')
+                .select('*, filetags(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
                 .eq("tenant", profileStore.currentTenant)
                 .not("path","is",null)
+                .not("archived","is",true)
                 .order(sortColumn, {ascending: true})).data
         } else {
             data = (await supabase
                 .from("files")
-                .select('*, filetags(*)')
+                .select('*, filetags(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
                 .eq("tenant", profileStore.currentTenant)
-                .not("path","is",null)).data
+                .not("path","is",null)
+                .not("archived","is",true)).data
 
         }
 
@@ -133,17 +135,19 @@ export const useFiles = () => {
         if(sortColumn !== null ) {
             data = (await supabase
                 .from("files")
-                .select('*, filetags(*)')
+                .select('*, filetags(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
                 .in("id",documentIds)
                 .eq("tenant", profileStore.currentTenant)
                 .not("path","is",null)
+                .not("archived","is",true)
                 .order(sortColumn, {ascending: true})).data
         } else {
             data = (await supabase
                 .from("files")
-                .select('*, filetags(*)')
+                .select('*, filetags(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
                 .in("id",documentIds)
                 .not("path","is",null)
+                .not("archived","is",true)
                 .eq("tenant", profileStore.currentTenant)).data
 
         }

From cd190132f990b2c3098e65d296736980bdbe36ba Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 14:29:44 +0100
Subject: [PATCH 057/104] Fix in Filters

---
 stores/data.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/stores/data.js b/stores/data.js
index 149220b..194edc7 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -135,7 +135,7 @@ export const useDataStore = defineStore('data', () => {
             historyItemHolder: "customer",
             supabaseSortColumn: "customerNumber",
             supabaseSelectWithInformation: "*, projects(*), plants(*), contracts(*), contacts(*), createddocuments(*), files(*)",
-            filters: [,{
+            filters: [{
                 name: "Archivierte ausblenden",
                 default: true,
                 "filterFunction": function (row) {
@@ -259,7 +259,7 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             historyItemHolder: "contact",
             supabaseSelectWithInformation: "*, customer(*), vendor(*)",
-            filters: [,{
+            filters: [{
                 name: "Archivierte ausblenden",
                 default: true,
                 "filterFunction": function (row) {
@@ -360,7 +360,7 @@ export const useDataStore = defineStore('data', () => {
             labelSingle: "Vertrag",
             isStandardEntity: true,
             redirect:true,
-            filters:[,{
+            filters:[{
                 name: "Archivierte ausblenden",
                 default: true,
                 "filterFunction": function (row) {
@@ -508,7 +508,7 @@ export const useDataStore = defineStore('data', () => {
             supabaseSelectWithInformation: "*",
             historyItemHolder: "absencerequest",
             redirect:true,
-            filters:[,{
+            filters:[{
                 name: "Archivierte ausblenden",
                 default: true,
                 "filterFunction": function (row) {
@@ -587,7 +587,7 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             historyItemHolder: "plant",
             supabaseSelectWithInformation: "*, customer(id,name)",
-            filters: [,{
+            filters: [{
                 name: "Archivierte ausblenden",
                 default: true,
                 "filterFunction": function (row) {
@@ -638,7 +638,7 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             supabaseSelectWithInformation: "*, unit(name)",
             historyItemHolder: "product",
-            filters: [,{
+            filters: [{
                 name: "Archivierte ausblenden",
                 default: true,
                 "filterFunction": function (row) {
@@ -839,7 +839,7 @@ export const useDataStore = defineStore('data', () => {
             redirect:true,
             historyItemHolder: "vehicle",
             supabaseSelectWithInformation: "*, checks(*), files(*)",
-            filters:[,{
+            filters:[{
                 name: "Archivierte ausblenden",
                 default: true,
                 "filterFunction": function (row) {
@@ -1071,7 +1071,7 @@ export const useDataStore = defineStore('data', () => {
             redirect: true,
             numberRangeHolder: "spaceNumber",
             historyItemHolder: "space",
-            filters:[,{
+            filters:[{
                 name: "Archivierte ausblenden",
                 default: true,
                 "filterFunction": function (row) {

From 2c175ad1b2e29edf6a5d41e011d944aebed16c4a Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 14:46:29 +0100
Subject: [PATCH 058/104] Removed logs

---
 pages/standardEntity/[type]/[[mode]]/[[id]].vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pages/standardEntity/[type]/[[mode]]/[[id]].vue b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
index 0a5d969..2f3a565 100644
--- a/pages/standardEntity/[type]/[[mode]]/[[id]].vue
+++ b/pages/standardEntity/[type]/[[mode]]/[[id]].vue
@@ -13,7 +13,6 @@ const items = ref([])
 const item = ref({})
 
 const setupPage = async () => {
-  console.log('setupPage')
   if(route.params.mode) mode.value = route.params.mode
 
   if(mode.value === "show") {
@@ -23,10 +22,8 @@ const setupPage = async () => {
     //Load Data for Edit
     const data = JSON.stringify((await supabase.from(type).select().eq("id", route.params.id).single()).data)
         //await useSupabaseSelectSingle(type, route.params.id)
-    console.log(JSON.parse(data))
     item.value = data
 
-    console.log(item.value)
   }  else if(mode.value === "create") {
     //Load Data for Create
     item.value = JSON.stringify({})

From 0baba6354246ccc66078f500a4d7b6dac77b7327 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 15:25:02 +0100
Subject: [PATCH 059/104] Added MaterialComposition Added Service Categorie
 Rendering

---
 components/EntityEdit.vue                     |   7 +
 .../columnRenderings/serviceCategories.vue    |  21 +++
 components/materialComposing.vue              | 129 ++++++++++++++++++
 stores/data.js                                |  12 +-
 4 files changed, 166 insertions(+), 3 deletions(-)
 create mode 100644 components/columnRenderings/serviceCategories.vue
 create mode 100644 components/materialComposing.vue

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index 366abf5..8b41f39 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -1,5 +1,6 @@
 <script setup>
 import dayjs from "dayjs";
+import MaterialComposing from "~/components/materialComposing.vue";
 
 const props = defineProps({
   type: {
@@ -613,6 +614,12 @@ const contentChanged = (content, datapoint) => {
               :preloadedContent="item[datapoint.key].html"
           />
 
+
+          <MaterialComposing
+            v-else-if="datapoint.inputType === 'materialComposing'"
+            :item="item"
+          />
+
           <UButton
               v-if="['text','number','select','date','datetime','textarea'].includes(datapoint.inputType)"
               @click="item[datapoint.key] = null"
diff --git a/components/columnRenderings/serviceCategories.vue b/components/columnRenderings/serviceCategories.vue
new file mode 100644
index 0000000..51295f1
--- /dev/null
+++ b/components/columnRenderings/serviceCategories.vue
@@ -0,0 +1,21 @@
+<script setup>
+const props = defineProps({
+  row: {
+    type: Object,
+    required: true,
+    default: {}
+  }
+})
+
+const servicecategories = ref([])
+
+const setup = async () => {
+  servicecategories.value = await useSupabaseSelect("servicecategories")
+}
+
+setup()
+</script>
+
+<template>
+  <span v-if="props.row.servicecategories && servicecategories.length > 0">{{props.row.servicecategories.map(i => servicecategories.find(x => x.id === i).name).join(", ")}}</span>
+</template>
diff --git a/components/materialComposing.vue b/components/materialComposing.vue
new file mode 100644
index 0000000..23d1282
--- /dev/null
+++ b/components/materialComposing.vue
@@ -0,0 +1,129 @@
+<script setup>
+
+import { v4 as uuidv4 } from 'uuid';
+
+const supabase = useSupabaseClient()
+
+const props = defineProps({
+  item: {
+    type: Object,
+    required: true
+  }
+})
+
+const products = ref([])
+const units = ref([])
+
+const setup = async () => {
+  products.value = await useSupabaseSelect("products")
+  units.value = (await supabase.from("units").select()).data
+}
+
+setup()
+
+const addProductToMaterialComposition = () => {
+
+  if(!props.item.materialComposition) props.item.materialComposition = []
+
+  props.item.materialComposition.push({
+    id: uuidv4(),
+    unit: 1,
+    quantity: 1,
+    price: 0,
+  })
+  calculateTotalMaterialPrice()
+}
+
+const removeProductFromMaterialComposition = (id) => {
+  props.item.materialComposition = props.item.materialComposition.filter((item) => item.id !== id)
+  calculateTotalMaterialPrice()
+}
+
+const calculateTotalMaterialPrice = () => {
+  let total = 0
+
+  props.item.materialComposition.forEach((item) => {
+    let rowSum = item.quantity * item.price
+    total += rowSum
+  })
+
+  props.item.sellingPriceComposed.material = total
+}
+
+const setRowData = (row) => {
+  let product = products.value.find(i => i.id === row.product)
+
+  row.unit = product.unit
+  row.price = product.sellingPrice
+}
+
+</script>
+
+<template>
+  <UCard class="w-full">
+    <UButton
+        @click="addProductToMaterialComposition"
+    >
+      + Artikel
+    </UButton>
+
+    <table class="w-full mt-3">
+      <tr
+          v-for="product in props.item.materialComposition"
+      >
+        <td>
+          <USelectMenu
+            :options="products"
+            value-attribute="id"
+            option-attribute="name"
+            v-model="product.product"
+            :color="product.product ? 'primary' : 'rose'"
+            @change="setRowData(product)"
+          >
+            <template #label>
+              {{products.find(i => i.id === product.product) ? products.find(i => i.id === product.product).name : 'Kein Artikel ausgewählt'}}
+            </template>
+          </USelectMenu>
+        </td>
+        <td>
+          <UInput
+            type="number"
+            v-model="product.quantity"
+            :step="units.find(i => i.id === product.unit) ? units.find(i => i.id === product.unit).step : 1"
+            @change="calculateTotalMaterialPrice"
+          />
+        </td>
+        <td>
+          <USelectMenu
+            :options="units"
+            value-attribute="id"
+            option-attribute="name"
+            v-model="product.unit"
+          ></USelectMenu>
+        </td>
+        <td>
+          <UInput
+            type="number"
+            v-model="product.price"
+            step="0.01"
+            @change="calculateTotalMaterialPrice"
+          />
+        </td>
+        <td>
+          <UButton
+            icon="i-heroicons-x-mark"
+            @click="removeProductFromMaterialComposition(product.id)"
+            variant="outline"
+            color="rose"
+          />
+        </td>
+      </tr>
+    </table>
+  </UCard>
+</template>
+
+<style scoped>
+td {
+  margin-bottom: 0.5em;
+}
+</style>
\ No newline at end of file
diff --git a/stores/data.js b/stores/data.js
index 194edc7..29177d8 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -30,6 +30,7 @@ import sellingPriceComposedWorker from "~/components/columnRenderings/sellingPri
 import sellingPriceComposedTotal from "~/components/columnRenderings/sellingPriceComposedTotal.vue"
 import startDate from "~/components/columnRenderings/startDate.vue"
 import endDate from "~/components/columnRenderings/endDate.vue"
+import serviceCategories from "~/components/columnRenderings/serviceCategories.vue"
 
 import quantity from "~/components/helpRenderings/quantity.vue"
 import {useZipCheck} from "~/composables/useZipCheck.js";
@@ -39,7 +40,6 @@ export const useDataStore = defineStore('data', () => {
 
     const supabase = useSupabaseClient()
     const profileStore = useProfileStore()
-    const user = useSupabaseUser()
     const toast = useToast()
     const router = useRouter()
 
@@ -1380,7 +1380,8 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "servicecategories",
                     selectOptionAttribute: "name",
                     selectSearchAttributes: ['name'],
-                    selectMultiple: true
+                    selectMultiple: true,
+                    component: serviceCategories
                 },
                 {
                     key: "sellingPriceComposed.worker",
@@ -1408,6 +1409,11 @@ export const useDataStore = defineStore('data', () => {
                     },
                     component: sellingPriceComposedMaterial
                 },
+                {
+                    key: "materialComposing",
+                    label: "Zusammensetzung Materialpreis",
+                    inputType: "materialComposing",
+                },
                 {
                     key: "sellingPriceComposed.total",
                     label: "Verkaufspreis Gesamt pro Einheit",
@@ -2213,7 +2219,7 @@ export const useDataStore = defineStore('data', () => {
 
             await generateHistoryItems(dataType, supabaseData[0])
 
-            if(!["statementallocations","absencerequests", "productcategories", "projecttypes", "checks", "profiles","services", "inventoryitems"].includes(dataType) ){
+            if(!["statementallocations","absencerequests", "productcategories", "servicecategories", "projecttypes", "checks", "profiles","services", "inventoryitems"].includes(dataType) ){
                 await eval( dataType + '.value.push(' + JSON.stringify(...supabaseData) + ')')
             }
 

From ff1685a721eb6dd21015862ea084e9d978a59384 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 15:36:12 +0100
Subject: [PATCH 060/104] Added rounding and total calc to
 materialComposing.vue

---
 components/materialComposing.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/materialComposing.vue b/components/materialComposing.vue
index 23d1282..15c566f 100644
--- a/components/materialComposing.vue
+++ b/components/materialComposing.vue
@@ -47,7 +47,8 @@ const calculateTotalMaterialPrice = () => {
     total += rowSum
   })
 
-  props.item.sellingPriceComposed.material = total
+  props.item.sellingPriceComposed.material = Number(total.toFixed(2))
+   props.item.sellingPriceComposed.total = Number((props.item.sellingPriceComposed.worker + props.item.sellingPriceComposed.material).toFixed(2))
 }
 
 const setRowData = (row) => {

From 26fef320ef0d4bf7538d09e8d58f6947f6462949 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 16:43:24 +0100
Subject: [PATCH 061/104] Corrected Errors in Workintimes Introduced Error
 Logging to Supabase

---
 components/MainNav.vue               |   4 +-
 components/displayRunningTime.vue    | 101 +++++++++++++++++++++++++++
 composables/useError.js              |  25 +++++++
 pages/index.vue                      |  11 ++-
 pages/workingtimes/evaluate/[id].vue |  22 +++---
 pages/workingtimes/index.vue         |  99 +++-----------------------
 stores/data.js                       |   2 +-
 7 files changed, 162 insertions(+), 102 deletions(-)
 create mode 100644 components/displayRunningTime.vue
 create mode 100644 composables/useError.js

diff --git a/components/MainNav.vue b/components/MainNav.vue
index 8e19e00..f0f53e5 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -159,11 +159,11 @@ const links = computed(() => {
           label: "Vorgänge",
           to: "/inventory",
           icon: "i-heroicons-square-3-stack-3d"
-        },{
+        },/*{
           label: "Bestände",
           to: "/inventory/stocks",
           icon: "i-heroicons-square-3-stack-3d"
-        },
+        },*/
         ... role.checkRight("spaces") ? [{
           label: "Lagerplätze",
           to: "/standardEntity/spaces",
diff --git a/components/displayRunningTime.vue b/components/displayRunningTime.vue
new file mode 100644
index 0000000..291d3d4
--- /dev/null
+++ b/components/displayRunningTime.vue
@@ -0,0 +1,101 @@
+<script setup>
+import dayjs from "dayjs";
+
+const profileStore = useProfileStore();
+const supabase = useSupabaseClient()
+const toast = useToast()
+
+const runningTimeInfo = ref({})
+
+const setupPage = async () => {
+    runningTimeInfo.value = (await supabase.from("workingtimes").select().eq("profile", profileStore.activeProfile.id).is("endDate", null).single()).data || {}
+  console.log(runningTimeInfo.value)
+}
+
+setupPage()
+
+/*if(dataStore.workingtimes.find(time => time.profile === profileStore.activeProfile.id && !time.endDate)) {
+  runningTimeInfo.value = dataStore.workingtimes.find(time => time.profile === profileStore.activeProfile.id && !time.end)
+}*/
+
+const startTime = async () => {
+  console.log("started")
+  runningTimeInfo.value = {
+    profile: profileStore.activeProfile.id,
+    startDate: dayjs(),
+    tenant: profileStore.currentTenant,
+    state: "Im Web gestartet",
+    source: "Dashboard"
+  }
+
+  const {data,error} = await supabase
+      .from("workingtimes")
+      .insert([runningTimeInfo.value])
+      .select()
+  if(error) {
+    console.log(error)
+    toast.add({title: "Fehler beim starten der Zeit",color:"rose"})
+  } else if(data) {
+    toast.add({title: "Zeit erfolgreich gestartet"})
+    runningTimeInfo.value = data[0]
+    console.log(runningTimeInfo.value)
+  }
+}
+
+const stopStartedTime = async () => {
+  runningTimeInfo.value.endDate = dayjs()
+  runningTimeInfo.value.state = "Im Web gestoppt"
+
+  const {error,status} = await supabase
+      .from("workingtimes")
+      .update(runningTimeInfo.value)
+      .eq('id',runningTimeInfo.value.id)
+
+  if(error) {
+    console.log(error)
+    let errorId = await useError().logError(`${status} - ${JSON.stringify(error)}`)
+    toast.add({title: errorId ? `Fehler beim stoppen der Zeit (Fehler ID: ${errorId})` : `Fehler beim stoppen der Zeit`,color:"rose"})
+
+
+  } else {
+    toast.add({title: "Zeit erfolgreich gestoppt"})
+    runningTimeInfo.value = {}
+  }
+}
+
+
+</script>
+
+<template>
+  <div v-if="runningTimeInfo.startDate">
+    <p>Start: {{dayjs(runningTimeInfo.startDate).format("HH:mm")}}</p>
+    <p>Dauer: {{dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') > 59 ? `${Math.floor(dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') / 60)}:${dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') % 60} h` : dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') + ' min' }}</p>
+
+    <UFormGroup
+        class="mt-2"
+        label="Notizen:"
+    >
+      <UTextarea
+          v-model="runningTimeInfo.notes"
+      />
+    </UFormGroup>
+    <UButton
+        class="mt-3"
+        @click="stopStartedTime"
+        :disabled="!runningTimeInfo.id"
+    >
+      Stop
+    </UButton>
+  </div>
+  <div v-else>
+    <p>Keine Anwesenheit gestartet</p>
+    <UButton
+        class="mt-3"
+      @click="startTime"
+    >Starten</UButton>
+  </div>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/composables/useError.js b/composables/useError.js
new file mode 100644
index 0000000..1c2e742
--- /dev/null
+++ b/composables/useError.js
@@ -0,0 +1,25 @@
+
+export const useError = (resourceType) => {
+    const supabase = useSupabaseClient()
+    const toast = useToast()
+    const profileStore = useProfileStore()
+
+    const logError = async (error) => {
+        let errorData = {
+            message: error,
+            tenant: profileStore.currentTenant,
+            profile: profileStore.activeProfile.id
+        }
+
+        const {data:supabaseData,error:supabaseError} = await supabase.from("errors").insert(errorData).select().single()
+
+        if(supabaseError) {
+            console.error(supabaseError)
+        } else if(supabaseData) {
+            return supabaseData.id
+        }
+
+    }
+
+    return { logError}
+}
diff --git a/pages/index.vue b/pages/index.vue
index 54ed7ba..2353678 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -15,24 +15,29 @@
 
       <UDashboardPanelContent>
         <UDashboardCard
+            class="mt-3"
             title="Anwesenheiten"
-          v-if="dataStore.getStartedWorkingTimes().length > 0"
+            v-if="dataStore.getStartedWorkingTimes().length > 0"
         >
           <p v-for="time in dataStore.getStartedWorkingTimes()"><UIcon name="i-heroicons-check"/>{{profileStore.getProfileById(time.profile).fullName}}</p>
         </UDashboardCard>
 
 
         <UDashboardCard
-            :ui="{ body: { padding: '!pb-3 !px-5' }}"
+            class="mt-3"
         >
           <display-income-and-expenditure/>
         </UDashboardCard>
         <UDashboardCard
             class="w-1/3 mt-3"
-            :ui="{ body: { padding: '!py-5 !px-5' }}"
         >
           <display-open-balances/>
         </UDashboardCard>
+        <UDashboardCard
+            class="w-1/3 mt-3"
+        >
+          <display-running-time/>
+        </UDashboardCard>
       </UDashboardPanelContent>
     </UDashboardPanel>
   </UDashboardPage>
diff --git a/pages/workingtimes/evaluate/[id].vue b/pages/workingtimes/evaluate/[id].vue
index 47ea2ee..8eb7436 100644
--- a/pages/workingtimes/evaluate/[id].vue
+++ b/pages/workingtimes/evaluate/[id].vue
@@ -123,18 +123,24 @@ const workingTimeInfo = computed(() => {
     return dayjs(date).isSameOrAfter(start) && dayjs(date).isSameOrBefore(end)
   }
 
-  absencerequests.value.filter(i => (dayjs(i.start).isBetween(dayjs(selectedStartDay.value),dayjs(selectedEndDay.value)) || dayjs(i.end).isBetween(dayjs(selectedStartDay.value),dayjs(selectedEndDay.value)) ) && i.reason === "Urlaub" && i.approved === "Genehmigt").forEach(absenceRequest => {
+  absencerequests.value.filter(i => (dayjs(i.startDate).isBetween(dayjs(selectedStartDay.value),dayjs(selectedEndDay.value)) || dayjs(i.endDate).isBetween(dayjs(selectedStartDay.value),dayjs(selectedEndDay.value)) ) && (i.reason === "Urlaub" || i.reason === "Berufsschule") && i.approved === "Genehmigt").forEach(absenceRequest => {
     let durationInDays = 0
 
-    if(isBetween(absenceRequest.start,selectedStartDay.value,selectedEndDay.value) && isBetween(absenceRequest.end,selectedStartDay.value,selectedEndDay.value)) {
+    console.log(absenceRequest)
+
+    if(isBetween(absenceRequest.startDate,selectedStartDay.value,selectedEndDay.value) && isBetween(absenceRequest.endDate,selectedStartDay.value,selectedEndDay.value)) {
       //Full in Range
-      durationInDays = dayjs(absenceRequest.end).diff(absenceRequest.start, "days") + 1
-    } else if(isBetween(absenceRequest.start,selectedStartDay.value,selectedEndDay.value) && !isBetween(absenceRequest.end,selectedStartDay.value,selectedEndDay.value)) {
+      console.log("Full in Range")
+      durationInDays = dayjs(absenceRequest.endDate).diff(absenceRequest.startDate, "days") + 1
+      console.log(durationInDays)
+    } else if(isBetween(absenceRequest.startDate,selectedStartDay.value,selectedEndDay.value) && !isBetween(absenceRequest.endDate,selectedStartDay.value,selectedEndDay.value)) {
       //Start in Range
-      durationInDays = dayjs(selectedEndDay.value).diff(absenceRequest.start, "days") + 1
-    } else if(!isBetween(absenceRequest.start,selectedStartDay.value,selectedEndDay.value) && isBetween(absenceRequest.end,selectedStartDay.value,selectedEndDay.value)) {
+      console.log("Start in Range")
+      durationInDays = dayjs(selectedEndDay.value).diff(absenceRequest.startDate, "days") + 1
+    } else if(!isBetween(absenceRequest.startDate,selectedStartDay.value,selectedEndDay.value) && isBetween(absenceRequest.endDate,selectedStartDay.value,selectedEndDay.value)) {
       //End in Range
-      durationInDays = dayjs(absenceRequest.end).diff(selectedStartDay.value, "days") + 1
+      console.log("End in Range")
+      durationInDays = dayjs(absenceRequest.endDate).diff(selectedStartDay.value, "days") + 1
 
     }
     sumVacationDays += durationInDays
@@ -308,7 +314,7 @@ changeRange()
           <p>Eingreicht: {{Math.floor(workingTimeInfo.sumWorkingMinutesEingereicht/60)}}:{{String(workingTimeInfo.sumWorkingMinutesEingereicht % 60).padStart(2,"0")}} h</p>
           <p>Genehmigt: {{Math.floor(workingTimeInfo.sumWorkingMinutesApproved/60)}}:{{String(workingTimeInfo.sumWorkingMinutesApproved % 60).padStart(2,"0")}} h</p>
           <p>Feiertagsausgleich: {{Math.floor(workingTimeInfo.sumWorkingMinutesRecreationDays/60)}}:{{String(workingTimeInfo.sumWorkingMinutesRecreationDays % 60).padStart(2,"0")}} h / {{workingTimeInfo.sumRecreationDays}} Tage</p>
-          <p>Urlaubsausgleich: {{Math.floor(workingTimeInfo.sumWorkingMinutesVacationDays/60)}}:{{String(workingTimeInfo.sumWorkingMinutesVacationDays % 60).padStart(2,"0")}} h / {{workingTimeInfo.sumVacationDays}} Tage</p>
+          <p>Urlaubs-/Berufsschulausgleich: {{Math.floor(workingTimeInfo.sumWorkingMinutesVacationDays/60)}}:{{String(workingTimeInfo.sumWorkingMinutesVacationDays % 60).padStart(2,"0")}} h / {{workingTimeInfo.sumVacationDays}} Tage</p>
           <p>Soll Stunden: {{Math.floor(workingTimeInfo.workingMinutesTarget/60)}}:{{String(workingTimeInfo.workingMinutesTarget % 60 ).padStart(2,"0")}} h</p>
 
           <!--         <p>Abwesend: </p>
diff --git a/pages/workingtimes/index.vue b/pages/workingtimes/index.vue
index 08c140d..7eae66e 100644
--- a/pages/workingtimes/index.vue
+++ b/pages/workingtimes/index.vue
@@ -11,17 +11,10 @@ definePageMeta({
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
-const user = useSupabaseUser()
-const toast = useToast()
 const router = useRouter()
 
 
-const timeInfo = ref({
-  profile: "",
-  start: "",
-  end: null,
-  notes: null,
-})
+
 
 const filterUser = ref(profileStore.activeProfile.id || "")
 
@@ -108,53 +101,8 @@ const columns = [
 ]
 
 
-const runningTimeInfo = ref({})
 
-const startTime = async () => {
-  console.log("started")
-  timeInfo.value = {
-    profile: profileStore.activeProfile.id,
-    startDate: dayjs(),
-    tenant: profileStore.currentTenant,
-    state: "Im Web gestartet"
-  }
 
-  const {data,error} = await supabase
-      .from("workingtimes")
-      .insert([timeInfo.value])
-      .select()
-  if(error) {
-    console.log(error)
-  } else if(data) {
-    //timeInfo.value = data[0]
-    await dataStore.fetchWorkingTimes()
-    runningTimeInfo.value = timeInfo.value//dataStore.times.find(time => time.profile === profileStore.activeProfile.id && !time.endDate)
-  }
-}
-
-const stopStartedTime = async () => {
-  runningTimeInfo.value.endDate = dayjs()
-  runningTimeInfo.value.state = "Im Web gestoppt"
-
-  const {data,error} = await supabase
-      .from("workingtimes")
-      .update(runningTimeInfo.value)
-      .eq('id',runningTimeInfo.value.id)
-      .select()
-  console.log(data)
-
-  if(error) {
-    console.log(error)
-  } else {
-    toast.add({title: "Zeit erfolgreich gestoppt"})
-    runningTimeInfo.value = {}
-    dataStore.fetchWorkingTimes()
-  }
-}
-
-if(dataStore.workingtimes.find(time => time.profile === profileStore.activeProfile.id && !time.endDate)) {
-  runningTimeInfo.value = dataStore.workingtimes.find(time => time.profile === profileStore.activeProfile.id && !time.end)
-}
 
 const getDuration = (time) => {
   const minutes = Math.floor(dayjs(time.endDate).diff(dayjs(time.startDate),'minutes',true))
@@ -185,17 +133,19 @@ const expand = ref({
   row: {}
 })
 
+const setEndDate = (row) => {
+  row.startDate = dayjs(row.startDate).toISOString()
+
+  row.endDate = dayjs(row.endDate).set("year", dayjs(row.startDate).get("year")).set("month", dayjs(row.startDate).get("month")).set("date", dayjs(row.startDate).get("date"))
+
+  row.endDate = dayjs(row.endDate).toISOString()
+}
+
 </script>
 
 <template>
   <UDashboardNavbar title="Anwesenheiten">
     <template #right>
-      <UButton
-          @click="startTime"
-          :disabled="runningTimeInfo.id "
-      >
-        Start
-      </UButton>
       <UButton
           @click="router.push(`/workingtimes/edit`)"
       >
@@ -224,34 +174,6 @@ const expand = ref({
       </UButton>
     </template>
   </UDashboardToolbar>
-  <div class="mx-3">
-    <UAlert
-        v-if="runningTimeInfo.startDate && !runningTimeInfo.endDate"
-        class="my-3"
-        title="Laufende Zeit:"
-    >
-      <template #description>
-        <p>Start: {{dayjs(runningTimeInfo.startDate).format("HH:mm")}}</p>
-        <p>Dauer: {{dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') > 59 ? `${Math.floor(dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') / 60)}:${dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') % 60} h` : dayjs().diff(dayjs(runningTimeInfo.startDate),'minutes') + ' min' }}</p>
-
-        <UFormGroup
-            class="mt-2"
-            label="Notizen:"
-        >
-          <UTextarea
-              v-model="runningTimeInfo.notes"
-          />
-        </UFormGroup>
-        <UButton
-            class="mt-3"
-            @click="stopStartedTime"
-            :disabled="!runningTimeInfo.id"
-        >
-          Stop
-        </UButton>
-      </template>
-    </UAlert>
-  </div>
 
   <UTable
       class="mt-3"
@@ -287,6 +209,7 @@ const expand = ref({
         </UTooltip>
       </InputGroup>
       <div class="p-4" v-if="!row.approved">
+        {{row}}
 
 
         <UFormGroup label="Start:">
@@ -298,7 +221,7 @@ const expand = ref({
             />
 
             <template #panel="{ close }">
-              <LazyDatePicker v-model="row.startDate" @close="row.endDate = row.startDate" mode="dateTime"/>
+              <LazyDatePicker v-model="row.startDate" @close="setEndDate(row)" mode="dateTime"/>
             </template>
           </UPopover>
         </UFormGroup>
diff --git a/stores/data.js b/stores/data.js
index 29177d8..b1f8fd6 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -1411,7 +1411,7 @@ export const useDataStore = defineStore('data', () => {
                 },
                 {
                     key: "materialComposing",
-                    label: "Zusammensetzung Materialpreis",
+                    label: "Zusammensetzung Materialpreis pro Einheit",
                     inputType: "materialComposing",
                 },
                 {

From 4df416a818f8dd1ec514f06a66af8c4177499dfd Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Tue, 7 Jan 2025 16:57:34 +0100
Subject: [PATCH 062/104] Corrected Error in Dashboard

---
 .../noAutoLoad/displayPresentProfiles.vue     | 24 +++++++++++++++++++
 pages/index.vue                               |  5 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 components/noAutoLoad/displayPresentProfiles.vue

diff --git a/components/noAutoLoad/displayPresentProfiles.vue b/components/noAutoLoad/displayPresentProfiles.vue
new file mode 100644
index 0000000..499e47d
--- /dev/null
+++ b/components/noAutoLoad/displayPresentProfiles.vue
@@ -0,0 +1,24 @@
+<script setup>
+const supabase = useSupabaseClient()
+const profileStore = useProfileStore()
+
+const workingtimes = ref([])
+const setupPage = async () => {
+    workingtimes.value = (await supabase.from("workingtimes").select().eq("tenant",profileStore.currentTenant).is("endDate",null)).data
+}
+
+setupPage()
+</script>
+
+<template>
+  <div v-if="workingtimes.length > 0">
+    <p v-for="time in workingtimes"><UIcon name="i-heroicons-check"/> {{profileStore.getProfileById(time.profile).fullName}}</p>
+  </div>
+  <div v-else>
+    <p>Keine Mitarbeiter anwesend</p>
+  </div>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/pages/index.vue b/pages/index.vue
index 2353678..cd4d044 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -17,9 +17,8 @@
         <UDashboardCard
             class="mt-3"
             title="Anwesenheiten"
-            v-if="dataStore.getStartedWorkingTimes().length > 0"
         >
-          <p v-for="time in dataStore.getStartedWorkingTimes()"><UIcon name="i-heroicons-check"/>{{profileStore.getProfileById(time.profile).fullName}}</p>
+            <display-present-profiles/>
         </UDashboardCard>
 
 
@@ -45,6 +44,8 @@
 
 <script setup>
 
+import DisplayPresentProfiles from "~/components/noAutoLoad/displayPresentProfiles.vue";
+
 definePageMeta({
   middleware: "auth"
 })

From 06725ee497e8ab7b977568552d469f741396f0c3 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Wed, 8 Jan 2025 10:03:40 +0100
Subject: [PATCH 063/104] Corrected Setting Error for Product in
 createddocument

---
 pages/createDocument/edit/[[id]].vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 6dc9421..260bef3 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -1514,9 +1514,7 @@ const setRowData = (row) => {
                           searchable-placeholder="Suche ..."
                           :search-attributes="['name']"
                           v-model="row.product"
-                          @input="row.unit = products.find(i => i.id === row.product).unit,
-                               row.price = (products.find(i => i.id === row.product).sellingPrice || 0),
-                               row.description = products.find(i => i.id === row.product).description"
+                          @change="setRowData(row)"
                       >
                         <template #label>
                           <span class="truncate">{{row.product ? products.find(i => i.id === row.product).name : "Kein Produkt ausgewählt" }}</span>

From 566efb0d2cb7d38eeaae8e31a152a0d96a7f0fdc Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Thu, 9 Jan 2025 11:31:26 +0100
Subject: [PATCH 064/104] Added Trailing to Datatypes Added Description Loading
 in LinkedDocument

---
 pages/createDocument/edit/[[id]].vue | 2 +-
 stores/data.js                       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 260bef3..0517e24 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -178,6 +178,7 @@ const setupPage = async () => {
       itemInfo.value.customer = linkedDocument.customer
       itemInfo.value.project = linkedDocument.project
       itemInfo.value.contact = linkedDocument.contact
+      itemInfo.value.description = linkedDocument.description
 
       setCustomerData()
 
@@ -928,7 +929,6 @@ const setRowData = (row) => {
       </UButton>
     </template>
   </UDashboardNavbar>
-
   <UDashboardPanelContent>
     <UTabs class="p-5" :items="tabItems" @change="onChangeTab" v-if="loaded">
       <template #item="{item}">
diff --git a/stores/data.js b/stores/data.js
index b1f8fd6..ad7c8c0 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -674,12 +674,14 @@ export const useDataStore = defineStore('data', () => {
                     key: "purchasePrice",
                     label: "Einkaufspreis",
                     component: purchasePrice,
-                    inputType: "number"
+                    inputType: "number",
+                    inputTrailing: "EUR"
                 },{
                     key: "sellingPrice",
                     label: "Verkaufpreispreis",
                     component: sellingPrice,
-                    inputType: "number"
+                    inputType: "number",
+                    inputTrailing: "EUR"
                 },{
                     key: "taxPercentage",
                     label: "Umsatzsteuer",

From 38c6e01d9f6f318351ec63ca5446466ce94aeaab Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Thu, 9 Jan 2025 11:50:13 +0100
Subject: [PATCH 065/104] Added Customer Ref Added Document Error in
 createddocuments

---
 pages/createDocument/edit/[[id]].vue | 9 +++++++++
 stores/data.js                       | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 0517e24..db076ff 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -187,6 +187,13 @@ const setupPage = async () => {
 
     if(route.query.project) {
       itemInfo.value.project = Number(route.query.project)
+
+      let project = await useSupabaseSelectSingle("projects",itemInfo.value.project)
+
+      if(!itemInfo.value.description){
+        itemInfo.value.description = project.customerRef
+      }
+
     }
     if(route.query.contact) itemInfo.value.contact = Number(route.query.contact)
     if(route.query.customer) {
@@ -422,6 +429,7 @@ const findDocumentErrors = computed(() => {
         if(row.mode === "service" && !row.service) errors.push({message: `In Position ${row.pos} ist keine Leistung ausgewählt`, type: "breaking"})
         if(row.mode === "title" && !row.text) errors.push({message: `In Position ${row.pos} ist kein Titel hinterlegt`, type: "breaking"})
         if(row.mode === "text" && !row.text) errors.push({message: `In einer Freitext Position ist kein Titel hinterlegt`, type: "breaking"})
+        if(row.mode === "free" && !row.text) errors.push({message: `In einer freien Position ist kein Titel hinterlegt`, type: "breaking"})
       })
     }
 
@@ -929,6 +937,7 @@ const setRowData = (row) => {
       </UButton>
     </template>
   </UDashboardNavbar>
+
   <UDashboardPanelContent>
     <UTabs class="p-5" :items="tabItems" @change="onChangeTab" v-if="loaded">
       <template #item="{item}">
diff --git a/stores/data.js b/stores/data.js
index ad7c8c0..8793a4b 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -792,6 +792,10 @@ export const useDataStore = defineStore('data', () => {
                     selectDataType: "plants",
                     selectOptionAttribute: "name",
                     selectSearchAttributes: ['name'],
+                },{
+                    key: "customerRef",
+                    label: "Referenz des Kunden",
+                    inputType: "text"
                 },{
                     key: "notes",
                     label: "Notizen",

From 423733967eb8ab8de0d2c3a100f9378f4c04f8c2 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 10 Jan 2025 14:15:06 +0100
Subject: [PATCH 066/104] Added Loading for DeliveryDate

---
 pages/createDocument/edit/[[id]].vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index db076ff..3e455d2 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -179,6 +179,9 @@ const setupPage = async () => {
       itemInfo.value.project = linkedDocument.project
       itemInfo.value.contact = linkedDocument.contact
       itemInfo.value.description = linkedDocument.description
+      itemInfo.value.deliveryDate = linkedDocument.deliveryDate
+      itemInfo.value.deliveryDateType = linkedDocument.deliveryDateType
+
 
       setCustomerData()
 

From 8a00dffce0f4af9d7978bec61a66ab946299fe35 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 10 Jan 2025 14:15:22 +0100
Subject: [PATCH 067/104] Added CustomerRef to HistoryItemGen

---
 stores/data.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/stores/data.js b/stores/data.js
index 8793a4b..ba6f566 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -2065,6 +2065,8 @@ export const useDataStore = defineStore('data', () => {
                     name = "Wöchentliche Arbeitstage"
                 } else if(key === "weeklyWorkingHours") {
                     name = "Wöchentliche Arbeitszeit"
+                } else if(key === "customerRef") {
+                    name = "Referenz des Kunden"
                 } else if(key === "licensePlate") {
                     name = "Kennzeichen"
                 }else if(key === "tankSize") {

From 630d04fb4600df45b9b90985a676f2875cd3c868 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 10 Jan 2025 14:15:39 +0100
Subject: [PATCH 068/104] Added Sorting to createddocument Loading

---
 pages/createDocument/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue
index 3bff7e7..0f04d86 100644
--- a/pages/createDocument/index.vue
+++ b/pages/createDocument/index.vue
@@ -162,7 +162,7 @@ const items = ref([])
 const selectedItem = ref(0)
 
 const setupPage = async () => {
-  items.value = await useSupabaseSelect("createddocuments","*, customer(id,name), statementallocations(id,amount)","documentDate")
+  items.value = await useSupabaseSelect("createddocuments","*, customer(id,name), statementallocations(id,amount)","documentNumber")
 }
 
 setupPage()

From 1ecf89a2b1389314d686e1da72a9d9246025c0c9 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 10 Jan 2025 14:15:50 +0100
Subject: [PATCH 069/104] Added Search to materialComposing.vue

---
 components/materialComposing.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/materialComposing.vue b/components/materialComposing.vue
index 15c566f..1079cd6 100644
--- a/components/materialComposing.vue
+++ b/components/materialComposing.vue
@@ -74,6 +74,8 @@ const setRowData = (row) => {
       >
         <td>
           <USelectMenu
+              searchable
+              :search-attributes="['name']"
             :options="products"
             value-attribute="id"
             option-attribute="name"

From f6accf0aa727bf77319beabd0bdb8b92857e9b38 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 10 Jan 2025 15:52:49 +0100
Subject: [PATCH 070/104] Changes

---
 pages/createDocument/edit/[[id]].vue | 3 ++-
 pages/createDocument/show/[id].vue   | 4 ++--
 pages/files/index.vue                | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 3e455d2..39c6c6c 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -737,7 +737,8 @@ const saveSerialInvoice = async () => {
     endText: itemInfo.value.endText,
     rows: itemInfo.value.rows,
     contactPerson: itemInfo.value.contactPerson,
-    serialConfig: itemInfo.value.serialConfig
+    serialConfig: itemInfo.value.serialConfig,
+    letterhead: itemInfo.value.letterhead,
   }
 
   let data = null
diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue
index 9e058c0..bd338f7 100644
--- a/pages/createDocument/show/[id].vue
+++ b/pages/createDocument/show/[id].vue
@@ -64,10 +64,10 @@ const openEmail = () => {
       >
         Bearbeiten
       </UButton>
-      <UButton
+<!--      <UButton
           :to="dataStore.documents.find(i => i.createdDocument === itemInfo.id) ? dataStore.documents.find(i => i.createdDocument === itemInfo.id).url : ''"
           target="_blank"
-      >In neuen Tab anzeigen</UButton>
+      >In neuen Tab anzeigen</UButton>-->
       <UButton
         @click="router.push(`/createDocument/edit/?linkedDocument=${itemInfo.id}`)"
       >
diff --git a/pages/files/index.vue b/pages/files/index.vue
index 70f84e8..2f29b72 100644
--- a/pages/files/index.vue
+++ b/pages/files/index.vue
@@ -412,14 +412,14 @@ const showFile = (fileId) => {
             <td>
               <UIcon class="mr-1" :name="entry.type === 'folder' ? 'i-heroicons-folder' : 'i-heroicons-document'"/>
               <a
-                  :class="[...index === selectedFileIndex ? ['text-primary'] : ['dark:text-white','text-black']]"
+                  :class="[...index === selectedFileIndex ? ['text-primary', 'text-xl'] : ['dark:text-white','text-black','text-xl']]"
                   @click="entry.type === 'folder' ? changeFolder(currentFolders.find(i => i.id === entry.id)) : showFile(entry.id)"
               >{{entry.label}}</a>
 
             </td>
             <td>
-              <span v-if="entry.type === 'file'">{{dayjs(documents.find(i => i.id === entry.id).created_at).format("DD.MM.YY HH:mm")}}</span>
-              <span v-if="entry.type === 'folder'">{{dayjs(currentFolders.find(i => i.id === entry.id).created_at).format("DD.MM.YY HH:mm")}}</span>
+              <span v-if="entry.type === 'file'" class="text-xl">{{dayjs(documents.find(i => i.id === entry.id).created_at).format("DD.MM.YY HH:mm")}}</span>
+              <span v-if="entry.type === 'folder'" class="text-xl">{{dayjs(currentFolders.find(i => i.id === entry.id).created_at).format("DD.MM.YY HH:mm")}}</span>
             </td>
           </tr>
         </table>
@@ -542,7 +542,7 @@ const showFile = (fileId) => {
 }
 
 tr:nth-child(odd) {
-  background-color: rgba(0, 0, 0, 0.2);
+  background-color: rgba(0, 0, 0, 0.05);
 }
 
 </style>
\ No newline at end of file

From 0d949c7894f40b13929bdb04e70051aefd7f905a Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 10 Jan 2025 16:19:02 +0100
Subject: [PATCH 071/104] Commented Own Fields

---
 components/EntityEdit.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/EntityEdit.vue b/components/EntityEdit.vue
index 8b41f39..c6b6e03 100644
--- a/components/EntityEdit.vue
+++ b/components/EntityEdit.vue
@@ -155,7 +155,7 @@ const contentChanged = (content, datapoint) => {
           Archivieren
         </template>
         <template #header>
-          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
+          <span class="text-md text-black dark:text-white font-bold">Archivieren bestätigen</span>
         </template>
         Möchten Sie das {{dataType.labelSingle}} {{item[dataType.templateColumns.find(i => i.title).key]}} wirklich archivieren?
       </ButtonWithConfirm>
@@ -628,7 +628,7 @@ const contentChanged = (content, datapoint) => {
               icon="i-heroicons-x-mark"
           />
         </InputGroup>
-        <div
+<!--        <div
             v-if="profileStore.ownTenant.ownFields"
         >
           <UDivider
@@ -650,7 +650,7 @@ const contentChanged = (content, datapoint) => {
                 v-model="item.ownFields[field.key]"
             />
           </UFormGroup>
-        </div>
+        </div>-->
 
       </UFormGroup>
     </UForm>

From c57ea6add6b2252329506832552cd13beea65e13 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 10 Jan 2025 16:20:56 +0100
Subject: [PATCH 072/104] Corrected key in checks

---
 stores/data.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stores/data.js b/stores/data.js
index ba6f566..316eda9 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -1684,8 +1684,8 @@ export const useDataStore = defineStore('data', () => {
                     selectSearchAttributes: ['name'],
                 },
                 {
-                    key: "notes",
-                    label: "Notizen",
+                    key: "description",
+                    label: "Beschreibung",
                     inputType: "textarea"
                 }
             ],

From 542f94187925ef1760a3b5e2f36bc3a9aaa6df74 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 10 Jan 2025 16:27:26 +0100
Subject: [PATCH 073/104] Changes in DocumentDisplayModal.vue

---
 components/DocumentDisplayModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/DocumentDisplayModal.vue b/components/DocumentDisplayModal.vue
index a22210c..a920fa3 100644
--- a/components/DocumentDisplayModal.vue
+++ b/components/DocumentDisplayModal.vue
@@ -250,7 +250,7 @@ const moveFile = async () => {
             <tr v-if="props.documentData.createddocument">
               <td>Ausgangsbeleg</td>
               <td>
-                <nuxt-link :to="`/createddocuments/show/${props.documentData.createddocument.id}`">{{props.documentData.createddocument.documentNumber}}</nuxt-link>
+                <nuxt-link :to="`/createDocument/show/${props.documentData.createddocument.id}`">{{props.documentData.createddocument.documentNumber}}</nuxt-link>
               </td>
             </tr>
             <tr v-if="props.documentData.plant">

From 9a61a309a72bd0d9d7a4ea6848441f1964025b8b Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 12:25:13 +0100
Subject: [PATCH 074/104] Changes

---
 components/EntityShow.vue          | 21 +++++++++++++++++++++
 pages/createDocument/show/[id].vue |  2 +-
 pages/files/index.vue              |  1 +
 stores/data.js                     |  4 +++-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 9995f98..25df1d4 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -255,6 +255,27 @@ const getAvailableQueryStringData = () => {
 
           </UCard>
         </div>
+        <div v-else-if="tab.label === 'Ansprechpartner'">
+          <UCard class="mt-5">
+            <Toolbar>
+              <UButton
+                  @click="router.push(`/standardEntity/contacts/create?${type.substring(0,type.length-1)}=${props.item.id}`)"
+              >
+                + Ansprechpartner
+              </UButton>
+            </Toolbar>
+            <UTable
+                :rows="props.item.contacts"
+                @select="(row) => router.push(`/standardEntity/contacts/show/${row.id}`)"
+                :columns="[{label: 'Name', key: 'fullName'},{label: 'Rolle', key: 'role'}]"
+                :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine zugehörigen Ansprechpartner' }"
+
+            >
+
+            </UTable>
+
+          </UCard>
+        </div>
         <div v-else-if="tab.label === 'Objekte'">
           <UCard class="mt-5">
             <Toolbar>
diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue
index bd338f7..f235a94 100644
--- a/pages/createDocument/show/[id].vue
+++ b/pages/createDocument/show/[id].vue
@@ -43,7 +43,7 @@ setupPage()
 
 const openEmail = () => {
   if(["invoices","advanceInvoices"].includes(itemInfo.value.type)){
-    router.push(`/email/new?loadDocuments=[${linkedDocument.value.id}]&bcc=${encodeURIComponent(currentTenant.value.standardEmailForInvoices)}`)
+    router.push(`/email/new?loadDocuments=["${linkedDocument.value.id}"]&bcc=${encodeURIComponent(currentTenant.value.standardEmailForInvoices)}`)
   } else {
     router.push(`/email/new?loadDocuments=[${linkedDocument.value.id}]`)
   }
diff --git a/pages/files/index.vue b/pages/files/index.vue
index 2f29b72..31281f7 100644
--- a/pages/files/index.vue
+++ b/pages/files/index.vue
@@ -412,6 +412,7 @@ const showFile = (fileId) => {
             <td>
               <UIcon class="mr-1" :name="entry.type === 'folder' ? 'i-heroicons-folder' : 'i-heroicons-document'"/>
               <a
+                  style="cursor: pointer"
                   :class="[...index === selectedFileIndex ? ['text-primary', 'text-xl'] : ['dark:text-white','text-black','text-xl']]"
                   @click="entry.type === 'folder' ? changeFolder(currentFolders.find(i => i.id === entry.id)) : showFile(entry.id)"
               >{{entry.label}}</a>
diff --git a/stores/data.js b/stores/data.js
index 316eda9..3c92365 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -250,7 +250,7 @@ export const useDataStore = defineStore('data', () => {
                     component: profiles
                 },
             ],
-            showTabs: [{label: 'Informationen'},{label: 'Dateien'},{label: 'Ausgangsbelege'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]
+            showTabs: [{label: 'Informationen'},{label: 'Ansprechpartner'},{label: 'Dateien'},{label: 'Ausgangsbelege'},{label: 'Projekte'},{label: 'Objekte'},{label: 'Verträge'}]
         },
         contacts: {
             label: "Kontakte",
@@ -1059,6 +1059,8 @@ export const useDataStore = defineStore('data', () => {
             showTabs: [
                 {
                     label: 'Informationen',
+                },{
+                    label: 'Ansprechpartner',
                 }, {
                     label: 'Dateien',
                 }

From 8b1950fc54eb5364e49559e000188752abaa47ca Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 12:29:15 +0100
Subject: [PATCH 075/104] Changes

---
 pages/email/new.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/email/new.vue b/pages/email/new.vue
index 8e935d6..2091378 100644
--- a/pages/email/new.vue
+++ b/pages/email/new.vue
@@ -41,7 +41,7 @@ const setupPage = async () => {
 
     if(route.query.loadDocuments) {
       //console.log(JSON.parse(route.query.loadDocuments))
-      const {data,error} = await supabase.from("documents").select('*, createdDocument(id,documentNumber,title,contact(email))').in('id',JSON.parse(route.query.loadDocuments))
+      const {data,error} = useFiles().selectSomeDocuments(JSON.parse(route.query.loadDocuments))
 
       if(error) console.log(error)
       if(data) loadedDocuments.value = data

From f3590ebf7c2a898f5e39a2f6c7d7786d9c7e1373 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 12:41:02 +0100
Subject: [PATCH 076/104] Changes

---
 pages/email/new.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pages/email/new.vue b/pages/email/new.vue
index 2091378..8591b91 100644
--- a/pages/email/new.vue
+++ b/pages/email/new.vue
@@ -40,17 +40,19 @@ const setupPage = async () => {
 
 
     if(route.query.loadDocuments) {
-      //console.log(JSON.parse(route.query.loadDocuments))
-      const {data,error} = useFiles().selectSomeDocuments(JSON.parse(route.query.loadDocuments))
+      console.log(JSON.parse(route.query.loadDocuments))
+      const data = await useFiles().selectSomeDocuments(JSON.parse(route.query.loadDocuments))
+      console.log(data)
+
+
 
-      if(error) console.log(error)
       if(data) loadedDocuments.value = data
 
       //console.log(loadedDocuments.value)
 
       if(loadedDocuments.value.length > 0) {
-        emailData.value.subject = loadedDocuments.value[0].createdDocument.title
-        emailData.value.to = loadedDocuments.value[0].createdDocument.contact ? loadedDocuments.value[0].createdDocument.contact.email : ""
+        emailData.value.subject = loadedDocuments.value[0].createddocument.title
+        emailData.value.to = loadedDocuments.value[0].createddocument.contact ? loadedDocuments.value[0].createddocument.contact.email : ""
 
       }
 
@@ -243,7 +245,7 @@ const sendEmail = async () => {
                 class="list-disc"
                 v-for="doc in loadedDocuments"
             >
-              <span v-if="doc.createdDocument">Dokument - {{doc.createdDocument.documentNumber}}</span>
+              <span v-if="doc.createddocument">Dokument - {{doc.createddocument.documentNumber}}</span>
             </li>
           </ul>
 

From 4f7bffe6fedb7520b159b384e0a112d5ff8a43cb Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:53:47 +0100
Subject: [PATCH 077/104] Changed FileBucket

---
 pages/email/new.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pages/email/new.vue b/pages/email/new.vue
index 8591b91..390559d 100644
--- a/pages/email/new.vue
+++ b/pages/email/new.vue
@@ -124,7 +124,7 @@ const sendEmail = async () => {
 
   for await (const doc of loadedDocuments.value) {
 
-    const {data,error} = await supabase.storage.from("files").download(doc.path)
+    const {data,error} = await supabase.storage.from("filesdev").download(doc.path)
 
     body.attachments.push({
       filename: doc.path.split("/")[doc.path.split("/").length -1],
@@ -197,25 +197,21 @@ const sendEmail = async () => {
           <UInput
               class="w-full my-1"
               placeholder="Empfänger"
-              variant="ghost"
               v-model="emailData.to"
           />
           <UInput
               class="w-full my-1"
               placeholder="Kopie"
-              variant="ghost"
               v-model="emailData.cc"
           />
           <UInput
               class="w-full my-1"
               placeholder="Blindkopie"
-              variant="ghost"
               v-model="emailData.bcc"
           />
           <UInput
               placeholder="Betreff"
               class="w-full my-1"
-              variant="ghost"
               v-model="emailData.subject"
           />
         </div>
@@ -230,7 +226,7 @@ const sendEmail = async () => {
                       class="mx-auto w-10 h-10"
                   />
                   <span class="text-center text-2xl">Anhänge hochladen</span>-->
-          <input
+          <UInput
               id="inputAttachments"
               type="file"
               multiple

From 07909550c3f57f11d5a9538282d5ad5a18511867 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:54:04 +0100
Subject: [PATCH 078/104] Fixed Calendar

---
 pages/calendar/[mode].vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/calendar/[mode].vue b/pages/calendar/[mode].vue
index 362509e..c0c2dd4 100644
--- a/pages/calendar/[mode].vue
+++ b/pages/calendar/[mode].vue
@@ -57,7 +57,7 @@ const calendarOptionsGrid = computed(() => {
     select: function (info) {
       console.log(info)
 
-      router.push(`/standardEntity/events/edit/?start=${info.startStr}&end=${info.endStr}&source=grid`)
+      router.push(`/standardEntity/events/create/?startDate=${encodeURIComponent(info.startStr)}&endDate=${encodeURIComponent(info.endStr)}`)
     },
     eventClick: function (info) {
       console.log(info.event)
@@ -89,7 +89,7 @@ const calendarOptionsTimeline = ref({
   }],
   selectable: true,
   select: function (info) {
-    router.push(`/events/edit/?start=${info.startStr}&end=${info.endStr}&resources=${JSON.stringify([info.resource.id])}&source=timeline`)
+    router.push(`/events/edit/?startDate=${info.startStr}&endDate=${info.endStr}&resources=${JSON.stringify([info.resource.id])}&source=timeline`)
   },
   eventClick: function (info){
     console.log(info.event)

From 0d4d5227a05e970eb9a332645b4edba4236e0c76 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:56:52 +0100
Subject: [PATCH 079/104] Added DocumentUploadModal

---
 components/DocumentUploadModal.vue | 99 ++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 components/DocumentUploadModal.vue

diff --git a/components/DocumentUploadModal.vue b/components/DocumentUploadModal.vue
new file mode 100644
index 0000000..f288015
--- /dev/null
+++ b/components/DocumentUploadModal.vue
@@ -0,0 +1,99 @@
+<script setup >
+
+const props = defineProps({
+  fileData: {
+    type: Object,
+    default: {
+      type: null
+    }
+  }
+})
+
+const emit = defineEmits(["uploadFinished"])
+
+const modal = useModal()
+const profileStore = useProfileStore()
+
+const uploadInProgress = ref(false)
+const availableFiletypes = ref([])
+
+const setup = async () => {
+  availableFiletypes.value = await useSupabaseSelect("filetags")
+}
+
+setup()
+
+const uploadFiles = async () => {
+  uploadInProgress.value = true;
+
+
+  await useFiles().uploadFiles(props.fileData,  document.getElementById("fileUploadInput").files,[],true)
+
+  uploadInProgress.value = false;
+  emit("uploadFinished")
+  modal.close()
+}
+</script>
+
+<template>
+  <UModal>
+    <UCard :ui="{ body: { base: 'flex-1' }, ring: '', divide: 'divide-y divide-gray-100 dark:divide-gray-800' }">
+      <template #header>
+        <div class="flex items-center justify-between">
+          <h3 class="text-base font-semibold leading-6 text-gray-900 dark:text-white">
+            Datei hochladen
+          </h3>
+          <UButton
+              color="gray"
+              variant="ghost"
+              icon="i-heroicons-x-mark-20-solid"
+              class="-my-1"
+              @click="modal.close()"
+              :disabled="uploadInProgress"
+          />
+        </div>
+      </template>
+
+      <UFormGroup
+          label="Datei:"
+      >
+        <UInput
+            type="file"
+            id="fileUploadInput"
+            multiple
+            accept="image/jpeg, image/png, image/gif, application/pdf"
+        />
+      </UFormGroup>
+      <UFormGroup
+          label="Tags:"
+          class="mt-3"
+      >
+        <USelectMenu
+            option-attribute="name"
+            value-attribute="id"
+            searchable
+            searchable-placeholder="Suchen..."
+            :options="availableFiletypes"
+            v-model="props.fileData.type"
+        >
+          <template #label>
+            <span v-if="props.fileData.type">{{availableFiletypes.find(x => x.id === props.fileData.type).name}}</span>
+            <span v-else>Keine Typ ausgewählt</span>
+          </template>
+        </USelectMenu>
+      </UFormGroup>
+
+      <template #footer>
+        <UButton
+            @click="uploadFiles"
+            :loading="uploadInProgress"
+            :disabled="uploadInProgress"
+        >Hochladen</UButton>
+      </template>
+    </UCard>
+  </UModal>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file

From 2bd8b2b03a7b9b7efeb6566901b0c0dae29cff89 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:57:05 +0100
Subject: [PATCH 080/104] Changes in Document Display Modal

---
 components/DocumentDisplayModal.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/components/DocumentDisplayModal.vue b/components/DocumentDisplayModal.vue
index a920fa3..d4edf41 100644
--- a/components/DocumentDisplayModal.vue
+++ b/components/DocumentDisplayModal.vue
@@ -78,6 +78,7 @@ const updateDocument = async () => {
   if(objData.profile) objData.profile = objData.profile.id
   if(objData.check) objData.check = objData.check.id
   if(objData.inventoryitem) objData.inventoryitem = objData.inventoryitem.id
+  if(objData.incominginvoice) objData.incominginvoice = objData.incominginvoice.id
 
 
   const {data,error} = await supabase
@@ -90,6 +91,8 @@ const updateDocument = async () => {
     console.log(error)
   } else {
     toast.add({title: "Datei aktualisiert"})
+    modal.close()
+    emit("updateNeeded")
     //openShowModal.value = false
   }
 }
@@ -295,6 +298,12 @@ const moveFile = async () => {
                 <nuxt-link :to="`/profiles/show/${props.documentData.profile.id}`">{{props.documentData.profile.fullName}}</nuxt-link>
               </td>
             </tr>
+            <tr v-if="props.documentData.incominginvoice">
+              <td>Eingangsrechnung</td>
+              <td>
+                <nuxt-link :to="`/incomingInvoices/show/${props.documentData.incominginvoice.id}`">{{props.documentData.incominginvoice.reference}}</nuxt-link>
+              </td>
+            </tr>
           </table>
 
           <UDivider class="my-3">Datei zuweisen</UDivider>

From 39b6ad28d075d6118110b559873d7c4ba9c243ff Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:57:35 +0100
Subject: [PATCH 081/104] Changes in Create New Item

---
 stores/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stores/data.js b/stores/data.js
index 3c92365..efe1fc8 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -2229,7 +2229,7 @@ export const useDataStore = defineStore('data', () => {
 
             await generateHistoryItems(dataType, supabaseData[0])
 
-            if(!["statementallocations","absencerequests", "productcategories", "servicecategories", "projecttypes", "checks", "profiles","services", "inventoryitems"].includes(dataType) ){
+            if(!["statementallocations","absencerequests", "productcategories", "servicecategories", "projecttypes", "checks", "profiles","services", "inventoryitems", "incominginvoices"].includes(dataType) ){
                 await eval( dataType + '.value.push(' + JSON.stringify(...supabaseData) + ')')
             }
 

From f48bcdcd7b10fa7ac2e6e30798c8d36312657bfb Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:57:56 +0100
Subject: [PATCH 082/104] Removed Filetags

---
 composables/useFiles.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composables/useFiles.js b/composables/useFiles.js
index a64dafc..41a34f1 100644
--- a/composables/useFiles.js
+++ b/composables/useFiles.js
@@ -87,12 +87,12 @@ export const useFiles = () => {
     }
 
     const selectDocuments = async (sortColumn = null, folder = null) => {
-        let data = null
+        let data = []
 
         if(sortColumn !== null ) {
             data = (await supabase
                 .from("files")
-                .select('*, filetags(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
+                .select('*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
                 .eq("tenant", profileStore.currentTenant)
                 .not("path","is",null)
                 .not("archived","is",true)
@@ -100,7 +100,7 @@ export const useFiles = () => {
         } else {
             data = (await supabase
                 .from("files")
-                .select('*, filetags(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
+                .select('*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
                 .eq("tenant", profileStore.currentTenant)
                 .not("path","is",null)
                 .not("archived","is",true)).data
@@ -135,7 +135,7 @@ export const useFiles = () => {
         if(sortColumn !== null ) {
             data = (await supabase
                 .from("files")
-                .select('*, filetags(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
+                .select('*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
                 .in("id",documentIds)
                 .eq("tenant", profileStore.currentTenant)
                 .not("path","is",null)
@@ -144,7 +144,7 @@ export const useFiles = () => {
         } else {
             data = (await supabase
                 .from("files")
-                .select('*, filetags(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
+                .select('*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
                 .in("id",documentIds)
                 .not("path","is",null)
                 .not("archived","is",true)
@@ -177,7 +177,7 @@ export const useFiles = () => {
     const selectDocument = async (id) => {
         const {data,error} = await supabase
             .from("files")
-            .select('*, filetags(*)')
+            .select('*')
             .eq("id",id)
             .single()
 

From 120aa12727e9f41800878a4421bac2e0c4391cb5 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:58:08 +0100
Subject: [PATCH 083/104] Removed PWA Comment

---
 nuxt.config.ts | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/nuxt.config.ts b/nuxt.config.ts
index e1d372a..861f850 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -54,26 +54,7 @@ export default defineNuxtConfig({
       preference: 'system'
   },
 
-  /*pwa: {
-      manifest: {
-          name: "FEDEO",
-          short_name: "FEDEO",
-          description: "FEDEO",
-          icons: [
-              {
-                  src: "/icon.png",
-                  sizes: "512x512",
-              }
 
-          ],
-          display: "standalone",
-          theme_color: "green"
-      },
-      devOptions: {
-          enabled: false,
-          type: "module"
-      }
-  },*/
   tiptap: {
       prefix: "Tiptap"
   },

From 0911678db0edf6e064545ce26dfea0e46090eb18 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:58:36 +0100
Subject: [PATCH 084/104] Added own file for incominginvoice creation

---
 pages/incomingInvoices/create.vue | 479 ++++++++++++++++++++++++++++++
 1 file changed, 479 insertions(+)
 create mode 100644 pages/incomingInvoices/create.vue

diff --git a/pages/incomingInvoices/create.vue b/pages/incomingInvoices/create.vue
new file mode 100644
index 0000000..3e936ee
--- /dev/null
+++ b/pages/incomingInvoices/create.vue
@@ -0,0 +1,479 @@
+<script setup>
+import InputGroup from "~/components/InputGroup.vue";
+import dayjs from "dayjs";
+import HistoryDisplay from "~/components/HistoryDisplay.vue";
+
+definePageMeta({
+  middleware: "auth"
+})
+
+const dataStore = useDataStore()
+const profileStore = useProfileStore()
+const supabase = useSupabaseClient()
+const route = useRoute()
+const router = useRouter()
+const toast = useToast()
+
+const itemInfo = ref({
+  vendor: 0,
+  expense: true,
+  reference: "",
+  date:  null,
+  dueDate: null,
+  paymentType: "Überweisung",
+  description: "",
+  state: "Entwurf",
+  accounts: [
+    {
+      account: null,
+      amountNet: null,
+      amountTax: null,
+      taxType: "19",
+      costCentre: null
+    }
+  ]
+})
+
+const availableDocuments = ref([])
+const setup = async () => {
+  let filetype = (await supabase.from("filetags").select().eq("tenant",profileStore.currentTenant).eq("incomingDocumentType","invoices").single()).data.id
+  console.log(filetype)
+  let ids = (await supabase.from("files").select("id").eq("tenant",profileStore.currentTenant).eq("type", filetype).is("incominginvoice",null)).data.map(i => i.id)
+  availableDocuments.value = await useFiles().selectSomeDocuments(ids)
+
+}
+
+setup()
+
+const useNetMode = ref(false)
+
+const loadedFile = ref(null)
+const loadFile = async (id) => {
+  console.log(id)
+  loadedFile.value = await useFiles().selectDocument(id)
+  console.log(loadedFile.value)
+}
+
+
+
+
+const changeNetMode = (mode) => {
+  useNetMode.value = mode
+
+  itemInfo.value.accounts = [{account: null,amountNet: null,amountTax: null,taxType: '19'}]
+}
+
+
+
+
+const taxOptions = ref([
+  {
+    label: "19% USt",
+    percentage: 19,
+    key: "19"
+  },{
+    label: "7% USt",
+    percentage: 7,
+    key: "7"
+  },{
+    label: "Innergemeintschaftlicher Erwerb 19%",
+    percentage: 0,
+    key: "19I"
+  },{
+    label: "Innergemeintschaftlicher Erwerb 7%",
+    percentage: 0,
+    key: "7I"
+  },{
+    label: "§13b UStG",
+    percentage: 0,
+    key: "13B"
+  },{
+    label: "Keine USt",
+    percentage: 0,
+    key: "null"
+  },
+])
+
+
+const totalCalculated = computed(() => {
+  let totalNet = 0
+  let totalAmount19Tax = 0
+  let totalAmount7Tax = 0
+  let totalAmount0Tax = 0
+  let totalGross = 0
+
+  itemInfo.value.accounts.forEach(account => {
+    if(account.amountNet) totalNet += account.amountNet
+
+    if(account.taxType === "19" && account.amountTax) {
+      totalAmount19Tax += account.amountTax
+    }
+  })
+
+  totalGross = Number(totalNet + totalAmount19Tax)
+
+  return {
+    totalNet,
+    totalAmount19Tax,
+    totalGross
+  }
+
+})
+
+const createIncomingInvoice = async () => {
+  const data = await dataStore.createNewItem('incominginvoices',itemInfo.value)
+
+  console.log(data)
+
+  const {error} = await supabase.from("files").update({incominginvoice: data[0].id}).eq("id",loadedFile.value.id)
+
+}
+
+
+</script>
+
+<template>
+  <UDashboardNavbar :title="'Eingangsbeleg erstellen'">
+    <template #right>
+      <UButton
+          @click="createIncomingInvoice"
+      >
+        Speichern
+      </UButton>
+    </template>
+  </UDashboardNavbar>
+  <UDashboardPanelContent>
+    <div v-if="!loadedFile">
+      <DocumentList
+          :documents="availableDocuments"
+          :return-document-id="true"
+          @selectDocument="(documentId) => loadFile(documentId)"
+      />
+    </div>
+    <div
+        v-else
+        class="flex justify-between mt-5"
+    >
+      <object
+          v-if="loadedFile"
+          :data="loadedFile.url + '#toolbar=0&navpanes=0&scrollbar=0&statusbar=0&messages=0&scrollbar=0'"
+          type="application/pdf"
+          class="mx-5 documentPreview w-full"
+      />
+      <div class="w-3/5 mx-5">
+
+        <div v-if="mode === 'show'">
+
+          <div class="truncate mb-5">
+            <p>Status: {{itemInfo.state}}</p>
+            <p>Datum: {{dayjs(itemInfo.date).format('DD.MM.YYYY')}}</p>
+            <p>Fälligkeitsdatum: {{dayjs(itemInfo.dueDate).format('DD.MM.YYYY')}}</p>
+            <p>Lieferant: <nuxt-link :to="`/vendors/show/${itemInfo.vendor}`">{{dataStore.getVendorById(itemInfo.vendor).name}}</nuxt-link></p>
+            <p>Bezahlt: {{itemInfo.paid}}</p>
+            <p>Beschreibung: {{itemInfo.description}}</p>
+
+            <!--     TODO: Buchungszeilen darstellen     -->
+          </div>
+
+          <HistoryDisplay
+              type="incomingInvoice"
+              v-if="itemInfo"
+              :element-id="itemInfo.id"
+              :render-headline="true"
+          />
+        </div>
+
+        <div v-else class=" scrollContainer">
+          <InputGroup class="mb-3">
+            <UButton
+                :variant="itemInfo.expense ? 'solid' : 'outline'"
+                @click="itemInfo.expense = true"
+            >
+              Ausgabe
+            </UButton>
+            <UButton
+                :variant="!itemInfo.expense ? 'solid' : 'outline'"
+                @click="itemInfo.expense = false"
+            >
+              Einnahme
+            </UButton>
+          </InputGroup>
+
+          <UFormGroup label="Lieferant:" required>
+            <InputGroup>
+              <USelectMenu
+                  v-model="itemInfo.vendor"
+                  :options="dataStore.vendors"
+                  option-attribute="name"
+                  value-attribute="id"
+                  searchable
+                  :search-attributes="['name','vendorNumber']"
+                  class="flex-auto"
+                  searchable-placeholder="Suche..."
+              >
+                <template #option="{option}">
+                  {{option.vendorNumber}} - {{option.name}}
+                </template>
+                <template #label>
+                  {{dataStore.vendors.find(vendor => vendor.id === itemInfo.vendor) ? dataStore.vendors.find(vendor => vendor.id === itemInfo.vendor).name : 'Lieferant auswählen'}}
+                </template>
+              </USelectMenu>
+              <UButton
+                  @click="router.push('/vendors/create')"
+              >
+                + Lieferant
+              </UButton>
+            </InputGroup>
+
+
+          </UFormGroup>
+
+          <UFormGroup
+              class="mt-3"
+              label="Rechnungsreferenz:"
+              required
+          >
+            <UInput
+                v-model="itemInfo.reference"
+            />
+          </UFormGroup>
+
+          <InputGroup class="mt-3" gap="2">
+            <UFormGroup label="Rechnungsdatum:" required>
+              <UPopover :popper="{ placement: 'bottom-start' }">
+                <UButton icon="i-heroicons-calendar-days-20-solid" :label="itemInfo.date ? dayjs(itemInfo.date).format('DD.MM.YYYY') : 'Datum auswählen'" />
+
+                <template #panel="{ close }">
+                  <LazyDatePicker v-model="itemInfo.date" @close="close" />
+                </template>
+              </UPopover>
+            </UFormGroup>
+
+            <UFormGroup label="Fälligkeitsdatum:" required>
+              <UPopover :popper="{ placement: 'bottom-start' }">
+                <UButton icon="i-heroicons-calendar-days-20-solid" :label="itemInfo.dueDate ? dayjs(itemInfo.dueDate).format('DD.MM.YYYY') : 'Datum auswählen'" />
+
+                <template #panel="{ close }">
+                  <LazyDatePicker v-model="itemInfo.dueDate" @close="close" />
+                </template>
+              </UPopover>
+            </UFormGroup>
+          </InputGroup>
+
+
+
+          <UFormGroup label="Zahlart:" required>
+            <USelectMenu
+                :options="['Einzug','Kreditkarte','Überweisung','Sonstiges']"
+                v-model="itemInfo.paymentType"
+            />
+          </UFormGroup>
+
+          <UFormGroup label="Beschreibung:" required>
+            <UTextarea
+                v-model="itemInfo.description"
+            />
+          </UFormGroup>
+
+          <InputGroup class="my-3">
+            <UButton
+              :variant="!useNetMode ? 'solid' : 'outline'"
+              @click="changeNetMode(false)"
+            >
+              Brutto
+            </UButton>
+            <UButton
+              :variant="useNetMode ? 'solid' : 'outline'"
+              @click="changeNetMode(true)"
+            >
+              Netto
+            </UButton>
+
+
+
+<!--            Brutto
+            <UToggle
+                v-model="useNetMode"
+                @update:model-value="itemInfo.accounts = [{account: null,amountNet: null,amountTax: null,taxType: '19'}]"
+            />
+            Netto-->
+          </InputGroup>
+
+          <table v-if="itemInfo.accounts.length > 1" class="w-full">
+            <tr>
+              <td>Gesamt exkl. Steuer: </td>
+              <td class="text-right">{{totalCalculated.totalNet.toFixed(2).replace(".",",")}} €</td>
+            </tr>
+            <tr>
+              <td>19% Steuer: </td>
+              <td class="text-right">{{totalCalculated.totalAmount19Tax.toFixed(2).replace(".",",")}} €</td>
+            </tr>
+            <tr>
+              <td>Gesamt inkl. Steuer: </td>
+              <td class="text-right">{{totalCalculated.totalGross.toFixed(2).replace(".",",")}} €</td>
+            </tr>
+          </table>
+
+          <div
+              class="my-3"
+              v-for="(item,index) in itemInfo.accounts"
+          >
+
+            <UFormGroup
+                label="Kategorie"
+                class=" mb-3"
+            >
+              <USelectMenu
+                  :options="dataStore.accounts"
+                  option-attribute="label"
+                  value-attribute="id"
+                  searchable
+                  :search-attributes="['label']"
+                  searchable-placeholder="Suche..."
+                  v-model="item.account"
+              >
+                <template #label>
+                  {{dataStore.accounts.find(account => account.id === item.account) ? dataStore.accounts.find(account => account.id === item.account).label : "Keine Kategorie ausgewählt" }}
+                </template>
+
+              </USelectMenu>
+            </UFormGroup>
+            <UFormGroup
+                label="Kostenstelle"
+                class=" mb-3"
+            >
+              <USelectMenu
+                  :options="dataStore.getCostCentresComposed"
+                  option-attribute="label"
+                  value-attribute="id"
+                  searchable
+                  :search-attributes="['label']"
+                  searchable-placeholder="Suche..."
+                  v-model="item.costCentre"
+              >
+                <template #label>
+                  {{dataStore.getCostCentresComposed.find(account => account.id === item.costCentre) ? dataStore.getCostCentresComposed.find(account => account.id === item.costCentre).label : "Keine Kostenstelle ausgewählt" }}
+                </template>
+
+              </USelectMenu>
+            </UFormGroup>
+
+
+
+            <InputGroup>
+              <UFormGroup
+                  label="Umsatzsteuer"
+                  class="w-32"
+                  :help="`Betrag: ${item.amountTax ? String(item.amountTax).replace('.',',') : '0,00'} €`"
+              >
+                <USelectMenu
+                    :options="taxOptions"
+                    v-model="item.taxType"
+                    value-attribute="key"
+                    option-attribute="label"
+                    @change="item.amountTax = Number(((item.amountNet ? item.amountNet : 0) * (Number(taxOptions.find(i => i.key === item.taxType).percentage)/100)).toFixed(2))"
+                >
+                  <template #label>
+                    <span class="truncate">{{taxOptions.find(i => i.key === item.taxType) ? taxOptions.find(i => i.key === item.taxType).label : ""}}</span>
+                  </template>
+                </USelectMenu>
+              </UFormGroup>
+              <UFormGroup
+                  v-if="useNetMode"
+                  label="Gesamtbetrag exkl. Steuer in EUR"
+                  class="flex-auto truncate"
+                  :help="item.taxType !== null ? `Betrag inkl. Steuern: ${String(Number(item.amountNet + item.amountTax).toFixed(2)).replace('.',',')} €` : 'Zuerst Steuertyp festlegen' "
+
+              >
+                <UInput
+                    type="number"
+                    step="0.01"
+                    v-model="item.amountNet"
+                    :disabled="item.taxType === null"
+                    @keyup="item.amountTax = Number((item.amountNet * (Number(taxOptions.find(i => i.key === item.taxType).percentage)/100)).toFixed(2))"
+                >
+                  <template #trailing>
+                    <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
+                  </template>
+                </UInput>
+              </UFormGroup>
+              <UFormGroup
+                  v-else
+                  label="Gesamtbetrag inkl. Steuer in EUR"
+                  class="flex-auto"
+                  :help="item.taxType !== null ? `Betrag exkl. Steuern: ${item.amountNet ? String(item.amountNet.toFixed(2)).replace('.',',') : '0,00'} €` : 'Zuerst Steuertyp festlegen' "
+
+              >
+                <UInput
+                    type="number"
+                    step="0.01"
+                    :disabled="item.taxType === null"
+                    v-model="item.amountGross"
+                    @keyup="item.amountNet = Number((item.amountGross / (1 + Number(item.taxType)/100)).toFixed(2)),
+                  item.amountTax = Number((item.amountGross - item.amountNet).toFixed(2))"
+                >
+                  <template #trailing>
+                    <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>
+                  </template>
+                </UInput>
+
+              </UFormGroup>
+
+
+            </InputGroup>
+
+
+            <UButton
+                class="mt-3"
+                @click="itemInfo.accounts = [...itemInfo.accounts.slice(0,index+1),{account:null, amountNet: null, amountTax:null, taxType: '19'} , ...itemInfo.accounts.slice(index+1)]"
+            >
+              Position hinzufügen
+            </UButton>
+            <UButton
+                v-if="index !== 0"
+                class="mt-3"
+                variant="ghost"
+                color="rose"
+                @click="itemInfo.accounts = itemInfo.accounts.filter((account,itemIndex) => itemIndex !== index)"
+            >
+              Position entfernen
+            </UButton>
+
+          </div>
+
+        </div>
+      </div>
+    </div>
+  </UDashboardPanelContent>
+
+
+
+
+</template>
+
+<style scoped>
+.documentPreview {
+  aspect-ratio: 1 / 1.414;
+}
+
+
+
+.scrollContainer {
+  overflow-y: scroll;
+  padding-left: 1em;
+  padding-right: 1em;
+  height: 75vh;
+  -ms-overflow-style: none;  /* IE and Edge */
+  scrollbar-width: none;  /* Firefox */
+}
+
+.scrollContainer::-webkit-scrollbar {
+  display: none;
+}
+
+
+.lineItemRow {
+  display: flex;
+  flex-direction: row;
+}
+</style>
\ No newline at end of file

From f2d4107172d211e69467ec127ba4be06681a838f Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:58:54 +0100
Subject: [PATCH 085/104] Cahnges

---
 pages/incomingInvoices/[mode]/[[id]].vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pages/incomingInvoices/[mode]/[[id]].vue b/pages/incomingInvoices/[mode]/[[id]].vue
index 71b6ee9..6813075 100644
--- a/pages/incomingInvoices/[mode]/[[id]].vue
+++ b/pages/incomingInvoices/[mode]/[[id]].vue
@@ -8,21 +8,22 @@ definePageMeta({
 })
 
 const dataStore = useDataStore()
+const profileStore = useProfileStore()
 const supabase = useSupabaseClient()
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
 
-const {vendors} = storeToRefs(useDataStore())
-const {fetchVendorInvoices} = useDataStore()
+const availableDocuments = ref([])
+const setup = async () => {
+  let filetype = (await supabase.from("filetags").select().eq("tenant",profileStore.currentTenant).eq("incomingDocumentType","invoices").single()).data.id
+  console.log(filetype)
+  let ids = (await supabase.from("files").select("id").eq("tenant",profileStore.currentTenant).eq("type", filetype)).data.map(i => i.id)
+  availableDocuments.value = await useFiles().selectSomeDocuments(ids)
 
-const availableDocuments = computed(() => {
+}
 
-  //console.log(dataStore.documents.filter(i => i.tags.includes('Eingangsrechnung') && !dataStore.incominginvoices.find(x => x.document === i.id)))
-  //console.log(dataStore.documents.filter(i => i.tags.includes('Eingangsrechnung')).length)
-
-  return dataStore.documents.filter(i => i.tags.includes('Eingangsrechnung') && !i.tags.includes("Archiviert") && !dataStore.incominginvoices.find(x => x.document === i.id))
-})
+setup()
 
 
 //let currentDocument  = ref(null)

From eff2b8a0bb9d2713d3bce62749a374ceff3910c8 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:59:22 +0100
Subject: [PATCH 086/104] Introduced UploadModal from Component

---
 pages/files/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/files/index.vue b/pages/files/index.vue
index 31281f7..01e6afe 100644
--- a/pages/files/index.vue
+++ b/pages/files/index.vue
@@ -4,6 +4,7 @@
 import {BlobReader, BlobWriter, ZipWriter} from "@zip.js/zip.js";
 import {useSupabaseSelectSingle} from "~/composables/useSupabase.js";
 import DocumentDisplayModal from "~/components/DocumentDisplayModal.vue";
+import DocumentUploadModal from "~/components/DocumentUploadModal.vue";
 import dayjs from "dayjs";
 
 definePageMeta({
@@ -362,7 +363,7 @@ const showFile = (fileId) => {
         </template>
       </USelectMenu>
 
-      <UButton @click="uploadModalOpen = true">+ Hochladen</UButton>
+      <UButton @click="modal.open(DocumentUploadModal,{fileData: {folder: currentFolder.id}})">+ Hochladen</UButton>
       <UButton
           @click="createFolderModalOpen = true"
           variant="outline"

From b2bc69f782f0e1d02e2708ba0a85a05ed816f5da Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 18:59:39 +0100
Subject: [PATCH 087/104] Changed Create Link

---
 pages/incomingInvoices/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/incomingInvoices/index.vue b/pages/incomingInvoices/index.vue
index a5a424c..b648811 100644
--- a/pages/incomingInvoices/index.vue
+++ b/pages/incomingInvoices/index.vue
@@ -133,7 +133,7 @@ const isPaid = (item) => {
         </template>
       </UInput>
 
-      <UButton @click="router.push(`/incomingInvoices/edit`)">+ Beleg</UButton>
+      <UButton @click="router.push(`/incomingInvoices/create`)">+ Beleg</UButton>
     </template>
   </UDashboardNavbar>
   <UDashboardToolbar>

From 5555239fb3a8cde04643dda2df6eb53fd6e4f95e Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 11 Jan 2025 19:04:24 +0100
Subject: [PATCH 088/104] Cahnges in E-Mail Creation

---
 pages/email/new.vue | 56 ++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/pages/email/new.vue b/pages/email/new.vue
index 390559d..76c997a 100644
--- a/pages/email/new.vue
+++ b/pages/email/new.vue
@@ -30,7 +30,7 @@ const setupPage = async () => {
   } else {
     emailData.value.account = emailAccounts.value[0].id
 
-    preloadedContent.value = `<p></p><p></p><p></p>${profileStore.activeProfile.emailSignature}`
+    preloadedContent.value = `<p></p><p></p><p></p>${profileStore.activeProfile.emailSignature || ""}`
 
     //Check Query
     if(route.query.to) emailData.value.to = route.query.to
@@ -194,26 +194,39 @@ const sendEmail = async () => {
             />
           </UFormGroup>
           <UDivider class="my-3"/>
-          <UInput
-              class="w-full my-1"
-              placeholder="Empfänger"
-              v-model="emailData.to"
-          />
-          <UInput
-              class="w-full my-1"
-              placeholder="Kopie"
-              v-model="emailData.cc"
-          />
-          <UInput
-              class="w-full my-1"
-              placeholder="Blindkopie"
-              v-model="emailData.bcc"
-          />
-          <UInput
-              placeholder="Betreff"
-              class="w-full my-1"
-              v-model="emailData.subject"
-          />
+          <UFormGroup
+            label="Empfänger"
+          >
+            <UInput
+                class="w-full my-1"
+                v-model="emailData.to"
+            />
+          </UFormGroup>
+          <UFormGroup
+            label="Kopie"
+          >
+            <UInput
+                class="w-full my-1"
+                v-model="emailData.cc"
+            />
+          </UFormGroup>
+          <UFormGroup
+            label="Blindkopie"
+          >
+            <UInput
+                class="w-full my-1"
+                placeholder=""
+                v-model="emailData.bcc"
+            />
+          </UFormGroup>
+          <UFormGroup
+            label="Betreff"
+          >
+            <UInput
+                class="w-full my-1"
+                v-model="emailData.subject"
+            />
+          </UFormGroup>
         </div>
 
       </UDashboardToolbar>
@@ -248,6 +261,7 @@ const sendEmail = async () => {
         </div>
 
         <Tiptap
+            class="mt-3"
             @updateContent="contentChanged"
             :preloadedContent="preloadedContent"
         />

From 62b29fb6447d10656eff7efe0952c1b070c04674 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 13 Jan 2025 11:27:36 +0100
Subject: [PATCH 089/104] Changes in Evaluate

---
 pages/workingtimes/evaluate/[id].vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/workingtimes/evaluate/[id].vue b/pages/workingtimes/evaluate/[id].vue
index 8eb7436..f435ac6 100644
--- a/pages/workingtimes/evaluate/[id].vue
+++ b/pages/workingtimes/evaluate/[id].vue
@@ -153,7 +153,7 @@ const workingTimeInfo = computed(() => {
 
   //Saldo
   let saldo = (sumWorkingMinutesApproved + sumWorkingMinutesRecreationDays +sumWorkingMinutesVacationDays - workingMinutesTarget).toFixed(2)
-  let saldoInOfficial = (sumWorkingMinutesApproved + sumWorkingMinutesEingereicht + sumWorkingMinutesRecreationDays + sumWorkingMinutesVacationDays - workingMinutesTarget).toFixed(2)
+  let saldoInOfficial = (sumWorkingMinutesEingereicht + sumWorkingMinutesRecreationDays + sumWorkingMinutesVacationDays - workingMinutesTarget).toFixed(2)
 
   return {
     monthlyWorkingMinutes,
@@ -321,8 +321,8 @@ changeRange()
 
                    <p>Ausgleich:</p>
          -->
-          <p>Inoffizielles Saldo: {{Math.sign(workingTimeInfo.saldoInOfficial) === 1 ? "" : "-"}}{{Math.floor(Math.abs(workingTimeInfo.saldoInOfficial/60))}}:{{String(Math.abs(workingTimeInfo.saldoInOfficial)  % 60).padStart(2,"0")}} h</p>
-          <p>Saldo: {{Math.sign(workingTimeInfo.saldo) === 1 ? "" : "-"}}{{Math.floor(Math.abs(workingTimeInfo.saldo/60))}}:{{String(Math.abs(workingTimeInfo.saldo)  % 60).padStart(2,"0")}} h</p>
+          <p>Inoffizielles Saldo(eingereichte Stunden): {{Math.sign(workingTimeInfo.saldoInOfficial) === 1 ? "" : "-"}}{{Math.floor(Math.abs(workingTimeInfo.saldoInOfficial/60))}}:{{String(Math.abs(workingTimeInfo.saldoInOfficial)  % 60).padStart(2,"0")}} h</p>
+          <p>Saldo(genehmigte Stunden): {{Math.sign(workingTimeInfo.saldo) === 1 ? "" : "-"}}{{Math.floor(Math.abs(workingTimeInfo.saldo/60))}}:{{String(Math.abs(workingTimeInfo.saldo)  % 60).padStart(2,"0")}} h</p>
         </UCard>
 
         <div style="overflow-y: scroll; height: 45vh">

From b40553cc540824c728aecaee4276334067e26353 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 13 Jan 2025 20:19:57 +0100
Subject: [PATCH 090/104] Changed NumberRange to EdgeFunction

---
 pages/createDocument/edit/[[id]].vue | 11 +++++++++--
 stores/data.js                       | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 39c6c6c..c3d2ff0 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -766,8 +766,15 @@ const saveDocument = async (state,resetup = false) => {
       type = itemInfo.value.type
     }
 
-    const numberRange = useNumberRange(type)
-    itemInfo.value.documentNumber = await numberRange.useNextNumber()
+    const {data,error} = await supabase.functions.invoke("use_next_number",{
+      body: {
+        tenant: profileStore.currentTenant,
+        numberRange: type
+      }
+    })
+
+    itemInfo.value.documentNumber = data.usedNumber
+
     setDocumentTypeConfig(false)
   }
 
diff --git a/stores/data.js b/stores/data.js
index efe1fc8..1053d7e 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -2185,14 +2185,22 @@ export const useDataStore = defineStore('data', () => {
             })
         }
 
-
-
         console.log(dataType)
         if(dataTypes[dataType].numberRangeHolder) {
 
-            const numberRange = useNumberRange(dataType)
+            const {data:numberRangeData,error} = await supabase.functions.invoke("use_next_number",{
+                body: {
+                    tenant: profileStore.currentTenant,
+                    numberRange: dataType
+                }
+            })
+
+            if(error){
+                console.log(error)
+            }
+
             if(!data[dataTypes[dataType].numberRangeHolder]) {
-                data[dataTypes[dataType].numberRangeHolder] = await numberRange.useNextNumber()
+                data[dataTypes[dataType].numberRangeHolder] = numberRangeData.usedNumber
             }
 
 

From 57c0f81263d5fb7e4c439cc9247353acc1f5991a Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 17 Jan 2025 11:27:18 +0100
Subject: [PATCH 091/104] Added Archiving

---
 pages/createDocument/edit/[[id]].vue | 6 +++---
 pages/createDocument/index.vue       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index c3d2ff0..d961de5 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -910,7 +910,7 @@ const setRowData = (row) => {
 <template>
   <UDashboardNavbar>
     <template #right>
-<!--      <ButtonWithConfirm
+      <ButtonWithConfirm
           v-if="itemInfo.state === 'Entwurf'"
           color="rose"
           variant="outline"
@@ -921,10 +921,10 @@ const setRowData = (row) => {
           Archivieren
         </template>
         <template #header>
-          <span class="text-md text-black font-bold">Archivieren bestätigen</span>
+          <span class="text-md dark:text-whitetext-black font-bold">Archivieren bestätigen</span>
         </template>
         Möchten Sie diesen Ausgangsbeleg wirklich archivieren?
-      </ButtonWithConfirm>-->
+      </ButtonWithConfirm>
       <UButton
           icon="i-mdi-content-save"
           @click="saveDocument('Entwurf',true)"
diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue
index 0f04d86..fd461a4 100644
--- a/pages/createDocument/index.vue
+++ b/pages/createDocument/index.vue
@@ -162,7 +162,7 @@ const items = ref([])
 const selectedItem = ref(0)
 
 const setupPage = async () => {
-  items.value = await useSupabaseSelect("createddocuments","*, customer(id,name), statementallocations(id,amount)","documentNumber")
+  items.value = (await useSupabaseSelect("createddocuments","*, customer(id,name), statementallocations(id,amount)","documentNumber")).filter(i => !i.archived)
 }
 
 setupPage()

From cdb313118575fae80541bcfebf54428e418de6ae Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 17 Jan 2025 11:53:25 +0100
Subject: [PATCH 092/104] Added E-Mail loading from Customer

---
 components/displayOpenBalances.vue |  2 +-
 composables/useFiles.js            |  2 +-
 pages/email/new.vue                | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/components/displayOpenBalances.vue b/components/displayOpenBalances.vue
index cc7c7d6..55771c6 100644
--- a/components/displayOpenBalances.vue
+++ b/components/displayOpenBalances.vue
@@ -6,7 +6,7 @@ let draftInvoicesSum = ref(0)
 let draftInvoicesCount = ref(0)
 let unallocatedStatements = ref(0)
 const setupPage = async () => {
-  let documents = (await useSupabaseSelect("createddocuments","*, statementallocations(*), customer(id,name)")).filter(i => i.type === "invoices" ||i.type === "advanceInvoices")
+  let documents = (await useSupabaseSelect("createddocuments","*, statementallocations(*), customer(id,name)")).filter(i => i.type === "invoices" ||i.type === "advanceInvoices").filter(i => !i.archived)
 
   let draftDocuments = documents.filter(i => i.state === "Entwurf")
   let finalizedDocuments = documents.filter(i => i.state === "Gebucht")
diff --git a/composables/useFiles.js b/composables/useFiles.js
index 41a34f1..a57ce5f 100644
--- a/composables/useFiles.js
+++ b/composables/useFiles.js
@@ -144,7 +144,7 @@ export const useFiles = () => {
         } else {
             data = (await supabase
                 .from("files")
-                .select('*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
+                .select('*, incominginvoice(*), project(*), vendor(*), customer(*), contract(*), plant(*), createddocument(*, customer(*)), vehicle(*), product(*), profile(*), check(*), inventoryitem(*)')
                 .in("id",documentIds)
                 .not("path","is",null)
                 .not("archived","is",true)
diff --git a/pages/email/new.vue b/pages/email/new.vue
index 76c997a..87fb5f5 100644
--- a/pages/email/new.vue
+++ b/pages/email/new.vue
@@ -51,9 +51,17 @@ const setupPage = async () => {
       //console.log(loadedDocuments.value)
 
       if(loadedDocuments.value.length > 0) {
+        console.log(loadedDocuments.value[0])
         emailData.value.subject = loadedDocuments.value[0].createddocument.title
-        emailData.value.to = loadedDocuments.value[0].createddocument.contact ? loadedDocuments.value[0].createddocument.contact.email : ""
 
+        if(loadedDocuments.value[0].createddocument.contact && loadedDocuments.value[0].createddocument.contact.email) {
+          console.log("Contact")
+          emailData.value.to = loadedDocuments.value[0].createddocument.contact.email
+        } else if(loadedDocuments.value[0].createddocument.customer && loadedDocuments.value[0].createddocument.customer.infoData.email) {
+
+
+          emailData.value.to = loadedDocuments.value[0].createddocument.customer.infoData.email
+        }
       }
 
     }

From 6626bd568dc4942b6fcd444dab55777cda80407f Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 17 Jan 2025 17:26:59 +0100
Subject: [PATCH 093/104] Added Function to Cancel Invoices

---
 components/displayOpenBalances.vue   |  3 ++
 pages/createDocument/edit/[[id]].vue | 55 ++++++++++++++++++++++++----
 pages/createDocument/index.vue       |  2 +-
 pages/createDocument/show/[id].vue   |  8 ++++
 stores/data.js                       |  4 ++
 5 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/components/displayOpenBalances.vue b/components/displayOpenBalances.vue
index 55771c6..aad0c82 100644
--- a/components/displayOpenBalances.vue
+++ b/components/displayOpenBalances.vue
@@ -11,10 +11,13 @@ const setupPage = async () => {
   let draftDocuments = documents.filter(i => i.state === "Entwurf")
   let finalizedDocuments = documents.filter(i => i.state === "Gebucht")
 
+  console.log(finalizedDocuments)
+
 
   finalizedDocuments = finalizedDocuments.filter(i => i.statementallocations.reduce((n,{amount}) => n + amount, 0).toFixed(2) !== getDocumentSum(i).toFixed(2))
 
   finalizedDocuments.forEach(i => {
+    console.log(getDocumentSum(i))
     unpaidInvoicesSum.value += getDocumentSum(i) - i.statementallocations.reduce((n,{amount}) => n + amount, 0)
   })
   unpaidInvoicesCount.value = finalizedDocuments.length
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index d961de5..6bde368 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -36,7 +36,7 @@ const itemInfo = ref({
   deliveryDate: dayjs(),
   deliveryDateType: "Lieferdatum",
   dateOfPerformance: null,
-  paymentDays: 7,
+  paymentDays: profileStore.ownTenant.standardPaymentDays,
   createdBy: profileStore.activeProfile.id,
   title: null,
   description: null,
@@ -61,6 +61,7 @@ const itemInfo = ref({
   usedAdvanceInvoices: []
 })
 
+console.log(profileStore.ownTenant)
 
 const letterheads = ref([])
 const createddocuments = ref([])
@@ -78,6 +79,7 @@ const texttemplates = ref([])
 const loaded = ref(false)
 const setupPage = async () => {
 
+
   letterheads.value = (await useSupabaseSelect("letterheads","*")).filter(i => i.documentTypes.length === 0 || i.documentTypes.includes(itemInfo.value.type))
   createddocuments.value = (await useSupabaseSelect("createddocuments","*"))
   projects.value = (await useSupabaseSelect("projects","*"))
@@ -154,7 +156,7 @@ const setupPage = async () => {
 
       setPosNumbers()
 
-      if(linkedDocuments.find(i => i.agriculture)){
+      if(linkedDocuments.find(i => i.agriculture.dieselUsage)){
         itemInfo.value.rows = itemInfo.value.rows.filter(i => i.key !== "dieselPos")
 
         itemInfo.value.rows.push({
@@ -185,6 +187,19 @@ const setupPage = async () => {
 
       setCustomerData()
 
+      if(route.query.loadMode === "storno") {
+        itemInfo.value.rows.forEach(row => {
+          row.price = row.price * -1
+        })
+
+        itemInfo.value.description = `Stornorechnung zu Rechnung ${linkedDocument.documentNumber} vom ${dayjs(linkedDocument.documentDate).format('DD.MM.YYYY')}`
+
+        itemInfo.value.type = "cancellationInvoices"
+
+        setDocumentTypeConfig(true)
+
+      }
+
 
     }
 
@@ -227,7 +242,7 @@ const addAdvanceInvoiceToInvoice = (advanceInvoice) => {
 }
 
 const setDocumentTypeConfig = (withTexts = false) => {
-  if(itemInfo.value.type === "invoices" ||itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "serialInvoices") {
+  if(itemInfo.value.type === "invoices" ||itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "serialInvoices"|| itemInfo.value.type === "cancellationInvoices") {
     itemInfo.value.documentNumberTitle = "Rechnungsnummer"
     itemInfo.value.title = `Rechnung-Nr. ${itemInfo.value.documentNumber ? itemInfo.value.documentNumber : "XXXX"}`
   } else if(itemInfo.value.type === "quotes") {
@@ -433,6 +448,21 @@ const findDocumentErrors = computed(() => {
         if(row.mode === "title" && !row.text) errors.push({message: `In Position ${row.pos} ist kein Titel hinterlegt`, type: "breaking"})
         if(row.mode === "text" && !row.text) errors.push({message: `In einer Freitext Position ist kein Titel hinterlegt`, type: "breaking"})
         if(row.mode === "free" && !row.text) errors.push({message: `In einer freien Position ist kein Titel hinterlegt`, type: "breaking"})
+
+        if(["normal","service","free"].includes(row.mode)){
+
+          if(!row.taxPercent) errors.push({message: `In Position ${row.pos} ist kein Steuersatz hinterlegt`, type: "breaking"})
+          if(!row.price || row.price === 0) errors.push({message: `In Position ${row.pos} ist kein Preis hinterlegt`, type: "breaking"})
+
+
+        }
+
+        if(row.agriculture){
+          if(row.agriculture.dieselUsage && (!row.agriculture.dieselPrice || row.agriculture.dieselPrice === 0)) {
+            errors.push({message: `In Position ${row.pos} ist kein Dieselpreis hinterlegt`, type: "breaking"})
+          }
+        }
+
       })
     }
 
@@ -760,7 +790,7 @@ const saveDocument = async (state,resetup = false) => {
     console.log("???")
 
     let type = ""
-    if(itemInfo.value.type === "advanceInvoices"){
+    if(itemInfo.value.type === "advanceInvoices" || itemInfo.value.type === "cancellationInvoices"){
       type = "invoices"
     } else {
       type = itemInfo.value.type
@@ -852,9 +882,16 @@ const closeDocument = async () => {
 
   fileData.project = itemInfo.value.project
   fileData.createddocument = itemInfo.value.id
-  fileData.folder = (await supabase.from("folders").select("id").eq("tenant", profileStore.currentTenant).eq("function", itemInfo.value.type).eq("year",dayjs().format("YYYY")).single()).data.id
 
-  let tag  = (await supabase.from("filetags").select("id").eq("tenant", profileStore.currentTenant).eq("createddocumenttype", itemInfo.value.type).single()).data
+  let mappedType = itemInfo.value.type
+
+  if(mappedType === "advanceInvoices" || mappedType === "cancellationInvoices"){
+    mappedType = "invoices"
+  }
+
+  fileData.folder = (await supabase.from("folders").select("id").eq("tenant", profileStore.currentTenant).eq("function", mappedType).eq("year",dayjs().format("YYYY")).single()).data.id
+
+  let tag  = (await supabase.from("filetags").select("id").eq("tenant", profileStore.currentTenant).eq("createddocumenttype", mappedType).single()).data
 
   function dataURLtoFile(dataurl, filename) {
     var arr = dataurl.split(","),
@@ -893,12 +930,14 @@ const setRowData = (row) => {
     row.unit = services.value.find(i => i.id === row.service).unit
     row.price = services.value.find(i => i.id === row.service).sellingPriceComposed.total || services.value.find(i => i.id === row.service).sellingPrice
     row.description = services.value.find(i => i.id === row.service).description
+    row.taxPercent = services.value.find(i => i.id === row.service).taxPercentage
   }
 
   if(row.product) {
     row.unit = products.value.find(i => i.id === row.product).unit
     row.price = products.value.find(i => i.id === row.product).sellingPrice
     row.description = products.value.find(i => i.id === row.product).description
+    row.taxPercent = products.value.find(i => i.id === row.product).taxPercentage
   }
 
 
@@ -956,14 +995,14 @@ const setRowData = (row) => {
 
           <UAlert
               class="my-5"
-            title="Vorhandene Probleme:"
+            title="Vorhandene Probleme und Informationen:"
             :color="findDocumentErrors.filter(i => i.type === 'breaking').length > 0 ? 'rose' : 'white'"
             variant="outline"
               v-if="findDocumentErrors.length > 0"
           >
             <template #description>
               <ul class="list-disc ml-5">
-                <li v-for="error in findDocumentErrors" :class="[...error.type === 'breaking' ? ['text-rose-600'] : ['text-gray-700']]">
+                <li v-for="error in findDocumentErrors" :class="[...error.type === 'breaking' ? ['text-rose-600'] : ['text-white']]">
                   {{error.message}}
                 </li>
               </ul>
diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue
index fd461a4..4a9b3fd 100644
--- a/pages/createDocument/index.vue
+++ b/pages/createDocument/index.vue
@@ -111,7 +111,7 @@
       </div>
     </template>
     <template #amount-data="{row}">
-      {{displayCurrency(calculateDocSum(row))}}
+      <span v-if="row.type !== 'deliveryNotes'">{{displayCurrency(calculateDocSum(row))}}</span>
     </template>
   </UTable>
 
diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue
index f235a94..df4764d 100644
--- a/pages/createDocument/show/[id].vue
+++ b/pages/createDocument/show/[id].vue
@@ -79,6 +79,13 @@ const openEmail = () => {
       >
         E-Mail
       </UButton>
+      <UButton
+          @click="router.push(`/createDocument/edit/?linkedDocument=${itemInfo.id}&loadMode=storno`)"
+          variant="outline"
+          color="rose"
+      >
+        Stornieren
+      </UButton>
       <UButton
           v-if="itemInfo.project"
         @click="router.push(`/standardEntity/projects/show/${itemInfo.project}`)"
@@ -87,6 +94,7 @@ const openEmail = () => {
       >
         Projekt
       </UButton>
+
     </template>
   </UDashboardToolbar>
   <UDashboardPanelContent>
diff --git a/stores/data.js b/stores/data.js
index 1053d7e..ce433c0 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -1728,6 +1728,10 @@ export const useDataStore = defineStore('data', () => {
             label: "Abschlagsrechnungen",
             labelSingle: "Abschlagsrechnung"
         },
+        cancellationInvoices: {
+            label: "Stornorechnungen",
+            labelSingle: "Stornorechnung"
+        },
         quotes: {
             label: "Angebote",
             labelSingle: "Angebot"

From e71281dceee1eea6df9d0987c30c19e2436aabc0 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Fri, 17 Jan 2025 18:49:19 +0100
Subject: [PATCH 094/104] Fixed Problems in LinkedDocuments and Storno

---
 pages/createDocument/edit/[[id]].vue | 22 +++++++++++++++-------
 pages/createDocument/index.vue       |  5 ++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 6bde368..6fa4bc3 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -156,12 +156,18 @@ const setupPage = async () => {
 
       setPosNumbers()
 
-      if(linkedDocuments.find(i => i.agriculture.dieselUsage)){
+      console.log(linkedDocuments)
+
+      if(linkedDocuments.find(i => i.rows.find( x => x.agriculture.dieselUsage))){
+        console.log("has diesel")
+
+        //Remove Existing Total Diesel Pos
         itemInfo.value.rows = itemInfo.value.rows.filter(i => i.key !== "dieselPos")
 
+        //Add Total Title
         itemInfo.value.rows.push({
           id:uuidv4(),
-          mode: "text",
+          mode: "title",
           text: "Allgemein"
         })
 
@@ -443,6 +449,7 @@ const findDocumentErrors = computed(() => {
       errors.push({message: "Es sind keine Positionen angegeben", type: "breaking"})
     } else {
       itemInfo.value.rows.forEach(row => {
+
         if(row.mode === "normal" && !row.product) errors.push({message: `In Position ${row.pos} ist kein Artikel ausgewählt`, type: "breaking"})
         if(row.mode === "service" && !row.service) errors.push({message: `In Position ${row.pos} ist keine Leistung ausgewählt`, type: "breaking"})
         if(row.mode === "title" && !row.text) errors.push({message: `In Position ${row.pos} ist kein Titel hinterlegt`, type: "breaking"})
@@ -451,15 +458,17 @@ const findDocumentErrors = computed(() => {
 
         if(["normal","service","free"].includes(row.mode)){
 
-          if(!row.taxPercent) errors.push({message: `In Position ${row.pos} ist kein Steuersatz hinterlegt`, type: "breaking"})
-          if(!row.price || row.price === 0) errors.push({message: `In Position ${row.pos} ist kein Preis hinterlegt`, type: "breaking"})
+          if(!row.taxPercent && typeof row.taxPercent !== "number") errors.push({message: `In Position ${row.pos} ist kein Steuersatz hinterlegt`, type: "breaking"})
+          if(!row.price && typeof row.price !== "number") errors.push({message: `In Position ${row.pos} ist kein Preis hinterlegt`, type: "breaking"})
 
 
         }
 
         if(row.agriculture){
-          if(row.agriculture.dieselUsage && (!row.agriculture.dieselPrice || row.agriculture.dieselPrice === 0)) {
+          if(row.agriculture.dieselUsage && (!row.agriculture.dieselPrice && typeof row.agriculture.dieselPrice !== "number")) {
             errors.push({message: `In Position ${row.pos} ist kein Dieselpreis hinterlegt`, type: "breaking"})
+          } else if(row.agriculture.dieselUsage && row.agriculture.dieselPrice === 0) {
+            errors.push({message: `In Position ${row.pos} ist 0,00 € als Dieselpreis hinterlegt`, type: "info"})
           }
         }
 
@@ -552,7 +561,6 @@ const processDieselPosition = () => {
     if(row.agriculture && row.agriculture.dieselUsage) {
       agricultureData.dieselUsageTotal += Number(row.agriculture.dieselUsage)
       agricultureData.dieselPriceTotal += Number(row.agriculture.dieselPrice) * Number(row.agriculture.dieselUsage)
-
     }
   })
 
@@ -970,7 +978,7 @@ const setRowData = (row) => {
           v-if="itemInfo.type !== 'serialInvoices' "
           :disabled="!itemInfo.customer"
       >
-        Entwurf speichern
+        Speichern
       </UButton>
       <UButton
           @click="closeDocument"
diff --git a/pages/createDocument/index.vue b/pages/createDocument/index.vue
index 4a9b3fd..4374a34 100644
--- a/pages/createDocument/index.vue
+++ b/pages/createDocument/index.vue
@@ -215,6 +215,9 @@ const templateTypes = [
   {
     key: "invoices",
     label: "Rechnungen"
+  },{
+    key: "cancellationInvoices",
+    label: "Stornorechnungen"
   },{
     key: "advanceInvoices",
     label: "Abschlagsrechnungen"
@@ -269,7 +272,7 @@ const calculateDocSum = (row) => {
 
   row.rows.forEach(row => {
     if(row.mode === "normal" || row.mode === "service" || row.mode === "free") {
-      sum += row.quantity * row.price * (1 - row.discountPercent / 100) * (1 + row.taxPercent / 100)
+      sum += row.quantity * row.price * (1 - row.discountPercent / 100) * (1 + (row.taxPercent || 0) / 100)
     }
   })
 

From bec94e4c6a741064c6c88f64f5f7348b2901ea80 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sat, 18 Jan 2025 21:05:27 +0100
Subject: [PATCH 095/104] Added Update Emit after Phase Change

---
 components/EntityShow.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/components/EntityShow.vue b/components/EntityShow.vue
index 25df1d4..2cae22e 100644
--- a/components/EntityShow.vue
+++ b/components/EntityShow.vue
@@ -101,13 +101,20 @@ const changeActivePhase = async (key) => {
     return p
   })
 
-  await supabase.from("projects").update({phases: item.phases}).eq("id",item.id)
+  const {error:updateError} = await supabase.from("projects").update({phases: item.phases}).eq("id",item.id)
+
+  console.log(updateError)
+
+
   const {error} = await supabase.from("historyitems").insert({
     createdBy: profileStore.activeProfile.id,
     tenant: profileStore.currentTenant,
     text: `Aktive Phase zu "${phaseLabel}" gewechselt`,
     project: item.id
   })
+
+  emit("updateNeeded")
+
 }
 
 const invoiceDeliveryNotes = () => {

From 9758c7b406496d5d952e79d162dffc4719963528 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Sun, 19 Jan 2025 18:40:06 +0100
Subject: [PATCH 096/104] Removed DEV Output

---
 pages/workingtimes/index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pages/workingtimes/index.vue b/pages/workingtimes/index.vue
index 7eae66e..ff0870e 100644
--- a/pages/workingtimes/index.vue
+++ b/pages/workingtimes/index.vue
@@ -209,9 +209,6 @@ const setEndDate = (row) => {
         </UTooltip>
       </InputGroup>
       <div class="p-4" v-if="!row.approved">
-        {{row}}
-
-
         <UFormGroup label="Start:">
           <UPopover :popper="{ placement: 'bottom-start' }">
             <UButton

From f6aae59e72cbd93bbebc4261a93ab199a017926f Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 20 Jan 2025 09:57:20 +0100
Subject: [PATCH 097/104] Corrected E-Mail link

---
 pages/createDocument/show/[id].vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/createDocument/show/[id].vue b/pages/createDocument/show/[id].vue
index df4764d..4b21b4f 100644
--- a/pages/createDocument/show/[id].vue
+++ b/pages/createDocument/show/[id].vue
@@ -45,7 +45,7 @@ const openEmail = () => {
   if(["invoices","advanceInvoices"].includes(itemInfo.value.type)){
     router.push(`/email/new?loadDocuments=["${linkedDocument.value.id}"]&bcc=${encodeURIComponent(currentTenant.value.standardEmailForInvoices)}`)
   } else {
-    router.push(`/email/new?loadDocuments=[${linkedDocument.value.id}]`)
+    router.push(`/email/new?loadDocuments=["${linkedDocument.value.id}"]`)
   }
 }
 </script>

From 96a66f24e6912cf63bb8decfd5dfc7faf00a5a67 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 20 Jan 2025 09:57:33 +0100
Subject: [PATCH 098/104] Tidying in Table

---
 pages/profiles/index.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pages/profiles/index.vue b/pages/profiles/index.vue
index ad44dde..129399e 100644
--- a/pages/profiles/index.vue
+++ b/pages/profiles/index.vue
@@ -7,16 +7,13 @@
   const templateColumns = [
     {
       key: 'employeeNumber',
-      label: "MA-Nummer:",
-      sortable: true
+      label: "MA-Nummer",
     },{
       key: 'fullName',
-      label: "Name:",
-      sortable: true
+      label: "Name",
     },{
       key: "email",
-      label: "E-Mail:",
-      sortable: true
+      label: "E-Mail",
     }
   ]
   const selectedColumns = ref(templateColumns)

From 879a8da1f422f584e1b12dd17219a38521f14ef8 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 20 Jan 2025 09:57:56 +0100
Subject: [PATCH 099/104] Added Right Check to Kontakte icon Changes

---
 components/MainNav.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/MainNav.vue b/components/MainNav.vue
index f0f53e5..3d2e6e9 100644
--- a/components/MainNav.vue
+++ b/components/MainNav.vue
@@ -76,7 +76,7 @@ const links = computed(() => {
         }
       ]
     },
-    ... profileStore.ownTenant.features.contacts ? [{
+    ... (role.checkRight("customers") || role.checkRight("vendors") || role.checkRight("contacts")) ? [{
       label: "Kontakte",
       defaultOpen: false,
       icon: "i-heroicons-user-group",
@@ -242,7 +242,7 @@ const links = computed(() => {
         {
           label: "Abrechnung",
           to: "https://billing.stripe.com/p/login/cN29Eb32Vdx0gOk288",
-          icon: "i-heroicons-clipboard-document-list",
+          icon: "i-heroicons-document-currency-euro",
           target: "_blank"
         },{
           label: "Nummernkreise",
@@ -251,15 +251,15 @@ const links = computed(() => {
         },{
           label: "Rollen",
           to: "/roles",
-          icon: "i-heroicons-clipboard-document-list"
+          icon: "i-heroicons-key"
         },{
           label: "E-Mail Konten",
           to: "/settings/emailAccounts",
-          icon: "i-heroicons-clipboard-document-list"
+          icon: "i-heroicons-envelope"
         },{
           label: "Bankkonten",
           to: "/settings/banking",
-          icon: "i-heroicons-clipboard-document-list"
+          icon: "i-heroicons-currency-euro"
         },{
           label: "Text Vorlagen",
           to: "/settings/texttemplates",
@@ -271,7 +271,7 @@ const links = computed(() => {
         },*/{
           label: "Firmeneinstellungen",
           to: "/settings/tenant",
-          icon: "i-heroicons-clipboard-document-list"
+          icon: "i-heroicons-building-office"
         },{
           label: "Projekttypen",
           to: "/projecttypes",

From ada3143ffb107aaf27acfcfcf2a209f9d1f7c5e0 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 20 Jan 2025 09:58:03 +0100
Subject: [PATCH 100/104] Removed Unused

---
 pages/settings/tenant.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pages/settings/tenant.vue b/pages/settings/tenant.vue
index b99d2b7..e38ac23 100644
--- a/pages/settings/tenant.vue
+++ b/pages/settings/tenant.vue
@@ -39,10 +39,6 @@ setupPage()
     :items="[
         {
           label: 'Rechnung & Kontakt'
-        }/*,{
-          label: 'Lizenz'
-        }*/,{
-          label: 'Funktionen'
         }
     ]"
   >

From 830e5d36024b7eac4ab007c097b75d28a92ce08f Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 20 Jan 2025 09:58:25 +0100
Subject: [PATCH 101/104] Introduced Functions Composable

---
 composables/useFunctions.js          |  27 +++++
 pages/workingtimes/evaluate/[id].vue | 151 ++++++++++++++-------------
 2 files changed, 106 insertions(+), 72 deletions(-)
 create mode 100644 composables/useFunctions.js

diff --git a/composables/useFunctions.js b/composables/useFunctions.js
new file mode 100644
index 0000000..31f30f9
--- /dev/null
+++ b/composables/useFunctions.js
@@ -0,0 +1,27 @@
+import axios from "axios";
+import dayjs from "dayjs";
+
+const baseURL = "https://functions.fedeo.io"
+
+export const useFunctions = () => {
+    const supabase = useSupabaseClient()
+
+    const getWorkingTimesEvaluationData = async (profileId, startDate, endDate) => {
+        const {data:{session:{access_token}}} = await supabase.auth.getSession()
+
+        return (await axios({
+            method: "POST",
+            url: `${baseURL}/functions/workingtimeevaluation`,
+            data: {
+                profile: profileId,
+                startDate: dayjs(startDate).format("YYYY-MM-DD"),
+                endDate: dayjs(endDate).format("YYYY-MM-DD"),
+            },
+            headers: {
+                Authorization: `Bearer ${access_token}`
+            }
+        })).data
+    }
+
+    return {getWorkingTimesEvaluationData}
+}
\ No newline at end of file
diff --git a/pages/workingtimes/evaluate/[id].vue b/pages/workingtimes/evaluate/[id].vue
index f435ac6..99dc7f4 100644
--- a/pages/workingtimes/evaluate/[id].vue
+++ b/pages/workingtimes/evaluate/[id].vue
@@ -6,6 +6,7 @@ import isBetween from "dayjs/plugin/isBetween";
 import isSameOrAfter from "dayjs/plugin/isSameOrAfter"
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore"
 import {useCreateWorkingTimesPdf} from "~/composables/useWorkingTimePDFGenerator.js";
+import {useFunctions} from "~/composables/useFunctions.js";
 dayjs.extend(customParseFormat)
 dayjs.extend(isoWeek)
 dayjs.extend(isBetween)
@@ -26,17 +27,26 @@ const oldItemInfo = ref({})
 const workingtimes = ref([])
 const absencerequests = ref([])
 
+const workingTimeInfo = ref(null)
+const selectedPresetRange = ref("Dieser Monat")
+const selectedStartDay = ref("")
+const selectedEndDay = ref("")
 
 const setupPage = async () => {
   if(route.params.id) itemInfo.value = profileStore.getProfileById(route.params.id)
   if(itemInfo.value.id) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
   workingtimes.value = (await supabase.from("workingtimes").select().eq("profile",itemInfo.value.id).order("startDate",{ascending:false})).data
   absencerequests.value = (await supabase.from("absencerequests").select().eq("profile",itemInfo.value.id).order("startDate",{ascending: false})).data
+
+  await loadWorkingTimeInfo()
+
+}
+
+const loadWorkingTimeInfo = async () => {
+  workingTimeInfo.value = await useFunctions().getWorkingTimesEvaluationData(route.params.id,selectedStartDay.value,selectedEndDay.value)
+  openTab.value = 0
 }
 
-const selectedPresetRange = ref("Dieser Monat")
-const selectedStartDay = ref("")
-const selectedEndDay = ref("")
 
 const changeRange = () => {
   let selector = "M"
@@ -68,9 +78,10 @@ const changeRange = () => {
   selectedEndDay.value = dayjs().subtract(subtract,selector === "isoWeek" ? "week" : selector).endOf(selector).format("YYYY-MM-DD")
 
   openTab.value = 0
+  loadWorkingTimeInfo()
 }
 
-const workingTimeInfo = computed(() => {
+/*const workingTimeInfo = computed(() => {
 
   let times = workingtimes.value
 
@@ -168,7 +179,7 @@ const workingTimeInfo = computed(() => {
     saldoInOfficial,
     times,
   }
-})
+})*/
 
 const getDuration = (time) => {
   const minutes = Math.floor(dayjs(time.endDate).diff(dayjs(time.startDate),'minutes',true))
@@ -281,7 +292,7 @@ changeRange()
           />
 
           <template #panel="{ close }">
-            <LazyDatePicker v-model="selectedStartDay" @close="openTab = 0" />
+            <LazyDatePicker v-model="selectedStartDay" @close="loadWorkingTimeInfo" />
           </template>
         </UPopover>
       </UFormGroup>
@@ -293,43 +304,44 @@ changeRange()
           />
 
           <template #panel="{ close }">
-            <LazyDatePicker v-model="selectedEndDay" @close="openTab = 0" />
+            <LazyDatePicker v-model="selectedEndDay" @close="loadWorkingTimeInfo" />
           </template>
         </UPopover>
       </UFormGroup>
     </template>
   </UDashboardToolbar>
-  <UTabs
-      :items="[{label: 'Information'},{label: 'Bericht'}]"
-      class="p-5 h-100"
-      @change="onTabChange"
-      v-model="openTab"
-  >
-    <template #item="{item}">
-      <div v-if="item.label === 'Information'">
-        <UCard class="truncate my-5">
-          <template #header>
-            Zusammenfassung
-          </template>
-          <p>Eingreicht: {{Math.floor(workingTimeInfo.sumWorkingMinutesEingereicht/60)}}:{{String(workingTimeInfo.sumWorkingMinutesEingereicht % 60).padStart(2,"0")}} h</p>
-          <p>Genehmigt: {{Math.floor(workingTimeInfo.sumWorkingMinutesApproved/60)}}:{{String(workingTimeInfo.sumWorkingMinutesApproved % 60).padStart(2,"0")}} h</p>
-          <p>Feiertagsausgleich: {{Math.floor(workingTimeInfo.sumWorkingMinutesRecreationDays/60)}}:{{String(workingTimeInfo.sumWorkingMinutesRecreationDays % 60).padStart(2,"0")}} h / {{workingTimeInfo.sumRecreationDays}} Tage</p>
-          <p>Urlaubs-/Berufsschulausgleich: {{Math.floor(workingTimeInfo.sumWorkingMinutesVacationDays/60)}}:{{String(workingTimeInfo.sumWorkingMinutesVacationDays % 60).padStart(2,"0")}} h / {{workingTimeInfo.sumVacationDays}} Tage</p>
-          <p>Soll Stunden: {{Math.floor(workingTimeInfo.workingMinutesTarget/60)}}:{{String(workingTimeInfo.workingMinutesTarget % 60 ).padStart(2,"0")}} h</p>
+  <UDashboardPanelContent>
+    <UTabs
+        :items="[{label: 'Information'},{label: 'Bericht'}]"
+        @change="onTabChange"
+        v-model="openTab"
+    >
+      <template #item="{item}">
+        <div v-if="item.label === 'Information'">
+          <UCard class="truncate my-5" v-if="workingTimeInfo">
+            <template #header>
+              Zusammenfassung
+            </template>
+            <p>Eingreicht: {{Math.floor(workingTimeInfo.sumWorkingMinutesEingereicht/60)}}:{{String(workingTimeInfo.sumWorkingMinutesEingereicht % 60).padStart(2,"0")}} h</p>
+            <p>Genehmigt: {{Math.floor(workingTimeInfo.sumWorkingMinutesApproved/60)}}:{{String(workingTimeInfo.sumWorkingMinutesApproved % 60).padStart(2,"0")}} h</p>
+            <p>Feiertagsausgleich: {{Math.floor(workingTimeInfo.sumWorkingMinutesRecreationDays/60)}}:{{String(workingTimeInfo.sumWorkingMinutesRecreationDays % 60).padStart(2,"0")}} h / {{workingTimeInfo.sumRecreationDays}} Tage</p>
+            <p>Urlaubs-/Berufsschulausgleich: {{Math.floor(workingTimeInfo.sumWorkingMinutesVacationDays/60)}}:{{String(workingTimeInfo.sumWorkingMinutesVacationDays % 60).padStart(2,"0")}} h / {{workingTimeInfo.sumVacationDays}} Tage</p>
+            <p>Soll Stunden: {{Math.floor(workingTimeInfo.workingMinutesTarget/60)}}:{{String(workingTimeInfo.workingMinutesTarget % 60 ).padStart(2,"0")}} h</p>
 
-          <!--         <p>Abwesend: </p>
+            <!--         <p>Abwesend: </p>
 
-                   <p>Ausgleich:</p>
-         -->
-          <p>Inoffizielles Saldo(eingereichte Stunden): {{Math.sign(workingTimeInfo.saldoInOfficial) === 1 ? "" : "-"}}{{Math.floor(Math.abs(workingTimeInfo.saldoInOfficial/60))}}:{{String(Math.abs(workingTimeInfo.saldoInOfficial)  % 60).padStart(2,"0")}} h</p>
-          <p>Saldo(genehmigte Stunden): {{Math.sign(workingTimeInfo.saldo) === 1 ? "" : "-"}}{{Math.floor(Math.abs(workingTimeInfo.saldo/60))}}:{{String(Math.abs(workingTimeInfo.saldo)  % 60).padStart(2,"0")}} h</p>
-        </UCard>
+                     <p>Ausgleich:</p>
+           -->
+            <p>Inoffizielles Saldo(eingereichte Stunden): {{Math.sign(workingTimeInfo.saldoInOfficial) === 1 ? "" : "-"}}{{Math.floor(Math.abs(workingTimeInfo.saldoInOfficial/60))}}:{{String(Math.abs(workingTimeInfo.saldoInOfficial)  % 60).padStart(2,"0")}} h</p>
+            <p>Saldo(genehmigte Stunden): {{Math.sign(workingTimeInfo.saldo) === 1 ? "" : "-"}}{{Math.floor(Math.abs(workingTimeInfo.saldo/60))}}:{{String(Math.abs(workingTimeInfo.saldo)  % 60).padStart(2,"0")}} h</p>
+          </UCard>
 
-        <div style="overflow-y: scroll; height: 45vh">
-          <UTable
-              :rows="workingTimeInfo.times"
-              @select="(row) => router.push(`/workingtimes/edit/${row.id}`)"
-              :columns="[
+          <div style="overflow-y: scroll; height: 45vh">
+            <UTable
+                v-if="workingTimeInfo"
+                :rows="workingTimeInfo.times"
+                @select="(row) => router.push(`/workingtimes/edit/${row.id}`)"
+                :columns="[
                 {
                   key: 'state',
                   label: 'Status'
@@ -350,45 +362,40 @@ changeRange()
                   label: 'Notizen'
                 }
             ]"
-          >
-            <template #profile-data="{row}">
-              {{profileStore.profiles.find(profile => profile.id === row.profile) ? profileStore.profiles.find(profile => profile.id === row.profile).fullName : row.profile }}
-            </template>
-            <template #approved-data="{row}">
-              <span v-if="row.approved" class="text-primary-500">Ja</span>
-              <span v-else class="text-rose-600">Nein</span>
-            </template>
+            >
+              <template #profile-data="{row}">
+                {{profileStore.profiles.find(profile => profile.id === row.profile) ? profileStore.profiles.find(profile => profile.id === row.profile).fullName : row.profile }}
+              </template>
+              <template #approved-data="{row}">
+                <span v-if="row.approved" class="text-primary-500">Ja</span>
+                <span v-else class="text-rose-600">Nein</span>
+              </template>
+
+              <template #start-data="{row}">
+                {{dayjs(row.startDate).format("HH:mm DD.MM.YY")}} Uhr
+              </template>
+              <template #end-data="{row}">
+                {{dayjs(row.endDate).format("HH:mm DD.MM.YY")}} Uhr
+              </template>
+              <template #duration-data="{row}">
+                {{getDuration(row).composed}}
+              </template>
+            </UTable>
+          </div>
+
 
-            <template #start-data="{row}">
-              {{dayjs(row.startDate).format("HH:mm DD.MM.YY")}} Uhr
-            </template>
-            <template #end-data="{row}">
-              {{dayjs(row.endDate).format("HH:mm DD.MM.YY")}} Uhr
-            </template>
-            <template #duration-data="{row}">
-              {{getDuration(row).composed}}
-            </template>
-          </UTable>
         </div>
-
-
-      </div>
-      <div v-else-if="item.label === 'Bericht'">
-        <UProgress animation="carousel" v-if="!showDocument"/>
-        <object
-            :data="uri"
-            v-else
-            type="application/pdf"
-            class="w-full previewDocument"
-        />
-      </div>
-    </template>
-  </UTabs>
-
-
-  <UDashboardPanelContent>
-
-
+        <div v-else-if="item.label === 'Bericht'">
+          <UProgress animation="carousel" v-if="!showDocument"/>
+          <object
+              :data="uri"
+              v-else
+              type="application/pdf"
+              class="w-full previewDocument"
+          />
+        </div>
+      </template>
+    </UTabs>
   </UDashboardPanelContent>
 </template>
 

From 94d61a6d526b057e4e98694889deda853107f4ed Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 20 Jan 2025 10:07:30 +0100
Subject: [PATCH 102/104] Changed usenextnumber from supabase to fs

---
 composables/useFunctions.js          | 17 ++++++++++++++++-
 pages/createDocument/edit/[[id]].vue | 11 ++---------
 stores/data.js                       | 14 ++------------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/composables/useFunctions.js b/composables/useFunctions.js
index 31f30f9..0f4890e 100644
--- a/composables/useFunctions.js
+++ b/composables/useFunctions.js
@@ -23,5 +23,20 @@ export const useFunctions = () => {
         })).data
     }
 
-    return {getWorkingTimesEvaluationData}
+    const useNextNumber = async (numberRange) => {
+        const {data:{session:{access_token}}} = await supabase.auth.getSession()
+
+        return (await axios({
+            method: "POST",
+            url: `${baseURL}/functions/usenextnumber`,
+            data: {
+                numberRange: numberRange,
+            },
+            headers: {
+                Authorization: `Bearer ${access_token}`
+            }
+        })).data.usedNumber
+    }
+
+    return {getWorkingTimesEvaluationData, useNextNumber}
 }
\ No newline at end of file
diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 6fa4bc3..4774ef9 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -1,8 +1,8 @@
 <script setup>
 import dayjs from "dayjs"
 import Handlebars from "handlebars"
-import {useNumberRange} from "~/composables/useNumberRange.js";
 import { v4 as uuidv4 } from 'uuid';
+import {useFunctions} from "~/composables/useFunctions.js";
 
 const dataStore = useDataStore()
 const profileStore = useProfileStore()
@@ -804,14 +804,7 @@ const saveDocument = async (state,resetup = false) => {
       type = itemInfo.value.type
     }
 
-    const {data,error} = await supabase.functions.invoke("use_next_number",{
-      body: {
-        tenant: profileStore.currentTenant,
-        numberRange: type
-      }
-    })
-
-    itemInfo.value.documentNumber = data.usedNumber
+    itemInfo.value.documentNumber = await useFunctions().useNextNumber(type) //data.usedNumber
 
     setDocumentTypeConfig(false)
   }
diff --git a/stores/data.js b/stores/data.js
index ce433c0..92b93c2 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -34,6 +34,7 @@ import serviceCategories from "~/components/columnRenderings/serviceCategories.v
 
 import quantity from "~/components/helpRenderings/quantity.vue"
 import {useZipCheck} from "~/composables/useZipCheck.js";
+import {useFunctions} from "~/composables/useFunctions.js";
 
 // @ts-ignore
 export const useDataStore = defineStore('data', () => {
@@ -2192,19 +2193,8 @@ export const useDataStore = defineStore('data', () => {
         console.log(dataType)
         if(dataTypes[dataType].numberRangeHolder) {
 
-            const {data:numberRangeData,error} = await supabase.functions.invoke("use_next_number",{
-                body: {
-                    tenant: profileStore.currentTenant,
-                    numberRange: dataType
-                }
-            })
-
-            if(error){
-                console.log(error)
-            }
-
             if(!data[dataTypes[dataType].numberRangeHolder]) {
-                data[dataTypes[dataType].numberRangeHolder] = numberRangeData.usedNumber
+                data[dataTypes[dataType].numberRangeHolder] = await useFunctions().useNextNumber(dataType)
             }
 
 

From e655d9cecda3050c3fe4d5699c88e9e7d31a931d Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 20 Jan 2025 11:00:52 +0100
Subject: [PATCH 103/104] Cahngees in Cards

---
 components/displayIncomeAndExpenditure.vue | 1 +
 components/displayOpenBalances.vue         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/displayIncomeAndExpenditure.vue b/components/displayIncomeAndExpenditure.vue
index 19d50bd..736d963 100644
--- a/components/displayIncomeAndExpenditure.vue
+++ b/components/displayIncomeAndExpenditure.vue
@@ -77,6 +77,7 @@ const setup = async () => {
 
     amount = Number(amount.toFixed(2))
 
+    console.log(amount)
     return {
       id: i.id,
       date: dayjs(i.documentDate).format("DD-MM-YY"),
diff --git a/components/displayOpenBalances.vue b/components/displayOpenBalances.vue
index aad0c82..0e3f3ac 100644
--- a/components/displayOpenBalances.vue
+++ b/components/displayOpenBalances.vue
@@ -61,7 +61,7 @@ const calculateOpenSum = (statement) => {
 <template>
   <table>
     <tr>
-      <td>Offene Ausgangsbelege:</td>
+      <td>Offene Rechnungen:</td>
       <td
           v-if="unpaidInvoicesSum > 0"
           class="text-rose-600 font-bold text-nowrap"
@@ -69,7 +69,7 @@ const calculateOpenSum = (statement) => {
       <td v-else class="text-primary-500 font-bold text-no-wrap">0 Stk / 0,00€</td>
     </tr>
     <tr>
-      <td>Angelegte Entwürfe:</td>
+      <td>Angelegte Rechnungsentwürfe:</td>
       <td
           v-if="draftInvoicesSum > 0"
           class="text-rose-600 font-bold text-nowrap"

From 33818033a4189124cb61a320bdc9e55798c186e0 Mon Sep 17 00:00:00 2001
From: florianfederspiel <florian@fedeo.de>
Date: Mon, 20 Jan 2025 11:01:28 +0100
Subject: [PATCH 104/104] Changes

---
 pages/banking/statements/[mode]/[[id]].vue | 4 +++-
 pages/incomingInvoices/[mode]/[[id]].vue   | 2 +-
 pages/settings/emailAccounts.vue           | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/banking/statements/[mode]/[[id]].vue b/pages/banking/statements/[mode]/[[id]].vue
index e71339b..cea4294 100644
--- a/pages/banking/statements/[mode]/[[id]].vue
+++ b/pages/banking/statements/[mode]/[[id]].vue
@@ -109,10 +109,12 @@ const calculateAllocatedSum = computed(() => {
   let startingAmount = 0
 
   itemInfo.value.statementallocations.forEach(item => {
+    console.log(item)
+
     if(item.cd_id) {
       startingAmount = startingAmount + item.amount
     } else if(item.ii_id) {
-      startingAmount = Number(startingAmount) - item.amount
+      startingAmount = Number(startingAmount) + item.amount
     }
   })
 
diff --git a/pages/incomingInvoices/[mode]/[[id]].vue b/pages/incomingInvoices/[mode]/[[id]].vue
index 6813075..eb45123 100644
--- a/pages/incomingInvoices/[mode]/[[id]].vue
+++ b/pages/incomingInvoices/[mode]/[[id]].vue
@@ -57,7 +57,7 @@ const itemInfo = ref({
 //Functions
 const setupPage = async () => {
   if((mode.value === "show" || mode.value === "edit" ) && route.params.id){
-    itemInfo.value = await dataStore.getIncomingInvoiceById(Number(route.params.id))
+    itemInfo.value = await useSupabaseSelectSingle("incominginvoices",route.params.id)
     //currentDocument.value = await dataStore.getDocumentById(currentVendorInvoice.value.document)
   }
   console.log(itemInfo.value)
diff --git a/pages/settings/emailAccounts.vue b/pages/settings/emailAccounts.vue
index 1911a44..1d68a7d 100644
--- a/pages/settings/emailAccounts.vue
+++ b/pages/settings/emailAccounts.vue
@@ -98,7 +98,6 @@ const columns = computed(() => templateColumns.filter((column) => selectedColumn
       <template #right>
         <UTooltip title="In der Beta nicht verfügbar">
           <UButton
-              :disabled="true"
               @click="showEmailAddressModal = true"
           >
             + E-Mail Konto
@@ -115,10 +114,10 @@ const columns = computed(() => templateColumns.filter((column) => selectedColumn
     :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Keine E-Mail Konten anzuzeigen' }"
   >
     <template #profiles-data="{row}">
-      {{row.profiles.map(i => profiles.find(x => x.id === i).fullName).join(", ")}}
+      {{row.profiles}}
     </template>
     <template #mailboxes-data="{row}">
-      {{row.mailboxes.map(i => i.name).join(", ")}}
+      {{row.mailboxes}}
     </template>
   </UTable>
 </template>