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

after remove conflicts, fix lint

Browse Source
This commit is contained in:
ogerly 2021-09-20 08:58:58 +02:00
parent e8e0eb4d8d
commit cdbd5f59b5
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@
</span>
<div v-if="decaytyp === 'new'">
<b-list-group style="border: 0px">
<b-list-group-item style="border: 0px; background-color: #f1f1f1">
<div class="d-flex" v-if="!decay.decayStartBlock">
@ -20,7 +19,6 @@
</div>
</div>
<div class="d-flex">
<div style="width: 40%" class="text-right pr-3 mr-2">
<div v-if="!decay.decayStartBlock">{{ $t('decay.last_transaction') }}</div>
@ -65,33 +63,36 @@
</div>
</div>
<div v-if="decay.balance > 0">
<div class="d-flex" >
<div style="width: 40%" class="text-right pr-3 mr-2">
<div v-if="type === 'send'">{{ $t('form.amount') }} </div>
<div v-if="type === 'receive'">{{ $t('form.amount') }} </div>
<div class="d-flex">
<div style="width: 40%" class="text-right pr-3 mr-2">
<div v-if="type === 'send'">{{ $t('form.amount') }}</div>
<div v-if="type === 'receive'">{{ $t('form.amount') }}</div>
</div>
<div style="width: 60%">
<div>{{ balance }}</div>
</div>
</div>
<div style="width: 60%">
<div> {{balance}} </div>
<div class="d-flex">
<div style="width: 40%" class="text-right pr-3 mr-2">
<div>{{ $t('decay.decay') }}</div>
</div>
<div style="width: 60%">
<div>{{ decay.balance }}</div>
</div>
</div>
</div>
<div class="d-flex">
<div style="width: 40%" class="text-right pr-3 mr-2">
<div>{{ $t('decay.decay') }}</div>
<div class="d-flex">
<div style="width: 40%" class="text-right pr-3 mr-2">
<div>{{ $t('decay.total') }}</div>
</div>
<div style="width: 60%">
<div v-if="type === 'send'">
<b>{{ parseInt(balance) + decay.balance }}</b>
</div>
<div v-if="type === 'receive'">
<b>{{ parseInt(balance) - decay.balance }}</b>
</div>
</div>
</div>
<div style="width: 60%">
<div> {{ decay.balance }} </div>
</div>
</div>
<div class="d-flex">
<div style="width: 40%" class="text-right pr-3 mr-2">
<div>{{ $t('decay.total') }}</div>
</div>
<div style="width: 60%">
<div v-if="type === 'send'"><b> {{ parseInt(balance) + decay.balance }} </b></div>
<div v-if="type === 'receive'"><b> {{ parseInt(balance) - decay.balance }} </b></div>
</div>
</div>
</div>
</b-list-group-item>
</b-list-group>

8
frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
View File

@ -76,7 +76,13 @@
<b-collapse v-if="type != 'decay'" class="pb-4" :id="'a' + date + ''">
<div style="border: 0px; background-color: #f1f1f1" class="p-2 pb-4 mb-4">
<decay-information v-if="decay" decaytyp="new" :balance="balance" :decay="decay" :type="type" />
<decay-information
v-if="decay"
decaytyp="new"
:balance="balance"
:decay="decay"
:type="type"
/>
</div>
</b-collapse>