From 7d7277d4755cfe4aef501e2a56864eb0dcf58004 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 28 Nov 2021 09:56:02 +0100
Subject: [PATCH 01/23] if creation is edited, insert text in form

---
 admin/src/components/CreationFormular.vue |  9 ++++++---
 admin/src/components/UserTable.vue        | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 49e10e7bb..a1b913d92 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -73,7 +73,6 @@
                 :min="rangeMin"
                 :max="rangeMax"
                 step="10"
-                @load="checkFormForUpdate('range')"
               ></b-form-input>
             </b-input-group>
           </div>
@@ -86,7 +85,6 @@
               v-model="text"
               :state="text.length >= 10"
               placeholder="Mindestens 10 Zeichen eingeben"
-              @load="checkFormForUpdate('text')"
               rows="3"
             ></b-form-textarea>
           </div>
@@ -159,7 +157,7 @@ export default {
   data() {
     return {
       radioSelected: '',
-      text: '',
+      text: !this.creationUserData.note ? '' : this.creationUserData.note,
       value: 0,
       rangeMin: 0,
       rangeMax: 1000,
@@ -180,6 +178,7 @@ export default {
       createdIndex: null,
     }
   },
+
   methods: {
     // Auswählen eines Zeitraumes
     updateRadioSelected(name, index, openCreation) {
@@ -196,7 +195,10 @@ export default {
         this.rangeMax = openCreation
       }
     },
+    /*
     checkFormForUpdate(input) {
+      console.log('checkFormForUpdate', input)
+      console.log('checkFormForUpdate creationUserData', this.creationUserData)
       switch (input) {
         case 'text':
           this.text = this.creationUserData.text
@@ -209,6 +211,7 @@ export default {
           alert("I don't know such values")
       }
     },
+    */
     submitCreation() {
       // Formular Prüfen ob ein Zeitraum ausgewählt wurde. Ansonsten abbrechen und Hinweis anzeigen
       if (this.radioSelected === '') {
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 816d95952..fa0b395a4 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -66,7 +66,7 @@
             :pagetype="type"
             :creation="row.item.creation"
             :item="row.item"
-            :creationUserData="creationData"
+            :creationUserData="creationUserData"
             @update-creation-data="updateCreationData"
             @update-user-data="updateUserData"
           />
@@ -150,7 +150,7 @@ export default {
   },
   data() {
     return {
-      creationData: {},
+      creationUserData: {},
       overlay: false,
       overlayBookmarkType: '',
       overlayItem: [],
@@ -223,13 +223,13 @@ export default {
       if (!row.detailsShowing) {
         alert('offen edit loslegen')
         // this.item = rowItem
-        this.creationData = rowItem
-        // alert(this.creationData)
+        this.creationUserData = rowItem
+        console.log('editCreationUserTable creationUserData', this.creationUserData)
       }
       row.toggleDetails()
     },
     updateCreationData(data) {
-      this.creationData = {
+      this.creationUserData = {
         ...data,
       }
     },
@@ -237,6 +237,12 @@ export default {
       rowItem.creation = newCreation
     },
   },
+    watch: {
+    creationUserData: function () {
+      alert('yolo')
+      console.log(this.creationUserData)
+    },
+  },
 }
 </script>
 <style>

From babb504824a4169e33d019e63d9c20be2534ce5b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 28 Nov 2021 17:02:43 +0100
Subject: [PATCH 02/23] edit pending creation, fill the form and extrapolate
 the range and the creation[index]

---
 admin/src/components/CreationFormular.vue | 45 ++++++++++++-----------
 admin/src/components/UserTable.vue        | 10 ++---
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index a1b913d92..80c0c36fc 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -1,21 +1,6 @@
 <template>
   <div class="component-creation-formular">
-    <div>
-      <h3>
-        {{
-          this.type === 'singleCreation'
-            ? 'Einzelschöpfung für ' + item.firstName + ' ' + item.lastName + ''
-            : 'Mehrfachschöpfung für ' + Object.keys(this.itemsMassCreation).length + ' Mitglieder'
-        }}
-      </h3>
-      <div v-show="this.type === 'massCreation' && Object.keys(this.itemsMassCreation).length <= 0">
-        Bitte wähle ein oder Mehrere Mitglieder aus für die du Schöpfen möchtest
-      </div>
-    </div>
-    <div
-      v-show="this.type === 'singleCreation' || Object.keys(this.itemsMassCreation).length > 0"
-      class="shadow p-3 mb-5 bg-white rounded"
-    >
+    <div class="shadow p-3 mb-5 bg-white rounded">
       <b-form ref="creationForm">
         <b-row class="m-4">
           <label>Monat Auswählen</label>
@@ -140,25 +125,34 @@ export default {
     item: {
       type: Object,
       required: false,
+      default() {
+        return {}
+      },
+    },
+    items: {
+      type: Array,
+      required: false,
+      default() {
+        return []
+      },
     },
     creationUserData: {
       type: Object,
       required: false,
+      default() {
+        return {}
+      },
     },
     creation: {
       type: Array,
       required: true,
     },
-    itemsMassCreation: {
-      type: Object,
-      required: false,
-    },
   },
   data() {
     return {
       radioSelected: '',
       text: !this.creationUserData.note ? '' : this.creationUserData.note,
-      value: 0,
+      value: !this.creationUserData.amount ? 0 : this.creationUserData.amount / 10000,
       rangeMin: 0,
       rangeMax: 1000,
       currentMonth: {
@@ -194,6 +188,12 @@ export default {
         // Der maximale offene Betrag an GDD die für ein User noch geschöpft werden kann
         this.rangeMax = openCreation
       }
+      // Wenn Einzelschöpfung
+      if (this.pagetype === 'PageCreationConfirm') {
+        this.rangeMin = 0
+        this.rangeMax = openCreation + ( this.creationUserData.amount / 10000 )
+        this.creation[index] = this.creation[index] + ( this.creationUserData.amount / 10000 )
+      }
     },
     /*
     checkFormForUpdate(input) {
@@ -229,6 +229,7 @@ export default {
       if (this.text.length < 10) {
         return alert('Bitte gib einen Text ein der länger als 10 Zeichen ist!')
       }
+      /*
       if (this.type === 'massCreation') {
         // Die anzahl der Mitglieder aus der Mehrfachschöpfung
         const i = Object.keys(this.itemsMassCreation).length
@@ -252,7 +253,7 @@ export default {
         // lösche alle Mitglieder aus der MehrfachSchöpfungsListe nach dem alle Mehrfachschpfungen zum bestätigen gesendet wurden.
         this.$emit('remove-all-bookmark')
       }
-
+      */
       if (this.type === 'singleCreation') {
         this.submitObj = {
           email: this.item.email,
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index fa0b395a4..bf752ed85 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -60,7 +60,7 @@
           <b-row class="mb-2">
             <b-col></b-col>
           </b-row>
-
+         {{type}}
           <creation-formular
             type="singleCreation"
             :pagetype="type"
@@ -225,6 +225,8 @@ export default {
         // this.item = rowItem
         this.creationUserData = rowItem
         console.log('editCreationUserTable creationUserData', this.creationUserData)
+      } else {
+        this.creationUserData = {}
       }
       row.toggleDetails()
     },
@@ -237,12 +239,6 @@ export default {
       rowItem.creation = newCreation
     },
   },
-    watch: {
-    creationUserData: function () {
-      alert('yolo')
-      console.log(this.creationUserData)
-    },
-  },
 }
 </script>
 <style>

From ac555f78356e8077ffcd10cf485459834900912a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 28 Nov 2021 17:03:35 +0100
Subject: [PATCH 03/23] Display of the form in the mass creation

---
 admin/src/pages/Creation.vue | 39 ++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue
index 7ab900b43..f9d6481ed 100644
--- a/admin/src/pages/Creation.vue
+++ b/admin/src/pages/Creation.vue
@@ -21,24 +21,29 @@
       </b-col>
       <b-col cols="12" lg="7" class="shadow p-3 mb-5 rounded bg-info">
         <user-table
-          v-if="massCreation.length > 0"
+          v-show="itemsMassCreation.length > 0"
           class="shadow p-3 mb-5 bg-white rounded"
           type="UserListMassCreation"
-          :itemsUser="massCreation"
+          :itemsUser="itemsMassCreation"
           :fieldsTable="fields"
           :criteria="null"
           :creation="creation"
           @update-item="updateItem"
         />
-
+        {{ itemsMassCreation.length === 0 }}
+        {{ itemsMassCreation.length < 0 }}
+        {{ itemsMassCreation.length > 0 }}
+        <div v-if="itemsMassCreation.length === 0">
+          Bitte wähle ein oder Mehrere Mitglieder aus für die du Schöpfen möchtest
+        </div>
         <creation-formular
-          v-if="massCreation.length > 0"
+          v-else
           type="massCreation"
           :creation="creation"
-          :itemsMassCreation="massCreation"
-          @update-radio-selected="updateRadioSelected"
+          :items="itemsMassCreation"
           @remove-all-bookmark="removeAllBookmark"
         />
+        {{itemsMassCreation}}
       </b-col>
     </b-row>
   </div>
@@ -72,7 +77,7 @@ export default {
         { key: 'bookmark', label: 'löschen' },
       ],
       itemsList: [],
-      massCreation: [],
+      itemsMassCreation: [],
       radioSelectedMass: '',
       criteria: '',
       creation: [null, null, null],
@@ -111,12 +116,12 @@ export default {
           findArr = this.itemsList.find((arr) => arr.id === e.id)
           index = this.itemsList.indexOf(findArr)
           this.itemsList.splice(index, 1)
-          this.massCreation.push(e)
+          this.itemsMassCreation.push(e)
           break
         case 'remove':
-          findArr = this.massCreation.find((arr) => arr.id === e.id)
-          index = this.massCreation.indexOf(findArr)
-          this.massCreation.splice(index, 1)
+          findArr = this.itemsMassCreation.find((arr) => arr.id === e.id)
+          index = this.itemsMassCreation.indexOf(findArr)
+          this.itemsMassCreation.splice(index, 1)
           this.itemsList.push(e)
           break
         default:
@@ -124,19 +129,19 @@ export default {
       }
     },
 
-    updateRadioSelected(obj) {
-      this.radioSelectedMass = obj[0]
-    },
+    //updateRadioSelected(obj) {
+    //  this.radioSelectedMass = obj[0]
+    //},
 
     removeAllBookmark() {
       alert('remove all bookmarks')
       const index = 0
       let i = 0
 
-      for (i; i < this.massCreation.length; i++) {
-        this.itemsList.push(this.massCreation[i])
+      for (i; i < this.itemsMassCreation.length; i++) {
+        this.itemsList.push(this.itemsMassCreation[i])
       }
-      this.massCreation.splice(index, this.massCreation.length)
+      this.itemsMassCreation.splice(index, this.itemsMassCreation.length)
     },
   },
 }

From 4c8c0678b1bd4b41002efba2415daa5d020146e4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Nov 2021 09:34:46 +0100
Subject: [PATCH 04/23] radio buttion cecked bei edit from pending creation

---
 admin/src/components/CreationFormular.vue | 33 ++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 80c0c36fc..5b7648bb4 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -12,7 +12,9 @@
               size="lg"
               @change="updateRadioSelected(beforeLastMonth, 0, creation[0])"
             >
-              {{ beforeLastMonth.short }} {{ creation[0] != null ? creation[0] + ' GDD' : '' }}
+              <label for="beforeLastMonth">
+                {{ beforeLastMonth.short }} {{ creation[0] != null ? creation[0] + ' GDD' : '' }}
+              </label>
             </b-form-radio>
           </b-col>
           <b-col>
@@ -23,7 +25,9 @@
               size="lg"
               @change="updateRadioSelected(lastMonth, 1, creation[1])"
             >
-              {{ lastMonth.short }} {{ creation[1] != null ? creation[1] + ' GDD' : '' }}
+              <label for="lastMonth">
+                {{ lastMonth.short }} {{ creation[1] != null ? creation[1] + ' GDD' : '' }}
+              </label>
             </b-form-radio>
           </b-col>
           <b-col class="text-right">
@@ -34,7 +38,9 @@
               size="lg"
               @change="updateRadioSelected(currentMonth, 2, creation[2])"
             >
-              {{ currentMonth.short }} {{ creation[2] != null ? creation[2] + ' GDD' : '' }}
+              <label for="currentMonth">
+                {{ currentMonth.short }} {{ creation[2] != null ? creation[2] + ' GDD' : '' }}
+              </label>
             </b-form-radio>
           </b-col>
         </b-row>
@@ -148,6 +154,21 @@ export default {
       required: true,
     },
   },
+  created() {
+    console.log(' created this.pagetype', this.pagetype)
+    if (this.pagetype === 'PageCreationConfirm' && this.creationUserData.date) {
+      console.log('if created CreationFormular.vue', this.creationUserData.date)
+      console.log(
+        'this.$moment(this.creationUserData.date).format("MMMM")',
+        this.$moment(this.creationUserData.date).format('MMMM'),
+      )
+      console.log(
+        'this.$moment(this.creationUserData.date).format("YYYY-MM-DD")',
+        this.$moment(this.creationUserData.date).format('YYYY-MM-DD'),
+      )
+      // const id = this.$moment(this.creationUserData.date).format('MMMM')
+    }
+  },
   data() {
     return {
       radioSelected: '',
@@ -172,11 +193,11 @@ export default {
       createdIndex: null,
     }
   },
-
   methods: {
     // Auswählen eines Zeitraumes
     updateRadioSelected(name, index, openCreation) {
       this.createdIndex = index
+      console.log("radioSelected", this.radioSelected)
       // Wenn Mehrfachschöpfung
       if (this.type === 'massCreation') {
         // An Creation.vue emitten und radioSelectedMass aktualisieren
@@ -191,8 +212,8 @@ export default {
       // Wenn Einzelschöpfung
       if (this.pagetype === 'PageCreationConfirm') {
         this.rangeMin = 0
-        this.rangeMax = openCreation + ( this.creationUserData.amount / 10000 )
-        this.creation[index] = this.creation[index] + ( this.creationUserData.amount / 10000 )
+        this.rangeMax = openCreation + this.creationUserData.amount / 10000
+        this.creation[index] = this.creation[index] + this.creationUserData.amount / 10000
       }
     },
     /*

From 17a2feeb722a275c528f9570eb963c4727e0e659 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Nov 2021 09:58:29 +0100
Subject: [PATCH 05/23] Edit updateRadioSelected so that we have two entry
 points massCreation or singleCreation.

---
 admin/src/components/CreationFormular.vue | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 5b7648bb4..fa21ed993 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -193,27 +193,26 @@ export default {
       createdIndex: null,
     }
   },
+
   methods: {
     // Auswählen eines Zeitraumes
     updateRadioSelected(name, index, openCreation) {
       this.createdIndex = index
-      console.log("radioSelected", this.radioSelected)
+      console.log('radioSelected', this.radioSelected)
       // Wenn Mehrfachschöpfung
       if (this.type === 'massCreation') {
         // An Creation.vue emitten und radioSelectedMass aktualisieren
         this.$emit('update-radio-selected', [name, index])
-      }
-      // Wenn Einzelschöpfung
-      if (this.type === 'singleCreation') {
+      } else if (this.type === 'singleCreation') {
         this.rangeMin = 0
         // Der maximale offene Betrag an GDD die für ein User noch geschöpft werden kann
         this.rangeMax = openCreation
-      }
-      // Wenn Einzelschöpfung
-      if (this.pagetype === 'PageCreationConfirm') {
-        this.rangeMin = 0
-        this.rangeMax = openCreation + this.creationUserData.amount / 10000
-        this.creation[index] = this.creation[index] + this.creationUserData.amount / 10000
+        // Wenn Einzelschöpfung
+        if (this.pagetype === 'PageCreationConfirm') {
+          this.rangeMin = 0
+          this.rangeMax = openCreation + this.creationUserData.amount / 10000
+          this.creation[index] = this.creation[index] + ( this.creationUserData.amount / 10000 )
+        }
       }
     },
     /*

From d3c42e4a5d98dbbbe7924ad4dbf7f154c3d49d6c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Nov 2021 09:59:17 +0100
Subject: [PATCH 06/23] Add EditCreationFormular to differenciate Edit vue from
 Creation Vue.

---
 admin/src/components/EditCreationFormular.vue | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 admin/src/components/EditCreationFormular.vue

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
new file mode 100644
index 000000000..8ea7d9578
--- /dev/null
+++ b/admin/src/components/EditCreationFormular.vue
@@ -0,0 +1,105 @@
+<template>
+  <div class="component-edit-creation-formular">
+    <div class="shadow p-3 mb-5 bg-white rounded">
+      <b-form ref="updateCreationForm">
+        <b-row class="m-4">
+          <label>Monat Auswählen</label>
+          <b-col class="text-left">
+            <b-form-radio
+              v-model="radioSelected"
+              :value="beforeLastMonth"
+              :disabled="creation[0] === 0"
+              size="lg"
+              @change="updateRadioSelected(beforeLastMonth, 0, creation[0])"
+            >
+              <label for="beforeLastMonth">
+                {{ beforeLastMonth.short }} {{ creation[0] != null ? creation[0] + ' GDD' : '' }}
+              </label>
+            </b-form-radio>
+          </b-col>
+          <b-col>
+            <b-form-radio
+              v-model="radioSelected"
+              :value="lastMonth"
+              :disabled="creation[1] === 0"
+              size="lg"
+              @change="updateRadioSelected(lastMonth, 1, creation[1])"
+            >
+              <label for="lastMonth">
+                {{ lastMonth.short }} {{ creation[1] != null ? creation[1] + ' GDD' : '' }}
+              </label>
+            </b-form-radio>
+          </b-col>
+          <b-col class="text-right">
+            <b-form-radio
+              v-model="radioSelected"
+              :value="currentMonth"
+              :disabled="creation[2] === 0"
+              size="lg"
+              @change="updateRadioSelected(currentMonth, 2, creation[2])"
+            >
+              <label for="currentMonth">
+                {{ currentMonth.short }} {{ creation[2] != null ? creation[2] + ' GDD' : '' }}
+              </label>
+            </b-form-radio>
+          </b-col>
+        </b-row>
+
+        <b-row class="m-4" v-show="createdIndex != null">
+          <label>Betrag Auswählen</label>
+          <div>
+            <b-input-group prepend="GDD" append=".00">
+              <b-form-input
+                type="number"
+                v-model="value"
+                :min="rangeMin"
+                :max="rangeMax"
+              ></b-form-input>
+            </b-input-group>
+
+            <b-input-group prepend="0" :append="String(rangeMax)" class="mt-3">
+              <b-form-input
+                type="range"
+                v-model="value"
+                :min="rangeMin"
+                :max="rangeMax"
+                step="10"
+              ></b-form-input>
+            </b-input-group>
+          </div>
+        </b-row>
+        <b-row class="m-4">
+          <label>Text eintragen</label>
+          <div>
+            <b-form-textarea
+              id="textarea-state"
+              v-model="text"
+              :state="text.length >= 10"
+              placeholder="Mindestens 10 Zeichen eingeben"
+              rows="3"
+            ></b-form-textarea>
+          </div>
+        </b-row>
+        <b-row class="m-4">
+          <b-col class="text-center">
+            <b-button type="reset" variant="danger" @click="$refs.updateCreationForm.reset()">
+              zurücksetzen
+            </b-button>
+          </b-col>
+          <b-col class="text-center">
+            <div class="text-right">
+              <b-button
+                type="button"
+                variant="success"
+                @click="submitCreation"
+                :disabled="radioSelected === '' || value <= 0 || text.length < 10"
+              >
+                Update Schöpfung ({{ type }},{{ pagetype }})
+              </b-button>
+            </div>
+          </b-col>
+        </b-row>
+      </b-form>
+    </div>
+  </div>
+</template>
\ No newline at end of file

From 7cf898f72c8341679353b9860d55dbbc3089261d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Nov 2021 10:06:56 +0100
Subject: [PATCH 07/23] Add switch between creationFormular and
 updateCreationFormular in UserTable.

---
 admin/src/components/UserTable.vue | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index bf752ed85..ea1fb532e 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -60,8 +60,19 @@
           <b-row class="mb-2">
             <b-col></b-col>
           </b-row>
-         {{type}}
+         {{ type }}
           <creation-formular
+            v-if="type === 'PageUserSearch'"
+            type="singleCreation"
+            :pagetype="type"
+            :creation="row.item.creation"
+            :item="row.item"
+            :creationUserData="creationUserData"
+            @update-creation-data="updateCreationData"
+            @update-user-data="updateUserData"
+          />
+          <edit-creation-formular
+            v-else
             type="singleCreation"
             :pagetype="type"
             :creation="row.item.creation"
@@ -119,6 +130,7 @@
 
 <script>
 import CreationFormular from '../components/CreationFormular.vue'
+import EditCreationFormular from '../components/EditCreationFormular.vue'
 
 export default {
   name: 'UserTable',
@@ -147,6 +159,7 @@ export default {
   },
   components: {
     CreationFormular,
+    EditCreationFormular,
   },
   data() {
     return {

From e03637d3e41623285b3d9ee8d84085f00895bbf6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Nov 2021 11:34:50 +0100
Subject: [PATCH 08/23] Change format.

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

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index ea1fb532e..1f7ffa94a 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -60,7 +60,7 @@
           <b-row class="mb-2">
             <b-col></b-col>
           </b-row>
-         {{ type }}
+          {{ type }}
           <creation-formular
             v-if="type === 'PageUserSearch'"
             type="singleCreation"

From 5c06ab256f898a4f31380c0896b240c1f7c57f34 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Nov 2021 11:35:26 +0100
Subject: [PATCH 09/23] Change format.

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

diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue
index f9d6481ed..21d4aa11a 100644
--- a/admin/src/pages/Creation.vue
+++ b/admin/src/pages/Creation.vue
@@ -30,9 +30,6 @@
           :creation="creation"
           @update-item="updateItem"
         />
-        {{ itemsMassCreation.length === 0 }}
-        {{ itemsMassCreation.length < 0 }}
-        {{ itemsMassCreation.length > 0 }}
         <div v-if="itemsMassCreation.length === 0">
           Bitte wähle ein oder Mehrere Mitglieder aus für die du Schöpfen möchtest
         </div>
@@ -43,7 +40,7 @@
           :items="itemsMassCreation"
           @remove-all-bookmark="removeAllBookmark"
         />
-        {{itemsMassCreation}}
+        {{ itemsMassCreation }}
       </b-col>
     </b-row>
   </div>
@@ -129,9 +126,9 @@ export default {
       }
     },
 
-    //updateRadioSelected(obj) {
+    // updateRadioSelected(obj) {
     //  this.radioSelectedMass = obj[0]
-    //},
+    // },
 
     removeAllBookmark() {
       alert('remove all bookmarks')

From 304395b6c80e85aa75ddcb8d9a079bd27831bfda Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Nov 2021 11:35:57 +0100
Subject: [PATCH 10/23] Logic has been moved to EditCreationFormular.

---
 admin/src/components/CreationFormular.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index fa21ed993..d5e774dc5 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -207,12 +207,6 @@ export default {
         this.rangeMin = 0
         // Der maximale offene Betrag an GDD die für ein User noch geschöpft werden kann
         this.rangeMax = openCreation
-        // Wenn Einzelschöpfung
-        if (this.pagetype === 'PageCreationConfirm') {
-          this.rangeMin = 0
-          this.rangeMax = openCreation + this.creationUserData.amount / 10000
-          this.creation[index] = this.creation[index] + ( this.creationUserData.amount / 10000 )
-        }
       }
     },
     /*

From e744d7c7e048e2168f0449f02053b5e5fb6a464a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Nov 2021 11:37:01 +0100
Subject: [PATCH 11/23] Added scripts to EditCreationFormular created query for
 updatePendingCreations.

---
 admin/src/components/EditCreationFormular.vue | 170 +++++++++++++++++-
 admin/src/graphql/updatePendingCreation.js    |  13 ++
 2 files changed, 181 insertions(+), 2 deletions(-)
 create mode 100644 admin/src/graphql/updatePendingCreation.js

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 8ea7d9578..2411e7127 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -45,7 +45,7 @@
           </b-col>
         </b-row>
 
-        <b-row class="m-4" v-show="createdIndex != null">
+        <b-row class="m-4">
           <label>Betrag Auswählen</label>
           <div>
             <b-input-group prepend="GDD" append=".00">
@@ -102,4 +102,170 @@
       </b-form>
     </div>
   </div>
-</template>
\ No newline at end of file
+</template>
+<script>
+import { updatePendingCreation } from '../graphql/updatePendingCreation'
+export default {
+  name: 'CreationFormular',
+  props: {
+    type: {
+      type: String,
+      required: false,
+    },
+    pagetype: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    item: {
+      type: Object,
+      required: false,
+      default() {
+        return {}
+      },
+    },
+    items: {
+      type: Array,
+      required: false,
+      default() {
+        return []
+      },
+    },
+    creationUserData: {
+      type: Object,
+      required: false,
+      default() {
+        return {}
+      },
+    },
+    creation: {
+      type: Array,
+      required: true,
+    },
+  },
+  created() {
+    console.log(' created this.pagetype', this.pagetype)
+    if (this.pagetype === 'PageCreationConfirm' && this.creationUserData.date) {
+      console.log('if created CreationFormular.vue', this.creationUserData.date)
+      console.log(
+        'this.$moment(this.creationUserData.date).format("MMMM")',
+        this.$moment(this.creationUserData.date).format('MMMM'),
+      )
+      console.log(
+        'this.$moment(this.creationUserData.date).format("YYYY-MM")',
+        this.$moment(this.creationUserData.date).format('YYYY-MM'),
+      )
+      switch (this.$moment(this.creationUserData.date).format('MMMM')) {
+        case this.currentMonth.short:
+          this.createdIndex = 2
+          break
+        case this.lastMonth.short:
+          this.createdIndex = 1
+          break
+        case this.beforeLastMonth.short:
+          this.createdIndex = 0
+          break
+        default:
+          throw new Error('Something went wrong')
+      }
+      this.selectedOpenCreationAmount = this.creation[this.createdIndex]
+      this.rangeMax =  this.selectedOpenCreationAmount 
+    }
+  },
+  data() {
+    return {
+      radioSelected: '',
+      text: !this.creationUserData.note ? '' : this.creationUserData.note,
+      value: !this.creationUserData.amount ? 0 : this.creationUserData.amount / 10000,
+      rangeMin: 0,
+      rangeMax: 1000,
+      currentMonth: {
+        short: this.$moment().format('MMMM'),
+        long: this.$moment().format('YYYY-MM-DD'),
+      },
+      lastMonth: {
+        short: this.$moment().subtract(1, 'month').format('MMMM'),
+        long: this.$moment().subtract(1, 'month').format('YYYY-MM') + '-01',
+      },
+      beforeLastMonth: {
+        short: this.$moment().subtract(2, 'month').format('MMMM'),
+        long: this.$moment().subtract(2, 'month').format('YYYY-MM') + '-01',
+      },
+      submitObj: null,
+      isdisabled: true,
+      createdIndex: null,
+      selectedOpenCreationAmount:{},
+    }
+  },
+
+  methods: {
+    updateRadioSelected(name, index, openCreation) {
+      console.log('createdIndex before update', this.createdIndex)
+      this.createdIndex = index
+      console.log('radioSelected', this.radioSelected)
+      console.log('openCreation', openCreation)
+
+      this.rangeMin = 0
+      this.rangeMax = this.creation[index]
+    },
+    submitCreation() {
+      // Formular Prüfen ob ein Zeitraum ausgewählt wurde. Ansonsten abbrechen und Hinweis anzeigen
+      if (this.radioSelected === '') {
+        return alert('Bitte wähle einen Zeitraum!')
+      }
+      // Formular Prüfen ob der GDD Betrag grösser 0 ist. Ansonsten abbrechen und Hinweis anzeigen
+      if (this.value <= 0) {
+        return alert('Bitte gib einen GDD Betrag an!')
+      }
+      // Formular Prüfen ob der Text vorhanden ist. Ansonsten abbrechen und Hinweis anzeigen
+      if (this.text === '') {
+        return alert('Bitte gib einen Text ein!')
+      }
+      // Formular Prüfen ob der Text länger als 10 Zeichen hat. Ansonsten abbrechen und Hinweis anzeigen
+      if (this.text.length < 10) {
+        return alert('Bitte gib einen Text ein der länger als 10 Zeichen ist!')
+      }
+      if (this.type === 'singleCreation') {
+        this.submitObj = {
+          email: this.item.email,
+          creationDate: this.radioSelected.long,
+          amount: Number(this.value),
+          note: this.text,
+          moderator: Number(this.$store.state.moderator.id),
+        }
+
+        if (this.pagetype === 'PageCreationConfirm') {
+          // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email)
+          alert('UPDATE EINZELSCHÖPFUNG ABSENDEN FÜR >> ' + JSON.stringify(this.submitObj))
+
+          this.$apollo
+            .query({
+              query: updatePendingCreation,
+              variables: this.submitObj,
+            })
+            .then((result) => {
+              this.$emit('update-user-data', this.item, result.data.createPendingCreation)
+              this.$toasted.success(
+                `Offene schöpfung (${this.value} GDD) für ${this.item.email} wurde geändert, liegt zur Bestätigung bereit`,
+              )
+              this.submitObj = null
+              this.createdIndex = null
+              // das creation Formular reseten
+              this.$refs.creationForm.reset()
+              // Den geschöpften Wert auf o setzen
+              this.value = 0
+            })
+            .catch((error) => {
+              this.$toasted.error(error.message)
+              this.submitObj = null
+              // das creation Formular reseten
+              this.$refs.creationForm.reset()
+              // Den geschöpften Wert auf o setzen
+              this.value = 0
+            })
+        }
+      }
+    },
+  },
+}
+</script>
diff --git a/admin/src/graphql/updatePendingCreation.js b/admin/src/graphql/updatePendingCreation.js
new file mode 100644
index 000000000..e9e372440
--- /dev/null
+++ b/admin/src/graphql/updatePendingCreation.js
@@ -0,0 +1,13 @@
+import gql from 'graphql-tag'
+
+export const updatePendingCreation = gql`
+  query ($email: String!, $amount: Int!, $note: String!, $creationDate: String!, $moderator: Int!) {
+    updatePendingCreation(
+      email: $email
+      amount: $amount
+      note: $note
+      creationDate: $creationDate
+      moderator: $moderator
+    )
+  }
+`

From 5523b1a5e9b666d0e59d893ca935fccc60ae04d2 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Nov 2021 12:07:33 +0100
Subject: [PATCH 12/23] Adden selectedOpenCreationAmount to differenciate the
 used datas.

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

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 2411e7127..da63f3aff 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -168,8 +168,8 @@ export default {
         default:
           throw new Error('Something went wrong')
       }
-      this.selectedOpenCreationAmount = this.creation[this.createdIndex]
-      this.rangeMax =  this.selectedOpenCreationAmount 
+      this.selectedOpenCreationAmount = this.creation
+      this.rangeMax = this.selectedOpenCreationAmount[this.createdIndex] + this.creationUserData.amount / 10000
     }
   },
   data() {
@@ -194,7 +194,7 @@ export default {
       submitObj: null,
       isdisabled: true,
       createdIndex: null,
-      selectedOpenCreationAmount:{},
+      selectedOpenCreationAmount: {},
     }
   },
 

From f9113abc75060add46ce5de05b9967df8fe82bd7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 29 Nov 2021 12:08:53 +0100
Subject: [PATCH 13/23] Selected radioButton automatically.

---
 admin/src/components/EditCreationFormular.vue | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index da63f3aff..22d151b9b 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -8,12 +8,12 @@
             <b-form-radio
               v-model="radioSelected"
               :value="beforeLastMonth"
-              :disabled="creation[0] === 0"
+              :disabled="selectedOpenCreationAmount[0] === 0"
               size="lg"
-              @change="updateRadioSelected(beforeLastMonth, 0, creation[0])"
+              @change="updateRadioSelected(beforeLastMonth, 0, selectedOpenCreationAmount[0])"
             >
               <label for="beforeLastMonth">
-                {{ beforeLastMonth.short }} {{ creation[0] != null ? creation[0] + ' GDD' : '' }}
+                {{ beforeLastMonth.short }} {{ selectedOpenCreationAmount[0] != null ? selectedOpenCreationAmount[0] + ' GDD' : '' }}
               </label>
             </b-form-radio>
           </b-col>
@@ -21,12 +21,12 @@
             <b-form-radio
               v-model="radioSelected"
               :value="lastMonth"
-              :disabled="creation[1] === 0"
+              :disabled="selectedOpenCreationAmount[1] === 0"
               size="lg"
-              @change="updateRadioSelected(lastMonth, 1, creation[1])"
+              @change="updateRadioSelected(lastMonth, 1, selectedOpenCreationAmount[1])"
             >
               <label for="lastMonth">
-                {{ lastMonth.short }} {{ creation[1] != null ? creation[1] + ' GDD' : '' }}
+                {{ lastMonth.short }} {{ selectedOpenCreationAmount[1] != null ? selectedOpenCreationAmount[1] + ' GDD' : '' }}
               </label>
             </b-form-radio>
           </b-col>
@@ -34,12 +34,12 @@
             <b-form-radio
               v-model="radioSelected"
               :value="currentMonth"
-              :disabled="creation[2] === 0"
+              :disabled="selectedOpenCreationAmount[2] === 0"
               size="lg"
-              @change="updateRadioSelected(currentMonth, 2, creation[2])"
+              @change="updateRadioSelected(currentMonth, 2, selectedOpenCreationAmount[2])"
             >
               <label for="currentMonth">
-                {{ currentMonth.short }} {{ creation[2] != null ? creation[2] + ' GDD' : '' }}
+                {{ currentMonth.short }} {{ selectedOpenCreationAmount[2] != null ? selectedOpenCreationAmount[2] + ' GDD' : '' }}
               </label>
             </b-form-radio>
           </b-col>
@@ -158,18 +158,24 @@ export default {
       switch (this.$moment(this.creationUserData.date).format('MMMM')) {
         case this.currentMonth.short:
           this.createdIndex = 2
+          this.radioSelected = this.currentMonth
           break
         case this.lastMonth.short:
           this.createdIndex = 1
+          this.radioSelected = this.lastMonth
           break
         case this.beforeLastMonth.short:
           this.createdIndex = 0
+          this.radioSelected = this.beforeLastMonth
           break
         default:
           throw new Error('Something went wrong')
       }
-      this.selectedOpenCreationAmount = this.creation
-      this.rangeMax = this.selectedOpenCreationAmount[this.createdIndex] + this.creationUserData.amount / 10000
+      console.log(this.creation)
+      const openCreations = this.creationUserData.creation
+      this.selectedOpenCreationAmount = openCreations
+      this.selectedOpenCreationAmount[this.createdIndex] = this.selectedOpenCreationAmount[this.createdIndex] + this.creationUserData.amount / 10000
+      this.rangeMax = this.selectedOpenCreationAmount[this.createdIndex]
     }
   },
   data() {

From 5f7e502f05efe9e980b344f40527633fc8501d48 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Mon, 29 Nov 2021 14:39:24 +0100
Subject: [PATCH 14/23] Clean calculation of openCreation when updating an open
 creation

---
 admin/src/components/CreationFormular.vue     | 119 ++++--------------
 admin/src/components/EditCreationFormular.vue |  43 +++----
 admin/src/components/UserTable.vue            |   4 -
 3 files changed, 45 insertions(+), 121 deletions(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index d5e774dc5..f9fee802a 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -154,21 +154,6 @@ export default {
       required: true,
     },
   },
-  created() {
-    console.log(' created this.pagetype', this.pagetype)
-    if (this.pagetype === 'PageCreationConfirm' && this.creationUserData.date) {
-      console.log('if created CreationFormular.vue', this.creationUserData.date)
-      console.log(
-        'this.$moment(this.creationUserData.date).format("MMMM")',
-        this.$moment(this.creationUserData.date).format('MMMM'),
-      )
-      console.log(
-        'this.$moment(this.creationUserData.date).format("YYYY-MM-DD")',
-        this.$moment(this.creationUserData.date).format('YYYY-MM-DD'),
-      )
-      // const id = this.$moment(this.creationUserData.date).format('MMMM')
-    }
-  },
   data() {
     return {
       radioSelected: '',
@@ -198,7 +183,6 @@ export default {
     // Auswählen eines Zeitraumes
     updateRadioSelected(name, index, openCreation) {
       this.createdIndex = index
-      console.log('radioSelected', this.radioSelected)
       // Wenn Mehrfachschöpfung
       if (this.type === 'massCreation') {
         // An Creation.vue emitten und radioSelectedMass aktualisieren
@@ -209,23 +193,6 @@ export default {
         this.rangeMax = openCreation
       }
     },
-    /*
-    checkFormForUpdate(input) {
-      console.log('checkFormForUpdate', input)
-      console.log('checkFormForUpdate creationUserData', this.creationUserData)
-      switch (input) {
-        case 'text':
-          this.text = this.creationUserData.text
-          break
-        case 'range':
-          this.value = this.creationUserData.creationGdd
-          break
-        default:
-          // TODO: Toast
-          alert("I don't know such values")
-      }
-    },
-    */
     submitCreation() {
       // Formular Prüfen ob ein Zeitraum ausgewählt wurde. Ansonsten abbrechen und Hinweis anzeigen
       if (this.radioSelected === '') {
@@ -243,31 +210,6 @@ export default {
       if (this.text.length < 10) {
         return alert('Bitte gib einen Text ein der länger als 10 Zeichen ist!')
       }
-      /*
-      if (this.type === 'massCreation') {
-        // Die anzahl der Mitglieder aus der Mehrfachschöpfung
-        const i = Object.keys(this.itemsMassCreation).length
-        // hinweis das eine Mehrfachschöpfung ausgeführt wird an (Anzahl der MItgleider an die geschöpft wird)
-        alert('SUBMIT CREATION => ' + this.type + ' >> für VIELE ' + i + ' Mitglieder')
-        this.submitObj = [
-          {
-            item: this.itemsMassCreation,
-            email: this.item.email,
-            creationDate: this.radioSelected.long,
-            amount: this.value,
-            note: this.text,
-            moderator: this.$store.state.moderator.id,
-          },
-        ]
-        alert('MehrfachSCHÖPFUNG ABSENDEN FÜR >> ' + i + ' Mitglieder')
-
-        // $store - offene Schöpfungen hochzählen
-        this.$store.commit('openCreationsPlus', i)
-
-        // lösche alle Mitglieder aus der MehrfachSchöpfungsListe nach dem alle Mehrfachschpfungen zum bestätigen gesendet wurden.
-        this.$emit('remove-all-bookmark')
-      }
-      */
       if (this.type === 'singleCreation') {
         this.submitObj = {
           email: this.item.email,
@@ -277,43 +219,32 @@ export default {
           moderator: Number(this.$store.state.moderator.id),
         }
 
-        if (this.pagetype === 'PageCreationConfirm') {
-          // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email)
-          alert('UPDATE EINZEL SCHÖPFUNG ABSENDEN FÜR >> ')
-          // umschreiben, update eine bestehende Schöpfung eine
-          this.$emit('update-creation-data', {
-            datum: this.radioSelected.long,
-            creationGdd: this.value,
-            text: this.text,
+        this.$apollo
+          .query({
+            query: createPendingCreation,
+            variables: this.submitObj,
+          })
+          .then((result) => {
+            this.$emit('update-user-data', this.item, result.data.createPendingCreation)
+            this.$toasted.success(
+              `Offene schöpfung (${this.value} GDD) für ${this.item.email} wurde gespeichert, liegen zur bestätigung bereit`,
+            )
+            this.$store.commit('openCreationsPlus', 1)
+            this.submitObj = null
+            this.createdIndex = null
+            // das creation Formular reseten
+            this.$refs.creationForm.reset()
+            // Den geschöpften Wert auf o setzen
+            this.value = 0
+          })
+          .catch((error) => {
+            this.$toasted.error(error.message)
+            this.submitObj = null
+            // das creation Formular reseten
+            this.$refs.creationForm.reset()
+            // Den geschöpften Wert auf o setzen
+            this.value = 0
           })
-        } else {
-          this.$apollo
-            .query({
-              query: createPendingCreation,
-              variables: this.submitObj,
-            })
-            .then((result) => {
-              this.$emit('update-user-data', this.item, result.data.createPendingCreation)
-              this.$toasted.success(
-                `Offene schöpfung (${this.value} GDD) für ${this.item.email} wurde gespeichert, liegen zur bestätigung bereit`,
-              )
-              this.$store.commit('openCreationsPlus', 1)
-              this.submitObj = null
-              this.createdIndex = null
-              // das creation Formular reseten
-              this.$refs.creationForm.reset()
-              // Den geschöpften Wert auf o setzen
-              this.value = 0
-            })
-            .catch((error) => {
-              this.$toasted.error(error.message)
-              this.submitObj = null
-              // das creation Formular reseten
-              this.$refs.creationForm.reset()
-              // Den geschöpften Wert auf o setzen
-              this.value = 0
-            })
-        }
       }
     },
   },
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 22d151b9b..922c6d830 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -13,7 +13,12 @@
               @change="updateRadioSelected(beforeLastMonth, 0, selectedOpenCreationAmount[0])"
             >
               <label for="beforeLastMonth">
-                {{ beforeLastMonth.short }} {{ selectedOpenCreationAmount[0] != null ? selectedOpenCreationAmount[0] + ' GDD' : '' }}
+                {{ beforeLastMonth.short }}
+                {{
+                  selectedOpenCreationAmount[0] != null
+                    ? selectedOpenCreationAmount[0] + ' GDD'
+                    : ''
+                }}
               </label>
             </b-form-radio>
           </b-col>
@@ -26,7 +31,12 @@
               @change="updateRadioSelected(lastMonth, 1, selectedOpenCreationAmount[1])"
             >
               <label for="lastMonth">
-                {{ lastMonth.short }} {{ selectedOpenCreationAmount[1] != null ? selectedOpenCreationAmount[1] + ' GDD' : '' }}
+                {{ lastMonth.short }}
+                {{
+                  selectedOpenCreationAmount[1] != null
+                    ? selectedOpenCreationAmount[1] + ' GDD'
+                    : ''
+                }}
               </label>
             </b-form-radio>
           </b-col>
@@ -39,7 +49,12 @@
               @change="updateRadioSelected(currentMonth, 2, selectedOpenCreationAmount[2])"
             >
               <label for="currentMonth">
-                {{ currentMonth.short }} {{ selectedOpenCreationAmount[2] != null ? selectedOpenCreationAmount[2] + ' GDD' : '' }}
+                {{ currentMonth.short }}
+                {{
+                  selectedOpenCreationAmount[2] != null
+                    ? selectedOpenCreationAmount[2] + ' GDD'
+                    : ''
+                }}
               </label>
             </b-form-radio>
           </b-col>
@@ -144,17 +159,7 @@ export default {
     },
   },
   created() {
-    console.log(' created this.pagetype', this.pagetype)
     if (this.pagetype === 'PageCreationConfirm' && this.creationUserData.date) {
-      console.log('if created CreationFormular.vue', this.creationUserData.date)
-      console.log(
-        'this.$moment(this.creationUserData.date).format("MMMM")',
-        this.$moment(this.creationUserData.date).format('MMMM'),
-      )
-      console.log(
-        'this.$moment(this.creationUserData.date).format("YYYY-MM")',
-        this.$moment(this.creationUserData.date).format('YYYY-MM'),
-      )
       switch (this.$moment(this.creationUserData.date).format('MMMM')) {
         case this.currentMonth.short:
           this.createdIndex = 2
@@ -171,10 +176,8 @@ export default {
         default:
           throw new Error('Something went wrong')
       }
-      console.log(this.creation)
-      const openCreations = this.creationUserData.creation
-      this.selectedOpenCreationAmount = openCreations
-      this.selectedOpenCreationAmount[this.createdIndex] = this.selectedOpenCreationAmount[this.createdIndex] + this.creationUserData.amount / 10000
+      this.selectedOpenCreationAmount[this.createdIndex] =
+        this.creation[this.createdIndex] + this.creationUserData.amount / 10000
       this.rangeMax = this.selectedOpenCreationAmount[this.createdIndex]
     }
   },
@@ -206,11 +209,7 @@ export default {
 
   methods: {
     updateRadioSelected(name, index, openCreation) {
-      console.log('createdIndex before update', this.createdIndex)
       this.createdIndex = index
-      console.log('radioSelected', this.radioSelected)
-      console.log('openCreation', openCreation)
-
       this.rangeMin = 0
       this.rangeMax = this.creation[index]
     },
@@ -242,8 +241,6 @@ export default {
 
         if (this.pagetype === 'PageCreationConfirm') {
           // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email)
-          alert('UPDATE EINZELSCHÖPFUNG ABSENDEN FÜR >> ' + JSON.stringify(this.submitObj))
-
           this.$apollo
             .query({
               query: updatePendingCreation,
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 1f7ffa94a..f2bc2e43b 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -232,12 +232,8 @@ export default {
       this.$emit('remove-confirm-result', item, 'remove')
     },
     editCreationUserTable(row, rowItem) {
-      alert('editCreationUserTable')
       if (!row.detailsShowing) {
-        alert('offen edit loslegen')
-        // this.item = rowItem
         this.creationUserData = rowItem
-        console.log('editCreationUserTable creationUserData', this.creationUserData)
       } else {
         this.creationUserData = {}
       }

From 4167bafdeeb3f86c17a0e5e7bd0ca7c782780acb Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 30 Nov 2021 10:14:38 +0100
Subject: [PATCH 15/23] Change note to memo.

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

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 922c6d830..20e449251 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -235,7 +235,7 @@ export default {
           email: this.item.email,
           creationDate: this.radioSelected.long,
           amount: Number(this.value),
-          note: this.text,
+          memo: this.text,
           moderator: Number(this.$store.state.moderator.id),
         }
 

From 46bfae5bf5bb45beaca86362307fab0affb11416 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 30 Nov 2021 15:07:14 +0100
Subject: [PATCH 16/23] Change update method from query to mutation.

---
 admin/src/components/EditCreationFormular.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 20e449251..fbc3d83c3 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -242,8 +242,8 @@ export default {
         if (this.pagetype === 'PageCreationConfirm') {
           // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email)
           this.$apollo
-            .query({
-              query: updatePendingCreation,
+            .mutate({
+              mutation: updatePendingCreation,
               variables: this.submitObj,
             })
             .then((result) => {

From 0e592fd353c435b5194857a0b02baae8258ebcc2 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 1 Dec 2021 09:22:08 +0100
Subject: [PATCH 17/23] Added some tests and reduce coverage since we removed
 comments.

---
 .github/workflows/test.yml |  2 +-
 admin/src/main.test.js     | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 66fc1c9f5..acff97d0e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -441,7 +441,7 @@ jobs:
           report_name: Coverage Admin Interface
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 52
+          min_coverage: 50
           token: ${{ github.token }}
 
   ##############################################################################
diff --git a/admin/src/main.test.js b/admin/src/main.test.js
index c639593d6..bf3df3799 100644
--- a/admin/src/main.test.js
+++ b/admin/src/main.test.js
@@ -3,12 +3,14 @@ import './main'
 import CONFIG from './config'
 
 import Vue from 'vue'
+import VueApollo from 'vue-apollo'
 import Vuex from 'vuex'
 import VueI18n from 'vue-i18n'
 import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
 import moment from 'vue-moment'
 
 jest.mock('vue')
+jest.mock('vue-apollo')
 jest.mock('vuex')
 jest.mock('vue-i18n')
 jest.mock('vue-moment')
@@ -55,6 +57,10 @@ describe('main', () => {
     expect(InMemoryCache).toBeCalled()
   })
 
+  it('calls the VueApollo', () => {
+    expect(VueApollo).toBeCalled()
+  })
+
   it('calls Vue', () => {
     expect(Vue).toBeCalled()
   })
@@ -63,16 +69,16 @@ describe('main', () => {
     expect(VueI18n).toBeCalled()
   })
 
-  it.skip('calls BootstrapVue', () => {
-    expect(BootstrapVue).toBeCalled()
+  it('calls BootstrapVue', () => {
+    expect(Vue.use).toBeCalledWith(BootstrapVue)
   })
 
-  it.skip('calls IconsPlugin', () => {
-    expect(IconsPlugin).toBeCalled()
+  it('calls IconsPlugin', () => {
+    expect(Vue.use).toBeCalledWith(IconsPlugin)
   })
 
-  it.skip('calls Moment', () => {
-    expect(moment).toBeCalled()
+  it('calls Moment', () => {
+    expect(Vue.use).toBeCalledWith(moment)
   })
 
   it.skip('creates a store', () => {

From 8becfef6c3a75c4718bbfe1d0b3939838c495a80 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 1 Dec 2021 09:37:56 +0100
Subject: [PATCH 18/23] Added submitObj to createPendignCreation mutation.

---
 admin/src/components/CreationFormular.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 47b6dee3f..40d5bcb8c 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -234,6 +234,14 @@ export default {
         // lösche alle Mitglieder aus der MehrfachSchöpfungsListe nach dem alle Mehrfachschpfungen zum bestätigen gesendet wurden.
         this.$emit('remove-all-bookmark')
       } else if (this.type === 'singleCreation') {
+        this.submitObj = {
+          email: this.item.email,
+          creationDate: this.radioSelected.long,
+          amount: Number(this.value),
+          memo: this.text,
+          moderator: Number(this.$store.state.moderator.id),
+        }
+
         this.$apollo
           .mutate({
             mutation: createPendingCreation,

From 1ba1c442197a9b932cfd17c1b48ac6fb331ecbb4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 1 Dec 2021 09:43:23 +0100
Subject: [PATCH 19/23] Rename note to memo.

---
 admin/src/components/CreationFormular.vue     | 2 +-
 admin/src/components/EditCreationFormular.vue | 2 +-
 admin/src/graphql/getPendingCreations.js      | 2 +-
 admin/src/graphql/updatePendingCreation.js    | 4 ++--
 admin/src/pages/CreationConfirm.spec.js       | 4 ++--
 admin/src/pages/CreationConfirm.vue           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 40d5bcb8c..e2b6fa483 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -157,7 +157,7 @@ export default {
   data() {
     return {
       radioSelected: '',
-      text: !this.creationUserData.note ? '' : this.creationUserData.note,
+      text: !this.creationUserData.memo ? '' : this.creationUserData.memo,
       value: !this.creationUserData.amount ? 0 : this.creationUserData.amount / 10000,
       rangeMin: 0,
       rangeMax: 1000,
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index fbc3d83c3..aa60cced7 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -184,7 +184,7 @@ export default {
   data() {
     return {
       radioSelected: '',
-      text: !this.creationUserData.note ? '' : this.creationUserData.note,
+      text: !this.creationUserData.memo ? '' : this.creationUserData.memo,
       value: !this.creationUserData.amount ? 0 : this.creationUserData.amount / 10000,
       rangeMin: 0,
       rangeMax: 1000,
diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js
index add9efc29..86b1965c8 100644
--- a/admin/src/graphql/getPendingCreations.js
+++ b/admin/src/graphql/getPendingCreations.js
@@ -8,7 +8,7 @@ export const getPendingCreations = gql`
       lastName
       email
       amount
-      note
+      memo
       date
       moderator
       creation
diff --git a/admin/src/graphql/updatePendingCreation.js b/admin/src/graphql/updatePendingCreation.js
index e9e372440..5c63b4674 100644
--- a/admin/src/graphql/updatePendingCreation.js
+++ b/admin/src/graphql/updatePendingCreation.js
@@ -1,11 +1,11 @@
 import gql from 'graphql-tag'
 
 export const updatePendingCreation = gql`
-  query ($email: String!, $amount: Int!, $note: String!, $creationDate: String!, $moderator: Int!) {
+  query ($email: String!, $amount: Int!, $memo: String!, $creationDate: String!, $moderator: Int!) {
     updatePendingCreation(
       email: $email
       amount: $amount
-      note: $note
+      memo: $memo
       creationDate: $creationDate
       moderator: $moderator
     )
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 365ccd809..6598738f1 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -13,7 +13,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         lastName: 'Bloxberg',
         email: 'bibi@bloxberg.de',
         amount: 500,
-        note: 'Danke für alles',
+        memo: 'Danke für alles',
         date: new Date(),
         moderator: 0,
       },
@@ -22,7 +22,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         lastName: 'Hotzenplotz',
         email: 'raeuber@hotzenplotz.de',
         amount: 1000000,
-        note: 'Gut Ergatert',
+        memo: 'Gut Ergatert',
         date: new Date(),
         moderator: 0,
       },
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index ec0e6e7af..cf15fb64f 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -33,7 +33,7 @@ export default {
             return value + ' GDD'
           },
         },
-        { key: 'note', label: 'Text' },
+        { key: 'memo', label: 'Text' },
         {
           key: 'date',
           label: 'Datum',

From 4c2e51b5170e44ae3608f6fcb076506b59d2a896 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Wed, 1 Dec 2021 15:43:22 +0100
Subject: [PATCH 20/23] Update pending creation

---
 admin/src/components/EditCreationFormular.vue | 13 +++--
 admin/src/components/UserTable.vue            | 15 ++++--
 admin/src/graphql/updatePendingCreation.js    | 18 ++++++-
 .../graphql/arg/UpdatePendingCreationArgs.ts  | 22 ++++++++
 .../graphql/model/UpdatePendingCreation.ts    | 19 +++++++
 backend/src/graphql/resolver/AdminResolver.ts | 52 +++++++++++++++++++
 6 files changed, 131 insertions(+), 8 deletions(-)
 create mode 100644 backend/src/graphql/arg/UpdatePendingCreationArgs.ts
 create mode 100644 backend/src/graphql/model/UpdatePendingCreation.ts

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index aa60cced7..896101e41 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -232,6 +232,7 @@ export default {
       }
       if (this.type === 'singleCreation') {
         this.submitObj = {
+          id: this.item.id,
           email: this.item.email,
           creationDate: this.radioSelected.long,
           amount: Number(this.value),
@@ -247,14 +248,20 @@ export default {
               variables: this.submitObj,
             })
             .then((result) => {
-              this.$emit('update-user-data', this.item, result.data.createPendingCreation)
+              this.$emit('update-user-data', this.item, result.data.updatePendingCreation.creation)
+              this.$emit('update-creation-data', {
+                amount: Number(result.data.updatePendingCreation.amount),
+                date: result.data.updatePendingCreation.date,
+                memo: result.data.updatePendingCreation.memo,
+                moderator: Number(result.data.updatePendingCreation.moderator),
+              })
               this.$toasted.success(
                 `Offene schöpfung (${this.value} GDD) für ${this.item.email} wurde geändert, liegt zur Bestätigung bereit`,
               )
               this.submitObj = null
               this.createdIndex = null
               // das creation Formular reseten
-              this.$refs.creationForm.reset()
+              this.$refs.updateCreationForm.reset()
               // Den geschöpften Wert auf o setzen
               this.value = 0
             })
@@ -262,7 +269,7 @@ export default {
               this.$toasted.error(error.message)
               this.submitObj = null
               // das creation Formular reseten
-              this.$refs.creationForm.reset()
+              this.$refs.updateCreationForm.reset()
               // Den geschöpften Wert auf o setzen
               this.value = 0
             })
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index f2bc2e43b..2c5c1c508 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -240,9 +240,18 @@ export default {
       row.toggleDetails()
     },
     updateCreationData(data) {
-      this.creationUserData = {
-        ...data,
-      }
+      // console.log('updateCreationData this.creationUserData11=> ', this.creationUserData)
+      // console.log('updateCreationData data=> ', data)
+      // this.creationUserData = {
+      //   ...this.creationUserData,
+      //   ...data,
+      // }
+      // console.log('updateCreationData this.creationUserData22=> ', this.creationUserData)
+
+      this.creationUserData.amount = data.amount
+      this.creationUserData.date = data.date
+      this.creationUserData.memo = data.memo
+      this.creationUserData.moderator = data.moderator
     },
     updateUserData(rowItem, newCreation) {
       rowItem.creation = newCreation
diff --git a/admin/src/graphql/updatePendingCreation.js b/admin/src/graphql/updatePendingCreation.js
index 5c63b4674..b137d961c 100644
--- a/admin/src/graphql/updatePendingCreation.js
+++ b/admin/src/graphql/updatePendingCreation.js
@@ -1,13 +1,27 @@
 import gql from 'graphql-tag'
 
 export const updatePendingCreation = gql`
-  query ($email: String!, $amount: Int!, $memo: String!, $creationDate: String!, $moderator: Int!) {
+  mutation (
+    $id: Int!
+    $email: String!
+    $amount: Int!
+    $memo: String!
+    $creationDate: String!
+    $moderator: Int!
+  ) {
     updatePendingCreation(
+      id: $id
       email: $email
       amount: $amount
       memo: $memo
       creationDate: $creationDate
       moderator: $moderator
-    )
+    ) {
+      amount
+      date
+      memo
+      creation
+      moderator
+    }
   }
 `
diff --git a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts b/backend/src/graphql/arg/UpdatePendingCreationArgs.ts
new file mode 100644
index 000000000..bde7133aa
--- /dev/null
+++ b/backend/src/graphql/arg/UpdatePendingCreationArgs.ts
@@ -0,0 +1,22 @@
+import { ArgsType, Field, Int } from 'type-graphql'
+
+@ArgsType()
+export default class CreatePendingCreationArgs {
+  @Field(() => Int)
+  id: number
+
+  @Field(() => String)
+  email: string
+
+  @Field(() => Int)
+  amount: number
+
+  @Field(() => String)
+  memo: string
+
+  @Field(() => String)
+  creationDate: string
+
+  @Field(() => Int)
+  moderator: number
+}
diff --git a/backend/src/graphql/model/UpdatePendingCreation.ts b/backend/src/graphql/model/UpdatePendingCreation.ts
new file mode 100644
index 000000000..c8033f86e
--- /dev/null
+++ b/backend/src/graphql/model/UpdatePendingCreation.ts
@@ -0,0 +1,19 @@
+import { ObjectType, Field } from 'type-graphql'
+
+@ObjectType()
+export class UpdatePendingCreation {
+  @Field(() => Date)
+  date: Date
+
+  @Field(() => String)
+  memo: string
+
+  @Field(() => Number)
+  amount: number
+
+  @Field(() => Number)
+  moderator: number
+
+  @Field(() => [Number])
+  creation: number[]
+}
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 51b018897..245809ffc 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -2,11 +2,13 @@ import { Resolver, Query, Arg, Args, Authorized, Mutation } from 'type-graphql'
 import { getCustomRepository, Raw } from 'typeorm'
 import { UserAdmin } from '../model/UserAdmin'
 import { PendingCreation } from '../model/PendingCreation'
+import { UpdatePendingCreation } from '../model/UpdatePendingCreation'
 import { RIGHTS } from '../../auth/RIGHTS'
 import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation'
 import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation'
 import { UserRepository } from '../../typeorm/repository/User'
 import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs'
+import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs'
 import moment from 'moment'
 import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin'
 
@@ -30,6 +32,7 @@ export class AdminResolver {
     return adminUsers
   }
 
+  @Authorized([RIGHTS.SEARCH_USERS])
   @Mutation(() => [Number])
   async createPendingCreation(
     @Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs,
@@ -54,6 +57,55 @@ export class AdminResolver {
     return await getUserCreations(user.id)
   }
 
+  // @Authorized([RIGHTS.SEARCH_USERS])
+  @Mutation(() => UpdatePendingCreation)
+  async updatePendingCreation(
+    @Args() { id, email, amount, memo, creationDate, moderator }: UpdatePendingCreationArgs,
+  ): Promise<UpdatePendingCreation> {
+    console.log('UpdatePendingCreationArgs', { id, email, amount, memo, creationDate, moderator })
+    const userRepository = getCustomRepository(UserRepository)
+    const user = await userRepository.findByEmail(email)
+
+    const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
+    const updatedCreation = await pendingCreationRepository.findOneOrFail({ id })
+    console.log('updatedCreation', updatedCreation)
+
+    if (updatedCreation.userId !== user.id)
+      throw new Error('user of the pending creation and send user does not correspond')
+
+    updatedCreation.amount = BigInt(amount * 10000)
+    updatedCreation.memo = memo
+    updatedCreation.date = new Date(creationDate)
+    updatedCreation.moderator = moderator
+
+    await pendingCreationRepository.save(updatedCreation)
+    const result = new UpdatePendingCreation()
+    result.amount = parseInt(updatedCreation.amount.toString())
+    result.memo = updatedCreation.memo
+    result.date = updatedCreation.date
+    result.moderator = updatedCreation.moderator
+    result.creation = await getUserCreations(user.id)
+
+    console.log('result', result)
+    return result
+
+    // const creations = await getUserCreations(user.id)
+    // const creationDateObj = new Date(creationDate)
+    // if (isCreationValid(creations, amount, creationDateObj)) {
+    //   const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
+    //   const loginPendingTaskAdmin = pendingCreationRepository.create()
+    //   loginPendingTaskAdmin.userId = user.id
+    //   loginPendingTaskAdmin.amount = BigInt(amount * 10000)
+    //   loginPendingTaskAdmin.created = new Date()
+    //   loginPendingTaskAdmin.date = creationDateObj
+    //   loginPendingTaskAdmin.memo = memo
+    //   loginPendingTaskAdmin.moderator = moderator
+    //
+    //   pendingCreationRepository.save(loginPendingTaskAdmin)
+    // }
+    // return await getUserCreations(user.id)
+  }
+
   @Query(() => [PendingCreation])
   async getPendingCreations(): Promise<PendingCreation[]> {
     const pendingCreationRepository = getCustomRepository(PendingCreationRepository)

From 0c5c59224b448dc92d0fa72a96a77a178084d015 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 1 Dec 2021 16:53:52 +0100
Subject: [PATCH 21/23] hand over and pass to be able to close editforms
 cleanly

---
 admin/src/components/EditCreationFormular.vue | 8 ++++++++
 admin/src/components/UserTable.vue            | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 896101e41..cfad75e6f 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -146,6 +146,13 @@ export default {
         return []
       },
     },
+    row: {
+      type: Array,
+      required: Object,
+      default() {
+        return []
+      },
+    },
     creationUserData: {
       type: Object,
       required: false,
@@ -254,6 +261,7 @@ export default {
                 date: result.data.updatePendingCreation.date,
                 memo: result.data.updatePendingCreation.memo,
                 moderator: Number(result.data.updatePendingCreation.moderator),
+                row: this.row,
               })
               this.$toasted.success(
                 `Offene schöpfung (${this.value} GDD) für ${this.item.email} wurde geändert, liegt zur Bestätigung bereit`,
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 2c5c1c508..7ce31e2ad 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -77,6 +77,7 @@
             :pagetype="type"
             :creation="row.item.creation"
             :item="row.item"
+            :row="row"
             :creationUserData="creationUserData"
             @update-creation-data="updateCreationData"
             @update-user-data="updateUserData"
@@ -232,6 +233,7 @@ export default {
       this.$emit('remove-confirm-result', item, 'remove')
     },
     editCreationUserTable(row, rowItem) {
+      console.log(row.index)
       if (!row.detailsShowing) {
         this.creationUserData = rowItem
       } else {
@@ -252,6 +254,9 @@ export default {
       this.creationUserData.date = data.date
       this.creationUserData.memo = data.memo
       this.creationUserData.moderator = data.moderator
+
+       data.row.toggleDetails()
+
     },
     updateUserData(rowItem, newCreation) {
       rowItem.creation = newCreation

From 06983d786b8f454c7d4e9646f58412cf0840a338 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 1 Dec 2021 16:54:57 +0100
Subject: [PATCH 22/23] remove all console logs

---
 admin/src/components/UserTable.vue            | 4 +---
 backend/src/graphql/resolver/AdminResolver.ts | 3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 7ce31e2ad..e47963159 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -233,7 +233,6 @@ export default {
       this.$emit('remove-confirm-result', item, 'remove')
     },
     editCreationUserTable(row, rowItem) {
-      console.log(row.index)
       if (!row.detailsShowing) {
         this.creationUserData = rowItem
       } else {
@@ -255,8 +254,7 @@ export default {
       this.creationUserData.memo = data.memo
       this.creationUserData.moderator = data.moderator
 
-       data.row.toggleDetails()
-
+      data.row.toggleDetails()
     },
     updateUserData(rowItem, newCreation) {
       rowItem.creation = newCreation
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 245809ffc..7ae4194b7 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -62,13 +62,11 @@ export class AdminResolver {
   async updatePendingCreation(
     @Args() { id, email, amount, memo, creationDate, moderator }: UpdatePendingCreationArgs,
   ): Promise<UpdatePendingCreation> {
-    console.log('UpdatePendingCreationArgs', { id, email, amount, memo, creationDate, moderator })
     const userRepository = getCustomRepository(UserRepository)
     const user = await userRepository.findByEmail(email)
 
     const pendingCreationRepository = getCustomRepository(PendingCreationRepository)
     const updatedCreation = await pendingCreationRepository.findOneOrFail({ id })
-    console.log('updatedCreation', updatedCreation)
 
     if (updatedCreation.userId !== user.id)
       throw new Error('user of the pending creation and send user does not correspond')
@@ -86,7 +84,6 @@ export class AdminResolver {
     result.moderator = updatedCreation.moderator
     result.creation = await getUserCreations(user.id)
 
-    console.log('result', result)
     return result
 
     // const creations = await getUserCreations(user.id)

From 2d2409b65d18a68fc7ac641bc2015cc8c22a3ace Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 2 Dec 2021 06:30:41 +0100
Subject: [PATCH 23/23] Added moderator query to the creationFormular so we can
 send the right moderator id.

---
 admin/src/components/CreationFormular.vue    | 14 ++++++++++++++
 admin/src/graphql/verifyLogin.js             | 11 +++++++++++
 admin/src/store/store.js                     |  3 +++
 backend/src/graphql/model/User.ts            |  4 ++++
 backend/src/graphql/resolver/UserResolver.ts |  2 ++
 5 files changed, 34 insertions(+)
 create mode 100644 admin/src/graphql/verifyLogin.js

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index e2b6fa483..2e811da81 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -115,6 +115,7 @@
   </div>
 </template>
 <script>
+import { verifyLogin } from '../graphql/verifyLogin'
 import { createPendingCreation } from '../graphql/createPendingCreation'
 export default {
   name: 'CreationFormular',
@@ -270,6 +271,19 @@ export default {
           })
       }
     },
+    searchModeratorData() {
+      this.$apollo
+        .query({ query: verifyLogin })
+        .then((result) => {
+          this.$store.commit('moderator', result.data.verifyLogin)
+        })
+        .catch(() => {
+          this.$store.commit('moderator', { id: 0, name: 'Test Moderator' })
+        })
+    },
+  },
+  created() {
+    this.searchModeratorData()
   },
 }
 </script>
diff --git a/admin/src/graphql/verifyLogin.js b/admin/src/graphql/verifyLogin.js
new file mode 100644
index 000000000..59f5e7eb1
--- /dev/null
+++ b/admin/src/graphql/verifyLogin.js
@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const verifyLogin = gql`
+  query {
+    verifyLogin {
+      firstName
+      lastName
+      id
+    }
+  }
+`
diff --git a/admin/src/store/store.js b/admin/src/store/store.js
index 9559e3d58..9319eafd8 100644
--- a/admin/src/store/store.js
+++ b/admin/src/store/store.js
@@ -21,6 +21,9 @@ export const mutations = {
   setOpenCreations: (state, openCreations) => {
     state.openCreations = openCreations
   },
+  moderator: (state, moderator) => {
+    state.moderator = moderator
+  },
 }
 
 export const actions = {
diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index cdb46c954..c7b5806ca 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -12,6 +12,7 @@ export class User {
   */
   constructor(json?: any) {
     if (json) {
+      this.id = json.id
       this.email = json.email
       this.firstName = json.first_name
       this.lastName = json.last_name
@@ -24,6 +25,9 @@ export class User {
     }
   }
 
+  @Field(() => Number)
+  id: number
+
   @Field(() => String)
   email: string
 
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 7f5f7dc43..ce403ac0e 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -207,6 +207,7 @@ export class UserResolver {
     const loginUserRepository = getCustomRepository(LoginUserRepository)
     const loginUser = await loginUserRepository.findByEmail(userEntity.email)
     const user = new User()
+    user.id = userEntity.id
     user.email = userEntity.email
     user.firstName = userEntity.firstName
     user.lastName = userEntity.lastName
@@ -276,6 +277,7 @@ export class UserResolver {
     }
 
     const user = new User()
+    user.id = userEntity.id
     user.email = email
     user.firstName = loginUser.firstName
     user.lastName = loginUser.lastName