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

Merge pull request #886 from gradido/826-Different-Design-of-GDD-and-GDT-Lists

Browse Source 
826 different design of gdd and gdt lists
This commit is contained in:
Alexander Friedland 2021-09-24 13:45:46 +02:00 committed by GitHub
commit 4a3588315e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,6 @@
</div> </div>
</b-col> </b-col>
</b-row> </b-row>
<b-row> <b-row>
<b-col col="6" class="text-right"> <b-col col="6" class="text-right">
<div v-if="!decay.decayStartBlock">{{ $t('decay.past_time') }}</div> <div v-if="!decay.decayStartBlock">{{ $t('decay.past_time') }}</div>

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

@ -19,47 +19,46 @@
<!-- type --> <!-- type -->
<b-row> <b-row>
<div class="col-6 text-right"> <b-col col="6" class="text-right">
{{ getLinesByType(gdtEntryType).description }} {{ getLinesByType(gdtEntryType).description }}
</div> </b-col>
<div class="col-6"> <b-col col="6">
{{ getLinesByType(gdtEntryType).descriptiontext }} {{ getLinesByType(gdtEntryType).descriptiontext }}
</div> </b-col>
</b-row> </b-row>
<!-- credit --> <!-- credit -->
<b-row> <b-row>
<div class="col-6 text-right"> <b-col col="6" class="text-right">
{{ $t('gdt.credit') }} {{ $t('gdt.credit') }}
</div> </b-col>
<div class="col-6"> <b-col col="6">
{{ getLinesByType(gdtEntryType).credittext }} {{ getLinesByType(gdtEntryType).credittext }}
</div> </b-col>
</b-row> </b-row>
<!-- Message--> <!-- Message-->
<b-row v-if="comment && gdtEntryType !== 7"> <b-row v-if="comment && gdtEntryType !== 7">
<div class="col-6 text-right"> <b-col col="6" class="text-right">
{{ $t('form.memo') }} {{ $t('form.memo') }}
</div> </b-col>
<div class="col-6"> <b-col col="6">
{{ comment }} {{ comment }}
</div> </b-col>
</b-row> </b-row>
<!-- date--> <!-- date-->
<b-row class="gdt-list-row text-header"> <b-row class="gdt-list-row text-header">
<div class="col-6 text-right"> <b-col col="6" class="text-right">
{{ $t('form.date') }} {{ $t('form.date') }}
</div> </b-col>
<div class="col-6"> <b-col col="6">
{{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }} {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
</div> </b-col>
</b-row> </b-row>
</div>
<!-- collaps trancaction info--> <!-- collaps trancaction info-->
<b-collapse :id="'a' + date + ''" class="pb-4"> <b-collapse :id="'a' + date + ''" class="mt-2 pb-4">
<transaction-collapse <transaction-collapse
:amount="amount" :amount="amount"
:gdtEntryType="gdtEntryType" :gdtEntryType="gdtEntryType"
@ -69,6 +68,7 @@
</b-collapse> </b-collapse>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
import TransactionCollapse from './TransactionCollapse.vue' import TransactionCollapse from './TransactionCollapse.vue'

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

@ -1,8 +1,11 @@
<template> <template>
<div class="gdt-transaction-collapse"> <div
class="gdt-transaction-collapse p-2 pt-4 pb-4 mb-4"
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 h4"> <div id="collapse-headline" class="col">
{{ getLinesByType(gdtEntryType).headline }} <b>{{ getLinesByType(gdtEntryType).headline }}</b>
</div> </div>
</b-row> </b-row>
<b-row class="gdt-list-collapse-box--all"> <b-row class="gdt-list-collapse-box--all">

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

@ -1,6 +1,6 @@
<template> <template>
<div class="gdt-transaction-list"> <div class="gdt-transaction-list">
<div class="list-group"> <div class="list-group" style="background-color: #fff">
<div v-if="transactionGdtCount === 0"> <div v-if="transactionGdtCount === 0">
{{ $t('gdt.no-transactions') }} {{ $t('gdt.no-transactions') }}
</div> </div>