From 00219c049ed46167e1de945334cd726319e545f1 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 16 Sep 2021 15:54:35 +0200 Subject: [PATCH 1/9] decay calculation is calculated and displayed at the transaction in a more user-friendly way --- frontend/src/components/DecayInformation.vue | 33 +++++++++++++++++++ frontend/src/locales/de.json | 3 ++ frontend/src/locales/en.json | 2 ++ .../AccountOverview/GddTransactionList.vue | 4 +-- 4 files changed, 40 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 24acbd47e..c7571140b 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -10,6 +10,7 @@
+
@@ -19,6 +20,7 @@
+
{{ $t('decay.last_transaction') }}
@@ -62,6 +64,35 @@
+
+
+
+
{{ $t('form.amount') }}
+
{{ $t('form.amount') }}
+
+
+
{{balance}}
+
+
+
+
+
{{ $t('decay.decay') }}
+
+
+
{{ decay.balance }}
+
+
+
+
+
{{ $t('decay.sent') }}
+
{{ $t('decay.received') }}
+
+
+
{{ parseInt(balance) + decay.balance }}
+
{{ parseInt(balance) - decay.balance }}
+
+
+
@@ -71,6 +102,8 @@ export default { name: 'DecayInformation', props: { + balance: { type: String, default: '' }, + type: { type: String, default: '' }, decay: { balance: '', decayDuration: '', diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 908d7b12c..4fd157de5 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -28,6 +28,9 @@ "decayStart": " - Startblock für Vergänglichkeit am: ", "last_transaction":"Letzte Transaktion", "past_time":"Vergangene Zeit", + "balanceForTransaction":"Balance vor Transaktion", + "balanceAfterTransaction":"Balance nach Transaktion", + "amountOfTransaction":"Betrag der Transaktion", "since_introduction":"seit Einführung der Vergänglichkeit", "year":"Jahre", "months":"Monate", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index f9e17b38b..229de1244 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -28,6 +28,8 @@ "decayStart": " - Starting block for decay at: ", "last_transaction": "Last transaction:", "past_time": "Past time", + "balanceForTransaction": "Balance before transaction", + "amountOfTransaction": "Amount of the transaction", "since_introduction": "Since the introduction of Decay", "year": "Years", "months": "Months", diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index 206b12a76..416e6392e 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -23,7 +23,7 @@
- +
@@ -76,7 +76,7 @@
- +
From e7d925b7943dba639f50bec1bab71d40d4e6c7ea Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 17 Sep 2021 09:07:01 +0200 Subject: [PATCH 2/9] transmit and receive, calculation of the decay as text: 'total' --- frontend/src/components/DecayInformation.vue | 4 ++-- frontend/src/locales/de.json | 3 ++- frontend/src/locales/en.json | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index c7571140b..55ca03317 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -84,8 +84,8 @@
-
{{ $t('decay.sent') }}
-
{{ $t('decay.received') }}
+
{{ $t('decay.total') }}
+
{{ parseInt(balance) + decay.balance }}
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 4fd157de5..03d8d0fe9 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -43,7 +43,8 @@ "created":"Geschöpft", "fromCommunity":"Aus der Gemeinschaft", "toCommunity":"An die Gemeinschaft", - "noDecay": "Keine Vergänglichkeit" + "noDecay": "Keine Vergänglichkeit", + "total":"Gesamt" }, "form": { "cancel": "Abbrechen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 229de1244..18b416f30 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -42,7 +42,8 @@ "created":"Created", "fromCommunity":"From the community", "toCommunity":"To the community", - "noDecay": "No Decay" + "noDecay": "No Decay", + "total":"Total" }, "form": { "cancel":"Cancel", From cdbd5f59b51a51103e34a37b74741109214197d7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Mon, 20 Sep 2021 08:58:58 +0200 Subject: [PATCH 3/9] after remove conflicts, fix lint --- frontend/src/components/DecayInformation.vue | 53 ++++++++++--------- .../AccountOverview/GddTransactionList.vue | 10 +++- 2 files changed, 35 insertions(+), 28 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 55ca03317..c827b26ee 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -10,7 +10,6 @@
-
@@ -20,7 +19,6 @@
-
{{ $t('decay.last_transaction') }}
@@ -65,33 +63,36 @@
-
-
-
{{ $t('form.amount') }}
-
{{ $t('form.amount') }}
+
+
+
{{ $t('form.amount') }}
+
{{ $t('form.amount') }}
+
+
+
{{ balance }}
+
-
-
{{balance}}
+
+
+
{{ $t('decay.decay') }}
+
+
+
{{ decay.balance }}
+
-
-
-
-
{{ $t('decay.decay') }}
+
+
+
{{ $t('decay.total') }}
+
+
+
+ {{ parseInt(balance) + decay.balance }} +
+
+ {{ parseInt(balance) - decay.balance }} +
+
-
-
{{ decay.balance }}
-
-
-
-
-
{{ $t('decay.total') }}
- -
-
-
{{ parseInt(balance) + decay.balance }}
-
{{ parseInt(balance) - decay.balance }}
-
-
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index 416e6392e..bdf4199f3 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -23,7 +23,7 @@
- +
@@ -76,7 +76,13 @@
- +
From 691a8c4dadd50a7d58b8ea138a5612e640e12abc Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 23 Sep 2021 08:55:45 +0200 Subject: [PATCH 4/9] Decay better explained in transactional info --- frontend/src/components/DecayInformation.vue | 36 +++++++++++--------- frontend/src/locales/de.json | 1 + frontend/src/locales/en.json | 1 + 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index c827b26ee..c9ffa9115 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -20,10 +20,10 @@
-
+
{{ $t('decay.last_transaction') }}
-
+
{{ $t('decay.Starting_block_decay') }}
@@ -32,7 +32,7 @@
- + {{ $d($moment.unix(decay.decayStart), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }} @@ -41,10 +41,10 @@
-
+
{{ $t('decay.past_time') }}
-
+
{{ $t('decay.since_introduction') }}
{{ duration.years }} {{ $t('decay.year') }}, @@ -64,29 +64,31 @@
-
-
{{ $t('form.amount') }}
-
{{ $t('form.amount') }}
+
+
{{ $t('decay.sent') }}
+
{{ $t('decay.received') }}
-
-
{{ balance }}
+
+
- {{ balance }}
+
+ {{ balance }}
-
+
{{ $t('decay.decay') }}
-
-
{{ decay.balance }}
+
+
- {{ decay.balance }}
+
-
+
{{ $t('decay.total') }}
-
+
- {{ parseInt(balance) + decay.balance }} + - {{ parseInt(balance) + decay.balance }}
{{ parseInt(balance) - decay.balance }} @@ -103,7 +105,7 @@ export default { name: 'DecayInformation', props: { - balance: { type: String, default: '' }, + balance: { type: Number }, type: { type: String, default: '' }, decay: { balance: '', diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 851f2a376..237eaff8f 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -31,6 +31,7 @@ "since_introduction": "seit Einführung der Vergänglichkeit", "Starting_block_decay": "Startblock Vergänglichkeit", "toCommunity": "An die Gemeinschaft", + "total":"Gesamt", "year": "Jahre" }, "error": { diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 4edf8e72d..882bca8c8 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -31,6 +31,7 @@ "since_introduction": "Since the introduction of Decay", "Starting_block_decay": "Starting Block Decay", "toCommunity": "To the community", + "total":"Total", "year": "Years" }, "error": { From ab16f6f16bc3fd4a2ae42142eecda0b49f2152c0 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 23 Sep 2021 14:01:04 +0200 Subject: [PATCH 5/9] fix locales --- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 237eaff8f..af7e19fc5 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -31,7 +31,7 @@ "since_introduction": "seit Einführung der Vergänglichkeit", "Starting_block_decay": "Startblock Vergänglichkeit", "toCommunity": "An die Gemeinschaft", - "total":"Gesamt", + "total": "Gesamt", "year": "Jahre" }, "error": { diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 882bca8c8..8bd6aea99 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -31,7 +31,7 @@ "since_introduction": "Since the introduction of Decay", "Starting_block_decay": "Starting Block Decay", "toCommunity": "To the community", - "total":"Total", + "total": "Total", "year": "Years" }, "error": { From 092d3f6f5ddafba3d0ff6c61fe44a791f43a1487 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 24 Sep 2021 12:13:48 +0200 Subject: [PATCH 6/9] Better explanation and presentation of the calculation of the total sum with the inclusion of decay --- frontend/src/components/DecayInformation.vue | 95 ++++++++++++-------- 1 file changed, 57 insertions(+), 38 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index c9ffa9115..9abc6cfbe 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -19,12 +19,12 @@
-
-
-
{{ $t('decay.last_transaction') }}
-
-
-
+ + +
{{ $t('decay.last_transaction') }}
+ + +
{{ $t('decay.Starting_block_decay') }}
{{ $t('decay.decay_introduced') }} : @@ -37,15 +37,15 @@ {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
-
-
+ + -
-
+ +
{{ $t('decay.past_time') }}
-
-
-
{{ $t('decay.since_introduction') }}
+ + +
{{ $t('decay.since_introduction') }}
{{ duration.years }} {{ $t('decay.year') }}, @@ -60,42 +60,61 @@ {{ duration.seconds }} {{ $t('decay.seconds') }} -
-
+ + +
-
-
+ + + +
{{ $t('decay.decay') }}
+ + +
- {{ decay.balance }}
+ + +
+ + + Berechnung der Gesamtsumme + + + + +
{{ $t('decay.sent') }}
{{ $t('decay.received') }}
-
-
+ +
- {{ balance }}
+ {{ balance }}
-
-
-
-
-
{{ $t('decay.decay') }}
-
-
-
- {{ decay.balance }}
-
-
-
-
-
-
{{ $t('decay.total') }}
-
-
+ + + + + + +
{{ $t('decay.total') }}
+ +
- {{ parseInt(balance) + decay.balance }}
{{ parseInt(balance) - decay.balance }}
-
-
-
+ + + + + + (Vergänglichkeit plus Gesendet) + (Vergänglichkeit minus Empfangen) + + + + +
From 4c574c1081a5be382d80580cde1383e0a03d1362 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 24 Sep 2021 12:27:39 +0200 Subject: [PATCH 7/9] add lacales, fix locales, fix lint --- frontend/src/components/DecayInformation.vue | 34 ++++++++++++-------- frontend/src/locales/de.json | 3 ++ frontend/src/locales/en.json | 3 ++ 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 9abc6cfbe..6b88e5cac 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -21,10 +21,10 @@ -
{{ $t('decay.last_transaction') }}
+
{{ $t('decay.last_transaction') }}
 -
+
{{ $t('decay.Starting_block_decay') }}
{{ $t('decay.decay_introduced') }} : @@ -45,7 +45,7 @@
{{ $t('decay.past_time') }}
-
{{ $t('decay.since_introduction') }}
+
{{ $t('decay.since_introduction') }}
{{ duration.years }} {{ $t('decay.year') }}, @@ -62,7 +62,7 @@ - +
@@ -73,10 +73,10 @@
- {{ decay.balance }}
 -
+
- Berechnung der Gesamtsumme + {{ $t('decay.calculation_total') }} @@ -90,11 +90,19 @@
+ {{ balance }}
- + + + +
{{ $t('decay.decay') }}
+ + +
- {{ decay.balance }}
+ + -
{{ $t('decay.total') }}
+
{{ $t('decay.total') }}
@@ -105,16 +113,14 @@
- + - (Vergänglichkeit plus Gesendet) - (Vergänglichkeit minus Empfangen) + {{ $t('decay.formula_total_sent') }} + {{ $t('decay.formula_total_received') }} - - -
+
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index af7e19fc5..27fa0e906 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -12,12 +12,15 @@ }, "decay": { "calculation_decay": "Berechnung der Vergänglichkeit", + "calculation_total": "Berechnung der Gesamtsumme", "created": "Geschöpft", "days": "Tage", "decay": "Vergänglichkeit", "decayStart": " - Startblock für Vergänglichkeit am: ", "decay_introduced": "Die Vergänglichkeit wurde Eingeführt am ", "decay_since_last_transaction": "Vergänglichkeit seit der letzten Transaktion", + "formula_total_received": "(Empfangen minus Vergänglichkeit)", + "formula_total_sent": "(Gesendet plus Vergänglichkeit)", "fromCommunity": "Aus der Gemeinschaft", "hours": "Stunden", "last_transaction": "Letzte Transaktion", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 8bd6aea99..90de4b9eb 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -12,12 +12,15 @@ }, "decay": { "calculation_decay": "Calculation of Decay", + "calculation_total": "Calculation of the total", "created": "Created", "days": "Days", "decay": "Decay", "decayStart": " - Starting block for decay at: ", "decay_introduced": "Decay was Introduced on", "decay_since_last_transaction": "Decay since the last transaction", + "formula_total_received": "(Received minus decay)", + "formula_total_sent": "(Sent plus decay)", "fromCommunity": "From the community", "hours": "Hours", "last_transaction": "Last transaction:", From 05bab6e7575ca6e67cca52ca769814473d81d1d8 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 24 Sep 2021 13:10:04 +0200 Subject: [PATCH 8/9] remove formal totale sum --- frontend/src/components/DecayInformation.vue | 7 ------- frontend/src/locales/de.json | 2 -- frontend/src/locales/en.json | 2 -- 3 files changed, 11 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 6b88e5cac..1fb0df3a4 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -113,13 +113,6 @@
- - - - {{ $t('decay.formula_total_sent') }} - {{ $t('decay.formula_total_received') }} - -
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 27fa0e906..280c9cf67 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -19,8 +19,6 @@ "decayStart": " - Startblock für Vergänglichkeit am: ", "decay_introduced": "Die Vergänglichkeit wurde Eingeführt am ", "decay_since_last_transaction": "Vergänglichkeit seit der letzten Transaktion", - "formula_total_received": "(Empfangen minus Vergänglichkeit)", - "formula_total_sent": "(Gesendet plus Vergänglichkeit)", "fromCommunity": "Aus der Gemeinschaft", "hours": "Stunden", "last_transaction": "Letzte Transaktion", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 90de4b9eb..67aa135c4 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -19,8 +19,6 @@ "decayStart": " - Starting block for decay at: ", "decay_introduced": "Decay was Introduced on", "decay_since_last_transaction": "Decay since the last transaction", - "formula_total_received": "(Received minus decay)", - "formula_total_sent": "(Sent plus decay)", "fromCommunity": "From the community", "hours": "Hours", "last_transaction": "Last transaction:", From c1f5a425b4a56b6ae64912ed3e235dc115f0cd81 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Fri, 24 Sep 2021 13:14:51 +0200 Subject: [PATCH 9/9] Update en.json --- frontend/src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 67aa135c4..48a0659d1 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -12,7 +12,7 @@ }, "decay": { "calculation_decay": "Calculation of Decay", - "calculation_total": "Calculation of the total", + "calculation_total": "Calculation of the grand total", "created": "Created", "days": "Days", "decay": "Decay",