From d662338f6a8aed337685dcc861e030e622803a1f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 13 Oct 2022 09:52:25 +0200
Subject: [PATCH] feat: Daily Rule for Contribution Links in Admin Interface

---
 admin/src/components/ContributionLink.spec.js |  1 +
 admin/src/components/ContributionLinkForm.vue | 76 +++++++++----------
 .../components/ContributionLinkList.spec.js   |  1 +
 admin/src/components/ContributionLinkList.vue | 24 +++++-
 admin/src/locales/de.json                     |  7 +-
 admin/src/locales/en.json                     |  7 +-
 admin/src/pages/Overview.spec.js              |  1 +
 7 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/admin/src/components/ContributionLink.spec.js b/admin/src/components/ContributionLink.spec.js
index f1b9cfb97..9818e8b93 100644
--- a/admin/src/components/ContributionLink.spec.js
+++ b/admin/src/components/ContributionLink.spec.js
@@ -5,6 +5,7 @@ const localVue = global.localVue
 
 const mocks = {
   $t: jest.fn((t) => t),
+  $d: jest.fn((d) => d),
 }
 
 const propsData = {
diff --git a/admin/src/components/ContributionLinkForm.vue b/admin/src/components/ContributionLinkForm.vue
index 6daf1e299..48cd98f9b 100644
--- a/admin/src/components/ContributionLinkForm.vue
+++ b/admin/src/components/ContributionLinkForm.vue
@@ -1,8 +1,5 @@
 <template>
   <div class="contribution-link-form">
-    <div v-if="updateData" class="text-light bg-info p-3">
-      {{ updateData }}
-    </div>
     <b-form class="m-5" @submit.prevent="onSubmit" ref="contributionLinkForm">
       <!-- Date -->
       <b-row>
@@ -68,34 +65,32 @@
           class="test-amount"
         ></b-form-input>
       </b-form-group>
-      <b-collapse id="collapse-2">
-        <b-jumbotron>
-          <b-row class="mb-4">
-            <b-col>
-              <!-- Cycle -->
-              <label for="cycle">{{ $t('contributionLink.cycle') }}</label>
-              <b-form-select
-                v-model="form.cycle"
-                :options="cycle"
-                :disabled="disabled"
-                class="mb-3"
-                size="lg"
-              ></b-form-select>
-            </b-col>
-            <b-col>
-              <!-- maxPerCycle -->
-              <label for="maxPerCycle">{{ $t('contributionLink.maxPerCycle') }}</label>
-              <b-form-select
-                v-model="form.maxPerCycle"
-                :options="maxPerCycle"
-                :disabled="disabled"
-                class="mb-3"
-                size="lg"
-              ></b-form-select>
-            </b-col>
-          </b-row>
+      <b-row class="mb-4">
+        <b-col>
+          <!-- Cycle -->
+          <label for="cycle">{{ $t('contributionLink.cycle') }}</label>
+          <b-form-select
+            v-model="form.cycle"
+            :options="cycle"
+            class="mb-3"
+            size="lg"
+          ></b-form-select>
+        </b-col>
+        <b-col>
+          <!-- maxPerCycle -->
+          <label for="maxPerCycle">{{ $t('contributionLink.maxPerCycle') }}</label>
+          <b-form-select
+            v-model="form.maxPerCycle"
+            :options="maxPerCycle"
+            :disabled="disabled"
+            class="mb-3"
+            size="lg"
+          ></b-form-select>
+        </b-col>
+      </b-row>
 
-          <!-- Max amount -->
+      <!-- Max amount -->
+      <!-- 
           <b-form-group :label="$t('contributionLink.maximumAmount')">
             <b-form-input
               v-model="form.maxAmountPerMonth"
@@ -105,8 +100,7 @@
               placeholder="0"
             ></b-form-input>
           </b-form-group>
-        </b-jumbotron>
-      </b-collapse>
+          -->
       <div class="mt-6">
         <b-button type="submit" variant="primary">{{ $t('contributionLink.create') }}</b-button>
         <b-button type="reset" variant="danger" @click.prevent="onReset">
@@ -143,18 +137,18 @@ export default {
       min: new Date(),
       cycle: [
         { value: 'ONCE', text: this.$t('contributionLink.options.cycle.once') },
-        { value: 'hourly', text: this.$t('contributionLink.options.cycle.hourly') },
-        { value: 'daily', text: this.$t('contributionLink.options.cycle.daily') },
-        { value: 'weekly', text: this.$t('contributionLink.options.cycle.weekly') },
-        { value: 'monthly', text: this.$t('contributionLink.options.cycle.monthly') },
-        { value: 'yearly', text: this.$t('contributionLink.options.cycle.yearly') },
+        //        { value: 'hourly', text: this.$t('contributionLink.options.cycle.hourly') },
+        { value: 'DAILY', text: this.$t('contributionLink.options.cycle.daily') },
+        //        { value: 'weekly', text: this.$t('contributionLink.options.cycle.weekly') },
+        //        { value: 'monthly', text: this.$t('contributionLink.options.cycle.monthly') },
+        //        { value: 'yearly', text: this.$t('contributionLink.options.cycle.yearly') },
       ],
       maxPerCycle: [
         { value: '1', text: '1 x' },
-        { value: '2', text: '2 x' },
-        { value: '3', text: '3 x' },
-        { value: '4', text: '4 x' },
-        { value: '5', text: '5 x' },
+        //        { value: '2', text: '2 x' },
+        //        { value: '3', text: '3 x' },
+        //        { value: '4', text: '4 x' },
+        //        { value: '5', text: '5 x' },
       ],
     }
   },
diff --git a/admin/src/components/ContributionLinkList.spec.js b/admin/src/components/ContributionLinkList.spec.js
index b2baf5e9b..44a1851f6 100644
--- a/admin/src/components/ContributionLinkList.spec.js
+++ b/admin/src/components/ContributionLinkList.spec.js
@@ -9,6 +9,7 @@ const mockAPIcall = jest.fn()
 
 const mocks = {
   $t: jest.fn((t) => t),
+  $d: jest.fn((d) => d),
   $apollo: {
     mutate: mockAPIcall,
   },
diff --git a/admin/src/components/ContributionLinkList.vue b/admin/src/components/ContributionLinkList.vue
index 48b7ce978..70a894b16 100644
--- a/admin/src/components/ContributionLinkList.vue
+++ b/admin/src/components/ContributionLinkList.vue
@@ -64,8 +64,28 @@ export default {
         'amount',
         { key: 'cycle', label: this.$t('contributionLink.cycle') },
         { key: 'maxPerCycle', label: this.$t('contributionLink.maxPerCycle') },
-        { key: 'validFrom', label: this.$t('contributionLink.validFrom') },
-        { key: 'validTo', label: this.$t('contributionLink.validTo') },
+        {
+          key: 'validFrom',
+          label: this.$t('contributionLink.validFrom'),
+          formatter: (value, key, item) => {
+            if (value) {
+              return this.$d(new Date(value))
+            } else {
+              return null
+            }
+          },
+        },
+        {
+          key: 'validTo',
+          label: this.$t('contributionLink.validTo'),
+          formatter: (value, key, item) => {
+            if (value) {
+              return this.$d(new Date(value))
+            } else {
+              return null
+            }
+          },
+        },
         'delete',
         'edit',
         'show',
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 65611b1ab..325d153dd 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -9,7 +9,6 @@
     "cycle": "Zyklus",
     "deleted": "Automatische Schöpfung gelöscht!",
     "deleteNow": "Automatische Creations '{name}' wirklich löschen?",
-    "maximumAmount": "maximaler Betrag",
     "maxPerCycle": "Wiederholungen",
     "memo": "Nachricht",
     "name": "Name",
@@ -21,11 +20,7 @@
     "options": {
       "cycle": {
         "daily": "täglich",
-        "hourly": "stündlich",
-        "monthly": "monatlich",
-        "once": "einmalig",
-        "weekly": "wöchentlich",
-        "yearly": "jährlich"
+        "once": "einmalig"
       }
     },
     "validFrom": "Startdatum",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 57fd1c6b4..8f050c34b 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -9,7 +9,6 @@
     "cycle": "Cycle",
     "deleted": "Automatic creation deleted!",
     "deleteNow": "Do you really delete automatic creations '{name}'?",
-    "maximumAmount": "Maximum amount",
     "maxPerCycle": "Repetition",
     "memo": "Memo",
     "name": "Name",
@@ -21,11 +20,7 @@
     "options": {
       "cycle": {
         "daily": "daily",
-        "hourly": "hourly",
-        "monthly": "monthly",
-        "once": "once",
-        "weekly": "weekly",
-        "yearly": "yearly"
+        "once": "once"
       }
     },
     "validFrom": "Start-date",
diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index e0063a446..1861c5330 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -78,6 +78,7 @@ const storeCommitMock = jest.fn()
 const mocks = {
   $t: jest.fn((t) => t),
   $n: jest.fn((n) => n),
+  $d: jest.fn((d) => d),
   $apollo: {
     query: apolloQueryMock,
   },