From 66f10df1d0d656758213eb83ed89b263c77e2ff7 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 15 Jul 2022 11:23:03 +0200
Subject: [PATCH] improve logic and date handling. use v-model for form

---
 .../Contributions/ContributionForm.vue        | 21 ++++---------------
 frontend/src/pages/Community.vue              |  5 +++--
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 1a43e87ef..777806c30 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -12,7 +12,6 @@
         <b>{{ $t('contribution.formText.text2') }}</b>
       </div>
     </div>
-    {{ id }}
     <b-form ref="form" @submit.prevent="submit">
       <label>{{ $t('time.month') }}</label>
       <b-form-datepicker
@@ -66,21 +65,14 @@
 export default {
   name: 'ContributionForm',
   props: {
-    id: { type: Number, required: false, default: null },
-    date: { type: String, required: false },
-    memo: { type: String, required: false },
-    amount: { type: String, required: false },
+    value: { type: Object, required: true },
   },
   data() {
     return {
       minlength: 50,
       maxlength: 255,
       max: new Date(),
-      form: {
-        date: this.id === null ? '' : this.date,
-        memo: this.id === null ? '' : this.memo,
-        amount: this.id === null ? '' : this.amount,
-      },
+      form: this.value,
     }
   },
   methods: {
@@ -97,10 +89,10 @@ export default {
      *
      */
     lastMonth() {
-      return new Date(new Date(new Date().setMonth(new Date().getMonth() - 1)))
+      return new Date(this.max.getFullYear(), this.max.getMonth() - 1, 1)
     },
     min() {
-      return new Date(new Date(new Date().setMonth(new Date().getMonth() - 1)).setDate(1))
+      return new Date(this.max.getFullYear(), this.max.getMonth() - 1, 1)
     },
     disabled() {
       if (
@@ -127,10 +119,5 @@ export default {
       return this.$t('contribution.formText.thisMonth', obj)
     },
   },
-  watch: {
-    id(newId, oldId) {
-      alert('eine id kommt mit')
-    },
-  },
 }
 </script>
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 42102a005..ee2cc0aff 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -3,7 +3,7 @@
     <div>
       <b-tabs v-model="tabIndex" content-class="mt-3" align="center">
         <b-tab :title="$t('community.writing')" active>
-          <contribution-form @set-contribution="setContribution" v-bind="form" />
+          <contribution-form @set-contribution="setContribution" v-model="form" />
         </b-tab>
         <b-tab :title="$t('community.myContributions')">
           <contribution-list
@@ -113,10 +113,11 @@ export default {
         })
     },
     updateContribution(item) {
-      this.tabIndex = 0
+      this.form.id = item.id
       this.form.date = item.createdAt
       this.form.memo = item.memo
       this.form.amount = item.amount
+      this.tabIndex = 0
     },
     updateTransactions(pagination) {
       this.$emit('update-transactions', pagination)