From 91c1db0c1c896aaa501091c1041791bd607fb91a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 28 Feb 2023 18:55:26 +0100
Subject: [PATCH 01/47] event buttons for myself turned off in open
 contributions

---
 .../components/Tables/OpenCreationsTable.vue  | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index a4db8ac99..7eefe8f10 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -13,14 +13,16 @@
         <b-icon :icon="getStatusIcon(row.item.state)"></b-icon>
       </template>
       <template #cell(bookmark)="row">
-        <b-button
-          variant="danger"
-          size="md"
-          @click="$emit('show-overlay', row.item, 'delete')"
-          class="mr-2"
-        >
-          <b-icon icon="trash" variant="light"></b-icon>
-        </b-button>
+        <div v-if="!myself(`${row.item.firstName} ${row.item.lastName}`)">
+          <b-button
+            variant="danger"
+            size="md"
+            @click="$emit('show-overlay', row.item, 'delete')"
+            class="mr-2"
+          >
+            <b-icon icon="trash" variant="light"></b-icon>
+          </b-button>
+        </div>
       </template>
       <template #cell(editCreation)="row">
         <div v-if="$store.state.moderator.id !== row.item.userId">
@@ -49,9 +51,11 @@
         </div>
       </template>
       <template #cell(reActive)>
-        <b-button variant="warning" size="md" class="mr-2">
-          <b-icon icon="arrow-up" variant="light"></b-icon>
-        </b-button>
+        <div v-if="!myself(`${row.item.firstName} ${row.item.lastName}`)">
+          <b-button variant="warning" size="md" class="mr-2">
+            <b-icon icon="arrow-up" variant="light"></b-icon>
+          </b-button>
+        </div>
       </template>
       <template #cell(chatCreation)="row">
         <b-button v-if="row.item.messagesCount > 0" @click="rowToggleDetails(row, 0)">
@@ -59,7 +63,7 @@
         </b-button>
       </template>
       <template #cell(deny)="row">
-        <div v-if="$store.state.moderator.id !== row.item.userId">
+        <div v-if="!myself(`${row.item.firstName} ${row.item.lastName}`)">
           <b-button
             variant="warning"
             size="md"
@@ -71,7 +75,7 @@
         </div>
       </template>
       <template #cell(confirm)="row">
-        <div v-if="$store.state.moderator.id !== row.item.userId">
+        <div v-if="!myself(`${row.item.firstName} ${row.item.lastName}`)">
           <b-button
             variant="success"
             size="md"
@@ -158,6 +162,11 @@ export default {
     }
   },
   methods: {
+    myself(name) {
+      return (
+        name === `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
+      )
+    },
     getStatusIcon(status) {
       return iconMap[status] ? iconMap[status] : 'default-icon'
     },

From 9eb42e0a418e5f578581f91f2db5de0849289e37 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 28 Feb 2023 21:39:18 +0100
Subject: [PATCH 02/47] Update
 admin/src/components/Tables/OpenCreationsTable.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/components/Tables/OpenCreationsTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 7eefe8f10..f0c0a7836 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -13,7 +13,7 @@
         <b-icon :icon="getStatusIcon(row.item.state)"></b-icon>
       </template>
       <template #cell(bookmark)="row">
-        <div v-if="!myself(`${row.item.firstName} ${row.item.lastName}`)">
+        <div v-if="!myself(row.item)">
           <b-button
             variant="danger"
             size="md"

From 215bf45169b68a85f3ee40407209670b6cbb7814 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 28 Feb 2023 21:39:45 +0100
Subject: [PATCH 03/47] Update
 admin/src/components/Tables/OpenCreationsTable.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/components/Tables/OpenCreationsTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index f0c0a7836..b1a4549b8 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -63,7 +63,7 @@
         </b-button>
       </template>
       <template #cell(deny)="row">
-        <div v-if="!myself(`${row.item.firstName} ${row.item.lastName}`)">
+        <div v-if="!myself(row.item)">
           <b-button
             variant="warning"
             size="md"

From 2c1c4ede7511a828e276639dab9bc7c97850e8ff Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 28 Feb 2023 21:39:56 +0100
Subject: [PATCH 04/47] Update
 admin/src/components/Tables/OpenCreationsTable.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/components/Tables/OpenCreationsTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index b1a4549b8..d479e82c6 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -51,7 +51,7 @@
         </div>
       </template>
       <template #cell(reActive)>
-        <div v-if="!myself(`${row.item.firstName} ${row.item.lastName}`)">
+        <div v-if="!myself(row.item)">
           <b-button variant="warning" size="md" class="mr-2">
             <b-icon icon="arrow-up" variant="light"></b-icon>
           </b-button>

From 8047dbf544a623e93ce2a8c130690e741cd54262 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 28 Feb 2023 21:40:09 +0100
Subject: [PATCH 05/47] Update
 admin/src/components/Tables/OpenCreationsTable.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/components/Tables/OpenCreationsTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index d479e82c6..dad78f600 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -75,7 +75,7 @@
         </div>
       </template>
       <template #cell(confirm)="row">
-        <div v-if="!myself(`${row.item.firstName} ${row.item.lastName}`)">
+        <div v-if="!myself(row.item)">
           <b-button
             variant="success"
             size="md"

From 815e06f8da270ad265e404415d7d80881207a90b Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 28 Feb 2023 21:40:20 +0100
Subject: [PATCH 06/47] Update
 admin/src/components/Tables/OpenCreationsTable.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/components/Tables/OpenCreationsTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index dad78f600..7238db69a 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -162,7 +162,7 @@ export default {
     }
   },
   methods: {
-    myself(name) {
+    myself(item) {
       return (
         name === `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
       )

From b3cfc6d9182465ba07da29c1d2da87eea7ffa2ac Mon Sep 17 00:00:00 2001
From: Alexander Friedland <fridolin@tutanota.com>
Date: Tue, 28 Feb 2023 21:40:35 +0100
Subject: [PATCH 07/47] Update
 admin/src/components/Tables/OpenCreationsTable.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/components/Tables/OpenCreationsTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 7238db69a..fd69923a1 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -164,7 +164,7 @@ export default {
   methods: {
     myself(item) {
       return (
-        name === `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
+        `${item.firstName} ${item.lastName}` === `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
       )
     },
     getStatusIcon(status) {

From 2f75b131ad5f5da12701874731728e0df0edb011 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 1 Mar 2023 09:20:54 +0100
Subject: [PATCH 08/47] fix lint

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

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index fd69923a1..ae1a74b17 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -164,7 +164,8 @@ export default {
   methods: {
     myself(item) {
       return (
-        `${item.firstName} ${item.lastName}` === `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
+        `${item.firstName} ${item.lastName}` ===
+        `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
       )
     },
     getStatusIcon(status) {

From 3f25962853aa8e9399c241c60ca80bf12debc47d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 2 Mar 2023 13:15:11 +0100
Subject: [PATCH 09/47] test add propsData item

---
 admin/src/pages/CreationConfirm.spec.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 710f2b26f..ef211d139 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -121,8 +121,12 @@ describe('CreationConfirm', () => {
     confirmContributionMock.mockResolvedValue({ data: { confirmContribution: true } }),
   )
 
+  const propsData = {
+    item: {},
+  }
+
   const Wrapper = () => {
-    return mount(CreationConfirm, { localVue, mocks, apolloProvider })
+    return mount(CreationConfirm, { localVue, mocks, apolloProvider, propsData })
   }
 
   describe('mount', () => {

From fe1473a9a540bdb4cdc885d6f63964533e030250 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 10:55:56 +0100
Subject: [PATCH 10/47] Change reActive to reopen, add localize for it.

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 00eef1812..3271724ba 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -47,6 +47,7 @@
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
     "reset": "Zurücksetzen",
+    "reopen": "Reopen",
     "select_month": "Monat auswählen",
     "select_value": "Betrag auswählen",
     "submit_creation": "Schöpfung einreichen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index e318376b4..dfb4de745 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -137,6 +137,7 @@
   },
   "redeemed": "redeemed",
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
+  "reopen": "Reopen",
   "save": "Speichern",
   "statistic": {
     "activeUsers": "Active members",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 55b819268..6ce4c7728 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -239,7 +239,7 @@ export default {
         ],
         [
           // denied contributions
-          { key: 'reActive', label: 'reActive' },
+          { key: 'reopen', label: this.$t('reopen') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {
@@ -276,7 +276,7 @@ export default {
         ],
         [
           // deleted contributions
-          { key: 'reActive', label: 'reActive' },
+          { key: 'reopen', label: this.$t('reopen') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From d2927f11545b2d005d42c0b87669537a6709be9b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 10:58:54 +0100
Subject: [PATCH 11/47] Change label of editCreation to chat

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

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 6ce4c7728..fcb233a48 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -199,7 +199,7 @@ export default {
             },
           },
           { key: 'moderator', label: this.$t('moderator') },
-          { key: 'editCreation', label: this.$t('edit') },
+          { key: 'editCreation', label: this.$t('chat') },
           { key: 'confirm', label: this.$t('save') },
         ],
         [

From b476e84bc651c4229fd9fb1822d202f1feccded8 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 10:59:28 +0100
Subject: [PATCH 12/47] Remove email for tab open

---
 admin/src/pages/CreationConfirm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index fcb233a48..75f2c6710 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -180,7 +180,6 @@ export default {
           // open contributions
           { key: 'bookmark', label: this.$t('delete') },
           { key: 'deny', label: this.$t('deny') },
-          { key: 'email', label: this.$t('e_mail') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From ed83e11ef19e85889ade8c419aba5ce2d977e1fe Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 11:46:49 +0100
Subject: [PATCH 13/47] Change reActive to reopen in OpenCreationsTable

---
 admin/src/components/Tables/OpenCreationsTable.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index a4db8ac99..7ddabf323 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -48,10 +48,10 @@
           </b-button>
         </div>
       </template>
-      <template #cell(reActive)>
-        <b-button variant="warning" size="md" class="mr-2">
+      <template #cell(reopen)>
+        <!--b-button variant="warning" size="md" class="mr-2">
           <b-icon icon="arrow-up" variant="light"></b-icon>
-        </b-button>
+        </b-button-->
       </template>
       <template #cell(chatCreation)="row">
         <b-button v-if="row.item.messagesCount > 0" @click="rowToggleDetails(row, 0)">

From 0f1ec58febb12e5c3db06e8628758705c690787d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 11:47:25 +0100
Subject: [PATCH 14/47] Add icons on tabs of contribution

---
 admin/src/pages/CreationConfirm.vue | 38 +++++++++++++++++++----------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 75f2c6710..4df55ee55 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -5,25 +5,37 @@
       <b-tabs v-model="tabIndex" content-class="mt-3" fill>
         <b-tab active :title-link-attributes="{ 'data-test': 'open' }">
           <template #title>
+            <b-icon icon="bell-fill" variant="primary"></b-icon>
             {{ $t('contributions.open') }}
             <b-badge v-if="$store.state.openCreations > 0" variant="danger">
               {{ $store.state.openCreations }}
             </b-badge>
           </template>
         </b-tab>
-        <b-tab
-          :title="$t('contributions.confirms')"
-          :title-link-attributes="{ 'data-test': 'confirmed' }"
-        />
-        <b-tab
-          :title="$t('contributions.denied')"
-          :title-link-attributes="{ 'data-test': 'denied' }"
-        />
-        <b-tab
-          :title="$t('contributions.deleted')"
-          :title-link-attributes="{ 'data-test': 'deleted' }"
-        />
-        <b-tab :title="$t('contributions.all')" :title-link-attributes="{ 'data-test': 'all' }" />
+        <b-tab :title-link-attributes="{ 'data-test': 'confirmed' }">
+          <template #title>
+            <b-icon icon="check" variant="success"></b-icon>
+            {{ $t('contributions.confirms') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'denied' }">
+          <template #title>
+            <b-icon icon="x-circle" variant="warning"></b-icon>
+            {{ $t('contributions.denied') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'deleted' }">
+          <template #title>
+            <b-icon icon="trash" variant="danger"></b-icon>
+            {{ $t('contributions.deleted') }}
+          </template>
+        </b-tab>
+        <b-tab :title-link-attributes="{ 'data-test': 'all' }">
+          <template #title>
+            <b-icon icon="list"></b-icon>
+            {{ $t('contributions.all') }}
+          </template>
+        </b-tab>
       </b-tabs>
     </div>
     <open-creations-table

From 2dd4d8edeeba246f0906e95fd4e4320eec81aebb Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 11:52:17 +0100
Subject: [PATCH 15/47] Localize state to Status & State

---
 admin/src/locales/de.json           | 1 +
 admin/src/locales/en.json           | 1 +
 admin/src/pages/CreationConfirm.vue | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 3271724ba..87a3c5f92 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -139,6 +139,7 @@
   "redeemed": "eingelöst",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
   "save": "Speichern",
+  "state": "Status",
   "statistic": {
     "activeUsers": "Aktive Mitglieder",
     "count": "Menge",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index dfb4de745..2e32ecb36 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -139,6 +139,7 @@
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
   "reopen": "Reopen",
   "save": "Speichern",
+  "state": "State",
   "statistic": {
     "activeUsers": "Active members",
     "count": "Count",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 4df55ee55..1af63175e 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -324,7 +324,7 @@ export default {
         ],
         [
           // all contributions
-          { key: 'state', label: 'state' },
+          { key: 'state', label: this.$t('state') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From cbac8caee2234362524304500b0494e1a9ded9b5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 12:06:18 +0100
Subject: [PATCH 16/47] Change local mod to moderator in contribution tab

---
 admin/src/pages/CreationConfirm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 1af63175e..6a9354d60 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -282,7 +282,7 @@ export default {
               return this.$d(new Date(value), 'short')
             },
           },
-          { key: 'deniedBy', label: this.$t('mod') },
+          { key: 'deniedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
         [
@@ -319,7 +319,7 @@ export default {
               return this.$d(new Date(value), 'short')
             },
           },
-          { key: 'deletedBy', label: this.$t('mod') },
+          { key: 'deletedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
         [
@@ -356,7 +356,7 @@ export default {
               return this.$d(new Date(value), 'short')
             },
           },
-          { key: 'confirmedBy', label: this.$t('mod') },
+          { key: 'confirmedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
       ][this.tabIndex]

From a14b9403b1a075b231641b956c2441a2fdfd6c38 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 12:06:44 +0100
Subject: [PATCH 17/47] Add messages to query of listAllContribution

---
 backend/src/graphql/resolver/ContributionResolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index ab177d759..2469f60ba 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -391,7 +391,7 @@ export class ContributionResolver {
       currentPage,
       pageSize,
       true,
-      ['user'],
+      ['user', 'messages'],
       undefined,
       statusFilter,
     )

From d0c5d7aff0df6b9fc1e6b8e673b2c8d95ac7aae9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 12:11:34 +0100
Subject: [PATCH 18/47] Change position of reopen.

---
 admin/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 87a3c5f92..be07ff1f4 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -47,7 +47,6 @@
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
     "reset": "Zurücksetzen",
-    "reopen": "Reopen",
     "select_month": "Monat auswählen",
     "select_value": "Betrag auswählen",
     "submit_creation": "Schöpfung einreichen",
@@ -138,6 +137,7 @@
   },
   "redeemed": "eingelöst",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
+  "reopen": "Reopen",
   "save": "Speichern",
   "state": "Status",
   "statistic": {

From 5cc58672130996e5db04f809cc3d0fc78432f6b1 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 12:13:45 +0100
Subject: [PATCH 19/47] Revert "Add messages to query of listAllContribution"

This reverts commit a14b9403b1a075b231641b956c2441a2fdfd6c38.
---
 backend/src/graphql/resolver/ContributionResolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 2469f60ba..ab177d759 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -391,7 +391,7 @@ export class ContributionResolver {
       currentPage,
       pageSize,
       true,
-      ['user', 'messages'],
+      ['user'],
       undefined,
       statusFilter,
     )

From dd44415099d9a7c85d44bd59f9eca9b4499dfc3d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 8 Mar 2023 13:21:47 +0100
Subject: [PATCH 20/47] remove unused locale keys

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

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index be07ff1f4..b7a064b34 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -63,7 +63,6 @@
   "deleted_user": "Alle gelöschten Nutzer",
   "delete_user": "Nutzer löschen",
   "deny": "Ablehnen",
-  "edit": "Bearbeiten",
   "enabled": "aktiviert",
   "error": "Fehler",
   "expired": "abgelaufen",
@@ -101,7 +100,6 @@
   "message": {
     "request": "Die Anfrage wurde gesendet."
   },
-  "mod": "Mod",
   "moderator": "Moderator",
   "name": "Name",
   "navbar": {
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 2e32ecb36..30558822f 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -63,7 +63,6 @@
   "deleted_user": "All deleted user",
   "delete_user": "Delete user",
   "deny": "Reject",
-  "edit": "Edit",
   "enabled": "enabled",
   "error": "Error",
   "expired": "expired",
@@ -101,7 +100,6 @@
   "message": {
     "request": "Request has been sent."
   },
-  "mod": "Mod",
   "moderator": "Moderator",
   "name": "Name",
   "navbar": {

From 8d3f345d72b210368c03ed515878eef22291e7db Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 07:31:44 +0100
Subject: [PATCH 21/47] Update admin/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 30558822f..93a324918 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -137,7 +137,7 @@
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
   "reopen": "Reopen",
   "save": "Speichern",
-  "state": "State",
+  "status": "State",
   "statistic": {
     "activeUsers": "Active members",
     "count": "Count",

From c8fea682bcc66fab2084fb648fc3ff989304bdc0 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 07:32:01 +0100
Subject: [PATCH 22/47] Update admin/src/locales/de.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b7a064b34..0be1808c0 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -137,7 +137,7 @@
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
   "reopen": "Reopen",
   "save": "Speichern",
-  "state": "Status",
+  "status": "Status",
   "statistic": {
     "activeUsers": "Aktive Mitglieder",
     "count": "Menge",

From e6fdf718d05ea6e06420f2bd16e33cd57046da11 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 07:32:26 +0100
Subject: [PATCH 23/47] Update admin/src/pages/CreationConfirm.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/pages/CreationConfirm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 6a9354d60..56867e4ef 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -324,7 +324,7 @@ export default {
         ],
         [
           // all contributions
-          { key: 'state', label: this.$t('state') },
+          { key: 'state', label: this.$t('status') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From af5212d0c30f3cf91095b3348f9c458866718a22 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 07:36:09 +0100
Subject: [PATCH 24/47] Change german local ``reopen``

---
 admin/src/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b7a064b34..46adb7ec2 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -135,7 +135,7 @@
   },
   "redeemed": "eingelöst",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
-  "reopen": "Reopen",
+  "reopen": "Öffnen",
   "save": "Speichern",
   "state": "Status",
   "statistic": {

From 8a808d994551959893c000475fe95e4bcbf29885 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 07:57:16 +0100
Subject: [PATCH 25/47] The locale status already existed

---
 admin/src/locales/de.json | 1 -
 admin/src/locales/en.json | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 396ec8df4..352c4b4a9 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -137,7 +137,6 @@
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
   "reopen": "Öffnen",
   "save": "Speichern",
-  "status": "Status",
   "statistic": {
     "activeUsers": "Aktive Mitglieder",
     "count": "Menge",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 93a324918..0afe1a446 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -137,7 +137,6 @@
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
   "reopen": "Reopen",
   "save": "Speichern",
-  "status": "State",
   "statistic": {
     "activeUsers": "Active members",
     "count": "Count",
@@ -149,7 +148,7 @@
     "totalGradidoUnbookedDecayed": "Unbooked GDD decay",
     "totalUsers": "Members"
   },
-  "status": "Status",
+  "status": "State",
   "success": "Success",
   "text": "Text",
   "transactionlink": {

From acbbc45ec29f5d68fdb9e9989b0dcce4631d7b55 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 08:23:44 +0100
Subject: [PATCH 26/47] Change translation 'denied' to 'rejected'

---
 admin/src/locales/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 0afe1a446..ca64f0b98 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -34,7 +34,7 @@
     "all": "All",
     "confirms": "Confirmed",
     "deleted": "Deleted",
-    "denied": "Denied",
+    "denied": "Rejected",
     "open": "Open"
   },
   "created": "Confirmed",
@@ -53,7 +53,7 @@
     "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.",
     "toasted_created": "Creation has been successfully saved",
     "toasted_delete": "Open creation has been deleted",
-    "toasted_denied": "Open creation has been denied",
+    "toasted_denied": "Open creation has been rejected",
     "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.",
     "update_creation": "Creation update"
   },
@@ -86,7 +86,7 @@
     "transactionlist": {
       "confirmed": "When was it confirmed by a moderator / admin.",
       "periods": "For what period was it submitted by the member.",
-      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = denied, CONFIRMED = confirmed]",
+      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = rejected, CONFIRMED = confirmed]",
       "submitted": "When was it submitted by the member"
     }
   },

From 083f51c0d92e59d8ee3ee945693e8d1f46fd1134 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 10:05:08 +0100
Subject: [PATCH 27/47] Add moderator confirmedBy to confirmed.

---
 admin/src/pages/CreationConfirm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 56867e4ef..bad7489db 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -246,6 +246,7 @@ export default {
               return this.$d(new Date(value), 'short')
             },
           },
+          { key: 'confirmedBy', label: this.$t('moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
         [

From ba42c282e4c661b0ed733a295a0ab0ba83d0284f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 10:05:31 +0100
Subject: [PATCH 28/47] Remove template for reopen.

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

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 7ddabf323..4e5563a59 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -48,11 +48,11 @@
           </b-button>
         </div>
       </template>
-      <template #cell(reopen)>
-        <!--b-button variant="warning" size="md" class="mr-2">
+      <!--template #cell(reopen)>
+        <b-button variant="warning" size="md" class="mr-2">
           <b-icon icon="arrow-up" variant="light"></b-icon>
-        </b-button-->
-      </template>
+        </b-button>
+      </template-->
       <template #cell(chatCreation)="row">
         <b-button v-if="row.item.messagesCount > 0" @click="rowToggleDetails(row, 0)">
           <b-icon icon="chat-dots"></b-icon>

From dc0e9c478e044b2e460c46b061b6fbf5cca3bd4b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 10:51:35 +0100
Subject: [PATCH 29/47] Date format if value null => '-'

---
 admin/src/pages/CreationConfirm.vue | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index bad7489db..6747f8188 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -206,7 +206,7 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           { key: 'moderator', label: this.$t('moderator') },
@@ -229,21 +229,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'confirmedAt',
             label: this.$t('contributions.confirms'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           { key: 'confirmedBy', label: this.$t('moderator') },
@@ -266,21 +266,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'deniedAt',
             label: this.$t('contributions.denied'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           { key: 'deniedBy', label: this.$t('moderator') },
@@ -303,21 +303,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'deletedAt',
             label: this.$t('contributions.deleted'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           { key: 'deletedBy', label: this.$t('moderator') },
@@ -340,21 +340,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           {
             key: 'confirmedAt',
             label: this.$t('contributions.confirms'),
             formatter: (value) => {
-              return this.$d(new Date(value), 'short')
+              return value ? this.$d(new Date(value), 'short') : '-'
             },
           },
           { key: 'confirmedBy', label: this.$t('moderator') },

From c81013a70e9366f77470ef2a856c01dbdd9cfc80 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 10:55:01 +0100
Subject: [PATCH 30/47] Remove reopen since it is not used yet

---
 admin/src/components/Tables/OpenCreationsTable.vue | 5 -----
 admin/src/locales/de.json                          | 1 -
 admin/src/locales/en.json                          | 1 -
 admin/src/pages/CreationConfirm.vue                | 1 -
 4 files changed, 8 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 4e5563a59..2f0c8a611 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -48,11 +48,6 @@
           </b-button>
         </div>
       </template>
-      <!--template #cell(reopen)>
-        <b-button variant="warning" size="md" class="mr-2">
-          <b-icon icon="arrow-up" variant="light"></b-icon>
-        </b-button>
-      </template-->
       <template #cell(chatCreation)="row">
         <b-button v-if="row.item.messagesCount > 0" @click="rowToggleDetails(row, 0)">
           <b-icon icon="chat-dots"></b-icon>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 352c4b4a9..0d05eaa88 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -135,7 +135,6 @@
   },
   "redeemed": "eingelöst",
   "removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
-  "reopen": "Öffnen",
   "save": "Speichern",
   "statistic": {
     "activeUsers": "Aktive Mitglieder",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index ca64f0b98..c46f563f5 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -135,7 +135,6 @@
   },
   "redeemed": "redeemed",
   "removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
-  "reopen": "Reopen",
   "save": "Speichern",
   "statistic": {
     "activeUsers": "Active members",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 6747f8188..b9565a744 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -251,7 +251,6 @@ export default {
         ],
         [
           // denied contributions
-          { key: 'reopen', label: this.$t('reopen') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From 53f48d0475f2a6ef79c49ae8f0bce339c4432001 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 12:59:17 +0100
Subject: [PATCH 31/47] Remove reopen from deleted tab

---
 admin/src/pages/CreationConfirm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index b9565a744..06c4e0797 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -287,7 +287,6 @@ export default {
         ],
         [
           // deleted contributions
-          { key: 'reopen', label: this.$t('reopen') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

From 159d1f2a51a4a7012dc114e43c938a888ca8dc06 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 14:38:27 +0100
Subject: [PATCH 32/47] Update admin/src/locales/en.json

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index c46f563f5..70b42479e 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -147,7 +147,7 @@
     "totalGradidoUnbookedDecayed": "Unbooked GDD decay",
     "totalUsers": "Members"
   },
-  "status": "State",
+  "status": "Status",
   "success": "Success",
   "text": "Text",
   "transactionlink": {

From 923cc5d81edb148a1c17241d0ab1dd51252ebe33 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 15:14:16 +0100
Subject: [PATCH 33/47] Extract format date or - to a method.

---
 admin/src/pages/CreationConfirm.vue | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 06c4e0797..4d57ed417 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -184,6 +184,9 @@ export default {
       this.items.find((obj) => obj.id === id).messagesCount++
       this.items.find((obj) => obj.id === id).state = 'IN_PROGRESS'
     },
+    formatDateOrDash(value) {
+      return value ? this.$d(new Date(value), 'short') : '-'
+    },
   },
   computed: {
     fields() {
@@ -206,7 +209,7 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'moderator', label: this.$t('moderator') },
@@ -229,21 +232,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'confirmedAt',
             label: this.$t('contributions.confirms'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'confirmedBy', label: this.$t('moderator') },
@@ -265,21 +268,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'deniedAt',
             label: this.$t('contributions.denied'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'deniedBy', label: this.$t('moderator') },
@@ -301,21 +304,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'deletedAt',
             label: this.$t('contributions.deleted'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'deletedBy', label: this.$t('moderator') },
@@ -338,21 +341,21 @@ export default {
             key: 'contributionDate',
             label: this.$t('created'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'createdAt',
             label: this.$t('createdAt'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           {
             key: 'confirmedAt',
             label: this.$t('contributions.confirms'),
             formatter: (value) => {
-              return value ? this.$d(new Date(value), 'short') : '-'
+              return this.formatDateOrDash(value)
             },
           },
           { key: 'confirmedBy', label: this.$t('moderator') },

From 6bdf82c25eab24827552ae557100e6576c6723b4 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 15:18:26 +0100
Subject: [PATCH 34/47] Update admin/src/pages/CreationConfirm.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 admin/src/pages/CreationConfirm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 4d57ed417..3f0b2d87f 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -185,7 +185,7 @@ export default {
       this.items.find((obj) => obj.id === id).state = 'IN_PROGRESS'
     },
     formatDateOrDash(value) {
-      return value ? this.$d(new Date(value), 'short') : '-'
+      return value ? this.$d(new Date(value), 'short') : '—'
     },
   },
   computed: {

From 027376b3e00a039f8ad80e7d69d1a15bf3ee88a2 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 15:51:21 +0100
Subject: [PATCH 35/47] Add contributionState check for message form

---
 .../ContributionMessagesList.vue                | 17 +++++++++++------
 .../components/Tables/OpenCreationsTable.vue    |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 636627385..fab6b5e4a 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -1,17 +1,18 @@
 <template>
   <div class="contribution-messages-list">
     <b-container>
-      {{ messages.lenght }}
       <div v-for="message in messages" v-bind:key="message.id">
         <contribution-messages-list-item :message="message" />
       </div>
     </b-container>
 
-    <contribution-messages-formular
-      :contributionId="contributionId"
-      @get-list-contribution-messages="getListContributionMessages"
-      @update-state="updateState"
-    />
+    <div v-if="contributionState === 'PENDING' || contributionState === 'IN_PROGRESS'">
+      <contribution-messages-formular
+        :contributionId="contributionId"
+        @get-list-contribution-messages="getListContributionMessages"
+        @update-state="updateState"
+      />
+    </div>
   </div>
 </template>
 <script>
@@ -30,6 +31,10 @@ export default {
       type: Number,
       required: true,
     },
+    contributionState: {
+      type: String,
+      required: true,
+    },
   },
   data() {
     return {
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 2f0c8a611..55961d8c0 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -99,6 +99,7 @@
             <div v-else>
               <contribution-messages-list
                 :contributionId="row.item.id"
+                :contributionState="row.item.state"
                 @update-state="updateState"
                 @update-user-data="updateUserData"
               />

From 06186dd2d72690784b1cbfb62354c010691c8cd5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 16:12:37 +0100
Subject: [PATCH 36/47] Change messageCount to messagesCount

---
 admin/src/components/Tables/OpenCreationsTable.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 55961d8c0..a0270cb4c 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -36,14 +36,15 @@
           <b-button v-else @click="rowToggleDetails(row, 0)">
             <b-icon icon="chat-dots"></b-icon>
             <b-icon
-              v-if="row.item.state === 'PENDING' && row.item.messageCount > 0"
+              v-if="row.item.state === 'PENDING' && row.item.messagesCount > 0"
               icon="exclamation-circle-fill"
               variant="warning"
             ></b-icon>
             <b-icon
-              v-if="row.item.state === 'IN_PROGRESS' && row.item.messageCount > 0"
+              v-if="row.item.state === 'IN_PROGRESS' && row.item.messagesCount > 0"
               icon="question-diamond"
-              variant="light"
+              variant="warning"
+              class="pl-1"
             ></b-icon>
           </b-button>
         </div>
@@ -160,7 +161,10 @@ export default {
     rowClass(item, type) {
       if (!item || type !== 'row') return
       if (item.state === 'CONFIRMED') return 'table-success'
-      if (item.state === 'DENIED') return 'table-info'
+      if (item.state === 'DENIED') return 'table-warning'
+      if (item.state === 'DELETED') return 'table-danger'
+      if (item.state === 'IN_PROGRESS') return 'table-primary'
+      if (item.state === 'PENDING') return 'table-primary'
     },
     updateCreationData(data) {
       const row = data.row

From 17e19debade9dc85a4b1c0c1a2acd1b0d3452062 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 16:18:37 +0100
Subject: [PATCH 37/47] Fix unit test.

---
 .../ContributionMessages/ContributionMessagesList.spec.js        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
index 0092751cc..f0b6ea821 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -10,6 +10,7 @@ describe('ContributionMessagesList', () => {
 
   const propsData = {
     contributionId: 42,
+    contributionState: 'PENDING',
   }
 
   const mocks = {

From 4c34f0933d62a5430a47c8720bc5e292d65727c7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 18:02:49 +0100
Subject: [PATCH 38/47] Unit test moved.

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

diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index ae1a74b17..c53be4183 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -25,7 +25,7 @@
         </div>
       </template>
       <template #cell(editCreation)="row">
-        <div v-if="$store.state.moderator.id !== row.item.userId">
+        <div v-if="!myself(row.item)">
           <b-button
             v-if="row.item.moderator"
             variant="info"
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 023d819e4..d256fc2c6 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -337,7 +337,7 @@ describe('CreationConfirm', () => {
       describe('click tab "confirmed"', () => {
         beforeEach(async () => {
           jest.clearAllMocks()
-          await wrapper.find('a[data-test="confirmed"]').trigger('click')
+          await wrapper.find('[data-test="confirmed"]').trigger('click')
         })
 
         it('refetches contributions with proper filter', () => {
@@ -348,68 +348,68 @@ describe('CreationConfirm', () => {
             statusFilter: ['CONFIRMED'],
           })
         })
+      })
 
-        describe('click tab "open"', () => {
-          beforeEach(async () => {
-            jest.clearAllMocks()
-            await wrapper.find('a[data-test="open"]').trigger('click')
-          })
-
-          it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
-              currentPage: 1,
-              order: 'DESC',
-              pageSize: 25,
-              statusFilter: ['IN_PROGRESS', 'PENDING'],
-            })
-          })
+      describe('click tab "open"', () => {
+        beforeEach(async () => {
+          jest.clearAllMocks()
+          await wrapper.find('[data-test="open"]').trigger('click')
         })
 
-        describe('click tab "denied"', () => {
-          beforeEach(async () => {
-            jest.clearAllMocks()
-            await wrapper.find('a[data-test="denied"]').trigger('click')
-          })
-
-          it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
-              currentPage: 1,
-              order: 'DESC',
-              pageSize: 25,
-              statusFilter: ['DENIED'],
-            })
+        it('refetches contributions with proper filter', () => {
+          expect(adminListAllContributionsMock).toBeCalledWith({
+            currentPage: 1,
+            order: 'DESC',
+            pageSize: 25,
+            statusFilter: ['IN_PROGRESS', 'PENDING'],
           })
         })
+      })
 
-        describe('click tab "deleted"', () => {
-          beforeEach(async () => {
-            jest.clearAllMocks()
-            await wrapper.find('a[data-test="deleted"]').trigger('click')
-          })
-
-          it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
-              currentPage: 1,
-              order: 'DESC',
-              pageSize: 25,
-              statusFilter: ['DELETED'],
-            })
-          })
+      describe('click tab "denied"', () => {
+        beforeEach(async () => {
+          jest.clearAllMocks()
+          await wrapper.find('[data-test="denied"]').trigger('click')
         })
 
-        describe('click tab "all"', () => {
-          beforeEach(async () => {
-            jest.clearAllMocks()
-            await wrapper.find('a[data-test="all"]').trigger('click')
+        it('refetches contributions with proper filter', () => {
+          expect(adminListAllContributionsMock).toBeCalledWith({
+            currentPage: 1,
+            order: 'DESC',
+            pageSize: 25,
+            statusFilter: ['DENIED'],
           })
+        })
+      })
 
-          it('refetches contributions with proper filter', () => {
-            expect(adminListAllContributionsMock).toBeCalledWith({
-              currentPage: 1,
-              order: 'DESC',
-              pageSize: 25,
-              statusFilter: ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
-            })
+      describe('click tab "deleted"', () => {
+        beforeEach(async () => {
+          jest.clearAllMocks()
+          await wrapper.find('[data-test="deleted"]').trigger('click')
+        })
+
+        it('refetches contributions with proper filter', () => {
+          expect(adminListAllContributionsMock).toBeCalledWith({
+            currentPage: 1,
+            order: 'DESC',
+            pageSize: 25,
+            statusFilter: ['DELETED'],
+          })
+        })
+      })
+
+      describe('click tab "all"', () => {
+        beforeEach(async () => {
+          jest.clearAllMocks()
+          await wrapper.find('[data-test="all"]').trigger('click')
+        })
+
+        it('refetches contributions with proper filter', () => {
+          expect(adminListAllContributionsMock).toBeCalledWith({
+            currentPage: 1,
+            order: 'DESC',
+            pageSize: 25,
+            statusFilter: ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
           })
         })
       })

From 52cc4e54bd155dd955a6d5df7e33d429406ae7dc Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 18:24:02 +0100
Subject: [PATCH 39/47] Remove clearAllMocks for 'open'

---
 admin/src/pages/CreationConfirm.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index d256fc2c6..cea77b810 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -352,7 +352,6 @@ describe('CreationConfirm', () => {
 
       describe('click tab "open"', () => {
         beforeEach(async () => {
-          jest.clearAllMocks()
           await wrapper.find('[data-test="open"]').trigger('click')
         })
 

From 44214e9657bff28975624268089c95984c71f7c4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 18:38:17 +0100
Subject: [PATCH 40/47] Change following test of tab confirmed.

---
 admin/src/pages/CreationConfirm.spec.js | 95 +++++++++++++------------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index cea77b810..1b7e522f1 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -348,67 +348,68 @@ describe('CreationConfirm', () => {
             statusFilter: ['CONFIRMED'],
           })
         })
-      })
 
-      describe('click tab "open"', () => {
-        beforeEach(async () => {
-          await wrapper.find('[data-test="open"]').trigger('click')
-        })
+        describe('click tab "open"', () => {
+          beforeEach(async () => {
+            jest.clearAllMocks()
+            await wrapper.find('[data-test="open"]').trigger('click')
+          })
 
-        it('refetches contributions with proper filter', () => {
-          expect(adminListAllContributionsMock).toBeCalledWith({
-            currentPage: 1,
-            order: 'DESC',
-            pageSize: 25,
-            statusFilter: ['IN_PROGRESS', 'PENDING'],
+          it('refetches contributions with proper filter', () => {
+            expect(adminListAllContributionsMock).toBeCalledWith({
+              currentPage: 1,
+              order: 'DESC',
+              pageSize: 25,
+              statusFilter: ['IN_PROGRESS', 'PENDING'],
+            })
           })
         })
-      })
 
-      describe('click tab "denied"', () => {
-        beforeEach(async () => {
-          jest.clearAllMocks()
-          await wrapper.find('[data-test="denied"]').trigger('click')
-        })
+        describe('click tab "denied"', () => {
+          beforeEach(async () => {
+            jest.clearAllMocks()
+            await wrapper.find('[data-test="denied"]').trigger('click')
+          })
 
-        it('refetches contributions with proper filter', () => {
-          expect(adminListAllContributionsMock).toBeCalledWith({
-            currentPage: 1,
-            order: 'DESC',
-            pageSize: 25,
-            statusFilter: ['DENIED'],
+          it('refetches contributions with proper filter', () => {
+            expect(adminListAllContributionsMock).toBeCalledWith({
+              currentPage: 1,
+              order: 'DESC',
+              pageSize: 25,
+              statusFilter: ['DENIED'],
+            })
           })
         })
-      })
 
-      describe('click tab "deleted"', () => {
-        beforeEach(async () => {
-          jest.clearAllMocks()
-          await wrapper.find('[data-test="deleted"]').trigger('click')
-        })
+        describe('click tab "deleted"', () => {
+          beforeEach(async () => {
+            jest.clearAllMocks()
+            await wrapper.find('[data-test="deleted"]').trigger('click')
+          })
 
-        it('refetches contributions with proper filter', () => {
-          expect(adminListAllContributionsMock).toBeCalledWith({
-            currentPage: 1,
-            order: 'DESC',
-            pageSize: 25,
-            statusFilter: ['DELETED'],
+          it('refetches contributions with proper filter', () => {
+            expect(adminListAllContributionsMock).toBeCalledWith({
+              currentPage: 1,
+              order: 'DESC',
+              pageSize: 25,
+              statusFilter: ['DELETED'],
+            })
           })
         })
-      })
 
-      describe('click tab "all"', () => {
-        beforeEach(async () => {
-          jest.clearAllMocks()
-          await wrapper.find('[data-test="all"]').trigger('click')
-        })
+        describe('click tab "all"', () => {
+          beforeEach(async () => {
+            jest.clearAllMocks()
+            await wrapper.find('[data-test="all"]').trigger('click')
+          })
 
-        it('refetches contributions with proper filter', () => {
-          expect(adminListAllContributionsMock).toBeCalledWith({
-            currentPage: 1,
-            order: 'DESC',
-            pageSize: 25,
-            statusFilter: ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
+          it('refetches contributions with proper filter', () => {
+            expect(adminListAllContributionsMock).toBeCalledWith({
+              currentPage: 1,
+              order: 'DESC',
+              pageSize: 25,
+              statusFilter: ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
+            })
           })
         })
       })

From 780f18f32be2515e10df4a33ebc68d512dd5aa7d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 18:40:29 +0100
Subject: [PATCH 41/47] Remove propsData

---
 admin/src/pages/CreationConfirm.spec.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 1b7e522f1..1b67a93da 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -121,12 +121,8 @@ describe('CreationConfirm', () => {
     confirmContributionMock.mockResolvedValue({ data: { confirmContribution: true } }),
   )
 
-  const propsData = {
-    item: {},
-  }
-
   const Wrapper = () => {
-    return mount(CreationConfirm, { localVue, mocks, apolloProvider, propsData })
+    return mount(CreationConfirm, { localVue, mocks, apolloProvider })
   }
 
   describe('mount', () => {

From 8f6c3d45aa216ce6890cefb3cc0979aacbbebcf1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 9 Mar 2023 18:59:05 +0100
Subject: [PATCH 42/47] a element at button match

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

diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 1b67a93da..87f94e91f 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -333,7 +333,7 @@ describe('CreationConfirm', () => {
       describe('click tab "confirmed"', () => {
         beforeEach(async () => {
           jest.clearAllMocks()
-          await wrapper.find('[data-test="confirmed"]').trigger('click')
+          await wrapper.find('a[data-test="confirmed"]').trigger('click')
         })
 
         it('refetches contributions with proper filter', () => {
@@ -348,7 +348,7 @@ describe('CreationConfirm', () => {
         describe('click tab "open"', () => {
           beforeEach(async () => {
             jest.clearAllMocks()
-            await wrapper.find('[data-test="open"]').trigger('click')
+            await wrapper.find('a[data-test="open"]').trigger('click')
           })
 
           it('refetches contributions with proper filter', () => {
@@ -364,7 +364,7 @@ describe('CreationConfirm', () => {
         describe('click tab "denied"', () => {
           beforeEach(async () => {
             jest.clearAllMocks()
-            await wrapper.find('[data-test="denied"]').trigger('click')
+            await wrapper.find('a[data-test="denied"]').trigger('click')
           })
 
           it('refetches contributions with proper filter', () => {
@@ -380,7 +380,7 @@ describe('CreationConfirm', () => {
         describe('click tab "deleted"', () => {
           beforeEach(async () => {
             jest.clearAllMocks()
-            await wrapper.find('[data-test="deleted"]').trigger('click')
+            await wrapper.find('a[data-test="deleted"]').trigger('click')
           })
 
           it('refetches contributions with proper filter', () => {
@@ -396,7 +396,7 @@ describe('CreationConfirm', () => {
         describe('click tab "all"', () => {
           beforeEach(async () => {
             jest.clearAllMocks()
-            await wrapper.find('[data-test="all"]').trigger('click')
+            await wrapper.find('a[data-test="all"]').trigger('click')
           })
 
           it('refetches contributions with proper filter', () => {

From e7f7b9b1641d4734993f90932b6095ec17896199 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 9 Mar 2023 20:13:54 +0100
Subject: [PATCH 43/47] fix english language for contributions in admin

---
 admin/src/locales/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 70b42479e..de7d3b871 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -37,9 +37,9 @@
     "denied": "Rejected",
     "open": "Open"
   },
-  "created": "Confirmed",
-  "createdAt": "Created",
-  "creation": "Creation",
+  "created": "Created for",
+  "createdAt": "Created at",
+  "creation": "Amount",
   "creationList": "Creation list",
   "creation_form": {
     "creation_for": "Active Basic Income for",

From fe560ff31974bfd13a0f7c33d1d2cfdba21e1ab6 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 9 Mar 2023 20:19:01 +0100
Subject: [PATCH 44/47] Change openCreation in case of tab open.

---
 admin/src/pages/CreationConfirm.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 3f0b2d87f..55caf8677 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -410,6 +410,9 @@ export default {
       update({ adminListAllContributions }) {
         this.rows = adminListAllContributions.contributionCount
         this.items = adminListAllContributions.contributionList
+        if (this.statusFilter === FILTER_TAB_MAP[0]) {
+          this.$store.commit('setOpenCreations', adminListAllContributions.contributionCount)
+        }
       },
       error({ message }) {
         this.toastError(message)

From 8a3d66861eb10d3e0af887e6723dd9bf4e6f9a44 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 10 Mar 2023 08:02:25 +0100
Subject: [PATCH 45/47] Change b-img to b-icon send.

---
 frontend/src/components/Menu/Sidebar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index c6cc4c4e0..83adcb594 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -13,7 +13,7 @@
             <span class="ml-2">{{ $t('navigation.overview') }}</span>
           </b-nav-item>
           <b-nav-item to="/send" class="mb-3" active-class="activeRoute">
-            <b-img src="/img/svg/send.svg" height="20" class="svg-icon" />
+            <b-icon icon="cash" aria-hidden="true"></b-icon>
             <span class="ml-2">{{ $t('navigation.send') }}</span>
           </b-nav-item>
           <b-nav-item to="/transactions" class="mb-3" active-class="activeRoute">

From ef3a9c16b272fd65947af83a6d31e775aac30da9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 10 Mar 2023 08:31:15 +0100
Subject: [PATCH 46/47] Removed code reintroduced.

---
 .../src/components/Contributions/ContributionListItem.vue   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index ffbf29fdd..56546d183 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -25,7 +25,11 @@
           </div>
           <div class="mt-3 font-weight-bold">{{ $t('contributionText') }}</div>
           <div class="mb-3 text-break word-break">{{ memo }}</div>
-          <div v-if="state === 'IN_PROGRESS' && !allContribution" class="text-205">
+          <div
+            v-if="state === 'IN_PROGRESS'"
+            class="text-205 pointer hover-font-bold"
+            @click="visible = !visible"
+          >
             {{ $t('contribution.alert.answerQuestion') }}
           </div>
         </b-col>

From e2fc7c173346620c2dfc29757831e04d0288e025 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 10 Mar 2023 11:36:35 +0100
Subject: [PATCH 47/47] chore(other): upgrade version to 1.19.1

---
 CHANGELOG.md          | 20 ++++++++++++++++++++
 admin/package.json    |  2 +-
 backend/package.json  |  2 +-
 database/package.json |  2 +-
 frontend/package.json |  2 +-
 package.json          |  2 +-
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce3bd4a10..8dc91f2fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,28 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.19.1](https://github.com/gradido/gradido/compare/1.19.0...1.19.1)
+
+- fix(frontend): admin question clickable [`#2810`](https://github.com/gradido/gradido/pull/2810)
+- refactor(frontend): change b-img to b-icon send [`#2809`](https://github.com/gradido/gradido/pull/2809)
+- fix(admin): update openCreation in case of tab open. [`#2806`](https://github.com/gradido/gradido/pull/2806)
+- fix(admin): english language for contributions in admin [`#2804`](https://github.com/gradido/gradido/pull/2804)
+- refactor(admin): event buttons for myself turned off in open contributions [`#2760`](https://github.com/gradido/gradido/pull/2760)
+- fix(admin): contribution page [`#2794`](https://github.com/gradido/gradido/pull/2794)
+- fix(frontend): info.svg [`#2798`](https://github.com/gradido/gradido/pull/2798)
+- fix(backend): add relation messages to database query [`#2795`](https://github.com/gradido/gradido/pull/2795)
+- fix(admin): header and menu [`#2793`](https://github.com/gradido/gradido/pull/2793)
+- fix(frontend): send gdd - change first submit button text to 'Check Now' [`#2774`](https://github.com/gradido/gradido/pull/2774)
+- refactor(frontend): creations generated by link NL [`#2771`](https://github.com/gradido/gradido/pull/2771)
+- refactor(frontend): creations generated by link (FR) + (NL) [`#2770`](https://github.com/gradido/gradido/pull/2770)
+- refactor(frontend): update German locales [`#2765`](https://github.com/gradido/gradido/pull/2765)
+- refactor(backend): use find contributions helper for list contributions [`#2762`](https://github.com/gradido/gradido/pull/2762)
+
 #### [1.19.0](https://github.com/gradido/gradido/compare/1.18.2...1.19.0)
 
+> 7 March 2023
+
+- chore(release): version 1.19.0 [`#2786`](https://github.com/gradido/gradido/pull/2786)
 - fix(frontend): change contribution design [`#2731`](https://github.com/gradido/gradido/pull/2731)
 - refactor(frontend): commnity navbar- & unauthenticated b-gradido styles [`#2732`](https://github.com/gradido/gradido/pull/2732)
 - fix(database): change downwards migration to delete entries with last_announced_at IS NULL [`#2767`](https://github.com/gradido/gradido/pull/2767)
diff --git a/admin/package.json b/admin/package.json
index 2b9f3032f..10399739d 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {
diff --git a/backend/package.json b/backend/package.json
index 08a9bf54d..db34fac6e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",
diff --git a/database/package.json b/database/package.json
index 95fd9a791..91bcce3f7 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",
diff --git a/frontend/package.json b/frontend/package.json
index 180959bc5..865ba060f 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
diff --git a/package.json b/package.json
index c28757c68..cba894803 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",