From bec95b9ec6f0a45e0d259b2d924d626704dbe60f Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 19 Dec 2025 12:24:32 +0100
Subject: [PATCH] combine first and last name fields and show alias underneath
 if exist

---
 .../src/components/Tables/OpenCreationsTable.vue |  9 +++++++++
 admin/src/pages/CreationConfirm.vue              | 16 ++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 94ddc7208..a774f74ea 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -34,6 +34,15 @@
           </BButton>
         </div>
       </template>
+      <template #cell(name)="row">
+        <span v-if="row.item.user">
+          {{ row.item.user.firstName }} {{ row.item.user.lastName }}
+          <small v-if="row.item.user.alias">
+            <hr />
+            {{ row.item.user.alias }}
+          </small>
+        </span>
+      </template>
       <template #cell(memo)="row">
         {{ row.value }}
         <small v-if="isAddCommentToMemo(row.item)">
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 7990b50f3..ea8414296 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -138,6 +138,7 @@ const hideResubmissionModel = ref(true)
 const { formatDateOrDash } = useDateFormatter()
 
 const baseFields = {
+  name: { key: 'name', label: t('name'), class: 'no-select' },
   firstName: { key: 'user.firstName', label: t('firstname'), class: 'no-select' },
   lastName: { key: 'user.lastName', label: t('lastname'), class: 'no-select' },
   amount: { key: 'amount', label: t('creation'), formatter: (value) => value + ' GDD' },
@@ -169,8 +170,7 @@ const fields = computed(
       [
         { key: 'bookmark', label: t('delete') },
         { key: 'deny', label: t('deny') },
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
@@ -179,8 +179,7 @@ const fields = computed(
       ],
       // confirmed contributions
       [
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
@@ -190,8 +189,7 @@ const fields = computed(
       ],
       // denied contributions
       [
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
@@ -201,8 +199,7 @@ const fields = computed(
       ],
       // deleted contributions
       [
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,
@@ -213,8 +210,7 @@ const fields = computed(
       // all contributions
       [
         { key: 'contributionStatus', label: t('status') },
-        baseFields.firstName,
-        baseFields.lastName,
+        baseFields.name,
         baseFields.amount,
         baseFields.memo,
         baseFields.contributionDate,