Changes

components/OwnFields.vue

@@ -0,0 +1,23 @@
+<script setup>
+const props = defineProps({
+  resource: {
+    required: true,
+    type: String
+  },
+  elementId: {
+    required: true,
+    type: String
+  },
+  edit: {
+    type: Boolean
+  }
+})
+</script>
+
+<template>
+
+</template>
+
+<style scoped>
+
+</style>

components/ProfileDropdown.vue

@@ -5,6 +5,8 @@ const supabase = useSupabaseClient()
 //const tenant = ref(dataStore.currentTenant)
 
 const selectedProfile = ref(dataStore.activeProfile.id)
+
+
 </script>
 
 <template>

layouts/default.vue

@@ -372,6 +372,10 @@ let links = computed(() => {
           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",

nuxt.config.ts

@@ -6,6 +6,7 @@ export default defineNuxtConfig({
             enabled: true
         }
     },
+    ssr:false,
     imports: {
         dirs: ['stores']
     },

pages/contracts/[mode]/[[id]].vue

@@ -37,12 +37,15 @@ const itemInfo = ref({
   name: "",
   customer: null,
   active: true,
+  ownFields: {}
 })
 
 //Functions
 const setupPage = async () => {
-  if(mode.value === "show" || mode.value === "edit"){
+  if(mode.value === "show" ){
     itemInfo.value = await useSupabaseSelectSingle("contracts", route.params.id, "*, customer(id,name)")
+  } else if (mode.value === "edit"){
+    itemInfo.value = await useSupabaseSelectSingle("contracts", route.params.id, "*")
   }
 
 
@@ -110,6 +113,7 @@ setupPage()
       </UButton>
     </template>
   </UDashboardNavbar>
+  <UDashboardPanelContent>
     <UTabs
         v-if="itemInfo.id && mode === 'show'"
         :items="[{label: 'Informationen'}, {label: 'Dokumente'}]"
@@ -122,6 +126,7 @@ setupPage()
             <UCard>
               <div class="text-wrap">
                 <p>Kundennummer: <nuxt-link :to="`/customers/show/${itemInfo.customer.id}`">{{itemInfo.customer ? itemInfo.customer.name : ""}}</nuxt-link></p>
+                Eigene Felder: {{itemInfo.ownFields}}<br>
                 Beschreibung:<br>
                 {{itemInfo.description}}<br>
               </div>
@@ -142,7 +147,7 @@ setupPage()
 
 
 
-<!--        <UBadge
+          <!--        <UBadge
                       v-if="itemInfo.active"
                   >
                     Vertrag aktiv
@@ -393,6 +398,30 @@ setupPage()
               maxrows="12"
           />
         </UFormGroup>
+
+        <div
+            v-if="dataStore.ownTenant.ownFields"
+        >
+          <UDivider
+              class="mt-3"
+          >Eigene Felder</UDivider>
+
+          <UFormGroup
+              v-for="field in dataStore.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>
 
 
@@ -400,6 +429,8 @@ setupPage()
 
 
     </UForm>
+  </UDashboardPanelContent>
+
 </template>
 
 <style scoped>

pages/customers/[mode]/[[id]].vue

@@ -58,15 +58,6 @@ const editItem = async () => {
   await router.push(`/customers/edit/${itemInfo.value.id}`)
 }
 
-const cancelEditorCreate = () => {
-  if(itemInfo.value) {
-    router.push(`/customers/show/${itemInfo.value.id}`)
-  } else {
-    router.push(`/customers`)
-  }
-
-}
-
 const setCityByZip = async () => {
     itemInfo.value.infoData.city = await useZipCheck(itemInfo.value.infoData.zip)
 }
@@ -108,7 +99,7 @@ setupPage()
         Erstellen
       </UButton>
       <UButton
-          @click="cancelEditorCreate"
+          @click="itemInfo ? router.push(`/customers/show/${itemInfo.id}`) : router.push(`/customers`)"
           color="red"
           class="ml-2"
           v-if="mode === 'edit' || mode === 'create'"

pages/index.vue

@@ -20,13 +20,14 @@
         >
           <p v-for="time in dataStore.getStartedWorkingTimes()"><UIcon name="i-heroicons-check"/>{{dataStore.getProfileById(time.profile).fullName}}</p>
         </UDashboardCard>
-<!--        <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 === dataStore.activeProfile.id ||!i.profile))"
+            @select="(row) => router.push(`/tasks/show/${row.id}`)"
             :columns="[
                 {
                   key: 'categorie',
@@ -36,7 +37,13 @@
                   label: 'Name'
                 },
             ]"
-          ></UTable>
+          >
+            <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>-->
 
       </UDashboardPanelContent>
@@ -51,6 +58,7 @@ definePageMeta({
 
 const dataStore = useDataStore()
 const toast = useToast()
+const router = useRouter()
 
 const { isNotificationsSlideoverOpen } = useDashboard()
 const items = [[{

pages/tasks/[mode]/[[id]].vue

@@ -9,8 +9,6 @@ const router = useRouter()
 const toast = useToast()
 const id = ref(route.params.id ? route.params.id : null )
 
-let currentItem = ref(null)
-
 //Working
 const mode = ref(route.params.mode || "show")
 const itemInfo = ref({
@@ -22,11 +20,9 @@ const categories = ["Offen", "In Bearbeitung", "Dringed", "Erledigt"]
 //Functions
 const setupPage = () => {
   if(mode.value === "show" || mode.value === "edit"){
-    currentItem.value = dataStore.getTaskById(Number(useRoute().params.id))
+    itemInfo.value = dataStore.getTaskById(Number(useRoute().params.id))
   }
 
-  if(mode.value === "edit") itemInfo.value = currentItem.value
-
   if(mode.value === "create") {
     let query = route.query
     if(query.project) itemInfo.value.project = Number(query.project)
@@ -34,17 +30,17 @@ const setupPage = () => {
 
   }
 
-  if(currentItem.value) oldItemInfo.value = JSON.parse(JSON.stringify(currentItem.value))
+  if(itemInfo.value) oldItemInfo.value = JSON.parse(JSON.stringify(itemInfo.value))
 }
 
 
 const editItem = async () => {
-  router.push(`/tasks/edit/${currentItem.value.id}`)
+  router.push(`/tasks/edit/${itemInfo.value.id}`)
 }
 
 const cancelEditorCreate = () => {
-  if(currentItem.value) {
+  if(itemInfo.value) {
-    router.push(`/tasks/show/${currentItem.value.id}`)
+    router.push(`/tasks/show/${itemInfo.value.id}`)
   } else {
     router.push(`/tasks/`)
   }
@@ -55,7 +51,23 @@ setupPage()
 </script>
 
 <template>
-  <UDashboardNavbar :title="currentItem ? currentItem.name : (mode === 'create' ? 'Aufgabe erstellen' : 'Aufgabe bearbeiten')">
+  <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'"
@@ -87,7 +99,7 @@ setupPage()
   </UDashboardNavbar>
   <UTabs
       :items="[{label: 'Informationen'},{label: 'Logbuch'}]"
-      v-if="currentItem && mode === 'show'"
+      v-if="itemInfo && mode === 'show'"
       class="p-5"
   >
     <template #item="{item}">
@@ -96,17 +108,17 @@ setupPage()
 
 
           <div class="truncate">
-            <p>Kategorie: {{currentItem.categorie}}</p>
+            <p>Kategorie: {{itemInfo.categorie}}</p>
-            <p v-if="currentItem.project">Projekt: <nuxt-link :to="`/projects/show/${currentItem.project}`">{{dataStore.getProjectById(currentItem.project).name}}</nuxt-link></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="currentItem.description"></pre></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="currentItem"
+              v-if="itemInfo"
-              :element-id="currentItem.id"
+              :element-id="itemInfo.id"
           />
         </div>
       </UCard>