From a7e39ba02e9add6e0dc04525f54e9fa00f4300ac Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 30 Jun 2021 15:21:45 +0200 Subject: [PATCH] check decay is clear --- frontend/src/views/Layout/DashboardLayout_gdd.vue | 1 + .../Pages/AccountOverview/GddTransactionList.vue | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 9990b91f2..14456605b 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -128,6 +128,7 @@ export default { if (result.success) { this.GdtBalance = Number(result.result.data.gdtSum) this.transactions = result.result.data.transactions + console.log("this.transactions => ", this.transactions[1].decay.decay_start) this.balance = Number(result.result.data.decay) this.bookedBalance = Number(result.result.data.balance) this.transactionCount = result.result.data.count diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index 03a9d187e..20e6c3f20 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -40,9 +40,11 @@
Seit deiner letzten Transaction sind
-
{{ item.decay }} vergangen.
-
{{ typeof(item.decay) }} vergangen.
-
{{ item.decay }} Vergänglichkeit.
+

{{ $moment(getDecay(item.id).decay_start).format('DDD.MM,YYYY - mm:hh:ss') }}

+

{{ $moment(getDecay(item.id).decay_end).format('DDD.MM,YYYY - mm:hh:ss') }}

+
{{ }} vergangen.
+
+
{{getDecay(item.id).balance }} Vergänglichkeit.
@@ -116,6 +118,9 @@ export default { }, }, methods: { + getDecay(id){ + return this.transactions.find(t => t.id === id) + }, updateTransactions() { this.$emit('update-transactions', { firstPage: this.currentPage,