From 5d22b5912d5fe86e0d643e1d54f6c6034b67d0d1 Mon Sep 17 00:00:00 2001
From: einhorn_b <dariofrodo@gmx.de>
Date: Thu, 23 Nov 2023 14:46:15 +0100
Subject: [PATCH] update admin logic to be still intuitive

---
 .../ContributionMessagesFormular.vue          | 19 +++++++++----------
 .../ContributionMessagesList.vue              |  4 ++++
 .../components/Tables/OpenCreationsTable.vue  |  4 ++++
 admin/src/pages/Overview.vue                  |  1 +
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 2799b74ad..e00684a53 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -112,15 +112,10 @@ export default {
     combineResubmissionDateAndTime() {
       if (this.resubmissionDate) {
         const formattedDate = new Date(this.resubmissionDate)
-        console.log('resubmission time: %s', this.resubmissionTime)
         const [hours, minutes] = this.resubmissionTime.split(':')
-        console.log('hours: %s, minutes: %s', hours, minutes)
         formattedDate.setHours(parseInt(hours))
-        console.log('set hours: %d', formattedDate.getHours())
         formattedDate.setMinutes(parseInt(minutes))
-        console.log('set minutes: %d', formattedDate.getMinutes())
-        console.log('IOS String: %s', formattedDate.toISOString())
-        return formattedDate.toString()
+        return formattedDate
       } else {
         return null
       }
@@ -136,14 +131,18 @@ export default {
               message: this.form.text,
               messageType: mType,
               resubmissionAt: this.showResubmissionDate
-                ? this.combineResubmissionDateAndTime()
+                ? this.combineResubmissionDateAndTime().toString()
                 : null,
             },
           })
           .then((result) => {
-            this.$emit('get-list-contribution-messages', this.contributionId)
-            this.$emit('update-status', this.contributionId)
-            this.form.text = ''
+            if (this.showResubmissionDate && this.combineResubmissionDateAndTime() > new Date()) {
+              this.$emit('update-contributions')
+            } else {
+              this.$emit('get-list-contribution-messages', this.contributionId)
+              this.$emit('update-status', this.contributionId)
+            }
+            this.onReset()
             this.toastSuccess(this.$t('message.request'))
             this.loading = false
           })
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index c6bed086d..2b9c063bf 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -15,6 +15,7 @@
         @get-list-contribution-messages="$apollo.queries.Messages.refetch()"
         @update-status="updateStatus"
         @reload-contribution="reloadContribution"
+        @update-contributions="updateContributions"
       />
     </div>
   </div>
@@ -79,6 +80,9 @@ export default {
     reloadContribution(id) {
       this.$emit('reload-contribution', id)
     },
+    updateContributions() {
+      this.$emit('update-contributions')
+    },
   },
 }
 </script>
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index f351fe228..e43fe398a 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -114,6 +114,7 @@
                 :contributionMemo="row.item.memo"
                 @update-status="updateStatus"
                 @reload-contribution="reloadContribution"
+                @update-contributions="updateContributions"
               />
             </div>
           </template>
@@ -176,6 +177,9 @@ export default {
     reloadContribution(id) {
       this.$emit('reload-contribution', id)
     },
+    updateContributions() {
+      this.$emit('update-contributions')
+    },
   },
 }
 </script>
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index 90924c9a9..f921d2bc3 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -49,6 +49,7 @@ export default {
         // may be at some point we need a pagination here
         return {
           statusFilter: this.statusFilter,
+          hideResubmission: true,
         }
       },
       update({ adminListContributions }) {