From 6d054745bf64572ceb1ed4f3af99ec9f5f365be9 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 20 Jan 2024 11:51:45 +0100
Subject: [PATCH] Move activity edit dialogs and simplify props

(cherry picked from commit e726a7f513817fcf53ddadb86b326fa8f90f0877)
---
 common/locales/de.json                        |  1 +
 .../src/components/activity/ScheduleEntry.vue |  6 ++--
 .../dialog}/DialogActivityEdit.vue            | 33 ++++++-------------
 .../dialog}/DialogActivityForm.vue            |  2 +-
 .../dialog}/FormScheduleEntryItem.vue         |  0
 .../dialog}/FormScheduleEntryList.vue         |  2 +-
 .../program/DialogActivityCreate.vue          |  8 ++---
 .../components/program/ScheduleEntries.vue    |  5 ++-
 .../program/picasso/PicassoEntry.vue          |  7 +++-
 frontend/src/locales/de.json                  |  8 +++++
 frontend/src/locales/en.json                  |  8 +++++
 frontend/src/locales/it.json                  |  8 +++++
 frontend/src/locales/rm.json                  |  8 +++++
 13 files changed, 60 insertions(+), 36 deletions(-)
 rename frontend/src/components/{program => activity/dialog}/DialogActivityEdit.vue (79%)
 rename frontend/src/components/{program => activity/dialog}/DialogActivityForm.vue (95%)
 rename frontend/src/components/{program => activity/dialog}/FormScheduleEntryItem.vue (100%)
 rename frontend/src/components/{program => activity/dialog}/FormScheduleEntryList.vue (97%)

diff --git a/common/locales/de.json b/common/locales/de.json
index 5c546db9de2..71aff8d823e 100644
--- a/common/locales/de.json
+++ b/common/locales/de.json
@@ -238,6 +238,7 @@
         "endDate": "Enddatum",
         "endDatetime": "Endzeit",
         "nr": "Nr.",
+        "start": "Start",
         "startDate": "Startdatum",
         "startDatetime": "Startzeit",
         "time": "Zeitpunkt"
diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index 0d0610ab31b..3bcb03794b5 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -203,9 +203,9 @@ Displays a single scheduleEntry
             </table>
             <DialogActivityEdit
               v-if="activity && isContributor"
-              :period="scheduleEntry().period"
-              :activity="activity"
+              :schedule-entry="scheduleEntry"
               hide-header-fields
+              @activityUpdated="activity.$reload()"
             >
               <template #activator="{ on }">
                 <ButtonEdit text small class="v-btn--has-bg" v-on="on" />
@@ -275,7 +275,7 @@ import TogglePaperSize from '@/components/activity/TogglePaperSize.vue'
 import ApiForm from '@/components/form/api/ApiForm.vue'
 import ApiSelect from '@/components/form/api/ApiSelect.vue'
 import ButtonEdit from '@/components/buttons/ButtonEdit.vue'
-import DialogActivityEdit from '@/components/program/DialogActivityEdit.vue'
+import DialogActivityEdit from '@/components/activity/dialog/DialogActivityEdit.vue'
 
 export default {
   name: 'ScheduleEntry',
diff --git a/frontend/src/components/program/DialogActivityEdit.vue b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
similarity index 79%
rename from frontend/src/components/program/DialogActivityEdit.vue
rename to frontend/src/components/activity/dialog/DialogActivityEdit.vue
index 814e9809747..cf68548e1f1 100644
--- a/frontend/src/components/program/DialogActivityEdit.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
@@ -14,18 +14,12 @@
     <template #activator="scope">
       <slot name="activator" v-bind="scope" />
     </template>
-    <template v-if="scheduleEntry" #moreActions>
-      <v-btn
-        v-if="!scheduleEntry.tmpEvent"
-        color="primary"
-        :to="scheduleEntryRoute(scheduleEntry)"
-      >
-        {{ $tc('global.button.open') }}
-      </v-btn>
+    <template #moreActions>
+      <slot name="moreActions" />
     </template>
     <DialogActivityForm
       :activity="entityData"
-      :period="currentPeriod"
+      :period="scheduleEntry.period"
       :hide-location="hideHeaderFields"
     />
   </dialog-form>
@@ -35,16 +29,13 @@
 import DialogForm from '@/components/dialog/DialogForm.vue'
 import DialogBase from '@/components/dialog/DialogBase.vue'
 import DialogActivityForm from './DialogActivityForm.vue'
-import { scheduleEntryRoute } from '@/router.js'
 
 export default {
   name: 'DialogActivityEdit',
   components: { DialogForm, DialogActivityForm },
   extends: DialogBase,
   props: {
-    scheduleEntry: { type: Object, required: false, default: null },
-    activity: { type: Object, required: false, default: null },
-    period: { type: Function, required: false, default: null },
+    scheduleEntry: { type: Object, required: true },
     hideHeaderFields: {
       type: Boolean,
       default: false,
@@ -57,20 +48,17 @@ export default {
     }
   },
   computed: {
-    scheduleEntries() {
-      return this.currentActivity.scheduleEntries()
-    },
-    currentPeriod() {
-      return this.period || this.scheduleEntry.period
+    activity() {
+      return this.scheduleEntry.activity()
     },
-    currentActivity() {
-      return this.activity || this.scheduleEntry.activity()
+    scheduleEntries() {
+      return this.activity.scheduleEntries()
     },
   },
   watch: {
     showDialog: async function (showDialog) {
       if (showDialog) {
-        this.loadEntityData(this.currentActivity._meta.self)
+        this.loadEntityData(this.activity._meta.self)
 
         const scheduleEntries = await this.scheduleEntries.$loadItems()
         this.$set(
@@ -120,7 +108,7 @@ export default {
           period: entry.period()._meta.self,
           start: entry.start,
           end: entry.end,
-          activity: this.currentActivity._meta.self,
+          activity: this.activity._meta.self,
         })
       })
 
@@ -144,7 +132,6 @@ export default {
       this.close()
       this.$emit('activity-updated', data)
     },
-    scheduleEntryRoute,
   },
 }
 </script>
diff --git a/frontend/src/components/program/DialogActivityForm.vue b/frontend/src/components/activity/dialog/DialogActivityForm.vue
similarity index 95%
rename from frontend/src/components/program/DialogActivityForm.vue
rename to frontend/src/components/activity/dialog/DialogActivityForm.vue
index ddde18e6dae..3e63e9cd1c5 100644
--- a/frontend/src/components/program/DialogActivityForm.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityForm.vue
@@ -36,7 +36,7 @@
       </template>
     </e-select>
 
-    <e-text-fieldv-if="!hideLocation" v-model="localActivity.location" path="location" />
+    <e-text-field v-if="!hideLocation" v-model="localActivity.location" path="location" />
 
     <FormScheduleEntryList
       v-if="activity.scheduleEntries"
diff --git a/frontend/src/components/program/FormScheduleEntryItem.vue b/frontend/src/components/activity/dialog/FormScheduleEntryItem.vue
similarity index 100%
rename from frontend/src/components/program/FormScheduleEntryItem.vue
rename to frontend/src/components/activity/dialog/FormScheduleEntryItem.vue
diff --git a/frontend/src/components/program/FormScheduleEntryList.vue b/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
similarity index 97%
rename from frontend/src/components/program/FormScheduleEntryList.vue
rename to frontend/src/components/activity/dialog/FormScheduleEntryList.vue
index 537e317fbfe..0b5eaa5a1bf 100644
--- a/frontend/src/components/program/FormScheduleEntryList.vue
+++ b/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
@@ -4,7 +4,7 @@
       <v-row no-gutters>
         <v-col class="header mb-3">
           <legend class="pa-2 float-left">
-            {{ $tc('components.program.formScheduleEntryList.name') }}
+            {{ $tc('components.activity.dialog.formScheduleEntryList.name') }}
           </legend>
 
           <button-add
diff --git a/frontend/src/components/program/DialogActivityCreate.vue b/frontend/src/components/program/DialogActivityCreate.vue
index 49f5a9fde8f..66075847b2d 100644
--- a/frontend/src/components/program/DialogActivityCreate.vue
+++ b/frontend/src/components/program/DialogActivityCreate.vue
@@ -106,7 +106,7 @@
 <script>
 import DialogForm from '@/components/dialog/DialogForm.vue'
 import DialogBase from '@/components/dialog/DialogBase.vue'
-import DialogActivityForm from './DialogActivityForm.vue'
+import DialogActivityForm from '@/components/activity/dialog/DialogActivityForm.vue'
 import CopyActivityInfoDialog from '@/components/activity/CopyActivityInfoDialog.vue'
 import PopoverPrompt from '@/components/prompt/PopoverPrompt.vue'
 import { uniqueId } from 'lodash'
@@ -125,9 +125,6 @@ export default {
   extends: DialogBase,
   props: {
     scheduleEntry: { type: Object, required: true },
-
-    // currently visible period
-    period: { type: Object, required: true },
   },
   data() {
     return {
@@ -145,6 +142,9 @@ export default {
     camp() {
       return this.period.camp()
     },
+    period() {
+      return this.scheduleEntry.period
+    },
     clipboardAccessDenied() {
       return (
         this.clipboardPermission === 'unaccessable' ||
diff --git a/frontend/src/components/program/ScheduleEntries.vue b/frontend/src/components/program/ScheduleEntries.vue
index 8991da5cb38..b4ddffea25e 100644
--- a/frontend/src/components/program/ScheduleEntries.vue
+++ b/frontend/src/components/program/ScheduleEntries.vue
@@ -6,9 +6,8 @@
       :reload-entries="reloadScheduleEntries"
       :on="eventHandlers"
     />
-    <dialog-activity-create
+    <DialogActivityCreate
       ref="dialogActivityCreate"
-      :period="period"
       :schedule-entry="newScheduleEntry"
       @activity-created="afterCreateActivity($event)"
     />
@@ -32,7 +31,7 @@
 </template>
 
 <script>
-import DialogActivityCreate from './DialogActivityCreate.vue'
+import DialogActivityCreate from '@/components/program/DialogActivityCreate.vue'
 
 export default {
   name: 'ScheduleEntries',
diff --git a/frontend/src/components/program/picasso/PicassoEntry.vue b/frontend/src/components/program/picasso/PicassoEntry.vue
index d5f36f6f399..bea73752dac 100644
--- a/frontend/src/components/program/picasso/PicassoEntry.vue
+++ b/frontend/src/components/program/picasso/PicassoEntry.vue
@@ -48,6 +48,11 @@
           <v-icon x-small color="white">mdi-pencil</v-icon>
         </v-btn>
       </template>
+      <template #moreActions>
+        <v-btn color="primary" :to="scheduleEntryRoute">
+          {{ $tc('global.button.open') }}
+        </v-btn>
+      </template>
     </DialogActivityEdit>
 
     <h4 class="e-picasso-entry__title">
@@ -129,7 +134,7 @@
 </template>
 <script>
 import { ref, toRefs, computed } from 'vue'
-import DialogActivityEdit from '../DialogActivityEdit.vue'
+import DialogActivityEdit from '@/components/activity/dialog/DialogActivityEdit.vue'
 import campCollaborationDisplayName from '@/common/helpers/campCollaborationDisplayName.js'
 import { timestampToUtcString } from './dateHelperVCalendar.js'
 import { dateHelperUTCFormatted } from '@/mixins/dateHelperUTCFormatted.js'
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index fa4d233b92e..8c17a201750 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -30,6 +30,14 @@
         "granted": "Du kannst nun kopierte Aktivitäten einfügen.",
         "title": "Aktivität kopieren & einfügen"
       },
+      "dialog": {
+        "dialogActivityEdit": {
+          "title": "Aktivität bearbeiten"
+        },
+        "formScheduleEntryList": {
+          "name": "Geplante Termine"
+        }
+      },
       "menuCardlessContentNode": {
         "deletingDisabled": "Muss leer sein zum Löschen"
       },
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 34819894322..6e48a135ea2 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -30,6 +30,14 @@
         "granted": "You can now paste copied activities.",
         "title": "Copy & paste activity"
       },
+      "dialog": {
+        "dialogActivityEdit": {
+          "title": "Edit activity"
+        },
+        "formScheduleEntryList": {
+          "name": "Scheduled"
+        }
+      },
       "menuCardlessContentNode": {
         "deletingDisabled": "Must be empty to delete"
       },
diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json
index a490fc15c3f..86c8bf3294b 100644
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@@ -23,6 +23,14 @@
       "copyActivityInfoDialog": {
         "allow": "Consenti ora"
       },
+      "dialog": {
+        "dialogActivityEdit": {
+          "title": "Modificare l'actività"
+        },
+        "formScheduleEntryList": {
+          "name": "Programmato"
+        }
+      },
       "menuCardlessContentNode": {
         "deletingDisabled": "Deve essere vuoto per essere eliminato"
       },
diff --git a/frontend/src/locales/rm.json b/frontend/src/locales/rm.json
index 9c1ec16579d..505420ac46a 100644
--- a/frontend/src/locales/rm.json
+++ b/frontend/src/locales/rm.json
@@ -17,6 +17,14 @@
           }
         }
       },
+      "dialog": {
+        "dialogActivityEdit": {
+          "title": "Modifitgar l'activitad"
+        },
+        "formScheduleEntryList": {
+          "name": "Termins planisads"
+        }
+      },
       "menuCardlessContentNode": {
         "deletingDisabled": "Sto esser vid per stizzar"
       },