fixed bugs, step 1

frontend/src/components/DecayInformation.vue

@@ -10,7 +10,7 @@
           <div class="d-flex">
             <div style="width: 100%" class="text-center pb-3">
               <b-icon icon="droplet-half" height="12" class="mb-2" />
-              {{ $t('decay.calculation_decay') }}
+              <b>{{ $t('decay.calculation_decay') }}</b>
             </div>
           </div>
 
@@ -42,12 +42,12 @@
             <div style="width: 60%">
               <div v-if="decay.decay_start_block > 0">{{ $t('decay.since_introduction') }}</div>
               <span v-if="duration">
-                <b v-if="duration.years > 0">{{ duration.years }} {{ $t('decay.year') }},</b>
-                <b v-if="duration.months > 0">{{ duration.months }} {{ $t('decay.months') }},</b>
-                <b v-if="duration.days > 0">{{ duration.days }} {{ $t('decay.days') }},</b>
-                <b v-if="duration.hours > 0">{{ duration.hours }} {{ $t('decay.hours') }},</b>
-                <b v-if="duration.minutes > 0">{{ duration.minutes }} {{ $t('decay.minutes') }},</b>
-                <b v-if="duration.seconds > 0">{{ duration.seconds }} {{ $t('decay.seconds') }}</b>
+                <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>
             </div>
           </div>

frontend/src/locales/de.json

@@ -33,11 +33,11 @@
     "hours":"Stunden",
     "minutes":"Minuten",
     "seconds":"Sekunden",
-    "received":"empfangen",
-    "sent":"gesendet",
-    "created":"geschöpft",
-    "fromCommunity":"Aus der Community",
-    "toCommunity":"An die Community"
+    "received":"Empfangen",
+    "sent":"Gesendet",
+    "created":"Geschöpft",
+    "fromCommunity":"Aus der Gemeinschaft",
+    "toCommunity":"An die Gemeinschaft"
   }, 
   "form": {
     "cancel": "Abbrechen",
@@ -175,6 +175,7 @@
      "conversion-gdt-euro":"Umrechnung Euro / Gradido Transform (GDT)",
      "calculation":"Berechnung der Gradido Transform",
      "conversion":"Umrechnung",
-     "formula":"Berechungsformel"
+     "formula":"Berechungsformel",
+     "no-transactions":"Du hast zur Zeit keine Transaktionen"
   }
 }

frontend/src/locales/en.json

@@ -33,9 +33,9 @@
     "hours": "Hours",
     "minutes": "Minutes",
     "seconds": "Seconds",
-    "received":"received",
-    "sent":"sent",
-    "created":"reated",
+    "received":"Received",
+    "sent":"Sent",
+    "created":"Created",
     "fromCommunity":"From the community",
     "toCommunity":"To the community"
   },
@@ -176,6 +176,7 @@
     "conversion-gdt-euro": "Conversion Euro / Gradido Transform (GDT)",
     "calculation": "Calculation of Gradido Transform",
     "conversion": "Conversion",
-    "formula": "Calculation formula"
+    "formula": "Calculation formula",
+    "no-transactions":"You currently have no transactions"
  }
 }

frontend/src/views/Pages/AccountOverview/GddTransactionList.vue

@@ -24,7 +24,10 @@
                 {{ $t('form.memo') }}
               </small>
             </div>
-            <div v-if="decay" class="text-sm">
+            <div  class="text-sm">
+           {{ $t('form.date') }}
+            </div>
+            <div v-if="decay" class="text-sm pt-2">
               <b-icon v-if="type != 'decay'" icon="droplet-half" height="15" class="mb-3" />
             </div>
           </div>

frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="gdt-transaction-list">
     <b-list-group>
+      <b-list-group-item v-if="transactionGdtCount === 0 ">{{ $t('gdt.no-transactions') }}</b-list-group-item>
       <b-list-group-item
         v-for="{
           id,
@@ -25,10 +26,13 @@
           <div class="font1_2em pr-2 text-right" style="width: 36%">
             <div>
               <div>
-                <span v-if="gdt_entry_type_id != 7">-</span>
-                {{ $n(amount, 'decimal') }}
+                <div v-if="gdt_entry_type_id === 7">{{ $n(gdt, 'decimal') }} </div>
+                <div v-else>{{ $n(amount, 'decimal') }} </div>
               </div>
-              <div v-if="gdt_entry_type_id != 7">+{{ $n(gdt, 'decimal') }}</div>
+               
+              <div v-if="gdt_entry_type_id !== 7 && gdt_entry_type_id !== 4">{{ $n(gdt, 'decimal') }}</div>
+               
+              
             </div>
 
             <div v-if="comment">
@@ -39,14 +43,12 @@
             <div v-if="date" class="text-sm">
               {{ $t('form.date') }}
             </div>
-            <div v-if="gdt_entry_type_id != 7">
-              <small>{{ $t('gdt.factor') }}</small>
-            </div>
+           
           </div>
           <!-- Text Rechts -->
           <div class="font1_2em text-left pl-2" style="width: 55%">
             <div>
-              <div v-if="gdt_entry_type_id != 7">EURO</div>
+              <div v-if="gdt_entry_type_id !== 7 && gdt_entry_type_id !== 4">EURO</div>
               <div>GDT</div>
             </div>
 
@@ -60,9 +62,7 @@
               {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
             </div>
 
-            <div v-if="gdt_entry_type_id != 7">
-              <small>{{ factor }}</small>
-            </div>
+           
           </div>
           <!-- Collaps Toggle Button -->
           <div v-if="gdt_entry_type_id" class="text-right" style="width: 5%">
@@ -75,16 +75,20 @@
         <!-- Collaps Start -->
         <b-collapse v-if="gdt_entry_type_id" :id="'a' + date + ''" class="pb-4">
           <b-list-group style="border: 0px; background-color: #f1f1f1">
-            <div v-if="gdt_entry_type_id != '7'" class="text-center pt-3">
+            
+            <div v-if="gdt_entry_type_id !== 7 && gdt_entry_type_id !== 4" class="text-center pt-3">
               {{ $t('gdt.conversion-gdt-euro') }}
             </div>
+            <div v-else-if="gdt_entry_type_id === 4" class="text-center pt-3">
+              Dein geworbenes Mitglied hat gespendet.  
+            </div>
             <div v-else class="text-center pt-3">
               {{ $t('gdt.calculation') }}
             </div>
 
             <!--EURO / GDT -->
             <b-list-group-item
-              v-if="gdt_entry_type_id != '7'"
+              v-if="gdt_entry_type_id !== 7 && gdt_entry_type_id !== 4"
               style="border: 0px; background-color: #f1f1f1"
             >
               <div class="d-flex">
@@ -94,16 +98,23 @@
                 </div>
                 <div style="width: 60%">
                   <div>{{ factor }}</div>
-                  <div>{{ amount }} € ⊢ {{ gdt }} GDT</div>
+                  <div>{{ amount }} € * {{factor}} = {{ $n(gdt, 'decimal') }} GDT</div>
                 </div>
               </div>
             </b-list-group-item>
+            
+            <b-list-group-item
+              v-else-if="gdt_entry_type_id === 4"
+              style="border: 0px; background-color: #f1f1f1"
+            >
+              
+            </b-list-group-item>
 
             <!-- Only GDT -->
             <b-list-group-item v-else style="border: 0px; background-color: #f1f1f1">
               <div class="d-flex">
                 <div style="width: 40%" class="text-right pr-3 mr-2">{{ $t('gdt.formula') }}:</div>
-                <div style="width: 60%">{{ amount }} GDT * {{ factor }} = {{ gdt }}</div>
+                <div style="width: 60%">{{ amount }} GDT * {{ factor }} = {{ $n(gdt, 'decimal') }}</div>
               </div>
             </b-list-group-item>
           </b-list-group>