From 01b58d5f6b9fb4ce43558ce6cba47f6e4e599fe8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 11 Aug 2021 08:24:52 +0200
Subject: [PATCH] fixed error handling, change reviews fixed

---
 .../admin_transactionGdt_list.json            | 45 -------------------
 frontend/src/locales/de.json                  |  2 +-
 .../src/views/Layout/DashboardLayout_gdd.vue  |  2 +-
 frontend/src/views/Pages/AccountOverview.vue  |  6 ---
 .../AccountOverview/GdtTransactionList.vue    | 38 +++-------------
 5 files changed, 8 insertions(+), 85 deletions(-)
 delete mode 100644 frontend/public/json-example/admin_transactionGdt_list.json

diff --git a/frontend/public/json-example/admin_transactionGdt_list.json b/frontend/public/json-example/admin_transactionGdt_list.json
deleted file mode 100644
index 0fab48c11..000000000
--- a/frontend/public/json-example/admin_transactionGdt_list.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{"state":"success", "gdt": 
-	[
-		{
-			"id": 8821,
-			"amount": 1000, 
-			"date": "2020-08-12T14:12:00+00:00",
-			"email": "foerderkreis-1@gradido.org",
-			"comment": null,
-			"coupon_code": "",
-			"gdt_entry_type_id": 4,
-			"factor": "20.0000",
-			"amount2": 0,
-			"factor2": "0.0500",
-			"gdt": 1000
-		},
-		{
-			"id": 8552,
-			"amount": 1000, 
-			"date": "2020-06-17T14:12:00+00:00",
-			"email": "foerderkreis-1@gradido.org",
-			"comment": null,
-			"coupon_code": "",
-			"gdt_entry_type_id": 4,
-			"factor": "20.0000",
-			"amount2": 0,
-			"factor2": "0.0500",
-			"gdt": 1000
-		},
-		{
-			"id": 8317,
-			"amount": 1000, 
-			"date": "2020-03-16T14:12:00+00:00",
-			"email": "foerderkreis-1@gradido.org",
-			"comment": null,
-			"coupon_code": "",
-			"gdt_entry_type_id": 4,
-			"factor": "20.0000",
-			"amount2": 0,
-			"factor2": "0.0500",
-			"gdt": 1000
-		}
-	],
-    "transactionExecutingCount": 3000,
-	"count": 3
-}
\ No newline at end of file
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 5b5c770fc..e1c56bd90 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -170,7 +170,7 @@
   },
   "gdt": {
      "gdt-received":"Gradido Transform (GDT) erhalten",
-     "factor":"Factor",
+     "factor":"Faktor",
      "conversion-gdt-euro":"Umrechnung Euro / Gradido Transform (GDT)",
      "calculation":"Berechnung der Gradido Transform",
      "conversion":"Umrechnung",
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index 5ede763be..5e069aba3 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -136,7 +136,7 @@ export default {
         this.pending = false
       } else {
         this.pending = true
-        // what to do when loading balance fails?
+        this.$toasted.error(result.result.message)
       }
     },
     updateBalance(ammount) {
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 54bcf2bdd..b7dbede2b 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -125,9 +125,3 @@ export default {
   },
 }
 </script>
-
-<style>
-.active {
-  background-color: rgba(192, 192, 192, 0.568);
-}
-</style>
diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
index 9d211d22d..9303bd837 100644
--- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
@@ -17,13 +17,6 @@
         } in this.transactionsGdt"
         :key="id"
       >
-        <div class="d-flex w-100 justify-content-between pb-3">
-          <h5 class="mb-1">
-            {{ $t('gdt.gdt-received') }} {{ comment ? ': [' + comment + ']' : '' }}
-          </h5>
-          <small>{{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}</small>
-        </div>
-
         <!-- ROW Start -->
         <div class="d-flex gdt-transaction-list-item" v-b-toggle="'a' + date + ''">
           <!-- ICON -->
@@ -124,16 +117,6 @@
 <script>
 import communityAPI from '../../../apis/communityAPI'
 
-const iconsByType = {
-  1: { icon: 'arrow-left-circle', classes: 'text-success', operator: '+' },
-  2: { icon: 'arrow-left-circle', classes: 'text-success', operator: '+' },
-  3: { icon: 'arrow-left-circle', classes: 'text-success', operator: '+' },
-  4: { icon: 'arrow-left-circle', classes: 'text-success', operator: '+' },
-  5: { icon: 'arrow-left-circle', classes: 'text-success', operator: '+' },
-  6: { icon: 'arrow-left-circle', classes: 'text-success', operator: '+' },
-  7: { icon: 'arrow-left-circle', classes: 'text-info', operator: '+' },
-}
-
 export default {
   name: 'gdt-transaction-list',
   data() {
@@ -143,23 +126,14 @@ export default {
     }
   },
   methods: {
-    getProperties(givenType) {
-      const type = iconsByType[givenType]
-      if (type)
-        return {
-          icon: type.icon,
-          class: type.classes + ' m-mb-1 font2em',
-          operator: type.operator,
-        }
-      this.throwError('no icon to given type')
-    },
-    throwError(msg) {
-      throw new Error(msg)
-    },
     async updateGdt() {
       const result = await communityAPI.transactionsgdt(this.$store.state.sessionId)
-      this.transactionsGdt = result.result.data.gdtEntries
-      this.transactionGdtCount = result.result.data.count
+      if (result.success) {
+        this.transactionsGdt = result.result.data.gdtEntries
+        this.transactionGdtCount = result.result.data.count
+      } else {
+        this.$toasted.error(result.result.message)
+      }
     },
   },
   mounted() {