From de4431774b4515e12da9a4a852be5a322d7b2bf1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 15 Dec 2022 14:18:45 +0100
Subject: [PATCH] badges AmountGDD and AmountGDT show and hide

---
 frontend/src/components/Inputs/InputTime.vue          |  5 +----
 .../components/Template/ContentHeader/GddAmount.vue   |  3 ++-
 .../components/Template/ContentHeader/GdtAmount.vue   |  5 +++--
 frontend/src/layouts/templates/ContentHeader.vue      | 10 +++++-----
 frontend/src/validation-rules.js                      | 11 ++---------
 5 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/frontend/src/components/Inputs/InputTime.vue b/frontend/src/components/Inputs/InputTime.vue
index e87aaa559..c64b788ba 100644
--- a/frontend/src/components/Inputs/InputTime.vue
+++ b/frontend/src/components/Inputs/InputTime.vue
@@ -4,7 +4,7 @@
       tag="div"
       :rules="rules"
       :name="name"
-      v-slot="{ errors, valid, validated, ariaInput, ariaMsg }"
+      v-slot="{ valid, validated, ariaInput }"
     >
       <b-form-group :label="label" :label-for="labelFor">
         <b-form-input
@@ -19,9 +19,6 @@
           min="0"
           :max="validMaxTime"
         ></b-form-input>
-        <b-form-invalid-feedback v-bind="ariaMsg">
-          {{ errors[0] }}
-        </b-form-invalid-feedback>
       </b-form-group>
     </validation-provider>
   </div>
diff --git a/frontend/src/components/Template/ContentHeader/GddAmount.vue b/frontend/src/components/Template/ContentHeader/GddAmount.vue
index d1ce42d33..2e0b09bed 100644
--- a/frontend/src/components/Template/ContentHeader/GddAmount.vue
+++ b/frontend/src/components/Template/ContentHeader/GddAmount.vue
@@ -2,6 +2,7 @@
   <div class="translucent-color-opacity">
     <div class="text-center">
       <b-badge
+        v-if="badgeShow"
         class="position-absolute mt--2 ml--4 px-3 zindex1"
         :variant="showStatus ? 'success' : 'light'"
       >
@@ -59,7 +60,7 @@ export default {
   props: {
     path: { type: String, required: false, default: '' },
     balance: { type: Number, required: true },
-    badge: { type: Boolean, default: false },
+    badgeShow: { type: Boolean, default: true },
     showStatus: { type: Boolean, default: false },
   },
   computed: {
diff --git a/frontend/src/components/Template/ContentHeader/GdtAmount.vue b/frontend/src/components/Template/ContentHeader/GdtAmount.vue
index d9ceea089..c1ef947dc 100644
--- a/frontend/src/components/Template/ContentHeader/GdtAmount.vue
+++ b/frontend/src/components/Template/ContentHeader/GdtAmount.vue
@@ -2,8 +2,9 @@
   <div>
     <div class="text-center">
       <b-badge
+        v-if="badgeShow"
         class="position-absolute mt--2 ml--4 px-3 zindex1"
-        :variant="badge ? 'success' : 'light'"
+        :variant="showStatus ? 'success' : 'light'"
       >
         {{ $t('GDT') }}
       </b-badge>
@@ -53,7 +54,7 @@ export default {
   name: 'GdtAmount',
   props: {
     GdtBalance: { type: Number, required: true },
-    badge: { type: Boolean, default: false },
+    badgeShow: { type: Boolean, default: true },
     showStatus: { type: Boolean, default: false },
   },
   computed: {
diff --git a/frontend/src/layouts/templates/ContentHeader.vue b/frontend/src/layouts/templates/ContentHeader.vue
index 68aef38f0..b479726d6 100644
--- a/frontend/src/layouts/templates/ContentHeader.vue
+++ b/frontend/src/layouts/templates/ContentHeader.vue
@@ -4,7 +4,7 @@
       <b-row>
         <b-col cols="5">
           <div>
-            <gdd-amount :balance="balance" :showStatus="false" :path="path" />
+            <gdd-amount :balance="balance" :showStatus="false" :path="path" :badgeShow="false" />
           </div>
         </b-col>
         <b-col cols="7">
@@ -20,13 +20,13 @@
       <b-row>
         <b-col cols="6">
           <div>
-            <gdd-amount :balance="balance" :badge="true" :showStatus="true" />
+            <gdd-amount :balance="balance" :badge="true" :showStatus="true" :badgeShow="false" />
           </div>
         </b-col>
         <b-col cols="6">
           <div>
             <router-link to="gdt">
-              <gdt-amount :GdtBalance="GdtBalance" />
+              <gdt-amount :GdtBalance="GdtBalance" :badgeShow="false" />
             </router-link>
           </div>
         </b-col>
@@ -37,7 +37,7 @@
         <b-col cols="6">
           <div>
             <router-link to="transactions">
-              <gdd-amount :balance="balance" :badge="true" :showStatus="true" />
+              <gdd-amount :balance="balance" :showStatus="true" />
             </router-link>
           </div>
         </b-col>
@@ -55,7 +55,7 @@
         <b-col cols="6">
           <div>
             <router-link to="transactions">
-              <gdd-amount :balance="balance" :badge="true" :showStatus="false" />
+              <gdd-amount :balance="balance" :showStatus="false" />
             </router-link>
           </div>
         </b-col>
diff --git a/frontend/src/validation-rules.js b/frontend/src/validation-rules.js
index b193880ff..6614d728b 100644
--- a/frontend/src/validation-rules.js
+++ b/frontend/src/validation-rules.js
@@ -56,15 +56,8 @@ export const loadAllRules = (i18nCallback) => {
 
   extend('gddCreationTime', {
     validate(value, { min, max }) {
-      value = value.replace(',', '.')
-      // console.log(value)
-      // console.log(min)
-      // console.log(max)
-      // console.log(typeof(value))
-      // console.log(typeof(min))
-      // console.log(typeof(max))
-      // value = value.replace(',', '.')
-      return Number(value) >= min && Number(value) <= max
+      if (value) value = value.replace(',', '.')
+      return value >= min && value <= max
     },
     params: ['min', 'max'],
     message: (_, values) => {