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 decay start block info

Browse Source
This commit is contained in:
Ulf Gebhardt 2022-03-04 14:31:08 +01:00
parent 970592d00b
commit 6b6cb43247
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
View File

@ -15,7 +15,7 @@
</div>
<div>
<span v-if="decay.start">
{{ $d(new Date(decay.start * 1000), 'long') }}
{{ $d(new Date(decay.start), 'long') }}
{{ $i18n.locale === 'de' ? 'Uhr' : '' }}
</span>
</div>
@ -69,13 +69,13 @@
</b-col>
<b-col cols="6">
<div v-if="typeId === 'SEND'">
<b>{{ $n(Number(amount) - Number(decay.decay), 'decimal') }}</b>
<b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
</div>
<div v-if="typeId === 'RECEIVE'">
<b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
<b>{{ $n(Number(amount) - Number(decay.decay), 'decimal') }}</b>
</div>
<div v-if="typeId === 'CREATION'">
<b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
<b>{{ $n(Number(amount) - Number(decay.decay), 'decimal') }}</b>
</div>
</b-col>
</b-row>
@ -86,7 +86,16 @@ export default {
name: 'DecayInformation-StartBlock',
props: {
balanceDate: { type: String },
decayStartBlock: { type: String },
decayStartBlock: { type: Date },
amount: {
type: String,
},
decay: {
type: Object,
},
typeId: {
type: String,
},
},
}
</script>

6
frontend/src/components/DecayInformations/DecayInformation-FirstTransaction.vue → frontend/src/components/DecayInformations/DecayInformation-NoDecayTransaction.vue
View File

@ -1,16 +1,16 @@
<template>
<div class="decayinformation-first-transaction">
<div class="decayinformation-no-decay-transaction">
<div>
<!-- if decay.start === null - Wenn kein decay angegeben dan ist es die erste Transaktion -->
<div class="mt-3 mb-3 text-center">
<b>{{ $t('decay.first_transaction') }}</b>
<b>{{ $t('decay.before_startblock_transaction') }}</b>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'DecayInformation-FirstTransaction',
name: 'DecayInformation-NoDecayTransaction',
props: {
decay: {
type: Object,

2
frontend/src/views/Pages/UserProfileTransactionList.vue
View File

@ -9,6 +9,7 @@
:transactionCount="transactionCount"
:transactions="transactions"
:show-pagination="true"
:decayStartBlock="decayStartBlock"
@update-transactions="updateTransactions"
/>
</b-tab>
@ -41,6 +42,7 @@ export default {
default: () => [],
},
transactionCount: { type: Number, default: 0 },
decayStartBlock: { type: Date },
},
data() {
return {