IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-03-01 12:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

combine first and last name fields and show alias underneath if exist

Browse Source
This commit is contained in:
einhornimmond 2025-12-19 12:24:32 +01:00
parent 8b8e6cfa0d
commit bec95b9ec6
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/src/components/Tables/OpenCreationsTable.vue
View File

@ -34,6 +34,15 @@
</BButton> </BButton>
</div> </div>
</template> </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"> <template #cell(memo)="row">
{{ row.value }} {{ row.value }}
<small v-if="isAddCommentToMemo(row.item)"> <small v-if="isAddCommentToMemo(row.item)">

16
admin/src/pages/CreationConfirm.vue
View File

@ -138,6 +138,7 @@ const hideResubmissionModel = ref(true)
const { formatDateOrDash } = useDateFormatter() const { formatDateOrDash } = useDateFormatter()
const baseFields = { const baseFields = {
name: { key: 'name', label: t('name'), class: 'no-select' },
firstName: { key: 'user.firstName', label: t('firstname'), class: 'no-select' }, firstName: { key: 'user.firstName', label: t('firstname'), class: 'no-select' },
lastName: { key: 'user.lastName', label: t('lastname'), class: 'no-select' }, lastName: { key: 'user.lastName', label: t('lastname'), class: 'no-select' },
amount: { key: 'amount', label: t('creation'), formatter: (value) => value + ' GDD' }, amount: { key: 'amount', label: t('creation'), formatter: (value) => value + ' GDD' },
@ -169,8 +170,7 @@ const fields = computed(
[ [
{ key: 'bookmark', label: t('delete') }, { key: 'bookmark', label: t('delete') },
{ key: 'deny', label: t('deny') }, { key: 'deny', label: t('deny') },
baseFields.firstName, baseFields.name,
baseFields.lastName,
baseFields.amount, baseFields.amount,
baseFields.memo, baseFields.memo,
baseFields.contributionDate, baseFields.contributionDate,
@ -179,8 +179,7 @@ const fields = computed(
], ],
// confirmed contributions // confirmed contributions
[ [
baseFields.firstName, baseFields.name,
baseFields.lastName,
baseFields.amount, baseFields.amount,
baseFields.memo, baseFields.memo,
baseFields.contributionDate, baseFields.contributionDate,
@ -190,8 +189,7 @@ const fields = computed(
], ],
// denied contributions // denied contributions
[ [
baseFields.firstName, baseFields.name,
baseFields.lastName,
baseFields.amount, baseFields.amount,
baseFields.memo, baseFields.memo,
baseFields.contributionDate, baseFields.contributionDate,
@ -201,8 +199,7 @@ const fields = computed(
], ],
// deleted contributions // deleted contributions
[ [
baseFields.firstName, baseFields.name,
baseFields.lastName,
baseFields.amount, baseFields.amount,
baseFields.memo, baseFields.memo,
baseFields.contributionDate, baseFields.contributionDate,
@ -213,8 +210,7 @@ const fields = computed(
// all contributions // all contributions
[ [
{ key: 'contributionStatus', label: t('status') }, { key: 'contributionStatus', label: t('status') },
baseFields.firstName, baseFields.name,
baseFields.lastName,
baseFields.amount, baseFields.amount,
baseFields.memo, baseFields.memo,
baseFields.contributionDate, baseFields.contributionDate,