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

fix review 2 pre release

Browse Source
This commit is contained in:
ogerly 2021-08-12 14:43:52 +02:00
parent 8e7ccf973f
commit 9e3f4af733
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/DecayInformation.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<span v-if="decaytyp === 'short'">
{{ decay ? ' -' + decay.balance + ' ' + decayStartBlockTextShort : '' }}
{{ decay ? ' -' + decay.balance + ' ' + decayStartBlockTextShort : '' }}
</span>
<div v-if="decaytyp === 'new'">

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

@ -177,9 +177,9 @@
"conversion":"Umrechnung",
"formula":"Berechungsformel",
"no-transactions":"Du hast zur Zeit keine Transaktionen",
"publisher":"Dein geworbenes Mitglied hat gespendet.",
"publisher":"Dein geworbenes Mitglied hat einen Beitrag bezahlt",
"gdt-receive":"Aktion",
"your-share":"Geworbenes Mitglied",
"donation":"Spende"
"contribution":"Beitrag"
}
}

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

@ -178,9 +178,9 @@
"conversion": "Conversion",
"formula": "Calculation formula",
"no-transactions":"You currently have no transactions",
"publisher":"Your recruited member has donated.",
"publisher":"A member you referred has paid a contribution",
"gdt-receive":"GDT receive",
"your-share":"Your share",
"donation":"Donation"
"contribution":"Contribution"
}
}

17
frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
View File

@ -17,7 +17,7 @@
/*amount2,*/
/*factor2,*/
gdt,
} in this.transactionsGdt"
} in transactionsGdt"
:key="id"
>
<div class="list-group-item gdt-transaction-list-item" v-b-toggle="'a' + date + ''">
@ -26,7 +26,7 @@
<b-icon
:icon="getIcon(gdt_entry_type_id).icon"
:class="getIcon(gdt_entry_type_id).class"
/>
></b-icon>
</div>
<!-- Collaps Button -->
@ -63,7 +63,7 @@
<!-- 1, 2, 3, 5, 6 spenden in euro -->
<b-row v-else>
<div class="col-6 text-right">
<div>{{ $t('gdt.donation') }}</div>
<div>{{ $t('gdt.contribution') }}</div>
<div>Gutschrift</div>
</div>
<div class="col-6">
@ -118,7 +118,9 @@
</div>
<div class="col-6 clooaps-col-right">
<div>{{ factor }}</div>
<div>{{ amount }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT</div>
<div>
{{ $n(amount, 'decimal') }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT
</div>
</div>
</b-row>
<!-- 4 publisher -->
@ -131,7 +133,7 @@
<b-row class="gdt-list-clooaps-box--all" v-else>
<div class="col-6 text-right clooaps-col-left">{{ $t('gdt.formula') }}:</div>
<div class="col-6 clooaps-col-right">
{{ amount }} GDT * {{ factor }} = {{ $n(gdt, 'decimal') }}
{{ $n(amount, 'decimal') }} € * {{ factor }} = {{ $n(gdt, 'decimal') }} GDT
</div>
</b-row>
</div>
@ -156,9 +158,9 @@ import communityAPI from '../../../apis/communityAPI'
import PaginationButtons from '../../../components/PaginationButtons'
const iconsByType = {
7: { icon: 'gift', classes: 'gradido-global-color-accent' },
4: { icon: 'person-check', classes: 'gradido-global-color-accent' },
1: { icon: 'heart', classes: 'gradido-global-color-accent' },
4: { icon: 'person-check', classes: 'gradido-global-color-accent' },
7: { icon: 'gift', classes: 'gradido-global-color-accent' },
}
export default {
@ -201,6 +203,7 @@ export default {
},
getIcon(givenType) {
const type = iconsByType[givenType]
if (type)
return {
icon: type.icon,