Fix Banking and Profiles

frontend/components/EntityEdit.vue

@@ -174,6 +174,49 @@ const setupQuery = () => {
 setupQuery()
 
 const loadedOptions = ref({})
+
+const normalizeSelectFieldValue = (value, isMultiple = false) => {
+  if (isMultiple) {
+    if (!Array.isArray(value)) return []
+
+    return value.map((entry) => {
+      if (entry && typeof entry === "object" && "id" in entry) {
+        return entry.id
+      }
+
+      return entry
+    })
+  }
+
+  if (value && typeof value === "object" && "id" in value) {
+    return value.id
+  }
+
+  return value
+}
+
+const normalizeLoadedSelectValues = () => {
+  dataType.templateColumns.forEach((datapoint) => {
+    if (datapoint.inputType !== "select") return
+
+    if (datapoint.key.includes(".")) {
+      const [parentKey, childKey] = datapoint.key.split(".")
+      if (!item.value[parentKey]) return
+
+      item.value[parentKey][childKey] = normalizeSelectFieldValue(
+        item.value[parentKey][childKey],
+        datapoint.selectMultiple
+      )
+      return
+    }
+
+    item.value[datapoint.key] = normalizeSelectFieldValue(
+      item.value[datapoint.key],
+      datapoint.selectMultiple
+    )
+  })
+}
+
 const loadOptions = async () => {
   let optionsToLoad = dataType.templateColumns.filter(i => i.selectDataType).map(i => {
     return {
@@ -198,6 +241,7 @@ const loadOptions = async () => {
 }
 
 loadOptions()
+normalizeLoadedSelectValues()
 
 const contentChanged = (content, datapoint) => {
   if (datapoint.key.includes(".")) {

frontend/components/StandardEntityModal.vue

@@ -75,7 +75,7 @@ setupPage()
           :type="props.type"
           :item="item"
           :inModal="true"
-          @return-data="(data) => emit('return-data',data)"
+          @return-data="(data) => emit('returnData', data)"
           :createQuery="props.createQuery"
           :mode="props.mode"
       />

frontend/pages/banking/statements/[mode]/[[id]].vue

@@ -582,20 +582,20 @@ setup()
                 <div class="flex gap-1">
                   <USelectMenu
                       class="w-full"
-                      :options="accounts"
-                      value-attribute="id"
-                      option-attribute="label"
+                      :items="accounts"
+                      value-key="id"
+                      label-key="label"
                       v-model="accountToSave"
-                      searchable
-                      :search-attributes="['number','label']"
+                      :search-input="{ placeholder: 'Konto suchen...' }"
+                      :filter-fields="['number','label']"
                       placeholder="Konto suchen..."
                   >
-                    <template #label>
+                    <template #default>
                       <span v-if="accountToSave"
                             class="truncate">{{ accounts.find(i => i.id === accountToSave).number }} - {{ accounts.find(i => i.id === accountToSave).label }}</span>
                       <span v-else>Direkt verbuchen...</span>
                     </template>
-                    <template #option="{option}">
+                    <template #item-label="{ item: option }">
                       <span class="font-mono text-xs text-gray-500 mr-2">{{ option.number }}</span> {{ option.label }}
                     </template>
                   </USelectMenu>
@@ -620,21 +620,21 @@ setup()
 
           <div v-if="showMoreWithoutRecipe"
                class="mt-4 p-3 bg-gray-50 dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 grid grid-cols-1 md:grid-cols-3 gap-3">
-            <USelectMenu :options="ownaccounts" value-attribute="id" option-attribute="name" v-model="ownAccountToSave"
-                         searchable placeholder="Eigenes Konto">
-              <template #label>
+            <USelectMenu :items="ownaccounts" value-key="id" label-key="name" v-model="ownAccountToSave"
+                         :search-input="{ placeholder: 'Eigenes Konto' }" :filter-fields="['number','name']" placeholder="Eigenes Konto">
+              <template #default>
                 {{ ownAccountToSave ? ownaccounts.find(i => i.id === ownAccountToSave).name : 'Eigenes Konto' }}
               </template>
             </USelectMenu>
-            <USelectMenu :options="customers" value-attribute="id" option-attribute="name"
-                         v-model="customerAccountToSave" searchable placeholder="Kunde (Guthaben)">
-              <template #label>
+            <USelectMenu :items="customers" value-key="id" label-key="name"
+                         v-model="customerAccountToSave" :search-input="{ placeholder: 'Kunde (Guthaben)' }" :filter-fields="['name','customerNumber']" placeholder="Kunde (Guthaben)">
+              <template #default>
                 {{ customerAccountToSave ? customers.find(i => i.id === customerAccountToSave).name : 'Kunde' }}
               </template>
             </USelectMenu>
-            <USelectMenu :options="vendors" value-attribute="id" option-attribute="name" v-model="vendorAccountToSave"
-                         searchable placeholder="Lieferant (Guthaben)">
-              <template #label>
+            <USelectMenu :items="vendors" value-key="id" label-key="name" v-model="vendorAccountToSave"
+                         :search-input="{ placeholder: 'Lieferant (Guthaben)' }" :filter-fields="['name','vendorNumber']" placeholder="Lieferant (Guthaben)">
+              <template #default>
                 {{ vendorAccountToSave ? vendors.find(i => i.id === vendorAccountToSave).name : 'Lieferant' }}
               </template>
             </USelectMenu>

frontend/pages/createDocument/edit/[[id]].vue

@@ -2707,7 +2707,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                         :disabled="itemInfo.type === 'cancellationInvoices'"
                         type="number"
                         :step="units.find(i => i.id === row.unit) ? units.find(i => i.id === row.unit).step : '1' "
-                        class="w-full"
+                        class="w-20"
 
                     />
                   </td>
@@ -2738,7 +2738,7 @@ const setRowData = async (row, service = {sellingPriceComposed: {}}, product = {
                         type="number"
                         step="0.001"
                         @change="updateCustomSurcharge"
-                        class="w-full"
+                        class="w-30"
                     >
                       <template #leading>
                         <span class="text-gray-500 dark:text-gray-400 text-xs">EUR</span>

frontend/pages/staff/profiles/index.vue

@@ -1,11 +1,39 @@
 <script setup>
   const router = useRouter()
+  const toast = useToast()
 
   const items = ref([])
+  const pending = ref(true)
+
+  const mapProfileRow = (user) => {
+    const profile = user?.profile || {}
+
+    return {
+      id: profile?.id || null,
+      employee_number: profile?.employee_number || '',
+      full_name: profile?.full_name || user?.full_name || user?.email || 'Ohne Profil',
+      email: user?.email || profile?.email || ''
+    }
+  }
 
   const setupPage = async () => {
-    items.value = (await useNuxtApp().$api("/api/tenant/users")).users
-    items.value = items.value.map(i => i.profile)
+    pending.value = true
+
+    try {
+      const response = await useNuxtApp().$api("/api/tenant/users")
+      items.value = (response?.users || [])
+        .map(mapProfileRow)
+        .filter((item) => !!item.id)
+    } catch (err) {
+      console.error('[staff/profiles/index]', err)
+      items.value = []
+      toast.add({
+        title: 'Profile konnten nicht geladen werden',
+        color: 'error'
+      })
+    } finally {
+      pending.value = false
+    }
   }
 
   setupPage()
@@ -31,7 +59,7 @@
   <UDashboardNavbar title="Benutzer Einstellungen">
       <template #right>
         <UButton
-          @click="router.push(`/profiles/create`)"
+          @click="router.push(`/staff/profiles/create`)"
           disabled
         >
           + Mitarbeiter
@@ -41,9 +69,14 @@
   <UTable
     :data="items"
     :columns="normalizeTableColumns(columns)"
-    :on-select="(i) => navigateTo(`/staff/profiles/${i.id}`)"
+    :loading="pending"
+    :on-select="(row) => navigateTo(`/staff/profiles/${row.original?.id || row.id}`)"
   >
-
+    <template #empty>
+      <div class="py-10 text-center text-sm text-gray-500">
+        Keine Mitarbeiterprofile gefunden.
+      </div>
+    </template>
   </UTable>
 </template>