mirror of
https://github.com/IT4Change/gradido.git
synced 2026-03-01 12:44:43 +00:00
combine first and last name fields and show alias underneath if exist
This commit is contained in:
parent
8b8e6cfa0d
commit
bec95b9ec6
@ -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)">
|
||||
|
||||
@ -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,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user