IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

add icon for deleted in crontibution list

Browse Source
This commit is contained in:
ogerly 2023-01-17 11:58:26 +01:00
parent c623ff1294
commit 5dec52f508
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/Contributions/ContributionListItem.spec.js
View File

@ -48,7 +48,7 @@ describe('ContributionListItem', () => {
it('is x-circle when deletedAt is present', async () => { it('is x-circle when deletedAt is present', async () => {
await wrapper.setProps({ deletedAt: new Date().toISOString() }) await wrapper.setProps({ deletedAt: new Date().toISOString() })
expect(wrapper.vm.icon).toBe('x-circle') expect(wrapper.vm.icon).toBe('trash')
}) })
it('is check when confirmedAt is present', async () => { it('is check when confirmedAt is present', async () => {

7
frontend/src/components/Contributions/ContributionListItem.vue
View File

@ -30,7 +30,10 @@
<div class="small"> <div class="small">
{{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }} {{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
</div> </div>
<div class="font-weight-bold">{{ amount | GDD }}</div> <div v-if="state === 'DELETED'" class="small">
{{ $t('contribution.deleted') }}
</div>
<div v-else class="font-weight-bold">{{ amount | GDD }}</div>
</b-col> </b-col>
<b-col cols="12" md="1" lg="1" class="text-right align-items-center"> <b-col cols="12" md="1" lg="1" class="text-right align-items-center">
<div v-if="messagesCount > 0" @click="visible = !visible"> <div v-if="messagesCount > 0" @click="visible = !visible">
@ -168,7 +171,7 @@ export default {
}, },
computed: { computed: {
icon() { icon() {
if (this.deletedAt) return 'x-circle' if (this.deletedAt) return 'trash'
if (this.confirmedAt) return 'check' if (this.confirmedAt) return 'check'
if (this.state === 'IN_PROGRESS') return 'question-circle' if (this.state === 'IN_PROGRESS') return 'question-circle'
return 'bell-fill' return 'bell-fill'

4
frontend/src/components/Template/RightSide/ContributionInfo.vue
View File

@ -22,6 +22,10 @@
<b-icon icon="x-circle" variant="danger"></b-icon> <b-icon icon="x-circle" variant="danger"></b-icon>
{{ $t('contribution.alert.rejected') }} {{ $t('contribution.alert.rejected') }}
</li> </li>
<li>
<b-icon icon="trash" variant="danger"></b-icon>
{{ $t('contribution.alert.deleted') }}
</li>
</ul> </ul>
</div> </div>
<div v-if="hash === '#all'" show fade variant="secondary" class="text-dark"> <div v-if="hash === '#all'" show fade variant="secondary" class="text-dark">

1
frontend/src/locales/de.json
View File

@ -40,6 +40,7 @@
"answerQuestion": "Bitte beantworte die Rückfrage!", "answerQuestion": "Bitte beantworte die Rückfrage!",
"communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.", "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
"confirm": "bestätigt", "confirm": "bestätigt",
"deleted": "gelöscht",
"in_progress": "Es gibt eine Rückfrage der Moderatoren.", "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
"myContributionNoteList": "Eingereichte Beiträge, die noch nicht bestätigt wurden, kannst du jederzeit bearbeiten oder löschen.", "myContributionNoteList": "Eingereichte Beiträge, die noch nicht bestätigt wurden, kannst du jederzeit bearbeiten oder löschen.",
"pending": "Eingereicht und wartet auf Bestätigung", "pending": "Eingereicht und wartet auf Bestätigung",

1
frontend/src/locales/en.json
View File

@ -40,6 +40,7 @@
"answerQuestion": "Please answer the question", "answerQuestion": "Please answer the question",
"communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.", "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
"confirm": "confirmed", "confirm": "confirmed",
"deleted": "deleted",
"in_progress": "There is a question from the moderators.", "in_progress": "There is a question from the moderators.",
"myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.", "myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.",
"pending": "Submitted and waiting for confirmation", "pending": "Submitted and waiting for confirmation",