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

bug fix givenType 2,3,5,6 change to givenType 1

Browse Source
This commit is contained in:
ogerly 2021-09-24 14:47:59 +02:00
parent 4a3588315e
commit c9839dce21
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/components/Transaction.vue
View File

@ -19,40 +19,40 @@
<!-- type --> <!-- type -->
<b-row> <b-row>
<b-col col="6" class="text-right"> <b-col cols="6" class="text-right">
{{ getLinesByType(gdtEntryType).description }} {{ getLinesByType(gdtEntryType).description }}
</b-col> </b-col>
<b-col col="6"> <b-col cols="6">
{{ getLinesByType(gdtEntryType).descriptiontext }} {{ getLinesByType(gdtEntryType).descriptiontext }}
</b-col> </b-col>
</b-row> </b-row>
<!-- credit --> <!-- credit -->
<b-row> <b-row>
<b-col col="6" class="text-right"> <b-col cols="6" class="text-right">
{{ $t('gdt.credit') }} {{ $t('gdt.credit') }}
</b-col> </b-col>
<b-col col="6"> <b-col cols="6">
{{ getLinesByType(gdtEntryType).credittext }} {{ getLinesByType(gdtEntryType).credittext }}
</b-col> </b-col>
</b-row> </b-row>
<!-- Message--> <!-- Message-->
<b-row v-if="comment && gdtEntryType !== 7"> <b-row v-if="comment && gdtEntryType !== 7">
<b-col col="6" class="text-right"> <b-col cols="6" class="text-right">
{{ $t('form.memo') }} {{ $t('form.memo') }}
</b-col> </b-col>
<b-col col="6"> <b-col cols="6">
{{ comment }} {{ comment }}
</b-col> </b-col>
</b-row> </b-row>
<!-- date--> <!-- date-->
<b-row class="gdt-list-row text-header"> <b-row class="gdt-list-row text-header">
<b-col col="6" class="text-right"> <b-col cols="6" class="text-right">
{{ $t('form.date') }} {{ $t('form.date') }}
</b-col> </b-col>
<b-col col="6"> <b-col cols="6">
{{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }} {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
</b-col> </b-col>
</b-row> </b-row>

14
frontend/src/components/TransactionCollapse.vue
View File

@ -4,21 +4,21 @@
style="border: 0px; background-color: #f1f1f1" style="border: 0px; background-color: #f1f1f1"
> >
<b-row class="gdt-list-collapse-header-text text-center pb-3"> <b-row class="gdt-list-collapse-header-text text-center pb-3">
<div id="collapse-headline" class="col"> <b-col id="collapse-headline">
<b>{{ getLinesByType(gdtEntryType).headline }}</b> <b>{{ getLinesByType(gdtEntryType).headline }}</b>
</div> </b-col>
</b-row> </b-row>
<b-row class="gdt-list-collapse-box--all"> <b-row class="gdt-list-collapse-box--all">
<div class="col-6 text-right collapse-col-left"> <b-col cols="6" class="text-right collapse-col-left">
<div id="collapse-first">{{ getLinesByType(gdtEntryType).first }}</div> <div id="collapse-first">{{ getLinesByType(gdtEntryType).first }}</div>
<div id="collapse-second">{{ getLinesByType(gdtEntryType).second }}</div> <div id="collapse-second">{{ getLinesByType(gdtEntryType).second }}</div>
</div> </b-col>
<div class="col-6 collapse-col-right"> <b-col cols="6" class="collapse-col-right">
<div id="collapse-firstMath">{{ getLinesByType(gdtEntryType).firstMath }}</div> <div id="collapse-firstMath">{{ getLinesByType(gdtEntryType).firstMath }}</div>
<div id="collapse-secondMath"> <div id="collapse-secondMath">
{{ getLinesByType(gdtEntryType).secondMath }} {{ getLinesByType(gdtEntryType).secondMath }}
</div> </div>
</div> </b-col>
</b-row> </b-row>
</div> </div>
</template> </template>
@ -33,6 +33,8 @@ export default {
}, },
methods: { methods: {
getLinesByType(givenType) { getLinesByType(givenType) {
if (givenType === 2 || givenType === 3 || givenType === 5 || givenType === 6) givenType = 1
const linesByType = { const linesByType = {
1: { 1: {
headline: this.$t('gdt.calculation'), headline: this.$t('gdt.calculation'),