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

change review from ulf gebhardt

Browse Source
This commit is contained in:
ogerly 2022-03-05 10:08:44 +01:00
parent 807757268c
commit 48ab9f695f
9 changed files with 11 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,148 +0,0 @@
<template>
<div class="decayinformation">
<span v-if="decaytyp === 'short'">
{{ decay ? $n(decay.decay, 'decimal') : '' }}
</span>
<div v-if="decaytyp === 'new' || decaytyp === 'decayLastTransaction'">
<!-- if decay.start === null - Wenn kein decay angegeben dan ist es die erste Transaktion -->
<div v-if="decay.start === null" class="mt-3 mb-3 text-center">
<b>{{ $t('decay.first_transaction') }}</b>
</div>
<!-- if balanceDate < decayStartBlock - Wenn die transaktion vor dem einführen der dacay function liegt. -->
<div
v-else-if="new Date(balanceDate).getTime() < new Date(decayStartBlock).getTime()"
class="mt-3 mb-3 text-center"
>
<b>{{ $t('decay.before_startblock_transaction') }}</b>
</div>
<div v-else>
<div class="d-flex">
<div style="width: 100%" class="text-center pb-3">
<b-icon icon="droplet-half" height="12" class="mb-2" />
<b>{{ $t('decay.calculation_decay') }}</b>
</div>
</div>
<b-row>
<b-col cols="6" class="text-right">
<!-- <div v-if="!decay.decayStartBlock">{{ $t('decay.last_transaction') }}</div> -->
<div>{{ $t('decay.last_transaction') }}</div>
</b-col>
<b-col cols="6">
<div>
<span v-if="decay.start">
{{ $d(new Date(decay.start), 'long') }}
{{ $i18n.locale === 'de' ? 'Uhr' : '' }}
</span>
</div>
</b-col>
</b-row>
<b-row>
<b-col cols="6" class="text-right">
<!-- <div v-if="!decay.decayStartBlock">{{ $t('decay.past_time') }}</div> -->
<div>{{ $t('decay.past_time') }}</div>
</b-col>
<b-col cols="6">
<span v-if="duration">
<span v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</span>
<span v-if="duration.months > 0">
{{ duration.months }} {{ $t('decay.months') }},
</span>
<span v-if="duration.days > 0">{{ duration.days }} {{ $t('decay.days') }},</span>
<span v-if="duration.hours > 0">{{ duration.hours }} {{ $t('decay.hours') }},</span>
<span v-if="duration.minutes > 0">
{{ duration.minutes }} {{ $t('decay.minutes') }},
</span>
<span v-if="duration.seconds > 0">
{{ duration.seconds }} {{ $t('decay.seconds') }}
</span>
</span>
</b-col>
</b-row>
<!-- Decay-->
<b-row>
<b-col cols="6" class="text-right">
<div>{{ $t('decay.decay') }}</div>
</b-col>
<b-col cols="6">
<div v-if="decaytyp === 'new'">- {{ $n(decay.decay, 'decimal') }}</div>
<div v-if="decaytyp === 'decayLastTransaction'">
{{ $n(decay.decay + amount, 'decimal') }} GDD - {{ $n(decay.decay, 'decimal') }} GDD =
<b>{{ $n(amount, 'decimal') }} GDD</b>
</div>
</b-col>
</b-row>
<hr class="mt-2 mb-2" />
<b-row v-if="decaytyp === 'new'">
<b-col class="text-center pt-3 pb-2">
<b>{{ $t('decay.calculation_total') }}</b>
</b-col>
</b-row>
<!-- Type-->
<b-row v-if="decaytyp === 'new'">
<b-col cols="6" class="text-right">
<div v-if="typeId === 'SEND'">{{ $t('decay.sent') }}</div>
<div v-if="typeId === 'RECEIVE'">{{ $t('decay.received') }}</div>
</b-col>
<b-col cols="6">
<div v-if="typeId === 'SEND'">{{ $n(amount, 'decimal') }}</div>
<div v-if="typeId === 'RECEIVE'">{{ $n(amount, 'decimal') }}</div>
</b-col>
</b-row>
<!-- Decay-->
<b-row v-if="decaytyp === 'new'">
<b-col cols="6" class="text-right">
<div>{{ $t('decay.decay') }}</div>
</b-col>
<b-col cols="6">
<div>{{ $n(decay.decay, 'decimal') }}</div>
</b-col>
</b-row>
<!-- Total-->
<b-row v-if="decaytyp === 'new'">
<b-col cols="6" class="text-right">
<div>{{ $t('decay.total') }}</div>
</b-col>
<b-col cols="6">
<div v-if="typeId === 'SEND'">
<b>{{ $n(amount + decay.decay, 'decimal') }}</b>
</div>
<div v-if="typeId === 'RECEIVE'">
<b>{{ $n(amount - decay.decay, 'decimal') }}</b>
</div>
<div v-if="typeId === 'CREATION'">
<b>{{ $n(amount - decay.decay, 'decimal') }}</b>
</div>
</b-col>
</b-row>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'DecayInformation',
props: {
amount: { type: String, default: '0' },
typeId: { type: String, default: '' },
balanceDate: { type: String },
decayStartBlock: { type: String },
decay: {
decay: '',
start: 0,
end: 0,
duration: '',
},
decaytyp: { type: String, default: '' },
},
computed: {
duration() {
return this.$moment.duration(this.decay.end - this.decay.start)._data
},
},
}
</script>

4
frontend/src/components/DecayInformations/DecayInformation-BeforeStartblock.vue
View File

@ -8,9 +8,5 @@
<script>
export default {
name: 'DecayInformation-StartBlock',
props: {
balanceDate: { type: String },
decayStartBlock: { type: String },
},
}
</script>

36
frontend/src/components/DecayInformations/DecayInformation-Decay.vue
View File

@ -1,36 +0,0 @@
<template>
<div class="decayinformation-decay">
<div class="d-flex">
<div style="width: 100%" class="text-center pb-3">
<b-icon icon="droplet-half" height="12" class="mb-2" />
<b>{{ $t('decay.calculation_decay') }}</b>
</div>
</div>
<b-row>
<b-col cols="6" class="text-right">
<div>{{ $t('decay.decay') }}</div>
</b-col>
<b-col cols="6">
<div>
{{ $n(Number(balance) - Number(decay.decay), 'decimal') }}
GDD - {{ $n(Number(decay.decay) * -1, 'decimal') }} GDD =
<b>{{ $n(Number(balance), 'decimal') }} GDD</b>
</div>
</b-col>
</b-row>
</div>
</template>
<script>
export default {
name: 'DecayInformation-Decay',
props: {
balance: {
type: String,
},
decay: {
type: Object,
},
},
}
</script>

20
frontend/src/components/DecayInformations/DecayInformation-NoDecayTransaction.vue
View File

@ -1,20 +0,0 @@
<template>
<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.before_startblock_transaction') }}</b>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'DecayInformation-NoDecayTransaction',
props: {
decay: {
type: Object,
},
},
}
</script>

12
frontend/src/components/Transactions/TransactionCreation.vue
View File

@ -31,11 +31,7 @@
</b-col>
<b-col cols="7">
<div class="gdd-transaction-list-item-name">
{{
typeId !== 'DECAY'
? linkedUser.firstName + ' ' + linkedUser.lastName
: $t('decay.decay_since_last_transaction')
}}
{{ $t('decay.decay_since_last_transaction') }}
</div>
</b-col>
</b-row>
@ -51,7 +47,7 @@
</b-row>
<!-- Datum -->
<b-row v-if="typeId !== 'DECAY'">
<b-row>
<b-col cols="5">
<div class="text-right">{{ $t('form.date') }}</div>
</b-col>
@ -67,12 +63,12 @@
<b-row v-if="decay">
<b-col cols="5">
<div class="text-right">
<b-icon v-if="typeId != 'DECAY'" icon="droplet-half" height="15" class="mb-1" />
<b-icon icon="droplet-half" height="15" class="mb-1" />
</div>
</b-col>
<b-col cols="7">
<div class="gdd-transaction-list-item-decay">
<decay-information-short v-if="decay" decaytyp="short" :decay="decay" />
<decay-information-short decaytyp="short" :decay="decay" />
</div>
</b-col>
</b-row>

10
frontend/src/components/Transactions/TransactionReceive.vue
View File

@ -34,11 +34,7 @@
</b-col>
<b-col cols="7">
<div class="gdd-transaction-list-item-name">
{{
typeId !== 'DECAY'
? linkedUser.firstName + ' ' + linkedUser.lastName
: $t('decay.decay_since_last_transaction')
}}
{{ linkedUser.firstName + ' ' + linkedUser.lastName }}
</div>
</b-col>
</b-row>
@ -54,7 +50,7 @@
</b-row>
<!-- Datum -->
<b-row v-if="typeId !== 'DECAY'">
<b-row>
<b-col cols="5">
<div class="text-right">{{ $t('form.date') }}</div>
</b-col>
@ -70,7 +66,7 @@
<b-row v-if="decay">
<b-col cols="5">
<div class="text-right">
<b-icon v-if="typeId != 'DECAY'" icon="droplet-half" height="15" class="mb-1" />
<b-icon icon="droplet-half" height="15" class="mb-1" />
</div>
</b-col>
<b-col cols="7">

10
frontend/src/components/Transactions/TransactionSend.vue
View File

@ -31,11 +31,7 @@
</b-col>
<b-col cols="7">
<div class="gdd-transaction-list-item-name">
{{
typeId !== 'DECAY'
? linkedUser.firstName + ' ' + linkedUser.lastName
: $t('decay.decay_since_last_transaction')
}}
{{ linkedUser.firstName + ' ' + linkedUser.lastName }}
</div>
</b-col>
</b-row>
@ -51,7 +47,7 @@
</b-row>
<!-- Datum -->
<b-row v-if="typeId !== 'DECAY'">
<b-row>
<b-col cols="5">
<div class="text-right">{{ $t('form.date') }}</div>
</b-col>
@ -67,7 +63,7 @@
<b-row v-if="decay">
<b-col cols="5">
<div class="text-right">
<b-icon v-if="typeId != 'DECAY'" icon="droplet-half" height="15" class="mb-1" />
<b-icon icon="droplet-half" height="15" class="mb-1" />
</div>
</b-col>
<b-col cols="7">

1
frontend/src/views/Layout/DashboardLayout_gdd.vue
View File

@ -98,7 +98,6 @@ export default {
transactionList.balanceGDT === null ? null : Number(transactionList.balanceGDT)
this.transactions = transactionList.transactions
this.balance = Number(transactionList.balance)
// this.bookedBalance = Number(transactionList.balance)
this.transactionCount = transactionList.count
this.decayStartBlock = new Date(transactionList.decayStartBlock)
this.pending = false

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

@ -50,7 +50,7 @@
:per-page="pageSize"
:total-rows="transactionCount"
></pagination-buttons>
<div v-if="transactionCount < 0" class="mt-4 text-center">
<div v-if="transactionCount <= 0" class="mt-4 text-center">
<span>{{ $t('transaction.nullTransactions') }}</span>
</div>
</div>