IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

update contributionStatus attribute

Browse Source
This commit is contained in:
einhornimmond 2025-05-13 11:45:19 +02:00
parent c4238a897c
commit 72936ba70d
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
View File

@ -108,7 +108,7 @@ describe('ContributionMessagesList', () => {
id: 42,
memo: 'test memo',
userId: 108,
status: 'PENDING',
contributionStatus: 'PENDING',
user: defaultUser,
},
hideResubmission: true,
@ -153,7 +153,7 @@ describe('ContributionMessagesList', () => {
it('does not render the ContributionMessagesFormular when status is not PENDING or IN_PROGRESS', async () => {
await wrapper.setProps({
contribution: {
status: 'COMPLETED',
contributionStatus: 'COMPLETED',
user: defaultUser,
},
})

2
admin/src/components/ContributionMessages/ContributionMessagesList.vue
View File

@ -41,7 +41,7 @@
/>
</div>
</BContainer>
<div v-if="contribution.status === 'PENDING' || contribution.status === 'IN_PROGRESS'">
<div v-if="contribution.contributionStatus === 'PENDING' || contribution.contributionStatus === 'IN_PROGRESS'">
<contribution-messages-formular
:contribution-id="contribution.id"
:contribution-memo="contribution.memo"

2
admin/src/components/CreationTransactionList.vue
View File

@ -80,7 +80,7 @@ const fields = [
},
},
{
key: 'status',
key: 'contributionStatus',
label: t('transactionlist.status'),
},
{

6
admin/src/components/Tables/OpenCreationsTable.spec.js
View File

@ -14,12 +14,12 @@ describe('OpenCreationsTable', () => {
let store
const mockItems = [
{ id: 1, status: 'PENDING', userId: 2, moderatorId: null, messagesCount: 0 },
{ id: 2, status: 'CONFIRMED', userId: 3, moderatorId: 1, messagesCount: 2 },
{ id: 1, contributionStatus: 'PENDING', userId: 2, moderatorId: null, messagesCount: 0 },
{ id: 2, contributionStatus: 'CONFIRMED', userId: 3, moderatorId: 1, messagesCount: 2 },
]
const mockFields = [
{ key: 'status', label: 'Status' },
{ key: 'contributionStatus', label: 'Status' },
{ key: 'bookmark', label: 'Bookmark' },
{ key: 'memo', label: 'Memo' },
{ key: 'editCreation', label: 'Edit' },

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

@ -9,12 +9,12 @@
stacked="md"
:tbody-tr-class="rowClass"
>
<template #cell(status)="row">
<IBiQuestionSquare v-if="row.item.status === 'IN_PROGRESS'" />
<IBiBellFill v-else-if="row.item.status === 'PENDING'" />
<IBiCheck v-else-if="row.item.status === 'CONFIRMED'" />
<IBiXCircle v-else-if="row.item.status === 'DENIED'" />
<IBiTrash v-else-if="row.item.status === 'DELETED'" />
<template #cell(contributionStatus)="row">
<IBiQuestionSquare v-if="row.item.contributionStatus === 'IN_PROGRESS'" />
<IBiBellFill v-else-if="row.item.contributionStatus === 'PENDING'" />
<IBiCheck v-else-if="row.item.contributionStatus === 'CONFIRMED'" />
<IBiXCircle v-else-if="row.item.contributionStatus === 'DENIED'" />
<IBiTrash v-else-if="row.item.contributionStatus === 'DELETED'" />
</template>
<template #cell(bookmark)="row">
<div v-if="!myself(row.item)">
@ -51,11 +51,11 @@
<BButton v-else @click="rowToggleDetails(row, 0)">
<IBiChatDots />
<IBiExclamationCircleFill
v-if="row.item.status === 'PENDING' && row.item.messagesCount > 0"
v-if="row.item.contributionStatus === 'PENDING' && row.item.messagesCount > 0"
style="color: #ffc107"
/>
<IBiQuestionDiamond
v-if="row.item.status === 'IN_PROGRESS' && row.item.messagesCount > 0"
v-if="row.item.contributionStatus === 'IN_PROGRESS' && row.item.messagesCount > 0"
variant="warning"
style="color: #ffc107"
class="ps-1"
@ -197,11 +197,11 @@ export default {
},
rowClass(item, type) {
if (!item || type !== 'row') return
if (item.status === 'CONFIRMED') return 'table-success'
if (item.status === 'DENIED') return 'table-warning'
if (item.status === 'DELETED') return 'table-danger'
if (item.status === 'IN_PROGRESS') return 'table-primary'
if (item.status === 'PENDING') return 'table-primary'
if (item.contributionStatus === 'CONFIRMED') return 'table-success'
if (item.contributionStatus === 'DENIED') return 'table-warning'
if (item.contributionStatus === 'DELETED') return 'table-danger'
if (item.contributionStatus === 'IN_PROGRESS') return 'table-primary'
if (item.contributionStatus === 'PENDING') return 'table-primary'
},
updateStatus(id) {
this.$emit('update-status', id)

2
admin/src/components/TransactionLinkList.spec.js
View File

@ -116,7 +116,7 @@ describe('TransactionLinkList', () => {
})
it('formats status correctly for different scenarios', () => {
const statusField = wrapper.vm.fields.find((f) => f.key === 'status')
const statusField = wrapper.vm.fields.find((f) => f.key === 'contributionStatus')
// Open transaction
expect(statusField.formatter(null, null, mockLinks[0])).toBe('open')

2
admin/src/components/TransactionLinkList.vue
View File

@ -54,7 +54,7 @@ const fields = computed(() => [
formatter: (value) => d(new Date(value)),
},
{
key: 'status',
key: 'contributionStatus',
label: 'status',
formatter: (value, key, item) => {
if (item.deletedAt) return `${t('deleted')}: ${d(new Date(item.deletedAt))}`

2
admin/src/pages/UserSearch.vue
View File

@ -129,7 +129,7 @@ const fields = computed(() => [
// { key: 'confirm_mail', label: t('confirmed') },
// { key: 'has_elopage', label: 'elopage' },
// { key: 'transactions_list', label: t('transaction') },
{ key: 'status', label: t('status') },
{ key: 'contributionStatus', label: t('status') },
])
watch(