Changed to new Layout System

spaces/pages/absenceRequests/[mode]/[[id]].vue

@@ -6,13 +6,12 @@ definePageMeta({
 })
 
 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 )
 
-let currentItem = null
+let currentItem = ref(null)
 
 //Working
 const mode = ref(route.params.mode || "show")
@@ -37,13 +36,10 @@ const absenceReasons = [
 //Functions
 const setupPage = () => {
   if(mode.value === "show" || mode.value === "edit"){
-    currentItem = dataStore.getAbsenceRequestById(Number(useRoute().params.id))
+    currentItem.value = dataStore.getAbsenceRequestById(Number(useRoute().params.id))
   }
 
-  if(mode.value === "edit") itemInfo.value = currentItem
-
-
-
+  if(mode.value === "edit") itemInfo.value = currentItem.value
 }
 
 const editItem = async () => {
@@ -52,175 +48,147 @@ const editItem = async () => {
 }
 
 const cancelEditorCreate = () => {
-  mode.value = "show"
-  itemInfo.value = {
-    id: 0,
-    infoData: {}
+  if(currentItem.value) {
+    router.push(`/tasks/show/${currentItem.value.id}`)
+  } else {
+    router.push(`/tasks/`)
   }
 }
-
-const updateItem = async () => {
-  const {error} = await supabase
-      .from("absenceRequests")
-      .update(itemInfo.value)
-      .eq('id',itemInfo.value.id)
-
-  if(error) {
-    console.log(error)
-  }
-
-
-  router.push(`/employees/absenceRequests/show/${currentItem.id}`)
-  toast.add({title: "Abwesenheit erfolgreich gespeichert"})
-  dataStore.fetchAbsenceRequests()
-}
-
-
-
 setupPage()
 </script>
 
 <template>
-  <div>
-    <UCard v-if="currentItem && mode == 'show'" >
-      <template #header>
-        <UBadge
-            v-if="currentItem.approved === 'Offen'"
-            color="blue"
-        >{{currentItem.approved}}</UBadge>
-        <UBadge
-            v-else-if="currentItem.approved === 'Genehmigt'"
-            color="primary"
-        >{{currentItem.approved}}</UBadge>
-        <UBadge
-            v-else-if="currentItem.approved === 'Abgelehnt'"
-            color="rose"
-        >{{currentItem.approved}}</UBadge>
-
-
-
-        {{currentItem.reason}}
-      </template>
-
-      <span>Mitarbeiter: {{dataStore.profiles.find(item => item.id === currentItem.user) ? dataStore.profiles.find(item => item.id === currentItem.user).fullName : ""}}<br></span>
-      <span>Start: {{dayjs(currentItem.start).format("DD.MM.YYYY")}}<br></span>
-      <span>Ende: {{dayjs(currentItem.end).format("DD.MM.YYYY")}}<br></span>
-
-      Notizen:<br>
-      {{currentItem.note}}<br>
-
-
-
-
-
-      <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 v-if="mode === 'edit'">
-        {{itemInfo.reason}}
-      </template>
-
-      <UFormGroup
-          label="Status:"
+  <UDashboardNavbar :title="currentItem ? currentItem.name : (mode === 'create' ? 'Abwesenheit erstellen' : 'Abwesenheit bearbeiten')">
+    <template #right>
+      <UButton
+          v-if="mode === 'edit'"
+          @click="dataStore.updateItem('tasks',itemInfo)"
       >
-        <USelectMenu
-            v-model="itemInfo.approved"
-            :options="states"
-            option-attribute="label"
-            value-attribute="value"
-        />
-      </UFormGroup>
-
-      <UFormGroup
-          label="Grund:"
+        Speichern
+      </UButton>
+      <UButton
+          v-else-if="mode === 'create'"
+          @click="dataStore.createNewItem('tasks',itemInfo)"
       >
-        <USelectMenu
-            v-model="itemInfo.reason"
-            :options="absenceReasons"
-        />
-      </UFormGroup>
-
-      <UFormGroup
-          label="Mitarbeiter:"
+        Erstellen
+      </UButton>
+      <UButton
+          @click="cancelEditorCreate"
+          color="red"
+          class="ml-2"
+          v-if="mode === 'edit' || mode === 'create'"
       >
-        <USelectMenu
-            v-model="itemInfo.user"
-            :options="dataStore.profiles"
-            option-attribute="fullName"
-            value-attribute="id"
-            searchable
-            :search-attributes="['fullName']"
-        >
-          <template #label>
-            {{dataStore.profiles.find(item => item.id === itemInfo.user) ? dataStore.profiles.find(item => item.id === 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'" />
-
-          <template #panel="{ close }">
-            <LazyDatePicker v-model="itemInfo.start" @close="close" />
-          </template>
-        </UPopover>
-      </UFormGroup>
-
-      <UFormGroup label="Ende:">
-        <UPopover :popper="{ placement: 'bottom-start' }">
-          <UButton 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:"
+        Abbrechen
+      </UButton>
+      <UButton
+          v-if="mode === 'show'"
+          @click="editItem"
       >
-        <UTextarea
-            v-model="itemInfo.note"
-        />
-      </UFormGroup>
+        Bearbeiten
+      </UButton>
+    </template>
+    <template #badge v-if="currentItem">
+      <UBadge
+          v-if="currentItem.approved === 'Offen'"
+          color="blue"
+      >{{currentItem.approved}}</UBadge>
+      <UBadge
+          v-else-if="currentItem.approved === 'Genehmigt'"
+          color="primary"
+      >{{currentItem.approved}}</UBadge>
+      <UBadge
+          v-else-if="currentItem.approved === 'Abgelehnt'"
+          color="rose"
+      >{{currentItem.approved}}</UBadge>
+    </template>
+  </UDashboardNavbar>
+  <UTabs
+      :items="[{label: 'Informationen'}]"
+      v-if="currentItem && mode == 'show'"
+      class="p-5"
+  >
+    <template #item="{item}">
+      <UCard class="mt-5">
+        <div v-if="item.label === 'Informationen'">
+          <div class="truncate">
+            <p>Mitarbeiter: {{dataStore.profiles.find(item => item.id === currentItem.user) ? dataStore.profiles.find(item => item.id === currentItem.user).fullName : ""}}</p>
+            <p>Start: {{dayjs(currentItem.start).format("DD.MM.YYYY")}}</p>
+            <p>Ende: {{dayjs(currentItem.end).format("DD.MM.YYYY")}}</p>
+            <p>Grund: {{currentItem.reason}}</p>
+            <p>Notizen: {{currentItem.notes}}</p>
+          </div>
+        </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"
+          option-attribute="label"
+          value-attribute="value"
+      />
+    </UFormGroup>
+
+    <UFormGroup
+        label="Grund:"
+    >
+      <USelectMenu
+          v-model="itemInfo.reason"
+          :options="absenceReasons"
+      />
+    </UFormGroup>
+
+    <UFormGroup
+        label="Mitarbeiter:"
+    >
+      <USelectMenu
+          v-model="itemInfo.user"
+          :options="dataStore.profiles"
+          option-attribute="fullName"
+          value-attribute="id"
+          searchable
+          :search-attributes="['fullName']"
+      >
+        <template #label>
+          {{dataStore.profiles.find(item => item.id === itemInfo.user) ? dataStore.profiles.find(item => item.id === 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'" />
+
+        <template #panel="{ close }">
+          <LazyDatePicker v-model="itemInfo.start" @close="close" />
+        </template>
+      </UPopover>
+    </UFormGroup>
+
+    <UFormGroup label="Ende:">
+      <UPopover :popper="{ placement: 'bottom-start' }">
+        <UButton 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>
 
 
-      <template #footer>
-        <UButton
-            v-if="mode == 'edit'"
-            @click="updateItem"
-        >
-          Speichern
-        </UButton>
-        <UButton
-            v-else-if="mode == 'create'"
-            @click="dataStore.createNewItem('absenceRequests', itemInfo)"
-        >
-          Erstellen
-        </UButton>
-        <UButton
-            @click="cancelEditorCreate"
-            color="red"
-            class="ml-2"
-        >
-          Abbrechen
-        </UButton>
-      </template>
+    <UFormGroup
+        label="Notizen:"
+    >
+      <UTextarea
+          v-model="itemInfo.note"
+      />
+    </UFormGroup>
 
-    </UCard>
-  </div>
+  </UForm>
 </template>
 
 <style scoped>

spaces/pages/absenceRequests/index.vue

@@ -1,37 +1,69 @@
 <template>
-  <div id="main">
+  <UDashboardNavbar title="Abwesenheiten" :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(`/employees/absenceRequests/create/`)">+ Abwesenheit</UButton>
+      <UButton @click="router.push(`/absenceRequests/create`)">+ Abwesenheit</UButton>
+    </template>
+  </UDashboardNavbar>
 
-    <UTable
-        :rows="dataStore.absenceRequests"
-        :columns="columns"
-        @select="selectItem"
-        :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }"
-    >
-      <template #approved-data="{row}">
+  <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"
-        >
+      <span
+          v-else-if="row.approved"
+          class="text-primary"
+      >
           Genemigt
         </span>
-        <span
-            v-else
-            class="text-rose"
-        >
+      <span
+          v-else
+          class="text-rose"
+      >
           Abgelehnt
         </span>
-      </template>
-      <template #user-data="{row}">
-        {{dataStore.profiles.find(profile => profile.id === row.user) ? dataStore.profiles.find(profile => profile.id === row.user).fullName : ""}}
-      </template>
-    </UTable>
-
-  </div>
+    </template>
+    <template #user-data="{row}">
+      {{dataStore.profiles.find(profile => profile.id === row.user) ? dataStore.profiles.find(profile => profile.id === row.user).fullName : ""}}
+    </template>
+  </UTable>
 </template>
 
 <script setup>
@@ -40,11 +72,21 @@ definePageMeta({
   middleware: "auth"
 })
 
+defineShortcuts({
+  '/': () => {
+    //console.log(searchinput)
+    //searchinput.value.focus()
+    document.getElementById("searchinput").focus()
+  },
+  '+': () => {
+    router.push("/absenceRequests/create")
+  }
+})
+
 const dataStore = useDataStore()
 const router = useRouter()
-const mode = ref("show")
 
-const columns = [
+const templateColumns = [
   {
     key: "approved",
     label: "Genehmigt",
@@ -73,10 +115,24 @@ const columns = [
   }
 ]
 
+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())
+    })
+  })
+})
 
-const selectItem = (item) => {
-  router.push(`/employees/absenceRequests/show/${item.id} `)
-}
 </script>
 
 <style scoped>