From bd6811f45aeaa037a62ee579f1a299f301fe0c30 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Fri, 19 Jan 2024 09:05:51 +0100
Subject: [PATCH 01/18] Add edit schedule entries ability to activity

(cherry picked from commit c9cfe1362826cf25487850493e0dfc234f64bf29)
---
 .../src/components/activity/ScheduleEntry.vue | 16 +++++++++-
 .../components/program/DialogActivityEdit.vue | 32 ++++++++++++++-----
 .../components/program/DialogActivityForm.vue |  6 +++-
 frontend/src/scss/tailwind.scss               |  4 +++
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index 655ba7caa2..25cf67fe3c 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -164,7 +164,7 @@ Displays a single scheduleEntry
       <template v-else>
         <!-- Header -->
         <v-row dense class="activity-header">
-          <v-col class="col col-sm-6 col-12 px-0 pt-0">
+          <v-col class="col col-sm-6 col-12 px-0 pt-0 d-flex flex-wrap gap-x-4">
             <table>
               <thead>
                 <tr>
@@ -201,6 +201,16 @@ Displays a single scheduleEntry
                 </tr>
               </tbody>
             </table>
+            <DialogActivityEdit
+              v-if="activity && isContributor"
+              :period="scheduleEntry().period"
+              :activity="activity"
+              hide-header-fields
+            >
+              <template #activator="{ on }">
+                <ButtonEdit text small class="v-btn--has-bg" v-on="on" />
+              </template>
+            </DialogActivityEdit>
           </v-col>
           <v-col class="col col-sm-6 col-12 px-0">
             <api-form :entity="activity" name="activity">
@@ -264,10 +274,14 @@ import DialogEntityDelete from '@/components/dialog/DialogEntityDelete.vue'
 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'
 
 export default {
   name: 'ScheduleEntry',
   components: {
+    DialogActivityEdit,
+    ButtonEdit,
     ApiForm,
     ApiSelect,
     TogglePaperSize,
diff --git a/frontend/src/components/program/DialogActivityEdit.vue b/frontend/src/components/program/DialogActivityEdit.vue
index eed8d6d1c0..814e980974 100644
--- a/frontend/src/components/program/DialogActivityEdit.vue
+++ b/frontend/src/components/program/DialogActivityEdit.vue
@@ -14,7 +14,7 @@
     <template #activator="scope">
       <slot name="activator" v-bind="scope" />
     </template>
-    <template #moreActions>
+    <template v-if="scheduleEntry" #moreActions>
       <v-btn
         v-if="!scheduleEntry.tmpEvent"
         color="primary"
@@ -23,7 +23,11 @@
         {{ $tc('global.button.open') }}
       </v-btn>
     </template>
-    <dialog-activity-form :activity="entityData" :period="scheduleEntry.period()" />
+    <DialogActivityForm
+      :activity="entityData"
+      :period="currentPeriod"
+      :hide-location="hideHeaderFields"
+    />
   </dialog-form>
 </template>
 
@@ -38,7 +42,13 @@ export default {
   components: { DialogForm, DialogActivityForm },
   extends: DialogBase,
   props: {
-    scheduleEntry: { type: Object, required: true },
+    scheduleEntry: { type: Object, required: false, default: null },
+    activity: { type: Object, required: false, default: null },
+    period: { type: Function, required: false, default: null },
+    hideHeaderFields: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -48,16 +58,19 @@ export default {
   },
   computed: {
     scheduleEntries() {
-      return this.activity.scheduleEntries()
+      return this.currentActivity.scheduleEntries()
+    },
+    currentPeriod() {
+      return this.period || this.scheduleEntry.period
     },
-    activity() {
-      return this.scheduleEntry.activity()
+    currentActivity() {
+      return this.activity || this.scheduleEntry.activity()
     },
   },
   watch: {
     showDialog: async function (showDialog) {
       if (showDialog) {
-        this.loadEntityData(this.activity._meta.self)
+        this.loadEntityData(this.currentActivity._meta.self)
 
         const scheduleEntries = await this.scheduleEntries.$loadItems()
         this.$set(
@@ -107,12 +120,15 @@ export default {
           period: entry.period()._meta.self,
           start: entry.start,
           end: entry.end,
-          activity: this.activity._meta.self,
+          activity: this.currentActivity._meta.self,
         })
       })
 
       // patch activity entity
       const activityPayload = { ...this.entityData }
+      if (this.hideHeaderFields) {
+        delete activityPayload.location
+      }
       delete activityPayload.scheduleEntries
       promises.push(this.api.patch(this.entityUri, activityPayload))
 
diff --git a/frontend/src/components/program/DialogActivityForm.vue b/frontend/src/components/program/DialogActivityForm.vue
index f1d9c7b5eb..ddde18e6da 100644
--- a/frontend/src/components/program/DialogActivityForm.vue
+++ b/frontend/src/components/program/DialogActivityForm.vue
@@ -36,7 +36,7 @@
       </template>
     </e-select>
 
-    <e-text-field v-model="localActivity.location" path="location" />
+    <e-text-fieldv-if="!hideLocation" v-model="localActivity.location" path="location" />
 
     <FormScheduleEntryList
       v-if="activity.scheduleEntries"
@@ -73,6 +73,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    hideLocation: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
diff --git a/frontend/src/scss/tailwind.scss b/frontend/src/scss/tailwind.scss
index 983932d944..8e91b3c408 100644
--- a/frontend/src/scss/tailwind.scss
+++ b/frontend/src/scss/tailwind.scss
@@ -24,6 +24,10 @@
   gap: 16px;
 }
 
+.gap-x-4 {
+  column-gap: 16px;
+}
+
 .flex-wrap-reverse {
   flex-wrap: wrap-reverse;
 }

From 958fb4b27d4ce8bf4157b5f738624a2fecb4961f 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 02/18] Move activity edit dialogs and simplify props

(cherry picked from commit e726a7f513817fcf53ddadb86b326fa8f90f0877)
---
 .../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 +++++
 12 files changed, 59 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/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index 25cf67fe3c..67bfd2a5a8 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 814e980974..cf68548e1f 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 ddde18e6da..3e63e9cd1c 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 c0d7c1e716..392bad9487 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 959206f040..7654713d33 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-es'
@@ -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 8991da5cb3..b4ddffea25 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 d5f36f6f39..bea73752da 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 fa4d233b92..8c17a20175 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 3481989432..6e48a135ea 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 a490fc15c3..86c8bf3294 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 9c1ec16579..505420ac46 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"
       },

From 500148415c8cfeac4c4f1ab9d83f26b406800ad4 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 20 Jan 2024 17:11:45 +0100
Subject: [PATCH 03/18] Fix scheduleEntry prop

(cherry picked from commit 6f1a21b76e62e0ccd8154b1eaa50e9625d081b37)
---
 frontend/src/components/activity/ScheduleEntry.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index 67bfd2a5a8..d49d738613 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -203,7 +203,7 @@ Displays a single scheduleEntry
             </table>
             <DialogActivityEdit
               v-if="activity && isContributor"
-              :schedule-entry="scheduleEntry"
+              :schedule-entry="scheduleEntry()"
               hide-header-fields
               @activityUpdated="activity.$reload()"
             >

From 84ca92588a4a456f4cda806ad24c84d47bf49717 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 14 Apr 2024 11:57:13 +0200
Subject: [PATCH 04/18] Fix schedule entry self delete

---
 .../src/components/activity/ScheduleEntry.vue | 37 +++++++++++++++++--
 .../activity/dialog/DialogActivityEdit.vue    |  1 +
 .../activity/dialog/DialogActivityForm.vue    |  5 +++
 .../activity/dialog/FormScheduleEntryItem.vue |  6 +--
 .../activity/dialog/FormScheduleEntryList.vue | 11 +++++-
 5 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index d49d738613..1057915133 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -168,7 +168,11 @@ Displays a single scheduleEntry
             <table>
               <thead>
                 <tr>
-                  <th scope="col" class="text-right pb-2 pr-4">
+                  <th
+                    v-if="category.numberingStyle !== '-'"
+                    scope="col"
+                    class="text-right pb-2 pr-4"
+                  >
                     {{ $tc('entity.scheduleEntry.fields.nr') }}
                   </th>
                   <th scope="col" class="text-left pb-2 pr-4">
@@ -184,8 +188,20 @@ Displays a single scheduleEntry
                   v-for="scheduleEntryItem in scheduleEntries"
                   :key="scheduleEntryItem._meta.self"
                 >
-                  <th class="text-right tabular-nums pb-2 pr-4">
-                    {{ scheduleEntryItem.number }}
+                  <th
+                    v-if="category.numberingStyle !== '-'"
+                    class="text-right tabular-nums pb-2 pr-4"
+                  >
+                    <RouterLink
+                      v-if="scheduleEntryItem._meta.self !== scheduleEntry()._meta.self"
+                      :to="scheduleEntryRoute(scheduleEntryItem)"
+                      class="e-title-link"
+                    >
+                      {{ scheduleEntryItem.number }}
+                    </RouterLink>
+                    <template v-else>
+                      {{ scheduleEntryItem.number }}
+                    </template>
                   </th>
                   <td class="text-left tabular-nums pb-2 pr-4">
                     {{
@@ -196,7 +212,19 @@ Displays a single scheduleEntry
                     {{ dateShort(scheduleEntryItem.start) }}
                   </td>
                   <td class="text-left tabular-nums pb-2 pr-0">
-                    {{ rangeLongEnd(scheduleEntryItem.start, scheduleEntryItem.end) }}
+                    <RouterLink
+                      v-if="
+                        category.numberingStyle === '-' &&
+                        scheduleEntryItem._meta.self !== scheduleEntry()._meta.self
+                      "
+                      :to="scheduleEntryRoute(scheduleEntryItem)"
+                      class="e-title-link"
+                    >
+                      {{ rangeLongEnd(scheduleEntryItem.start, scheduleEntryItem.end) }}
+                    </RouterLink>
+                    <template v-else>
+                      {{ rangeLongEnd(scheduleEntryItem.start, scheduleEntryItem.end) }}
+                    </template>
                   </td>
                 </tr>
               </tbody>
@@ -404,6 +432,7 @@ export default {
           this.$toast.error(errorToMultiLineToast(e))
         })
     },
+    scheduleEntryRoute,
     countContentNodes(contentType) {
       return this.contentNodes.items.filter((cn) => {
         return cn.contentType().id === contentType.id
diff --git a/frontend/src/components/activity/dialog/DialogActivityEdit.vue b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
index cf68548e1f..9bd4f9a603 100644
--- a/frontend/src/components/activity/dialog/DialogActivityEdit.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
@@ -19,6 +19,7 @@
     </template>
     <DialogActivityForm
       :activity="entityData"
+      :current-schedule-entry="scheduleEntry"
       :period="scheduleEntry.period"
       :hide-location="hideHeaderFields"
     />
diff --git a/frontend/src/components/activity/dialog/DialogActivityForm.vue b/frontend/src/components/activity/dialog/DialogActivityForm.vue
index 3e63e9cd1c..13b0f0ecc5 100644
--- a/frontend/src/components/activity/dialog/DialogActivityForm.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityForm.vue
@@ -41,6 +41,7 @@
     <FormScheduleEntryList
       v-if="activity.scheduleEntries"
       :schedule-entries="activity.scheduleEntries"
+      :current-schedule-entry="currentScheduleEntry"
       :period="period"
       :periods="camp.periods().items"
     />
@@ -69,6 +70,10 @@ export default {
       type: Object,
       required: true,
     },
+    currentScheduleEntry: {
+      type: Object,
+      required: true,
+    },
     autoselectTitle: {
       type: Boolean,
       default: false,
diff --git a/frontend/src/components/activity/dialog/FormScheduleEntryItem.vue b/frontend/src/components/activity/dialog/FormScheduleEntryItem.vue
index 2726ce06a6..fe35687130 100644
--- a/frontend/src/components/activity/dialog/FormScheduleEntryItem.vue
+++ b/frontend/src/components/activity/dialog/FormScheduleEntryItem.vue
@@ -50,7 +50,7 @@
       </v-col>
 
       <v-col cols="1" class="pt-3 text-center">
-        <button-delete v-if="!isLastItem" icon-only @click="$emit('delete')" />
+        <button-delete v-if="deletable" icon-only @click="$emit('delete')" />
       </v-col>
     </v-row>
   </v-container>
@@ -82,9 +82,9 @@ export default {
     },
 
     // true if current item is the last scheduleEntry
-    isLastItem: {
+    deletable: {
       type: Boolean,
-      required: true,
+      required: false,
     },
   },
   data() {
diff --git a/frontend/src/components/activity/dialog/FormScheduleEntryList.vue b/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
index 392bad9487..194283d734 100644
--- a/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
+++ b/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
@@ -22,7 +22,11 @@
           class="transition-list-item pa-0 mb-4"
           :schedule-entry="scheduleEntry"
           :periods="periods"
-          :is-last-item="scheduleEntriesWithoutDeleted.length === 1"
+          :deletable="
+            scheduleEntriesWithoutDeleted.length > 1 &&
+            ($route.name !== 'activity' ||
+              scheduleEntry.self !== currentScheduleEntry._meta.self)
+          "
           @delete="deleteEntry(scheduleEntry)"
         />
       </transition-group>
@@ -47,6 +51,11 @@ export default {
       required: true,
     },
 
+    currentScheduleEntry: {
+      type: Object,
+      required: true,
+    },
+
     // all available periods
     periods: {
       type: Array,

From 88380a4e5bb22c8724d5bd8a2f7f27fc6d74f291 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 8 Feb 2025 18:40:16 +0100
Subject: [PATCH 05/18] Fixup translation

---
 .../src/components/activity/dialog/DialogActivityEdit.vue | 2 +-
 frontend/src/locales/de.json                              | 3 ---
 frontend/src/locales/en.json                              | 3 ---
 frontend/src/locales/fr.json                              | 8 +++++---
 frontend/src/locales/it.json                              | 3 ---
 frontend/src/locales/rm.json                              | 3 ---
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/activity/dialog/DialogActivityEdit.vue b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
index 9bd4f9a603..ded4439bb9 100644
--- a/frontend/src/components/activity/dialog/DialogActivityEdit.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
@@ -1,7 +1,7 @@
 <template>
   <dialog-form
     v-model="showDialog"
-    :title="$tc('components.program.dialogActivityEdit.title')"
+    :title="$tc('components.activity.dialog.dialogActivityEdit.title')"
     :loading="loading"
     :error="error"
     icon="mdi-calendar-plus"
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 8c17a20175..3ff4aba884 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -413,9 +413,6 @@
         "copySourceInfo": "Hier kannst du die URL einer Aktivität einfügen, um dessen Inhalte zu kopieren.",
         "pasteActivity": "Kopierte Aktivität einfügen"
       },
-      "dialogActivityEdit": {
-        "title": "Aktivität bearbeiten"
-      },
       "formScheduleEntryItem": {
         "end": "Ende",
         "start": "Start"
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 6e48a135ea..c8ee92f645 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -413,9 +413,6 @@
         "copySourceInfo": "Here you can paste the URL of an activity to copy its contents.",
         "pasteActivity": "paste activity"
       },
-      "dialogActivityEdit": {
-        "title": "Edit activity"
-      },
       "formScheduleEntryItem": {
         "end": "End",
         "start": "Start"
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index a4398d4761..92e22762bf 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -27,6 +27,11 @@
         "granted": "Vous pouvez maintenant coller les activités copiées.",
         "title": "Copier et coller une activité"
       },
+      "dialog": {
+        "dialogActivityEdit": {
+          "title": "Modifier l'activité"
+        }
+      },
       "menuCardlessContentNode": {
         "deletingDisabled": "Doit être vide pour être supprimé"
       },
@@ -358,9 +363,6 @@
         "copySourceInfo": "Vous pouvez coller ici l'URL d'une activité pour copier son contenu.",
         "pasteActivity": "coller l'activité"
       },
-      "dialogActivityEdit": {
-        "title": "Modifier l'activité"
-      },
       "formScheduleEntryItem": {
         "end": "Fin",
         "start": "Début"
diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json
index 86c8bf3294..03ef4a9839 100644
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@@ -352,9 +352,6 @@
       }
     },
     "program": {
-      "dialogActivityEdit": {
-        "title": "Modificare l'actività"
-      },
       "formScheduleEntryItem": {
         "end": "Fine",
         "start": "Inizio"
diff --git a/frontend/src/locales/rm.json b/frontend/src/locales/rm.json
index 505420ac46..10f235f61b 100644
--- a/frontend/src/locales/rm.json
+++ b/frontend/src/locales/rm.json
@@ -312,9 +312,6 @@
       }
     },
     "program": {
-      "dialogActivityEdit": {
-        "title": "Modifitgar l'activitad"
-      },
       "formScheduleEntryItem": {
         "end": "Fin",
         "start": "Entschatta"

From f1a84b6790c6fb0434a056aa60792a323bad0eb7 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 8 Feb 2025 18:47:24 +0100
Subject: [PATCH 06/18] Fix redirect problem for scheduleEntry delete

---
 .../src/components/activity/ScheduleEntry.vue |  54 +++++++--
 .../activity/dialog/DialogActivityEdit.vue    |   3 +-
 .../activity/dialog/DialogActivityForm.vue    |   2 +-
 .../activity/dialog/FormScheduleEntryList.vue |   6 +-
 .../campAdmin/DialogCategoryCreate.vue        |   5 +-
 .../campAdmin/ErrorExistingActivitiesList.vue |   1 +
 .../src/components/dashboard/ActivityRow.vue  |   1 +
 .../program/DialogActivityCreate.vue          |   8 +-
 frontend/src/components/story/StoryDay.vue    |   1 +
 frontend/src/router.js                        | 113 +++++++++++-------
 frontend/src/views/camp/activity/Activity.vue |  10 +-
 .../views/camp/activity/SideBarProgram.vue    |  11 +-
 12 files changed, 148 insertions(+), 67 deletions(-)

diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index 1057915133..cd84cbf75a 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -193,7 +193,7 @@ Displays a single scheduleEntry
                     class="text-right tabular-nums pb-2 pr-4"
                   >
                     <RouterLink
-                      v-if="scheduleEntryItem._meta.self !== scheduleEntry()._meta.self"
+                      v-if="scheduleEntryItem._meta.self !== scheduleEntry._meta.self"
                       :to="scheduleEntryRoute(scheduleEntryItem)"
                       class="e-title-link"
                     >
@@ -215,7 +215,7 @@ Displays a single scheduleEntry
                     <RouterLink
                       v-if="
                         category.numberingStyle === '-' &&
-                        scheduleEntryItem._meta.self !== scheduleEntry()._meta.self
+                        scheduleEntryItem._meta.self !== scheduleEntry._meta.self
                       "
                       :to="scheduleEntryRoute(scheduleEntryItem)"
                       class="e-title-link"
@@ -231,9 +231,9 @@ Displays a single scheduleEntry
             </table>
             <DialogActivityEdit
               v-if="activity && isContributor"
-              :schedule-entry="scheduleEntry()"
+              :schedule-entry="scheduleEntry"
               hide-header-fields
-              @activityUpdated="activity.$reload()"
+              @activity-updated="activity.$reload()"
             >
               <template #activator="{ on }">
                 <ButtonEdit text small class="v-btn--has-bg" v-on="on" />
@@ -292,7 +292,11 @@ import RootNode from '@/components/activity/RootNode.vue'
 import ActivityResponsibles from '@/components/activity/ActivityResponsibles.vue'
 import { dateHelperUTCFormatted } from '@/mixins/dateHelperUTCFormatted.js'
 import { campRoleMixin } from '@/mixins/campRoleMixin'
-import router, { periodRoute, scheduleEntryRoute } from '@/router.js'
+import router, {
+  firstActivityScheduleEntry,
+  periodRoute,
+  scheduleEntryRoute,
+} from '@/router.js'
 import DownloadNuxtPdf from '@/components/print/print-nuxt/DownloadNuxtPdfListItem.vue'
 import DownloadClientPdf from '@/components/print/print-client/DownloadClientPdfListItem.vue'
 import { errorToMultiLineToast } from '@/components/toast/toasts'
@@ -332,11 +336,34 @@ export default {
       isPaperDisplaySize: () => this.isPaperDisplaySize,
     }
   },
+  async beforeRouteUpdate(to, from, next) {
+    if (to.params.scheduleEntryId !== from.params.scheduleEntryId) {
+      return await this.api
+        .get()
+        .scheduleEntries({ id: to.params.scheduleEntryId })
+        ._meta.load.then(() => next())
+        .catch(() =>
+          next({
+            name: 'camp/activity',
+            params: {
+              ...to.params,
+              scheduleEntryId: firstActivityScheduleEntry(this.activity).id,
+            },
+          })
+        )
+    } else {
+      return next()
+    }
+  },
   props: {
-    scheduleEntry: {
-      type: Object,
+    activityId: {
+      type: String,
       required: true,
     },
+    scheduleEntryId: {
+      type: String,
+      default: null,
+    },
   },
   data() {
     return {
@@ -348,7 +375,18 @@ export default {
   },
   computed: {
     activity() {
-      return this.scheduleEntry.activity()
+      return this.api.get().activities({ id: this.activityId })
+    },
+    scheduleEntry() {
+      try {
+        if (this.scheduleEntryId) {
+          return this.api.get().scheduleEntries({ id: this.scheduleEntryId })
+        } else {
+          return firstActivityScheduleEntry(this.activity)
+        }
+      } catch {
+        return firstActivityScheduleEntry(this.activity)
+      }
     },
     camp() {
       return this.activity.camp()
diff --git a/frontend/src/components/activity/dialog/DialogActivityEdit.vue b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
index ded4439bb9..affe8f087f 100644
--- a/frontend/src/components/activity/dialog/DialogActivityEdit.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
@@ -20,7 +20,7 @@
     <DialogActivityForm
       :activity="entityData"
       :current-schedule-entry="scheduleEntry"
-      :period="scheduleEntry.period"
+      :period="scheduleEntry.period()"
       :hide-location="hideHeaderFields"
     />
   </dialog-form>
@@ -131,6 +131,7 @@ export default {
     },
     updatedSuccessful(data) {
       this.close()
+      this.api.reload(this.activity)
       this.$emit('activity-updated', data)
     },
   },
diff --git a/frontend/src/components/activity/dialog/DialogActivityForm.vue b/frontend/src/components/activity/dialog/DialogActivityForm.vue
index 13b0f0ecc5..b28db8a9d7 100644
--- a/frontend/src/components/activity/dialog/DialogActivityForm.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityForm.vue
@@ -72,7 +72,7 @@ export default {
     },
     currentScheduleEntry: {
       type: Object,
-      required: true,
+      default: null,
     },
     autoselectTitle: {
       type: Boolean,
diff --git a/frontend/src/components/activity/dialog/FormScheduleEntryList.vue b/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
index 194283d734..ac79f70d12 100644
--- a/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
+++ b/frontend/src/components/activity/dialog/FormScheduleEntryList.vue
@@ -24,8 +24,8 @@
           :periods="periods"
           :deletable="
             scheduleEntriesWithoutDeleted.length > 1 &&
-            ($route.name !== 'activity' ||
-              scheduleEntry.self !== currentScheduleEntry._meta.self)
+            ($route.name !== 'camp/activity' ||
+              scheduleEntry.self !== currentScheduleEntry?._meta.self)
           "
           @delete="deleteEntry(scheduleEntry)"
         />
@@ -53,7 +53,7 @@ export default {
 
     currentScheduleEntry: {
       type: Object,
-      required: true,
+      default: null,
     },
 
     // all available periods
diff --git a/frontend/src/components/campAdmin/DialogCategoryCreate.vue b/frontend/src/components/campAdmin/DialogCategoryCreate.vue
index d12377e6ed..889073acb2 100644
--- a/frontend/src/components/campAdmin/DialogCategoryCreate.vue
+++ b/frontend/src/components/campAdmin/DialogCategoryCreate.vue
@@ -264,10 +264,7 @@ export default {
         const match = router.matcher.match(url)
 
         if (match.name === 'camp/activity') {
-          const scheduleEntry = await this.api
-            .get()
-            .scheduleEntries({ id: match.params['scheduleEntryId'] })
-          return await scheduleEntry.activity()
+          return await this.api.get().activities({ id: match.params['activityId'] })
         } else if (match.name === 'camp/admin/activity/category') {
           return await this.api.get().categories({ id: match.params['categoryId'] })
         }
diff --git a/frontend/src/components/campAdmin/ErrorExistingActivitiesList.vue b/frontend/src/components/campAdmin/ErrorExistingActivitiesList.vue
index b594587211..6a75a13db1 100644
--- a/frontend/src/components/campAdmin/ErrorExistingActivitiesList.vue
+++ b/frontend/src/components/campAdmin/ErrorExistingActivitiesList.vue
@@ -16,6 +16,7 @@
                 name: 'camp/activity',
                 params: {
                   campId: camp.id,
+                  activityId: activity.id,
                   scheduleEntryId: scheduleEntry.id,
                 },
               }"
diff --git a/frontend/src/components/dashboard/ActivityRow.vue b/frontend/src/components/dashboard/ActivityRow.vue
index f1123a24af..2534fa2f60 100644
--- a/frontend/src/components/dashboard/ActivityRow.vue
+++ b/frontend/src/components/dashboard/ActivityRow.vue
@@ -139,6 +139,7 @@ export default {
         name: 'camp/activity',
         params: {
           campId: this.scheduleEntry.period().camp().id,
+          activityId: this.scheduleEntry.activity().id,
           scheduleEntryId: this.scheduleEntry.id,
         },
       }
diff --git a/frontend/src/components/program/DialogActivityCreate.vue b/frontend/src/components/program/DialogActivityCreate.vue
index 7654713d33..6bb1bbc9ff 100644
--- a/frontend/src/components/program/DialogActivityCreate.vue
+++ b/frontend/src/components/program/DialogActivityCreate.vue
@@ -143,7 +143,7 @@ export default {
       return this.period.camp()
     },
     period() {
-      return this.scheduleEntry.period
+      return this.scheduleEntry.period()
     },
     clipboardAccessDenied() {
       return (
@@ -282,11 +282,7 @@ export default {
         const match = router.matcher.match(url)
 
         if (match.name === 'camp/activity') {
-          const scheduleEntry = await this.api
-            .get()
-            .scheduleEntries({ id: match.params['scheduleEntryId'] })
-
-          return await scheduleEntry.activity()
+          return await this.api.get().activities({ id: match.params['activityId'] })
         }
       }
       return null
diff --git a/frontend/src/components/story/StoryDay.vue b/frontend/src/components/story/StoryDay.vue
index 1c99950f28..3071e9ce91 100644
--- a/frontend/src/components/story/StoryDay.vue
+++ b/frontend/src/components/story/StoryDay.vue
@@ -24,6 +24,7 @@
                   name: 'camp/activity',
                   params: {
                     campId: day.period().camp().id,
+                    activityId: scheduleEntry.activity().id,
                     scheduleEntryId: scheduleEntry.id,
                   },
                 }"
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 1101697414..b52f4a4528 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -502,23 +502,32 @@ export default new Router({
       ],
     },
     {
-      path: '/camps/:campId/:campShortTitle/program/activities/:scheduleEntryId/:activityName?',
+      path: '/camps/:campId/:campShortTitle/program/activity/:activityId/:scheduleEntryId?/:activityName?',
       name: 'camp/activity',
       components: {
         navigation: NavigationCamp,
         default: () => import('./views/camp/activity/Activity.vue'),
         aside: () => import('./views/camp/activity/SideBarProgram.vue'),
       },
-      beforeEnter: all([requireAuth, requireCamp, requireScheduleEntry]),
+      beforeEnter: all([requireAuth, requireCamp, requireActivityScheduleEntry]),
       props: {
         navigation: (route) => ({ camp: campFromRoute(route) }),
-        default: (route) => ({ scheduleEntry: scheduleEntryFromRoute(route) }),
+        default: (route) => ({
+          activityId: route.params.activityId,
+          scheduleEntryId: route.params.scheduleEntryId,
+        }),
         aside: (route) => ({
           camp: campFromRoute(route),
-          day: dayFromScheduleEntryInRoute(route),
+          activityId: route.params.activityId,
+          scheduleEntryId: route.params.scheduleEntryId,
         }),
       },
     },
+    {
+      path: '/camps/:campId/:campShortTitle/program/activities/:scheduleEntryId/:activityName?',
+      redirect:
+        '/camps/:campId/:campShortTitle/program/activity/0/:scheduleEntryId?/:activityName?',
+    },
     {
       path: '/',
       name: 'home',
@@ -600,27 +609,48 @@ async function requireCamp(to, from, next) {
   }
 }
 
-async function requireScheduleEntry(to, from, next) {
-  const scheduleEntry = await scheduleEntryFromRoute(to)
-  if (scheduleEntry === undefined) {
-    next({
-      name: 'PageNotFound',
-      params: [to.fullPath, ''],
-      replace: true,
+async function requireActivityScheduleEntry(to, from, next) {
+  await apiStore
+    .get()
+    .activities({ id: to.params.activityId })
+    ._meta.load.then((activity) => {
+      // activity exists
+      if (to.params.scheduleEntryId) {
+        apiStore
+          .get()
+          .scheduleEntries({ id: to.params.scheduleEntryId })
+          ._meta.load.then(() => {
+            // activity and scheduleEntry exist
+            next()
+          })
+          .catch(async () => {
+            // scheduleEntry is not found, use first activity scheduleEntry
+            to.params.scheduleEntryId = firstActivityScheduleEntry(activity).id
+            next(to)
+          })
+      }
+      next()
+    })
+    .catch(() => {
+      // activityId does not exist, check if scheduleEntryId exists
+      if (to.params.scheduleEntryId) {
+        apiStore
+          .get()
+          .scheduleEntries({ id: to.params.scheduleEntryId })
+          ._meta.load.then(async (scheduleEntry) => {
+            const activity = await scheduleEntry.activity()._meta.load
+            to.params.activityId = activity.id
+            next(to)
+          })
+          .catch(async () => {
+            // scheduleEntry and activity are not found, fallback to camp program
+            next({
+              ...to,
+              name: 'camp/program',
+            })
+          })
+      }
     })
-  } else {
-    await scheduleEntry._meta.load
-      .then(() => {
-        next()
-      })
-      .catch(() => {
-        next({
-          name: 'PageNotFound',
-          params: [to.fullPath, ''],
-          replace: true,
-        })
-      })
-  }
 }
 
 async function requirePeriod(to, from, next) {
@@ -721,13 +751,6 @@ export function periodFromRoute(route) {
   return apiStore.get().periods({ id: route.params.periodId })
 }
 
-function scheduleEntryFromRoute(route) {
-  if (!route.params.scheduleEntryId) {
-    return undefined
-  }
-  return apiStore.get().scheduleEntries({ id: route.params.scheduleEntryId })
-}
-
 function categoryFromRoute(route) {
   if (!route.params.categoryId) {
     return undefined
@@ -772,13 +795,6 @@ function getContentLayout(route) {
   }
 }
 
-function dayFromScheduleEntryInRoute(route) {
-  if (!route.params.scheduleEntryId) {
-    return undefined
-  }
-  return apiStore.get().scheduleEntries({ id: route.params.scheduleEntryId }).day()
-}
-
 /**
  * @param camp
  * @param subroute {'admin' | 'dashboard' | 'program' | 'material' | 'story' | 'home' | 'collaborators' | 'print' }
@@ -856,7 +872,8 @@ export function periodRoute(period, routeName = 'camp/period/program', query = {
 export function scheduleEntryRoute(scheduleEntry, query = {}) {
   if (scheduleEntry._meta.loading || scheduleEntry.activity()._meta.loading) return {}
 
-  const camp = scheduleEntry.activity().camp()
+  const activity = scheduleEntry.activity()
+  const camp = activity.camp()
 
   // if (camp._meta.loading) return {}
 
@@ -866,7 +883,8 @@ export function scheduleEntryRoute(scheduleEntry, query = {}) {
       campId: camp.id,
       campShortTitle: slugify(campShortTitle(camp)),
       scheduleEntryId: scheduleEntry.id,
-      activityName: slugify(scheduleEntry.activity().title),
+      activityId: activity.id,
+      activityName: slugify(activity.title),
     },
     query,
   }
@@ -967,6 +985,21 @@ async function firstFuturePeriod(route) {
   )
 }
 
+export async function firstActivityScheduleEntry(activity) {
+  if (typeof activity === 'string') {
+    activity = apiStore.get().activities({ id: activity })
+  }
+  return activity
+    .scheduleEntries()
+    .items.reduce(
+      (result, current) =>
+        result === null || new Date(result.start) > new Date(current.start)
+          ? current
+          : result,
+      null
+    )
+}
+
 async function redirectToPeriod(to, from, next, routeName) {
   const period = await firstFuturePeriod(to)
   if (period) {
diff --git a/frontend/src/views/camp/activity/Activity.vue b/frontend/src/views/camp/activity/Activity.vue
index e297a5b085..d091798b31 100644
--- a/frontend/src/views/camp/activity/Activity.vue
+++ b/frontend/src/views/camp/activity/Activity.vue
@@ -4,7 +4,7 @@ Displays a single activity
 
 <template>
   <v-container fluid>
-    <ScheduleEntry :key="scheduleEntry._meta.self" :schedule-entry="scheduleEntry" />
+    <ScheduleEntry :activity-id="activityId" :schedule-entry-id="scheduleEntryId" />
   </v-container>
 </template>
 
@@ -18,10 +18,14 @@ export default {
   },
 
   props: {
-    scheduleEntry: {
-      type: Object,
+    activityId: {
+      type: String,
       required: true,
     },
+    scheduleEntryId: {
+      type: String,
+      default: null,
+    },
   },
 }
 </script>
diff --git a/frontend/src/views/camp/activity/SideBarProgram.vue b/frontend/src/views/camp/activity/SideBarProgram.vue
index e8ca4dbc26..79f11d8948 100644
--- a/frontend/src/views/camp/activity/SideBarProgram.vue
+++ b/frontend/src/views/camp/activity/SideBarProgram.vue
@@ -37,13 +37,15 @@ import ScheduleEntries from '@/components/program/ScheduleEntries.vue'
 
 import { HTML5_FMT } from '@/common/helpers/dateFormat.js'
 import DaySwitcher from '@/components/activity/DaySwitcher.vue'
+import { firstActivityScheduleEntry } from '@/router.js'
 
 export default {
   name: 'SideBarProgram',
   components: { DaySwitcher, SideBar, Picasso, ScheduleEntries },
   props: {
-    day: { type: Object, required: true },
     camp: { type: Object, required: true },
+    activityId: { type: String, required: true },
+    scheduleEntryId: { type: String, default: null },
   },
   data() {
     return {
@@ -51,6 +53,13 @@ export default {
     }
   },
   computed: {
+    day() {
+      if (this.scheduleEntryId) {
+        return this.api.get().scheduleEntries({ id: this.scheduleEntryId }).day()
+      } else {
+        return firstActivityScheduleEntry(this.activityId).day()
+      }
+    },
     period() {
       return this.daySelection.period()
     },

From 563361272b4d5dfd02c72c34c87aea2cf7506450 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 8 Feb 2025 19:51:14 +0100
Subject: [PATCH 07/18] Fix timing issue with browser back

---
 .../src/components/activity/ScheduleEntry.vue | 10 ++++----
 frontend/src/router.js                        |  9 +++++---
 .../views/camp/activity/SideBarProgram.vue    | 23 +++++++++++++++++--
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index cd84cbf75a..5b71122d96 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -342,15 +342,15 @@ export default {
         .get()
         .scheduleEntries({ id: to.params.scheduleEntryId })
         ._meta.load.then(() => next())
-        .catch(() =>
-          next({
+        .catch(async () => {
+          return next({
             name: 'camp/activity',
             params: {
-              ...to.params,
-              scheduleEntryId: firstActivityScheduleEntry(this.activity).id,
+              activityId: to.params.activityId,
+              scheduleEntryId: (await firstActivityScheduleEntry(this.activityId)).id,
             },
           })
-        )
+        })
     } else {
       return next()
     }
diff --git a/frontend/src/router.js b/frontend/src/router.js
index b52f4a4528..0e12ab06ba 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -625,11 +625,13 @@ async function requireActivityScheduleEntry(to, from, next) {
           })
           .catch(async () => {
             // scheduleEntry is not found, use first activity scheduleEntry
-            to.params.scheduleEntryId = firstActivityScheduleEntry(activity).id
+            const scheduleEntry = await firstActivityScheduleEntry(activity)
+            to.params.scheduleEntryId = scheduleEntry.id
             next(to)
           })
+      } else {
+        next()
       }
-      next()
     })
     .catch(() => {
       // activityId does not exist, check if scheduleEntryId exists
@@ -987,8 +989,9 @@ async function firstFuturePeriod(route) {
 
 export async function firstActivityScheduleEntry(activity) {
   if (typeof activity === 'string') {
-    activity = apiStore.get().activities({ id: activity })
+    activity = await apiStore.get().activities({ id: activity })._meta.load
   }
+  await activity.scheduleEntries()._meta.load
   return activity
     .scheduleEntries()
     .items.reduce(
diff --git a/frontend/src/views/camp/activity/SideBarProgram.vue b/frontend/src/views/camp/activity/SideBarProgram.vue
index 79f11d8948..a730e4a848 100644
--- a/frontend/src/views/camp/activity/SideBarProgram.vue
+++ b/frontend/src/views/camp/activity/SideBarProgram.vue
@@ -3,7 +3,7 @@
     :title="$tc('views.camp.activity.sideBarProgram.title')"
     icon="mdi-format-list-numbered"
   >
-    <ScheduleEntries :period="period" :show-button="false">
+    <ScheduleEntries v-if="period" :period="period" :show-button="false">
       <template #default="slotProps">
         <DaySwitcher
           :camp="camp"
@@ -42,6 +42,25 @@ import { firstActivityScheduleEntry } from '@/router.js'
 export default {
   name: 'SideBarProgram',
   components: { DaySwitcher, SideBar, Picasso, ScheduleEntries },
+  async beforeRouteUpdate(to, from, next) {
+    if (to.params.scheduleEntryId !== from.params.scheduleEntryId) {
+      return await this.api
+        .get()
+        .scheduleEntries({ id: to.params.scheduleEntryId })
+        ._meta.load.then(() => next())
+        .catch(async () => {
+          return next({
+            name: 'camp/activity',
+            params: {
+              activityId: to.params.activityId,
+              scheduleEntryId: (await firstActivityScheduleEntry(this.activityId)).id,
+            },
+          })
+        })
+    } else {
+      return next()
+    }
+  },
   props: {
     camp: { type: Object, required: true },
     activityId: { type: String, required: true },
@@ -61,7 +80,7 @@ export default {
       }
     },
     period() {
-      return this.daySelection.period()
+      return this.daySelection?.period()
     },
     daySelection() {
       return this.selectedDay ?? this.day

From 771b0845f503a2387f045c0b0e5cd77a595c1958 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 8 Feb 2025 19:59:30 +0100
Subject: [PATCH 08/18] Keep activityTitle in browser back

---
 frontend/src/components/activity/ScheduleEntry.vue  | 2 +-
 frontend/src/views/camp/activity/SideBarProgram.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index 5b71122d96..a7ccc7199b 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -346,7 +346,7 @@ export default {
           return next({
             name: 'camp/activity',
             params: {
-              activityId: to.params.activityId,
+              ...to.params,
               scheduleEntryId: (await firstActivityScheduleEntry(this.activityId)).id,
             },
           })
diff --git a/frontend/src/views/camp/activity/SideBarProgram.vue b/frontend/src/views/camp/activity/SideBarProgram.vue
index a730e4a848..7ae2ee4e50 100644
--- a/frontend/src/views/camp/activity/SideBarProgram.vue
+++ b/frontend/src/views/camp/activity/SideBarProgram.vue
@@ -52,7 +52,7 @@ export default {
           return next({
             name: 'camp/activity',
             params: {
-              activityId: to.params.activityId,
+              ...to.params,
               scheduleEntryId: (await firstActivityScheduleEntry(this.activityId)).id,
             },
           })

From e625d307fcd24c37b5c05092d3535a7ba8cc8c20 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 8 Feb 2025 20:15:52 +0100
Subject: [PATCH 09/18] Use scheduleEntry link

---
 frontend/src/components/dashboard/ActivityRow.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/dashboard/ActivityRow.vue b/frontend/src/components/dashboard/ActivityRow.vue
index 2534fa2f60..a91cd55078 100644
--- a/frontend/src/components/dashboard/ActivityRow.vue
+++ b/frontend/src/components/dashboard/ActivityRow.vue
@@ -92,6 +92,7 @@ import AvatarRow from '@/components/generic/AvatarRow.vue'
 import CategoryChip from '@/components/generic/CategoryChip.vue'
 import { dateHelperUTCFormatted } from '@/mixins/dateHelperUTCFormatted.js'
 import TextAlignBaseline from '@/components/layout/TextAlignBaseline.vue'
+import { scheduleEntryRoute } from '@/router.js'
 
 export default {
   name: 'ActivityRow',
@@ -135,14 +136,7 @@ export default {
       return this.timeDurationShort(this.scheduleEntry.start, this.scheduleEntry.end)
     },
     routerLink() {
-      return {
-        name: 'camp/activity',
-        params: {
-          campId: this.scheduleEntry.period().camp().id,
-          activityId: this.scheduleEntry.activity().id,
-          scheduleEntryId: this.scheduleEntry.id,
-        },
-      }
+      return scheduleEntryRoute(this.scheduleEntry)
     },
   },
 }

From 8f4573672ece295e66bcc54870c8f901912ad429 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 8 Feb 2025 20:23:56 +0100
Subject: [PATCH 10/18] Refactor scheduleEntryRouteChange method

---
 .../src/components/activity/ScheduleEntry.vue | 19 ++----------
 .../src/mixins/scheduleEntryRouteChange.js    | 30 +++++++++++++++++++
 .../views/camp/activity/SideBarProgram.vue    | 19 ++----------
 3 files changed, 34 insertions(+), 34 deletions(-)
 create mode 100644 frontend/src/mixins/scheduleEntryRouteChange.js

diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index a7ccc7199b..7c0ddf11bf 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -308,6 +308,7 @@ 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/activity/dialog/DialogActivityEdit.vue'
+import scheduleEntryRouteChange from '@/mixins/scheduleEntryRouteChange.js'
 
 export default {
   name: 'ScheduleEntry',
@@ -337,23 +338,7 @@ export default {
     }
   },
   async beforeRouteUpdate(to, from, next) {
-    if (to.params.scheduleEntryId !== from.params.scheduleEntryId) {
-      return await this.api
-        .get()
-        .scheduleEntries({ id: to.params.scheduleEntryId })
-        ._meta.load.then(() => next())
-        .catch(async () => {
-          return next({
-            name: 'camp/activity',
-            params: {
-              ...to.params,
-              scheduleEntryId: (await firstActivityScheduleEntry(this.activityId)).id,
-            },
-          })
-        })
-    } else {
-      return next()
-    }
+    return scheduleEntryRouteChange(this.activityId, to, from, next)
   },
   props: {
     activityId: {
diff --git a/frontend/src/mixins/scheduleEntryRouteChange.js b/frontend/src/mixins/scheduleEntryRouteChange.js
new file mode 100644
index 0000000000..baafd08701
--- /dev/null
+++ b/frontend/src/mixins/scheduleEntryRouteChange.js
@@ -0,0 +1,30 @@
+import { firstActivityScheduleEntry } from '@/router.js'
+import { apiStore } from '@/plugins/store'
+
+/**
+ * Loads first valid schedule entry for activity if current one is missing
+ * @param activity
+ * @param to
+ * @param from
+ * @param next
+ * @return {Promise<*>}
+ */
+export default async function scheduleEntryRouteChange(activity, to, from, next) {
+  if (to.params.scheduleEntryId !== from.params.scheduleEntryId) {
+    return await apiStore
+      .get()
+      .scheduleEntries({ id: to.params.scheduleEntryId })
+      ._meta.load.then(() => next())
+      .catch(async () => {
+        return next({
+          name: 'camp/activity',
+          params: {
+            ...to.params,
+            scheduleEntryId: (await firstActivityScheduleEntry(activity)).id,
+          },
+        })
+      })
+  } else {
+    return next()
+  }
+}
diff --git a/frontend/src/views/camp/activity/SideBarProgram.vue b/frontend/src/views/camp/activity/SideBarProgram.vue
index 7ae2ee4e50..c34672eb86 100644
--- a/frontend/src/views/camp/activity/SideBarProgram.vue
+++ b/frontend/src/views/camp/activity/SideBarProgram.vue
@@ -38,28 +38,13 @@ import ScheduleEntries from '@/components/program/ScheduleEntries.vue'
 import { HTML5_FMT } from '@/common/helpers/dateFormat.js'
 import DaySwitcher from '@/components/activity/DaySwitcher.vue'
 import { firstActivityScheduleEntry } from '@/router.js'
+import scheduleEntryRouteChange from '@/mixins/scheduleEntryRouteChange.js'
 
 export default {
   name: 'SideBarProgram',
   components: { DaySwitcher, SideBar, Picasso, ScheduleEntries },
   async beforeRouteUpdate(to, from, next) {
-    if (to.params.scheduleEntryId !== from.params.scheduleEntryId) {
-      return await this.api
-        .get()
-        .scheduleEntries({ id: to.params.scheduleEntryId })
-        ._meta.load.then(() => next())
-        .catch(async () => {
-          return next({
-            name: 'camp/activity',
-            params: {
-              ...to.params,
-              scheduleEntryId: (await firstActivityScheduleEntry(this.activityId)).id,
-            },
-          })
-        })
-    } else {
-      return next()
-    }
+    return scheduleEntryRouteChange(this.activityId, to, from, next)
   },
   props: {
     camp: { type: Object, required: true },

From 2a965c4ca1a3d6f50d67dadf76da5f2d21f0a401 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 8 Feb 2025 20:29:45 +0100
Subject: [PATCH 11/18] Remove unnecessary optional chaining

---
 frontend/src/views/camp/activity/SideBarProgram.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/camp/activity/SideBarProgram.vue b/frontend/src/views/camp/activity/SideBarProgram.vue
index c34672eb86..f713839629 100644
--- a/frontend/src/views/camp/activity/SideBarProgram.vue
+++ b/frontend/src/views/camp/activity/SideBarProgram.vue
@@ -65,7 +65,7 @@ export default {
       }
     },
     period() {
-      return this.daySelection?.period()
+      return this.daySelection.period()
     },
     daySelection() {
       return this.selectedDay ?? this.day

From 482f75ebbf0fae1360bc4d8f3dc9c088a3d02146 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 12 Feb 2025 16:34:13 +0100
Subject: [PATCH 12/18] Fix endless loop upon delete

---
 .../activity/dialog/DialogActivityEdit.vue    | 32 +++++++++++++++----
 frontend/src/router.js                        | 31 +++++++++++++++++-
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/activity/dialog/DialogActivityEdit.vue b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
index affe8f087f..98cc459176 100644
--- a/frontend/src/components/activity/dialog/DialogActivityEdit.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
@@ -20,7 +20,7 @@
     <DialogActivityForm
       :activity="entityData"
       :current-schedule-entry="scheduleEntry"
-      :period="scheduleEntry.period()"
+      :period="period"
       :hide-location="hideHeaderFields"
     />
   </dialog-form>
@@ -30,6 +30,7 @@
 import DialogForm from '@/components/dialog/DialogForm.vue'
 import DialogBase from '@/components/dialog/DialogBase.vue'
 import DialogActivityForm from './DialogActivityForm.vue'
+import { firstActivityScheduleEntryRoute } from '@/router.js'
 
 export default {
   name: 'DialogActivityEdit',
@@ -52,6 +53,9 @@ export default {
     activity() {
       return this.scheduleEntry.activity()
     },
+    period() {
+      return this.scheduleEntry.period()
+    },
     scheduleEntries() {
       return this.activity.scheduleEntries()
     },
@@ -97,11 +101,27 @@ export default {
 
         // update existing
         if (entry.self) {
-          return this.api.patch(entry.self, {
-            period: entry.period()._meta.self,
-            start: entry.start,
-            end: entry.end,
-          })
+          return this.api
+            .patch(entry.self, {
+              period: entry.period()._meta.self,
+              start: entry.start,
+              end: entry.end,
+            })
+            .catch(async (e) => {
+              // entry was deleted in the meantime
+              if (e.response.status === 404) {
+                if (entry.self === this.scheduleEntry._meta.self) {
+                  // redirect to first entry to not break UI
+                  this.$router.push(await firstActivityScheduleEntryRoute(this.activity))
+                  return Promise.resolve()
+                } else {
+                  // remove self reference and show error
+                  entry.self = null
+                  return Promise.reject(e)
+                }
+              }
+              return Promise.reject(e)
+            })
         }
 
         // else: create new entry
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 0e12ab06ba..ef29febe52 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -872,7 +872,7 @@ export function periodRoute(period, routeName = 'camp/period/program', query = {
 }
 
 export function scheduleEntryRoute(scheduleEntry, query = {}) {
-  if (scheduleEntry._meta.loading || scheduleEntry.activity()._meta.loading) return {}
+  if (scheduleEntry?._meta.loading || scheduleEntry?.activity()._meta.loading) return {}
 
   const activity = scheduleEntry.activity()
   const camp = activity.camp()
@@ -892,6 +892,35 @@ export function scheduleEntryRoute(scheduleEntry, query = {}) {
   }
 }
 
+export async function firstActivityScheduleEntryRoute(activity, query = {}) {
+  if (typeof activity === 'string') {
+    activity = await apiStore.get().activities({ id: activity })._meta.load
+  }
+  const camp = activity.camp()
+  await apiStore.reload(activity.scheduleEntries())
+  const scheduleEntry = activity
+    .scheduleEntries()
+    .items.reduce(
+      (result, current) =>
+        result === null || new Date(result.start) > new Date(current.start)
+          ? current
+          : result,
+      null
+    )
+
+  return {
+    name: 'camp/activity',
+    params: {
+      campId: camp.id,
+      campShortTitle: slugify(campShortTitle(camp)),
+      scheduleEntryId: scheduleEntry.id,
+      activityId: activity.id,
+      activityName: slugify(activity.title),
+    },
+    query,
+  }
+}
+
 export function categoryRoute(camp, category, query = {}) {
   if (camp._meta.loading || category._meta.loading) return {}
   return {

From b977fd8b6c2a37de1de9a3e9e1531e6b212f2cf7 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Thu, 13 Feb 2025 11:42:32 +0100
Subject: [PATCH 13/18] Keep state in dialog clean

---
 .../activity/dialog/DialogActivityEdit.vue    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/activity/dialog/DialogActivityEdit.vue b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
index 98cc459176..ee86fbef7f 100644
--- a/frontend/src/components/activity/dialog/DialogActivityEdit.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
@@ -107,30 +107,36 @@ export default {
               start: entry.start,
               end: entry.end,
             })
+            .then((serverEntry) => {
+              entry.start = serverEntry.start
+              entry.end = serverEntry.end
+              entry.period = serverEntry.period
+            })
             .catch(async (e) => {
               // entry was deleted in the meantime
               if (e.response.status === 404) {
                 if (entry.self === this.scheduleEntry._meta.self) {
                   // redirect to first entry to not break UI
                   this.$router.push(await firstActivityScheduleEntryRoute(this.activity))
-                  return Promise.resolve()
-                } else {
-                  // remove self reference and show error
-                  entry.self = null
-                  return Promise.reject(e)
                 }
+                entry.deleted = true
+                return Promise.resolve()
               }
               return Promise.reject(e)
             })
         }
 
         // else: create new entry
-        return this.scheduleEntries.$post({
-          period: entry.period()._meta.self,
-          start: entry.start,
-          end: entry.end,
-          activity: this.activity._meta.self,
-        })
+        return this.scheduleEntries
+          .$post({
+            period: entry.period()._meta.self,
+            start: entry.start,
+            end: entry.end,
+            activity: this.activity._meta.self,
+          })
+          .then((data) => {
+            entry.self = data._meta.self
+          })
       })
 
       // patch activity entity

From 47a5de5397f737372484af8335ac4c833f6f1e67 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Thu, 13 Feb 2025 11:43:27 +0100
Subject: [PATCH 14/18] Align missing id of ScheduleEntry to SideBarProgram

---
 frontend/src/components/activity/ScheduleEntry.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index 7c0ddf11bf..d5335f6f1d 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -363,14 +363,10 @@ export default {
       return this.api.get().activities({ id: this.activityId })
     },
     scheduleEntry() {
-      try {
-        if (this.scheduleEntryId) {
-          return this.api.get().scheduleEntries({ id: this.scheduleEntryId })
-        } else {
-          return firstActivityScheduleEntry(this.activity)
-        }
-      } catch {
-        return firstActivityScheduleEntry(this.activity)
+      if (this.scheduleEntryId) {
+        return this.api.get().scheduleEntries({ id: this.scheduleEntryId })
+      } else {
+        return firstActivityScheduleEntry(this.activityId)
       }
     },
     camp() {

From 8d832785c7980fb41d03b4d3131d32d5b96b12f8 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Thu, 13 Feb 2025 12:15:51 +0100
Subject: [PATCH 15/18] Reuse firstActivityScheduleEntry

---
 frontend/src/components/program/ScheduleEntries.vue |  2 +-
 frontend/src/router.js                              | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/program/ScheduleEntries.vue b/frontend/src/components/program/ScheduleEntries.vue
index b4ddffea25..d8441adc63 100644
--- a/frontend/src/components/program/ScheduleEntries.vue
+++ b/frontend/src/components/program/ScheduleEntries.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import DialogActivityCreate from '@/components/program/DialogActivityCreate.vue'
+import DialogActivityCreate from './DialogActivityCreate.vue'
 
 export default {
   name: 'ScheduleEntries',
diff --git a/frontend/src/router.js b/frontend/src/router.js
index ef29febe52..01e01dec6b 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -898,15 +898,7 @@ export async function firstActivityScheduleEntryRoute(activity, query = {}) {
   }
   const camp = activity.camp()
   await apiStore.reload(activity.scheduleEntries())
-  const scheduleEntry = activity
-    .scheduleEntries()
-    .items.reduce(
-      (result, current) =>
-        result === null || new Date(result.start) > new Date(current.start)
-          ? current
-          : result,
-      null
-    )
+  const scheduleEntry = await firstActivityScheduleEntry(activity)
 
   return {
     name: 'camp/activity',

From fcb536f9e8044ae0fd4f1d8e5ebcd13a4eb8dfb3 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Thu, 13 Feb 2025 14:31:47 +0100
Subject: [PATCH 16/18] Use watch instead of computed

---
 .../src/components/activity/ScheduleEntry.vue | 23 ++++++++++++-------
 .../activity/dialog/DialogActivityEdit.vue    |  1 +
 .../scheduleEntryRouteChange.js               |  3 ++-
 frontend/src/router.js                        |  2 +-
 .../views/camp/activity/SideBarProgram.vue    | 21 ++++++++++++-----
 5 files changed, 34 insertions(+), 16 deletions(-)
 rename frontend/src/{mixins => helpers}/scheduleEntryRouteChange.js (94%)

diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index d5335f6f1d..7374601361 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -308,7 +308,7 @@ 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/activity/dialog/DialogActivityEdit.vue'
-import scheduleEntryRouteChange from '@/mixins/scheduleEntryRouteChange.js'
+import scheduleEntryRouteChange from '@/helpers/scheduleEntryRouteChange.js'
 
 export default {
   name: 'ScheduleEntry',
@@ -355,6 +355,7 @@ export default {
       layoutMode: false,
       editActivityTitle: false,
       categoryChangeState: null,
+      scheduleEntry: null,
       loading: true,
     }
   },
@@ -362,13 +363,6 @@ export default {
     activity() {
       return this.api.get().activities({ id: this.activityId })
     },
-    scheduleEntry() {
-      if (this.scheduleEntryId) {
-        return this.api.get().scheduleEntries({ id: this.scheduleEntryId })
-      } else {
-        return firstActivityScheduleEntry(this.activityId)
-      }
-    },
     camp() {
       return this.activity.camp()
     },
@@ -427,6 +421,19 @@ export default {
     },
   },
 
+  watch: {
+    scheduleEntryId: {
+      async handler(id) {
+        try {
+          this.scheduleEntry = this.api.get().scheduleEntries({ id })
+        } catch {
+          this.scheduleEntry = await firstActivityScheduleEntry(this.activityId)
+        }
+      },
+      immediate: true,
+    },
+  },
+
   // reload data every time user navigates to Activity view
   async mounted() {
     this.loading = true
diff --git a/frontend/src/components/activity/dialog/DialogActivityEdit.vue b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
index ee86fbef7f..4d959d5f62 100644
--- a/frontend/src/components/activity/dialog/DialogActivityEdit.vue
+++ b/frontend/src/components/activity/dialog/DialogActivityEdit.vue
@@ -158,6 +158,7 @@ export default {
     updatedSuccessful(data) {
       this.close()
       this.api.reload(this.activity)
+      this.api.reload(this.scheduleEntry.period().scheduleEntries())
       this.$emit('activity-updated', data)
     },
   },
diff --git a/frontend/src/mixins/scheduleEntryRouteChange.js b/frontend/src/helpers/scheduleEntryRouteChange.js
similarity index 94%
rename from frontend/src/mixins/scheduleEntryRouteChange.js
rename to frontend/src/helpers/scheduleEntryRouteChange.js
index baafd08701..ce34c6e4dd 100644
--- a/frontend/src/mixins/scheduleEntryRouteChange.js
+++ b/frontend/src/helpers/scheduleEntryRouteChange.js
@@ -14,7 +14,8 @@ export default async function scheduleEntryRouteChange(activity, to, from, next)
     return await apiStore
       .get()
       .scheduleEntries({ id: to.params.scheduleEntryId })
-      ._meta.load.then(() => next())
+      .$reload()
+      .then(() => next())
       .catch(async () => {
         return next({
           name: 'camp/activity',
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 01e01dec6b..0c50397c54 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -897,7 +897,7 @@ export async function firstActivityScheduleEntryRoute(activity, query = {}) {
     activity = await apiStore.get().activities({ id: activity })._meta.load
   }
   const camp = activity.camp()
-  await apiStore.reload(activity.scheduleEntries())
+  apiStore.reload(activity.scheduleEntries())
   const scheduleEntry = await firstActivityScheduleEntry(activity)
 
   return {
diff --git a/frontend/src/views/camp/activity/SideBarProgram.vue b/frontend/src/views/camp/activity/SideBarProgram.vue
index f713839629..de03c6ac20 100644
--- a/frontend/src/views/camp/activity/SideBarProgram.vue
+++ b/frontend/src/views/camp/activity/SideBarProgram.vue
@@ -38,7 +38,7 @@ import ScheduleEntries from '@/components/program/ScheduleEntries.vue'
 import { HTML5_FMT } from '@/common/helpers/dateFormat.js'
 import DaySwitcher from '@/components/activity/DaySwitcher.vue'
 import { firstActivityScheduleEntry } from '@/router.js'
-import scheduleEntryRouteChange from '@/mixins/scheduleEntryRouteChange.js'
+import scheduleEntryRouteChange from '@/helpers/scheduleEntryRouteChange.js'
 
 export default {
   name: 'SideBarProgram',
@@ -54,15 +54,12 @@ export default {
   data() {
     return {
       selectedDay: null,
+      scheduleEntry: null,
     }
   },
   computed: {
     day() {
-      if (this.scheduleEntryId) {
-        return this.api.get().scheduleEntries({ id: this.scheduleEntryId }).day()
-      } else {
-        return firstActivityScheduleEntry(this.activityId).day()
-      }
+      return this.scheduleEntry.day()
     },
     period() {
       return this.daySelection.period()
@@ -74,6 +71,18 @@ export default {
       return this.$date.utc(this.daySelection.start).format(HTML5_FMT.DATE)
     },
   },
+  watch: {
+    scheduleEntryId: {
+      async handler(id) {
+        try {
+          this.scheduleEntry = this.api.get().scheduleEntries({ id })
+        } catch {
+          this.scheduleEntry = await firstActivityScheduleEntry(this.activityId)
+        }
+      },
+      immediate: true,
+    },
+  },
 }
 </script>
 

From 8bc9fd2ca1b576279f68b6dfbb1bc2caa60009de Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 23 Feb 2025 11:50:01 +0100
Subject: [PATCH 17/18] Prevent error on activity change and
 scheduleEntry/activity mismatch

---
 .../src/helpers/scheduleEntryRouteChange.js   |  7 ++--
 frontend/src/router.js                        | 33 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/frontend/src/helpers/scheduleEntryRouteChange.js b/frontend/src/helpers/scheduleEntryRouteChange.js
index ce34c6e4dd..8c788bd839 100644
--- a/frontend/src/helpers/scheduleEntryRouteChange.js
+++ b/frontend/src/helpers/scheduleEntryRouteChange.js
@@ -10,7 +10,10 @@ import { apiStore } from '@/plugins/store'
  * @return {Promise<*>}
  */
 export default async function scheduleEntryRouteChange(activity, to, from, next) {
-  if (to.params.scheduleEntryId !== from.params.scheduleEntryId) {
+  if (
+    to.params.scheduleEntryId !== from.params.scheduleEntryId ||
+    to.params.activityId !== from.params.activityId
+  ) {
     return await apiStore
       .get()
       .scheduleEntries({ id: to.params.scheduleEntryId })
@@ -21,7 +24,7 @@ export default async function scheduleEntryRouteChange(activity, to, from, next)
           name: 'camp/activity',
           params: {
             ...to.params,
-            scheduleEntryId: (await firstActivityScheduleEntry(activity)).id,
+            scheduleEntryId: (await firstActivityScheduleEntry(to.params.activityId)).id,
           },
         })
       })
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 0c50397c54..5cb1871a6d 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -613,24 +613,22 @@ async function requireActivityScheduleEntry(to, from, next) {
   await apiStore
     .get()
     .activities({ id: to.params.activityId })
-    ._meta.load.then((activity) => {
+    .$reload()
+    .then(async (activity) => {
       // activity exists
-      if (to.params.scheduleEntryId) {
-        apiStore
-          .get()
-          .scheduleEntries({ id: to.params.scheduleEntryId })
-          ._meta.load.then(() => {
-            // activity and scheduleEntry exist
-            next()
-          })
-          .catch(async () => {
-            // scheduleEntry is not found, use first activity scheduleEntry
-            const scheduleEntry = await firstActivityScheduleEntry(activity)
-            to.params.scheduleEntryId = scheduleEntry.id
-            next(to)
-          })
-      } else {
+      const scheduleEntry = to.params.scheduleEntryId
+        ? activity
+            .scheduleEntries()
+            .items.find((entry) => entry.id === to.params.scheduleEntryId)
+        : null
+
+      if (scheduleEntry) {
+        // activity and scheduleEntry exist
         next()
+      } else {
+        // scheduleEntry is not found, use first activity scheduleEntry
+        to.params.scheduleEntryId = (await firstActivityScheduleEntry(activity)).id
+        next(to)
       }
     })
     .catch(() => {
@@ -640,8 +638,7 @@ async function requireActivityScheduleEntry(to, from, next) {
           .get()
           .scheduleEntries({ id: to.params.scheduleEntryId })
           ._meta.load.then(async (scheduleEntry) => {
-            const activity = await scheduleEntry.activity()._meta.load
-            to.params.activityId = activity.id
+            to.params.activityId = scheduleEntry.activity().id
             next(to)
           })
           .catch(async () => {

From 203b7f40f3a78778e21c1dc3b2b2b20d497f9ee1 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 23 Feb 2025 11:55:27 +0100
Subject: [PATCH 18/18] Show edit button iff scheduleEntry loaded

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

diff --git a/frontend/src/components/activity/ScheduleEntry.vue b/frontend/src/components/activity/ScheduleEntry.vue
index 7374601361..f0093491cc 100644
--- a/frontend/src/components/activity/ScheduleEntry.vue
+++ b/frontend/src/components/activity/ScheduleEntry.vue
@@ -230,7 +230,7 @@ Displays a single scheduleEntry
               </tbody>
             </table>
             <DialogActivityEdit
-              v-if="activity && isContributor"
+              v-if="scheduleEntry && isContributor"
               :schedule-entry="scheduleEntry"
               hide-header-fields
               @activity-updated="activity.$reload()"