From 018bfa05d6782904e0bf89578748537f06d2d67e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 19 Jan 2022 14:37:49 +0100
Subject: [PATCH 1/9] defined fields for Transactionlist in UserSearch in
 Adminarea, add Localized fields and formatted fields

---
 .../CreationTransactionListFormular.vue       | 25 ++++++++++++++++++-
 admin/src/locales/de.json                     |  8 +++++-
 admin/src/locales/en.json                     |  8 +++++-
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index 7fed4adcc..1de1cce83 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="component-creation-transaction-list">
     {{ $t('transactionlist.title') }}
-    <b-table striped hover :items="items"></b-table>
+    <b-table striped hover :fields="fields" :items="items"></b-table>
   </div>
 </template>
 <script>
@@ -13,6 +13,29 @@ export default {
   },
   data() {
     return {
+      fields: [
+        {
+          key: 'date',
+          label: this.$t('transactionlist.date'),
+          formatter: (value, key, item) => {
+            return this.$moment(value).format(this.$t('transactionlist.formatter'))
+          },
+        },
+        { key: 'name', label: this.$t('transactionlist.community') },
+        { key: 'balance', label: this.$t('transactionlist.amount') },
+        { key: 'memo', label: this.$t('transactionlist.memo') },
+        {
+          key: 'decay',
+          label: this.$t('transactionlist.decay'),
+          formatter: (value, key, item) => {
+            if (value && value.balance >= 0) {
+              return value.balance
+            } else {
+              return '0'
+            }
+          },
+        },
+      ],
       items: [],
     }
   },
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index d3b87383a..e2a3b142c 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -52,7 +52,13 @@
   "remove": "Entfernen",
   "transaction": "Transaktion",
   "transactionlist": {
-    "title": "Alle geschöpften Transaktionen für den Nutzer"
+    "title": "Alle geschöpften Transaktionen für den Nutzer",
+    "amount":"Betrag",
+    "memo":"Nachricht",
+    "date":"Datum",
+    "decay":"Vergänglichkeit",
+    "community":"Gemeinschaft",
+    "formatter":"DD.MM.YYYY"
   },
   "unregistered_emails": "Nur unregistrierte Nutzer",
   "unregister_mail": {
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 517b69379..59ed05c12 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -52,7 +52,13 @@
   "remove": "Remove",
   "transaction": "Transaction",
   "transactionlist": {
-    "title": "All creation-transactions for the user"
+    "title": "All creation-transactions for the user",
+    "amount":"Amount",
+    "memo":"Message",
+    "date":"Date",
+    "decay":"Decay",
+    "community":"Community",
+    "formatter":"MM.DD.YYYY"
   },
   "unregistered_emails": "Only unregistered users",
   "unregister_mail": {

From b86431fa400f80283f9a9bd7bdb22a1a31759f37 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 19 Jan 2022 14:42:44 +0100
Subject: [PATCH 2/9] change field amount an position 2 last date

---
 admin/src/components/CreationTransactionListFormular.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index 1de1cce83..6f5864f7c 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -21,8 +21,8 @@ export default {
             return this.$moment(value).format(this.$t('transactionlist.formatter'))
           },
         },
-        { key: 'name', label: this.$t('transactionlist.community') },
         { key: 'balance', label: this.$t('transactionlist.amount') },
+        { key: 'name', label: this.$t('transactionlist.community') },
         { key: 'memo', label: this.$t('transactionlist.memo') },
         {
           key: 'decay',

From a8de79c0c61ad3589f49d4216fb5aeb08b7f33ae Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 19 Jan 2022 15:08:29 +0100
Subject: [PATCH 3/9] yarn test fixed

---
 .../CreationTransactionListFormular.spec.js   | 19 ++++++++++++++++---
 .../CreationTransactionListFormular.vue       |  2 ++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js
index 32dcb6c9d..e531ce040 100644
--- a/admin/src/components/CreationTransactionListFormular.spec.js
+++ b/admin/src/components/CreationTransactionListFormular.spec.js
@@ -15,7 +15,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
           decayDuration: 0,
           memo: 'Testing',
           transactionId: 1,
-          name: 'Bibi',
+          name: 'Gradido Akademie',
           email: 'bibi@bloxberg.de',
           date: new Date(),
           decay: {
@@ -34,7 +34,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
           decayDuration: 0,
           memo: 'Testing 2',
           transactionId: 2,
-          name: 'Bibi',
+          name: 'Gradido Akademie',
           email: 'bibi@bloxberg.de',
           date: new Date(),
           decay: {
@@ -53,6 +53,16 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
 const toastedErrorMock = jest.fn()
 
 const mocks = {
+  $moment: jest.fn(() => {
+    return {
+      format: jest.fn((m) => m),
+      subtract: jest.fn(() => {
+        return {
+          format: jest.fn((m) => m),
+        }
+      }),
+    }
+  }),
   $t: jest.fn((t) => t),
   $apollo: {
     query: apolloQueryMock,
@@ -64,6 +74,7 @@ const mocks = {
 
 const propsData = {
   userId: 1,
+  fields: ['date', 'balance', 'name', 'memo', 'decay'],
 }
 
 describe('CreationTransactionListFormular', () => {
@@ -92,7 +103,9 @@ describe('CreationTransactionListFormular', () => {
       )
     })
 
-    it('has two values for the transaction', () => {
+    it('has two values for the transaction', async () => {
+      await wrapper.vm.$nextTick()
+      console.log(wrapper.html())
       expect(wrapper.find('tbody').findAll('tr').length).toBe(2)
     })
 
diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index 6f5864f7c..54684b679 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -53,7 +53,9 @@ export default {
           },
         })
         .then((result) => {
+          console.log(result)
           this.items = result.data.transactionList.transactions.filter((t) => t.type === 'creation')
+          console.log( this.items)
         })
         .catch((error) => {
           this.$toasted.error(error.message)

From 5d4b3825c18ff1103e3fd68f763ba5402c6f31ed Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 19 Jan 2022 15:09:04 +0100
Subject: [PATCH 4/9] yarn locales fixed

---
 admin/src/locales/de.json | 14 +++++++-------
 admin/src/locales/en.json | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index e2a3b142c..137e45895 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -52,13 +52,13 @@
   "remove": "Entfernen",
   "transaction": "Transaktion",
   "transactionlist": {
-    "title": "Alle geschöpften Transaktionen für den Nutzer",
-    "amount":"Betrag",
-    "memo":"Nachricht",
-    "date":"Datum",
-    "decay":"Vergänglichkeit",
-    "community":"Gemeinschaft",
-    "formatter":"DD.MM.YYYY"
+    "amount": "Betrag",
+    "community": "Gemeinschaft",
+    "date": "Datum",
+    "decay": "Vergänglichkeit",
+    "formatter": "DD.MM.YYYY",
+    "memo": "Nachricht",
+    "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
   "unregistered_emails": "Nur unregistrierte Nutzer",
   "unregister_mail": {
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 59ed05c12..36caa4616 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -52,13 +52,13 @@
   "remove": "Remove",
   "transaction": "Transaction",
   "transactionlist": {
-    "title": "All creation-transactions for the user",
-    "amount":"Amount",
-    "memo":"Message",
-    "date":"Date",
-    "decay":"Decay",
-    "community":"Community",
-    "formatter":"MM.DD.YYYY"
+    "amount": "Amount",
+    "community": "Community",
+    "date": "Date",
+    "decay": "Decay",
+    "formatter": "MM.DD.YYYY",
+    "memo": "Message",
+    "title": "All creation-transactions for the user"
   },
   "unregistered_emails": "Only unregistered users",
   "unregister_mail": {

From 1aeab3244d454be259eb5eef5d7dc3d315f6a715 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 19 Jan 2022 15:10:31 +0100
Subject: [PATCH 5/9] yarn lint --fix

---
 admin/src/components/CreationTransactionListFormular.spec.js | 4 +---
 admin/src/components/CreationTransactionListFormular.vue     | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js
index e531ce040..e316678f3 100644
--- a/admin/src/components/CreationTransactionListFormular.spec.js
+++ b/admin/src/components/CreationTransactionListFormular.spec.js
@@ -103,9 +103,7 @@ describe('CreationTransactionListFormular', () => {
       )
     })
 
-    it('has two values for the transaction', async () => {
-      await wrapper.vm.$nextTick()
-      console.log(wrapper.html())
+    it('has two values for the transaction', () => {
       expect(wrapper.find('tbody').findAll('tr').length).toBe(2)
     })
 
diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index 54684b679..6f5864f7c 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -53,9 +53,7 @@ export default {
           },
         })
         .then((result) => {
-          console.log(result)
           this.items = result.data.transactionList.transactions.filter((t) => t.type === 'creation')
-          console.log( this.items)
         })
         .catch((error) => {
           this.$toasted.error(error.message)

From e1df3718c57d300377228a54a97a070cbc83c28e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 19 Jan 2022 17:45:41 +0100
Subject: [PATCH 6/9] add string GDD on creation amount

---
 admin/src/components/CreationTransactionListFormular.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index 6f5864f7c..8ea49eb45 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -21,7 +21,13 @@ export default {
             return this.$moment(value).format(this.$t('transactionlist.formatter'))
           },
         },
-        { key: 'balance', label: this.$t('transactionlist.amount') },
+        {
+          key: 'balance',
+          label: this.$t('transactionlist.amount'),
+          formatter: (value, key, item) => {
+            return `${value} GDD`
+          },
+        },
         { key: 'name', label: this.$t('transactionlist.community') },
         { key: 'memo', label: this.$t('transactionlist.memo') },
         {

From 6f082726f8f09adcc5c918b096941b72adc681ed Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 20 Jan 2022 13:22:44 +0100
Subject: [PATCH 7/9] change fields key data formatter

---
 admin/src/components/CreationTransactionListFormular.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index 8ea49eb45..627647534 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -18,7 +18,7 @@ export default {
           key: 'date',
           label: this.$t('transactionlist.date'),
           formatter: (value, key, item) => {
-            return this.$moment(value).format(this.$t('transactionlist.formatter'))
+            return this.$d(new Date(value))
           },
         },
         {

From a2848fa21ce7a1011d6dd8f399d4a74b68aa7c91 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 20 Jan 2022 13:25:00 +0100
Subject: [PATCH 8/9] remove in locales formatter for date fields

---
 admin/src/locales/de.json | 1 -
 admin/src/locales/en.json | 1 -
 2 files changed, 2 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 137e45895..111d6823f 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -56,7 +56,6 @@
     "community": "Gemeinschaft",
     "date": "Datum",
     "decay": "Vergänglichkeit",
-    "formatter": "DD.MM.YYYY",
     "memo": "Nachricht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 36caa4616..d412ecfcb 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -56,7 +56,6 @@
     "community": "Community",
     "date": "Date",
     "decay": "Decay",
-    "formatter": "MM.DD.YYYY",
     "memo": "Message",
     "title": "All creation-transactions for the user"
   },

From fbd0d65b350187c281cf1489d0ac466882939abf Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 20 Jan 2022 16:04:49 +0100
Subject: [PATCH 9/9] add mock  in tests

---
 .../CreationTransactionListFormular.spec.js           | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js
index e316678f3..88cda89ee 100644
--- a/admin/src/components/CreationTransactionListFormular.spec.js
+++ b/admin/src/components/CreationTransactionListFormular.spec.js
@@ -53,16 +53,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
 const toastedErrorMock = jest.fn()
 
 const mocks = {
-  $moment: jest.fn(() => {
-    return {
-      format: jest.fn((m) => m),
-      subtract: jest.fn(() => {
-        return {
-          format: jest.fn((m) => m),
-        }
-      }),
-    }
-  }),
+  $d: jest.fn((t) => t),
   $t: jest.fn((t) => t),
   $apollo: {
     query: apolloQueryMock,