From eb404cf8b3e0d106f18a12883a00bccb4e9dfc57 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 13 Jul 2022 14:30:46 +0200
Subject: [PATCH 01/36] add migrations to insert contributions to all
 transactions with type creation that do not have a contribution yet

---
 .../0043-insert_missing_contributions.ts      | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 database/migrations/0043-insert_missing_contributions.ts

diff --git a/database/migrations/0043-insert_missing_contributions.ts b/database/migrations/0043-insert_missing_contributions.ts
new file mode 100644
index 000000000..a14141498
--- /dev/null
+++ b/database/migrations/0043-insert_missing_contributions.ts
@@ -0,0 +1,34 @@
+/* MIGRATION TO INSERT contributions for all transactions with type creation that do not have a contribution yet */
+
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(
+    `INSERT INTO gradido_community.contributions
+  (user_id, created_at, contribution_date, memo, amount, moderator_id, confirmed_by, confirmed_at, transaction_id)
+SELECT 
+  user_id,
+  balance_date,
+  creation_date AS contribution_date,
+  memo,
+  amount,
+  20 AS moderator_id,
+  502 AS confirmed_by,
+  balance_date AS confirmed_at,
+  id
+FROM
+  gradido_community.transactions
+WHERE
+  type_id = 1
+  AND NOT EXISTS(
+    SELECT * FROM gradido_community.contributions
+    WHERE gradido_community.contributions.transaction_id = gradido_community.transactions.id);`,
+  )
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(
+    'DELETE FROM `contributions` WHERE `contributions`.`moderator_id` = 20 AND `contributions`.`confirmed_by` = 502 AND `contributions`.`created_at` = `contributions`.`confirmed_at`;',
+  )
+}

From bdcbb196b77fc16cd165e898c7d54bf9b5aef6f1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 13 Jul 2022 14:31:31 +0200
Subject: [PATCH 02/36] update database version

---
 backend/src/config/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 8b84c059d..208425792 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -10,7 +10,7 @@ Decimal.set({
 })
 
 const constants = {
-  DB_VERSION: '0042-update_transactions_for_blockchain',
+  DB_VERSION: '0043-insert_missing_contributions',
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   LOG4JS_CONFIG: 'log4js-config.json',
   // default log level on production should be info

From af9d874fea27cdb1e69bf83a9b635686d6a7f53a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 25 Jul 2022 13:29:45 +0200
Subject: [PATCH 03/36] fix: Update contribution_date when Moved by Seed

---
 backend/src/seeds/factory/creation.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts
index 75a765fae..d3f0f78ca 100644
--- a/backend/src/seeds/factory/creation.ts
+++ b/backend/src/seeds/factory/creation.ts
@@ -35,12 +35,17 @@ export const creationFactory = async (
   if (creation.confirmed) {
     await mutate({ mutation: confirmContribution, variables: { id: pendingCreation.id } })
 
+    const confirmedCreation = await Contribution.findOneOrFail({ id: pendingCreation.id })
+
     if (creation.moveCreationDate) {
       const transaction = await Transaction.findOneOrFail({
         where: { userId: user.id, creationDate: new Date(creation.creationDate) },
         order: { balanceDate: 'DESC' },
       })
       if (transaction.decay.equals(0) && transaction.creationDate) {
+        confirmedCreation.contributionDate = new Date(
+          nMonthsBefore(transaction.creationDate, creation.moveCreationDate),
+        )
         transaction.creationDate = new Date(
           nMonthsBefore(transaction.creationDate, creation.moveCreationDate),
         )
@@ -48,6 +53,7 @@ export const creationFactory = async (
           nMonthsBefore(transaction.balanceDate, creation.moveCreationDate),
         )
         await transaction.save()
+        await confirmedCreation.save()
       }
     }
   } else {

From ae6fdd51e97c448f99efd7ee1d0a6f46c58aa1a1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 25 Jul 2022 14:00:26 +0200
Subject: [PATCH 04/36] use camel case instead of snake case for edit creation
 field

---
 admin/src/components/Tables/OpenCreationsTable.spec.js | 2 +-
 admin/src/components/Tables/OpenCreationsTable.vue     | 2 +-
 admin/src/pages/CreationConfirm.vue                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 2b41a9b96..05f4506d0 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -66,7 +66,7 @@ const propsData = {
       },
     },
     { key: 'moderator', label: 'moderator' },
-    { key: 'edit_creation', label: 'edit' },
+    { key: 'editCreation', label: 'edit' },
     { key: 'confirm', label: 'save' },
   ],
   toggleDetails: false,
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 1e61f00b0..dd9ee5015 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -11,7 +11,7 @@
           <b-icon icon="x" variant="light"></b-icon>
         </b-button>
       </template>
-      <template #cell(edit_creation)="row">
+      <template #cell(editCreation)="row">
         <b-button variant="info" size="md" @click="rowToggleDetails(row, 0)" class="mr-2">
           <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
         </b-button>
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 061556ba1..b103bbc5d 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -114,7 +114,7 @@ export default {
           },
         },
         { key: 'moderator', label: this.$t('moderator') },
-        { key: 'edit_creation', label: this.$t('edit') },
+        { key: 'editCreation', label: this.$t('edit') },
         { key: 'confirm', label: this.$t('save') },
       ]
     },

From 5fd8ea2223f6f2e2739834ef39fde091ec955682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 25 Jul 2022 14:06:10 +0200
Subject: [PATCH 05/36] Reset amount in Contribution form and write a test

---
 .../src/components/Contributions/ContributionForm.vue    | 1 +
 frontend/src/pages/Community.spec.js                     | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 6b8ef39d0..72576ece8 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -111,6 +111,7 @@ export default {
       this.form.date = ''
       this.id = null
       this.form.memo = ''
+      this.form.amount = '0'
     },
   },
   computed: {
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index d834ddac1..bce29452c 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -190,6 +190,13 @@ describe('Community', () => {
             fetchPolicy: 'network-only',
           })
         })
+
+        it('set all data to the default values)', () => {
+          expect(wrapper.vm.form.id).toBe(null)
+          expect(wrapper.vm.form.date).toBe('')
+          expect(wrapper.vm.form.memo).toBe('')
+          expect(wrapper.vm.form.amount).toBe('0')
+        })
       })
 
       describe('with error', () => {
@@ -376,7 +383,7 @@ describe('Community', () => {
           })
       })
 
-      it('sets the form date to the new values', () => {
+      it('sets the form data to the new values', () => {
         expect(wrapper.vm.form.id).toBe(2)
         expect(wrapper.vm.form.date).toBe(now)
         expect(wrapper.vm.form.memo).toBe('Mein Beitrag zur Gemeinschaft für diesen Monat ...')

From 387e45cdbc13d5ae47dc8f5c03fb2e8e7cae05f4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 25 Jul 2022 14:06:53 +0200
Subject: [PATCH 06/36] show edit button only, if it is an admin creation

---
 admin/src/components/Tables/OpenCreationsTable.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index dd9ee5015..3ebc81fba 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -12,7 +12,13 @@
         </b-button>
       </template>
       <template #cell(editCreation)="row">
-        <b-button variant="info" size="md" @click="rowToggleDetails(row, 0)" class="mr-2">
+        <b-button
+          v-if="row.item.moderator"
+          variant="info"
+          size="md"
+          @click="rowToggleDetails(row, 0)"
+          class="mr-2"
+        >
           <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
         </b-button>
       </template>

From 09c9ad111f3d0970b5240a674dde0f6165785c5f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 25 Jul 2022 14:14:24 +0200
Subject: [PATCH 07/36] add test for edit button on user creation

---
 admin/src/components/Tables/OpenCreationsTable.spec.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 05f4506d0..2eb149e4f 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -28,7 +28,7 @@ const propsData = {
       amount: 210,
       memo: 'Aktives Grundeinkommen für Januar 2022',
       date: '2022-01-01T00:00:00.000Z',
-      moderator: 1,
+      moderator: null,
       creation: [790, 1000, 1000],
       __typename: 'PendingCreation',
     },
@@ -113,6 +113,10 @@ describe('OpenCreationsTable', () => {
       expect(wrapper.findAll('tr').at(1).find('.bi-pencil-square').exists()).toBe(true)
     })
 
+    it('has no button.bi-pencil-square for user contribution ', () => {
+      expect(wrapper.findAll('tr').at(2).find('.bi-pencil-square').exists()).toBe(false)
+    })
+
     describe('show edit details', () => {
       beforeEach(async () => {
         await wrapper.findAll('tr').at(1).find('.bi-pencil-square').trigger('click')

From 4b26c99be986eba4e713946442a000d90b2becb7 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 25 Jul 2022 14:24:20 +0200
Subject: [PATCH 08/36] add bv modal to confirm deletion of contribution

---
 admin/src/locales/de.json           |  1 +
 admin/src/locales/en.json           |  1 +
 admin/src/pages/CreationConfirm.vue | 31 ++++++++++++++++-------------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index fa0ca6903..3d88e0257 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -35,6 +35,7 @@
   "creation_form": {
     "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
     "creation_for": "Aktives Grundeinkommen für",
+    "deleteNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich löschen?",
     "enter_text": "Text eintragen",
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 6d19b1732..f23c61e21 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -35,6 +35,7 @@
   "creation_form": {
     "creation_failed": "Could not create pending creation for {email}",
     "creation_for": "Active Basic Income for",
+    "deleteNow": "Do you really want to delete this contribution to the community?",
     "enter_text": "Enter text",
     "form": "Creation form",
     "min_characters": "Enter at least 10 characters",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 061556ba1..e78499c4b 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -34,20 +34,23 @@ export default {
   },
   methods: {
     removeCreation(item) {
-      this.$apollo
-        .mutate({
-          mutation: adminDeleteContribution,
-          variables: {
-            id: item.id,
-          },
-        })
-        .then((result) => {
-          this.updatePendingCreations(item.id)
-          this.toastSuccess(this.$t('creation_form.toasted_delete'))
-        })
-        .catch((error) => {
-          this.toastError(error.message)
-        })
+      this.$bvModal.msgBoxConfirm(this.$t('creation_form.deleteNow')).then(async (value) => {
+        if (value)
+          await this.$apollo
+            .mutate({
+              mutation: adminDeleteContribution,
+              variables: {
+                id: item.id,
+              },
+            })
+            .then((result) => {
+              this.updatePendingCreations(item.id)
+              this.toastSuccess(this.$t('creation_form.toasted_delete'))
+            })
+            .catch((error) => {
+              this.toastError(error.message)
+            })
+      })
     },
     confirmCreation() {
       this.$apollo

From 0b97e8e38e3212776c7b2f64ee852dcf4ae260f9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 25 Jul 2022 14:31:16 +0200
Subject: [PATCH 09/36] test the confirm deletion modal

---
 admin/src/pages/CreationConfirm.spec.js | 50 +++++++++++++++++++------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 632f19ff9..d0293fb3f 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -80,28 +80,54 @@ describe('CreationConfirm', () => {
     })
 
     describe('remove creation with success', () => {
-      beforeEach(async () => {
-        await wrapper.findAll('tr').at(1).findAll('button').at(0).trigger('click')
-      })
+      let spy
 
-      it('calls the adminDeleteContribution mutation', () => {
-        expect(apolloMutateMock).toBeCalledWith({
-          mutation: adminDeleteContribution,
-          variables: { id: 1 },
+      describe('admin confirms deletion', () => {
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve('some value'))
+          await wrapper.findAll('tr').at(1).findAll('button').at(0).trigger('click')
+        })
+
+        it('opens a modal', () => {
+          expect(spy).toBeCalled()
+        })
+
+        it('calls the adminDeleteContribution mutation', () => {
+          expect(apolloMutateMock).toBeCalledWith({
+            mutation: adminDeleteContribution,
+            variables: { id: 1 },
+          })
+        })
+
+        it('commits openCreationsMinus to store', () => {
+          expect(storeCommitMock).toBeCalledWith('openCreationsMinus', 1)
+        })
+
+        it('toasts a success message', () => {
+          expect(toastSuccessSpy).toBeCalledWith('creation_form.toasted_delete')
         })
       })
 
-      it('commits openCreationsMinus to store', () => {
-        expect(storeCommitMock).toBeCalledWith('openCreationsMinus', 1)
-      })
+      describe('admin cancels deletion', () => {
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(false))
+          await wrapper.findAll('tr').at(1).findAll('button').at(0).trigger('click')
+        })
 
-      it('toasts a success message', () => {
-        expect(toastSuccessSpy).toBeCalledWith('creation_form.toasted_delete')
+        it('does not call the adminDeleteContribution mutation', () => {
+          expect(apolloMutateMock).not.toBeCalled()
+        })
       })
     })
 
     describe('remove creation with error', () => {
+      let spy
+
       beforeEach(async () => {
+        spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+        spy.mockImplementation(() => Promise.resolve('some value'))
         apolloMutateMock.mockRejectedValue({ message: 'Ouchhh!' })
         await wrapper.findAll('tr').at(1).findAll('button').at(0).trigger('click')
       })

From 00ca2bb9a9af3822255f55bbecd2378dbd9395e9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 25 Jul 2022 14:37:40 +0200
Subject: [PATCH 10/36] set moderator > 0, as we have no ids with value 0 and 0
 evaluates to false

---
 admin/src/pages/CreationConfirm.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 632f19ff9..b33cb71e9 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -18,7 +18,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         amount: 500,
         memo: 'Danke für alles',
         date: new Date(),
-        moderator: 0,
+        moderator: 2,
       },
       {
         id: 2,
@@ -28,7 +28,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         amount: 1000000,
         memo: 'Gut Ergattert',
         date: new Date(),
-        moderator: 0,
+        moderator: 2,
       },
     ],
   },

From 7b2de945bc5bc109d44f1db1f9cf82db9a4dc675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 09:29:20 +0200
Subject: [PATCH 11/36] Set amount in Contribution form all over the place as
 '0'

---
 frontend/src/pages/Community.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 64aca6156..e85f708c3 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -103,7 +103,7 @@ export default {
         id: null,
         date: '',
         memo: '',
-        amount: '',
+        amount: '0',
       },
       updateAmount: '',
     }

From a4947339dcff69ae6dde73242cd23cdaf1afdf84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 09:39:33 +0200
Subject: [PATCH 12/36] Set amount in Contribution form all over the place as
 '' and not '0'

---
 frontend/src/components/Contributions/ContributionForm.vue | 2 +-
 frontend/src/pages/Community.spec.js                       | 2 +-
 frontend/src/pages/Community.vue                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 72576ece8..6bd18d784 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -111,7 +111,7 @@ export default {
       this.form.date = ''
       this.id = null
       this.form.memo = ''
-      this.form.amount = '0'
+      this.form.amount = ''
     },
   },
   computed: {
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index bce29452c..05dbb3bdc 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -195,7 +195,7 @@ describe('Community', () => {
           expect(wrapper.vm.form.id).toBe(null)
           expect(wrapper.vm.form.date).toBe('')
           expect(wrapper.vm.form.memo).toBe('')
-          expect(wrapper.vm.form.amount).toBe('0')
+          expect(wrapper.vm.form.amount).toBe('')
         })
       })
 
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index e85f708c3..64aca6156 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -103,7 +103,7 @@ export default {
         id: null,
         date: '',
         memo: '',
-        amount: '0',
+        amount: '',
       },
       updateAmount: '',
     }

From 5ff0de7b4f604db95388ccd94380d03f554dee79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 10:41:29 +0200
Subject: [PATCH 13/36] Submit on 'Change' (with id) submit button text shall
 change to 'Submit' and chnage button text from 'Edit' to 'Change'

---
 .../components/Contributions/ContributionForm.vue | 15 ++++++++-------
 frontend/src/locales/de.json                      |  2 +-
 frontend/src/locales/en.json                      |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 6bd18d784..647cd0067 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -74,7 +74,7 @@
         </b-col>
         <b-col class="text-right">
           <b-button class="test-submit" type="submit" variant="primary" :disabled="disabled">
-            {{ value.id ? $t('form.edit') : $t('contribution.submit') }}
+            {{ form.id ? $t('form.change') : $t('contribution.submit') }}
           </b-button>
         </b-col>
       </b-row>
@@ -93,13 +93,13 @@ export default {
       minlength: 50,
       maxlength: 255,
       maximalDate: new Date(),
-      form: this.value,
-      id: this.value.id,
+      form: this.value, // includes 'id'
+      // Wolle: id: this.value.id,
     }
   },
   methods: {
     submit() {
-      if (this.value.id) {
+      if (this.form.id) {
         this.$emit('update-contribution', this.form)
       } else {
         this.$emit('set-contribution', this.form)
@@ -108,8 +108,9 @@ export default {
     },
     reset() {
       this.$refs.form.reset()
+      // Wolle: this.id = null
+      this.form.id = null
       this.form.date = ''
-      this.id = null
       this.form.memo = ''
       this.form.amount = ''
     },
@@ -154,13 +155,13 @@ export default {
     },
     maxGddLastMonth() {
       // When edited, the amount is added back on top of the amount
-      return this.value.id && !this.isThisMonth
+      return this.form.id && !this.isThisMonth
         ? parseInt(this.$store.state.creation[1]) + parseInt(this.updateAmount)
         : this.$store.state.creation[1]
     },
     maxGddThisMonth() {
       // When edited, the amount is added back on top of the amount
-      return this.value.id && this.isThisMonth
+      return this.form.id && this.isThisMonth
         ? parseInt(this.$store.state.creation[2]) + parseInt(this.updateAmount)
         : this.$store.state.creation[2]
     },
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ef81d463e..d06299245 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -110,7 +110,7 @@
     "current_balance": "Aktueller Kontostand",
     "date": "Datum",
     "description": "Beschreibung",
-    "edit": "Bearbeiten",
+    "change": "Ändern",
     "email": "E-Mail",
     "firstname": "Vorname",
     "from": "Von",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 47753487d..de1ee6900 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -110,7 +110,7 @@
     "current_balance": "Current Balance",
     "date": "Date",
     "description": "Description",
-    "edit": "Edit",
+    "change": "Change",
     "email": "Email",
     "firstname": "Firstname",
     "from": "from",

From 37a255ffeaa6e4d944da4d96ceba2ba90a80e084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 10:51:57 +0200
Subject: [PATCH 14/36] Write a test for reseting all form data after
 updateContribution

---
 frontend/src/pages/Community.spec.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index 05dbb3bdc..24260addf 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -277,6 +277,13 @@ describe('Community', () => {
             fetchPolicy: 'network-only',
           })
         })
+
+        it('set all data to the default values)', () => {
+          expect(wrapper.vm.form.id).toBe(null)
+          expect(wrapper.vm.form.date).toBe('')
+          expect(wrapper.vm.form.memo).toBe('')
+          expect(wrapper.vm.form.amount).toBe('')
+        })
       })
 
       describe('with error', () => {

From 049b9728c558fe502901ce2cadbf79ae3a2972cd Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Jul 2022 11:17:35 +0200
Subject: [PATCH 15/36] Replace own logic to validation-provider.

---
 .../Contributions/ContributionForm.vue        | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 6b8ef39d0..1c98dfd98 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -25,25 +25,27 @@
         :label-no-date-selected="$t('contribution.noDateSelected')"
         required
       ></b-form-datepicker>
-      <label class="mt-3">{{ $t('contribution.activity') }}</label>
-      <b-form-textarea
-        id="contribution-memo"
-        v-model="form.memo"
-        rows="3"
-        max-rows="6"
-        required
-        :minlength="minlength"
-        :maxlength="maxlength"
-      ></b-form-textarea>
-      <div
-        v-show="form.memo.length > 0"
-        class="text-right"
-        :class="form.memo.length < minlength ? 'text-danger' : 'text-success'"
+      <validation-provider
+        :rules="{
+          required: true,
+          min: minlength,
+          max: maxlength,
+        }"
+        :name="$t('form.message')"
+        v-slot="{ errors }"
       >
-        {{ form.memo.length }}
-        <span v-if="form.memo.length < minlength">{{ $t('math.lower') }} {{ minlength }}</span>
-        <span v-else>{{ $t('math.divide') }} {{ maxlength }}</span>
-      </div>
+        <label class="mt-3">{{ $t('contribution.activity') }}</label>
+        <b-form-textarea
+          id="contribution-memo"
+          v-model="form.memo"
+          rows="3"
+          max-rows="6"
+          required
+        ></b-form-textarea>
+        <b-col v-if="errors">
+          <span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
+        </b-col>
+      </validation-provider>
       <label class="mt-3">{{ $t('form.amount') }}</label>
       <b-input-group size="lg" prepend="GDD" append=".00">
         <b-form-input
@@ -90,7 +92,7 @@ export default {
   },
   data() {
     return {
-      minlength: 50,
+      minlength: 5,
       maxlength: 255,
       maximalDate: new Date(),
       form: this.value,

From f01225e40007afade0512ba780f3c0ce66176d53 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Jul 2022 11:21:57 +0200
Subject: [PATCH 16/36] Remove unused locales.

---
 frontend/src/locales/de.json | 2 --
 frontend/src/locales/en.json | 2 --
 2 files changed, 4 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index ef81d463e..62edd9815 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -203,10 +203,8 @@
   "login": "Anmeldung",
   "math": {
     "aprox": "~",
-    "divide": "/",
     "equal": "=",
     "exclaim": "!",
-    "lower": "<",
     "minus": "−",
     "pipe": "|"
   },
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 47753487d..1cbdc5a8a 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -203,10 +203,8 @@
   "login": "Login",
   "math": {
     "aprox": "~",
-    "divide": "/",
     "equal": "=",
     "exclaim": "!",
-    "lower": "<",
     "minus": "−",
     "pipe": "|"
   },

From 2eaf93bb34f9c3de7f7b0a65e4a3ec7c7c61766f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Jul 2022 12:01:14 +0200
Subject: [PATCH 17/36] errors in red, datepicker localized

---
 .../src/components/Contributions/ContributionForm.spec.js   | 3 +++
 frontend/src/components/Contributions/ContributionForm.vue  | 6 ++++++
 frontend/src/pages/Community.spec.js                        | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 5b05957bb..4f3ee6fa6 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -23,6 +23,9 @@ describe('ContributionForm', () => {
         creation: ['1000', '1000', '1000'],
       },
     },
+    $i18n: {
+      locale: 'en',
+    },
   }
 
   const Wrapper = () => {
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 1c98dfd98..f345ffff4 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -18,6 +18,7 @@
         id="contribution-date"
         v-model="form.date"
         size="lg"
+        :locale="$i18n.locale"
         :max="maximalDate"
         :min="minimalDate"
         class="mb-4"
@@ -168,3 +169,8 @@ export default {
   },
 }
 </script>
+<style>
+span.errors {
+  color: red;
+}
+</style>
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index d834ddac1..deccabbb1 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -26,6 +26,9 @@ describe('Community', () => {
         creation: ['1000', '1000', '1000'],
       },
     },
+    $i18n: {
+      locale: 'en',
+    },
   }
 
   const Wrapper = () => {

From 57f06280ce1ac19487691bb9c17b74adb74d062b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Jul 2022 13:00:08 +0200
Subject: [PATCH 18/36] Remove nav prev and nav next year arrows.

---
 frontend/src/components/Contributions/ContributionForm.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index f345ffff4..1a1e08d59 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -25,7 +25,10 @@
         reset-value=""
         :label-no-date-selected="$t('contribution.noDateSelected')"
         required
-      ></b-form-datepicker>
+      >
+        <template #nav-prev-year><span></span></template>
+        <template #nav-next-year><span></span></template>
+      </b-form-datepicker>
       <validation-provider
         :rules="{
           required: true,

From 69f415e082700572951eccf716b633f01840a5b4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Jul 2022 13:05:07 +0200
Subject: [PATCH 19/36] Change 'my contributions' to 'my contributions to the
 common good'

---
 frontend/src/locales/de.json | 2 +-
 frontend/src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 62edd9815..4649ce32f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -26,7 +26,7 @@
     "community": "Gemeinschaft",
     "continue-to-registration": "Weiter zur Registrierung",
     "current-community": "Aktuelle Gemeinschaft",
-    "myContributions": "Meine Beiträge",
+    "myContributions": "Meine Beiträge zum Gemeinwohl",
     "other-communities": "Weitere Gemeinschaften",
     "submitContribution": "Beitrag einreichen",
     "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 1cbdc5a8a..6340c4ad6 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -26,7 +26,7 @@
     "community": "Community",
     "continue-to-registration": "Continue to registration",
     "current-community": "Current community",
-    "myContributions": "My contributions",
+    "myContributions": "My contributions to the common good",
     "other-communities": "Other communities",
     "submitContribution": "Submit contribution",
     "switch-to-this-community": "Switch to this community"

From b6ead39ff2408298d296636a257ca9922b681c88 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Jul 2022 13:11:52 +0200
Subject: [PATCH 20/36] Change 'myContributionNoteList' to new text

---
 frontend/src/locales/de.json | 2 +-
 frontend/src/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 4649ce32f..7c3761827 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -36,7 +36,7 @@
     "alert": {
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
-      "myContributionNoteList": "Hier findest du chronologisch aufgelistet alle deine eingereichten Beiträge. Es gibt drei Darstellungsarten. Du kannst deine Beiträge, welche noch nicht bestätigt wurden, jederzeit bearbeiten.",
+      "myContributionNoteList": "Eingereichte Beiträge, die noch nicht bestätigt wurden, kannst du jederzeit bearbeiten oder löschen.",
       "myContributionNoteSupport": "Es wird bald an dieser Stelle die Möglichkeit geben das ein Dialog zwischen Moderatoren und dir stattfinden kann. Solltest du jetzt Probleme haben bitte nimm Kontakt mit dem Support auf.",
       "pending": "Eingereicht und wartet auf Bestätigung",
       "rejected": "abgelehnt"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 6340c4ad6..436f789c5 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -36,7 +36,7 @@
     "alert": {
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
-      "myContributionNoteList": "Here you will find a chronological list of all your submitted contributions. There are three display types. There are three ways of displaying your posts. You can edit your contributions, which have not yet been confirmed, at any time.",
+      "myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.",
       "myContributionNoteSupport": "Soon there will be the possibility for a dialogue between moderators and you. If you have any problems now, please contact the support.",
       "pending": "Submitted and waiting for confirmation",
       "rejected": "deleted"

From c808ecc3f4094f5103e2f131ea51317a260ec621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 15:47:51 +0200
Subject: [PATCH 21/36] Fix linting and cleanup

---
 frontend/src/components/Contributions/ContributionForm.vue | 2 --
 frontend/src/locales/de.json                               | 2 +-
 frontend/src/locales/en.json                               | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 647cd0067..39a7b6130 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -94,7 +94,6 @@ export default {
       maxlength: 255,
       maximalDate: new Date(),
       form: this.value, // includes 'id'
-      // Wolle: id: this.value.id,
     }
   },
   methods: {
@@ -108,7 +107,6 @@ export default {
     },
     reset() {
       this.$refs.form.reset()
-      // Wolle: this.id = null
       this.form.id = null
       this.form.date = ''
       this.form.memo = ''
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index d06299245..0deec9ae1 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -105,12 +105,12 @@
     "amount": "Betrag",
     "at": "am",
     "cancel": "Abbrechen",
+    "change": "Ändern",
     "check_now": "Jetzt prüfen",
     "close": "Schließen",
     "current_balance": "Aktueller Kontostand",
     "date": "Datum",
     "description": "Beschreibung",
-    "change": "Ändern",
     "email": "E-Mail",
     "firstname": "Vorname",
     "from": "Von",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index de1ee6900..65b7abc87 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -105,12 +105,12 @@
     "amount": "Amount",
     "at": "at",
     "cancel": "Cancel",
+    "change": "Change",
     "check_now": "Check now",
     "close": "Close",
     "current_balance": "Current Balance",
     "date": "Date",
     "description": "Description",
-    "change": "Change",
     "email": "Email",
     "firstname": "Firstname",
     "from": "from",

From 91538b72de88c9fb63d02c257f518ec75092f00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 16:10:05 +0200
Subject: [PATCH 22/36] Change reset button to cancel and add tests

---
 .../Contributions/ContributionForm.spec.js    | 66 ++++++++++++++++++-
 .../Contributions/ContributionForm.vue        |  4 +-
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 4f3ee6fa6..0a85c088d 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -45,8 +45,70 @@ describe('ContributionForm', () => {
       expect(wrapper.find('div.contribution-form').exists()).toBe(true)
     })
 
-    it('is submit button disable of true', () => {
-      expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled')
+    describe('empty form data', () => {
+      describe('has button', () => {
+        it('reset enabled', () => {
+          expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
+        })
+
+        it('submit disabled', () => {
+          expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled')
+        })
+      })
+    })
+
+    describe('set contrubtion', () => {
+      describe('fill in form data', () => {
+        const now = new Date().toISOString()
+
+        beforeEach(async () => {
+          await wrapper.setData({
+            form: {
+              id: null,
+              date: now,
+              memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...',
+              amount: '200',
+            },
+          })
+        })
+
+        describe('has button', () => {
+          it('reset enabled', () => {
+            expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
+          })
+
+          it('submit enabled', () => {
+            expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBeFalsy()
+          })
+        })
+      })
+    })
+
+    describe('update contrubtion', () => {
+      describe('fill in form data and "id"', () => {
+        const now = new Date().toISOString()
+
+        beforeEach(async () => {
+          await wrapper.setData({
+            form: {
+              id: 2,
+              date: now,
+              memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...',
+              amount: '200',
+            },
+          })
+        })
+
+        describe('has button', () => {
+          it('reset enabled', () => {
+            expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
+          })
+
+          it('submit enabled', () => {
+            expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBeFalsy()
+          })
+        })
+      })
     })
   })
 })
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index f5231c1aa..b18a92a13 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -71,8 +71,8 @@
       </div>
       <b-row class="mt-3">
         <b-col>
-          <b-button type="button" variant="light" @click.prevent="reset">
-            {{ $t('form.reset') }}
+          <b-button class="test-cancel" type="reset" variant="secondary" @click="reset">
+            {{ $t('form.cancel') }}
           </b-button>
         </b-col>
         <b-col class="text-right">

From 16d098d808e127b8d27848a06f10b7db1741afcc Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Jul 2022 16:20:41 +0200
Subject: [PATCH 23/36] Add new locales for contribution date.

---
 frontend/src/locales/de.json | 1 +
 frontend/src/locales/en.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 62edd9815..8bf402805 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -41,6 +41,7 @@
       "pending": "Eingereicht und wartet auf Bestätigung",
       "rejected": "abgelehnt"
     },
+    "date": "Beitrag für:",
     "delete": "Beitrag löschen! Bist du sicher?",
     "deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.",
     "formText": {
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 1cbdc5a8a..236eff4d1 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -41,6 +41,7 @@
       "pending": "Submitted and waiting for confirmation",
       "rejected": "deleted"
     },
+    "date": "Contribution for:",
     "delete": "Delete Contribution! Are you sure?",
     "deleted": "The contribution has been deleted! But it will remain visible.",
     "formText": {

From 722886fedc616625050047c77f9a3b77f2ec41cc Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Jul 2022 16:27:44 +0200
Subject: [PATCH 24/36] Add contributionDate month & year to list items.

---
 .../Contributions/ContributionListItem.vue         | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index ca766a008..174335c97 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -11,6 +11,13 @@
           {{ $t('math.minus') }}
           <div class="mx-2">{{ $d(new Date(date), 'short') }}</div>
         </div>
+        <div class="mr-2">
+          <span>{{ $t('contribution.date') }}</span>
+          <span>
+            {{ $d(new Date(contributionDate), 'month') }}
+            {{ $d(new Date(contributionDate), 'year') }}
+          </span>
+        </div>
         <div class="mr-2">{{ memo }}</div>
         <div v-if="type === 'pending' && !firstName" class="d-flex flex-row-reverse">
           <div
@@ -91,9 +98,10 @@ export default {
       return 'primary'
     },
     date() {
-      if (this.deletedAt) return this.deletedAt
-      if (this.confirmedAt) return this.confirmedAt
-      return this.contributionDate
+      // if (this.deletedAt) return this.deletedAt
+      // if (this.confirmedAt) return this.confirmedAt
+      // return this.contributionDate
+      return this.createdAt
     },
   },
   methods: {

From 0489130f4caefe670cdb1e07a68e1857c825e4ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 16:31:16 +0200
Subject: [PATCH 25/36] Update
 frontend/src/components/Contributions/ContributionForm.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Contributions/ContributionForm.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 0a85c088d..85c4506ed 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -46,7 +46,7 @@ describe('ContributionForm', () => {
     })
 
     describe('empty form data', () => {
-      describe('has button', () => {
+      describe('buttons', () => {
         it('reset enabled', () => {
           expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
         })

From 539e50cad2b8bff74acd27b96bc787ddf4dc1a7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 16:31:26 +0200
Subject: [PATCH 26/36] Update
 frontend/src/components/Contributions/ContributionForm.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Contributions/ContributionForm.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 85c4506ed..53244e484 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -47,7 +47,7 @@ describe('ContributionForm', () => {
 
     describe('empty form data', () => {
       describe('buttons', () => {
-        it('reset enabled', () => {
+        it('has reset enabled', () => {
           expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
         })
 

From cc8f0d0ee7f970b986c714e9a0b60b94e18ed559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 16:31:33 +0200
Subject: [PATCH 27/36] Update
 frontend/src/components/Contributions/ContributionForm.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Contributions/ContributionForm.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 53244e484..1e80e7cf7 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -51,7 +51,7 @@ describe('ContributionForm', () => {
           expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
         })
 
-        it('submit disabled', () => {
+        it('has submit disabled', () => {
           expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled')
         })
       })

From 67048de5c79c8a8762782b37807fb80ea72afb71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 16:31:41 +0200
Subject: [PATCH 28/36] Update
 frontend/src/components/Contributions/ContributionForm.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Contributions/ContributionForm.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 1e80e7cf7..58f1b9a24 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -72,7 +72,7 @@ describe('ContributionForm', () => {
           })
         })
 
-        describe('has button', () => {
+        describe('buttons', () => {
           it('reset enabled', () => {
             expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
           })

From 52c48f16e494525ebe918fc5f2672532251da7ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 16:31:50 +0200
Subject: [PATCH 29/36] Update
 frontend/src/components/Contributions/ContributionForm.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Contributions/ContributionForm.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 58f1b9a24..f5d5d04f4 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -73,7 +73,7 @@ describe('ContributionForm', () => {
         })
 
         describe('buttons', () => {
-          it('reset enabled', () => {
+          it('has reset enabled', () => {
             expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
           })
 

From e171abfa7d7c7b97497fe8497e9ff64ae98fa7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 16:32:13 +0200
Subject: [PATCH 30/36] Update
 frontend/src/components/Contributions/ContributionForm.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Contributions/ContributionForm.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index f5d5d04f4..5a6241e86 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -77,7 +77,7 @@ describe('ContributionForm', () => {
             expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
           })
 
-          it('submit enabled', () => {
+          it('has submit enabled', () => {
             expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBeFalsy()
           })
         })

From 1ae5c7cfac8a8e5d19571a893ac513b5f7213d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 16:32:21 +0200
Subject: [PATCH 31/36] Update
 frontend/src/components/Contributions/ContributionForm.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Contributions/ContributionForm.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 5a6241e86..5cddad918 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -99,7 +99,7 @@ describe('ContributionForm', () => {
           })
         })
 
-        describe('has button', () => {
+        describe('buttons', () => {
           it('reset enabled', () => {
             expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
           })

From 8b596de97ed7ec5683fb33b11bfede5273af3f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 16:32:29 +0200
Subject: [PATCH 32/36] Update
 frontend/src/components/Contributions/ContributionForm.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Contributions/ContributionForm.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 5cddad918..c74add5b0 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -100,7 +100,7 @@ describe('ContributionForm', () => {
         })
 
         describe('buttons', () => {
-          it('reset enabled', () => {
+          it('has reset enabled', () => {
             expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
           })
 

From 3be2e00ff88b8463ac3c3a2e7d8921718461bfb7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 26 Jul 2022 16:42:13 +0200
Subject: [PATCH 33/36] Test that date is always createdAt

---
 .../Contributions/ContributionListItem.spec.js  | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js
index 20f4db959..08523cae4 100644
--- a/frontend/src/components/Contributions/ContributionListItem.spec.js
+++ b/frontend/src/components/Contributions/ContributionListItem.spec.js
@@ -13,6 +13,7 @@ describe('ContributionListItem', () => {
 
   const propsData = {
     id: 1,
+    createdAt: '26/07/2022',
     contributionDate: '07/06/2022',
     memo: 'Ich habe 10 Stunden die Elbwiesen von Müll befreit.',
     amount: '200',
@@ -85,20 +86,8 @@ describe('ContributionListItem', () => {
     })
 
     describe('contribution date', () => {
-      it('is contributionDate by default', () => {
-        expect(wrapper.vm.date).toBe(wrapper.vm.contributionDate)
-      })
-
-      it('is deletedAt when deletedAt is present', async () => {
-        const now = new Date().toISOString()
-        await wrapper.setProps({ deletedAt: now })
-        expect(wrapper.vm.date).toBe(now)
-      })
-
-      it('is confirmedAt at when confirmedAt is present', async () => {
-        const now = new Date().toISOString()
-        await wrapper.setProps({ confirmedAt: now })
-        expect(wrapper.vm.date).toBe(now)
+      it('is equal to createdAt', () => {
+        expect(wrapper.vm.date).toBe(wrapper.vm.createdAt)
       })
     })
 

From e41be4d8329d916be7eb427f832cf3dc168398c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 26 Jul 2022 16:52:39 +0200
Subject: [PATCH 34/36] Update
 frontend/src/components/Contributions/ContributionForm.spec.js

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/Contributions/ContributionForm.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index c74add5b0..eb1509328 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -104,7 +104,7 @@ describe('ContributionForm', () => {
             expect(wrapper.find('button[type="reset"]').attributes('disabled')).toBeFalsy()
           })
 
-          it('submit enabled', () => {
+          it('has submit enabled', () => {
             expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBeFalsy()
           })
         })

From 89b72f90c581a784f0172d42316742a16fc34c21 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Jul 2022 16:57:39 +0200
Subject: [PATCH 35/36] Update
 frontend/src/components/Contributions/ContributionListItem.spec.js

---
 .../src/components/Contributions/ContributionListItem.spec.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js
index 08523cae4..59918e762 100644
--- a/frontend/src/components/Contributions/ContributionListItem.spec.js
+++ b/frontend/src/components/Contributions/ContributionListItem.spec.js
@@ -85,7 +85,7 @@ describe('ContributionListItem', () => {
       })
     })
 
-    describe('contribution date', () => {
+    describe('date', () => {
       it('is equal to createdAt', () => {
         expect(wrapper.vm.date).toBe(wrapper.vm.createdAt)
       })

From 96a7f8a2bff284dfc9a9ea239c8fd9d3d4490fd2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Jul 2022 16:57:53 +0200
Subject: [PATCH 36/36] Update
 frontend/src/components/Contributions/ContributionListItem.vue

---
 frontend/src/components/Contributions/ContributionListItem.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 174335c97..90e98bc4c 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -14,8 +14,7 @@
         <div class="mr-2">
           <span>{{ $t('contribution.date') }}</span>
           <span>
-            {{ $d(new Date(contributionDate), 'month') }}
-            {{ $d(new Date(contributionDate), 'year') }}
+            {{ $d(new Date(contributionDate), 'monthAndYear') }}
           </span>
         </div>
         <div class="mr-2">{{ memo }}</div>