devel to staging

frontend/eslint.config.mjs

@@ -81,7 +81,7 @@ export default [
         'error',
         {
           ignoreKeysRegex:
-            '^(global|entity|contentNode\\.[a-z][a-zA-Z]+|print\\.(global|activity|cover|picasso|program|config|summary|toc))\\..+',
+            '^(global|entity|contentNode\\.[a-z][a-zA-Z]+|print\\.(global|activity|cover|picasso|program|config|summary|toc|activityList))\\..+',
           translationKeyPropRegex: '[a-zA-Z0-9]-i18n-key$',
         },
       ],

frontend/src/components/activity/content/Checklist.vue

@@ -2,9 +2,12 @@
   <ContentNodeCard class="ec-checklist-node" v-bind="$props">
     <template #outer>
       <DetailPane
+        v-if="!disabled && !layoutMode"
         v-model="showDialog"
         icon="mdi-clipboard-list-outline"
         :title="$tc('components.activity.content.checklist.title')"
+        :cancel-action="close"
+        :cancel-visible="false"
       >
         <template #activator="{ on }">
           <button
@@ -19,36 +22,10 @@
                 {{ $tc('global.button.edit') }}
               </v-list-item-title>
             </v-list-item>
-            <div
-              v-for="{ checklist, items } in activeChecklists"
-              :key="checklist._meta.self"
-              class="w-100"
-            >
-              <h3 class="px-4">{{ checklist.name }}</h3>
-              <v-list-item
-                v-for="{ item, parents } in items"
-                :key="item._meta.self"
-                class="min-h-0"
-                :disabled="layoutMode"
-              >
-                <v-list-item-content class="py-2">
-                  <v-list-item-subtitle v-if="parents.length > 0" class="d-flex gap-1">
-                    <template v-for="(parent, index) in parents">
-                      <span v-if="index" :key="parent._meta.self + 'divider'">/</span>
-                      <span
-                        :key="parent._meta.self"
-                        class="e-checklist-item-parent-name"
-                        >{{ parent.text }}</span
-                      >
-                    </template>
-                  </v-list-item-subtitle>
-                  <v-list-item-title>
-                    {{ parents.map(({ position }) => position + 1 + '.').join('')
-                    }}{{ item.position + 1 }}. {{ item.text }}
-                  </v-list-item-title>
-                </v-list-item-content>
-              </v-list-item>
-            </div>
+            <ChecklistItems
+              :active-checklists="activeChecklists"
+              :layout-mode="layoutMode"
+            />
           </button>
         </template>
         <div class="ma-n4">
@@ -88,6 +65,12 @@
           </v-expansion-panels>
         </div>
       </DetailPane>
+      <ChecklistItems
+        v-else
+        class="mb-1"
+        :active-checklists="activeChecklists"
+        :layout-mode="layoutMode"
+      />
     </template>
   </ContentNodeCard>
 </template>
@@ -97,13 +80,14 @@ import ContentNodeCard from '@/components/activity/content/layout/ContentNodeCar
 import { contentNodeMixin } from '@/mixins/contentNodeMixin.js'
 import DetailPane from '@/components/generic/DetailPane.vue'
 import ChecklistItem from './checklist/ChecklistItem.vue'
+import ChecklistItems from './checklist/ChecklistItems.vue'
 import { serverErrorToString } from '@/helpers/serverError.js'
 import { debounce, isEqual, sortBy, uniq } from 'lodash'
 import { computed } from 'vue'
 
 export default {
   name: 'Checklist',
-  components: { DetailPane, ContentNodeCard, ChecklistItem },
+  components: { ChecklistItems, DetailPane, ContentNodeCard, ChecklistItem },
   mixins: [contentNodeMixin],
   provide() {
     return {
@@ -257,14 +241,11 @@ export default {
       this.uncheckedItems = []
       this.dirty = false
     },
+    close() {
+      this.showDialog = false
+    },
   },
 }
 </script>
 
-<style scoped>
-.e-checklist-item-parent-name {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-</style>
+<style scoped></style>

frontend/src/components/activity/content/checklist/ChecklistItems.vue

@@ -0,0 +1,55 @@
+<template>
+  <div class="w-100">
+    <template v-for="{ checklist, items } in activeChecklists">
+      <h3 :key="checklist._meta.self" class="px-4">{{ checklist.name }}</h3>
+      <v-list-item
+        v-for="{ item, parents } in items"
+        :key="item._meta.self"
+        class="min-h-0"
+        :disabled="layoutMode"
+      >
+        <v-list-item-content class="py-2">
+          <v-list-item-subtitle v-if="parents.length > 0" class="d-flex gap-1">
+            <template v-for="(parent, index) in parents">
+              <span v-if="index" :key="parent._meta.self + 'divider'">/</span>
+              <span :key="parent._meta.self" class="e-checklist-item-parent-name">{{
+                parent.text
+              }}</span>
+            </template>
+          </v-list-item-subtitle>
+          <v-list-item-title class="ec-checklist--item-title">
+            {{ parents.map(({ position }) => position + 1 + '.').join('')
+            }}{{ item.position + 1 }}. {{ item.text }}
+          </v-list-item-title>
+        </v-list-item-content>
+      </v-list-item>
+    </template>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ChecklistItems',
+  props: {
+    activeChecklists: {
+      type: Array,
+      required: true,
+    },
+    layoutMode: {
+      type: Boolean,
+      default: false,
+    },
+  },
+}
+</script>
+<style scoped>
+.e-checklist-item-parent-name {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.ec-checklist--item-title {
+  white-space: normal;
+  line-height: 1.33;
+}
+</style>

frontend/src/components/campAdmin/DialogMaterialListEdit.vue

@@ -16,6 +16,7 @@
       <PromptEntityDelete
         :entity="entityUri"
         :warning-text-entity="materialList.name"
+        :error-handler="deleteErrorHandler"
         position="top"
         align="left"
       />
@@ -50,6 +51,14 @@ export default {
       }
     },
   },
+  methods: {
+    deleteErrorHandler(e) {
+      if (e?.response?.status === 422 /* Validation Error */) {
+        return this.$tc('components.campAdmin.dialogMaterialListEdit.deleteError')
+      }
+      return null
+    },
+  },
 }
 </script>
 

frontend/src/components/checklist/SortableChecklist.vue

@@ -180,11 +180,15 @@ export default {
   padding-bottom: 6px;
   display: grid;
 }
+.e-checklist-dragarea--inner {
+  min-width: 0;
+}
 .e-checklist-dragarea.dragging:deep(.e-checklist-dragarea) {
   background: rgba(0, 130, 236, 0.15);
   padding-bottom: 0;
 }
 .e-sortable-checklist-item__add {
+  min-width: 0;
   padding-top: 2px;
   padding-bottom: 2px;
 }

frontend/src/components/dialog/DialogBottomSheet.vue

@@ -138,4 +138,12 @@ export default {
 .error-area:empty {
   display: none;
 }
+:deep(.ec-dialog-form.v-bottom-sheet.v-dialog) {
+  overflow-y: auto;
+}
+.ec-dialog-toolbar {
+  position: sticky;
+  z-index: 10;
+  top: 0;
+}
 </style>

frontend/src/locales/de.json

@@ -93,10 +93,6 @@
         "createMaterialList": "Materialliste erstellen",
         "title": "Materiallisten"
       },
-      "campMaterialListsItem": {
-        "deleteError": "Materialliste konnte nicht gelöscht werden. Überprüfe vor dem Löschen, dass die Liste leer ist.",
-        "deleteWarning": "Möchtest du diese Materialliste wirklich löschen?"
-      },
       "campPeriods": {
         "createPeriod": "Lagerabschnitt erstellen",
         "title": "Lagerabschnitt | Lagerabschnitte"
@@ -135,7 +131,8 @@
         "title": "Materialliste erstellen"
       },
       "dialogMaterialListEdit": {
-        "title": "Materialliste bearbeiten"
+        "title": "Materialliste bearbeiten",
+        "deleteError": "Materialliste konnte nicht gelöscht werden. Überprüfe vor dem Löschen, dass die Liste leer ist."
       },
       "dialogPeriodCreate": {
         "title": "Lagerabschnitt erstellen"

frontend/src/locales/en.json

@@ -93,10 +93,6 @@
         "createMaterialList": "Create material list",
         "title": "Material lists"
       },
-      "campMaterialListsItem": {
-        "deleteError": "Could not delete the material list. Check if the list is empty before deleting it.",
-        "deleteWarning": "Do you really want to delete this material list?"
-      },
       "campPeriods": {
         "createPeriod": "Create period",
         "title": "Period | Periods"
@@ -135,7 +131,8 @@
         "title": "Create material list"
       },
       "dialogMaterialListEdit": {
-        "title": "Edit material list"
+        "title": "Edit material list",
+        "deleteError": "Could not delete the material list. Check if the list is empty before deleting it."
       },
       "dialogPeriodCreate": {
         "title": "Create period"

frontend/src/locales/fr.json

@@ -89,10 +89,6 @@
         "createMaterialList": "Créer une liste de matériel",
         "title": "Listes de matériel"
       },
-      "campMaterialListsItem": {
-        "deleteError": "Impossible de supprimer la liste de matériel. Vérifie que la liste soit vide avant de la supprimer.",
-        "deleteWarning": "Veux-tu vraiment supprimer cette liste de matériel ?"
-      },
       "campPeriods": {
         "createPeriod": "Créer une période",
         "title": "Période | Périodes"
@@ -124,7 +120,8 @@
         "title": "Créer une liste de matériel"
       },
       "dialogMaterialListEdit": {
-        "title": "Modifier la liste de matériel"
+        "title": "Modifier la liste de matériel",
+        "deleteError": "Impossible de supprimer la liste de matériel. Vérifie que la liste soit vide avant de la supprimer."
       },
       "dialogPeriodCreate": {
         "title": "Créer une période"

frontend/src/locales/it.json

@@ -81,10 +81,6 @@
         "createMaterialList": "Crea l'elenco dei materiali",
         "title": "Elenchi di materiali"
       },
-      "campMaterialListsItem": {
-        "deleteError": "Impossibile eliminare l'elenco dei materiali. Controlla che l'elenco sia vuoto prima di eliminarlo.",
-        "deleteWarning": "Vuoi davvero cancellare questo elenco di materiali?"
-      },
       "campPeriods": {
         "createPeriod": "Creare il periodo",
         "title": "Periodo | Periodi"
@@ -116,7 +112,8 @@
         "title": "Crea l'elenco dei materiali"
       },
       "dialogMaterialListEdit": {
-        "title": "Modifica elenco materiali"
+        "title": "Modifica elenco materiali",
+        "deleteError": "Impossibile eliminare l'elenco dei materiali. Controlla che l'elenco sia vuoto prima di eliminarlo."
       },
       "dialogPeriodCreate": {
         "title": "Creare il periodo"

frontend/src/locales/rm.json

@@ -74,10 +74,6 @@
         "createMaterialList": "Crear ina glista da material",
         "title": "Glistas da material"
       },
-      "campMaterialListsItem": {
-        "deleteError": "Impussibel da stizzar la glista da material. Verifitgescha che la glista è vida avant che stizzar.",
-        "deleteWarning": "Vuls ti propi stizzar questa glista da material?"
-      },
       "campPeriods": {
         "createPeriod": "Crear ina part dal champ",
         "title": "Part dal champ | Parts dal champ"
@@ -109,7 +105,8 @@
         "title": "Crear ina glista da material"
       },
       "dialogMaterialListEdit": {
-        "title": "Modifitgar la glista da material"
+        "title": "Modifitgar la glista da material",
+        "deleteError": "Impussibel da stizzar la glista da material. Verifitgescha che la glista è vida avant che stizzar."
       },
       "dialogPeriodCreate": {
         "title": "Craer ina part dal champ"

frontend/src/views/auth/Register.vue

@@ -2,7 +2,7 @@
   <auth-container>
     <h1 class="display-1 text-center">{{ $tc('views.auth.register.title') }}</h1>
     <validation-observer v-slot="{ handleSubmit }">
-      <e-form name="user">
+      <e-form name="profile">
         <v-form @submit.prevent="handleSubmit(register)">
           <e-text-field
             v-model="firstname"

frontend/src/views/auth/ResendActivation.vue

@@ -18,7 +18,7 @@
     >
       <e-text-field
         v-model="email"
-        :label="$tc('entity.user.fields.email')"
+        :label="$tc('entity.profile.fields.email')"
         name="email"
         vee-rules="email"
         append-icon="mdi-at"

frontend/src/views/auth/ResetPassword.vue

@@ -21,7 +21,7 @@
     </v-alert>
 
     <validation-observer v-slot="{ handleSubmit }">
-      <e-form name="user">
+      <e-form name="profile">
         <v-form
           v-if="status == 'loaded' || status == 'reseting'"
           @submit.prevent="handleSubmit(resetPassword)"

frontend/src/views/auth/ResetPasswordRequest.vue

@@ -18,7 +18,7 @@
     >
       <e-text-field
         v-model="email"
-        :label="$tc('entity.user.fields.email')"
+        :label="$tc('entity.profile.fields.email')"
         name="email"
         vee-rules="email"
         append-icon="mdi-at"

pdf/eslint.config.mjs

@@ -77,7 +77,7 @@ export default [
         'error',
         {
           ignoreKeysRegex:
-            '^(global|entity|contentNode\\.[a-z][a-zA-Z]+|print\\.(global|activity|cover|picasso|program|config|summary|toc))\\..+',
+            '^(global|entity|contentNode\\.[a-z][a-zA-Z]+|print\\.(global|activity|cover|picasso|program|config|summary|toc|activityList))\\..+',
           translationKeyPropRegex: '[a-zA-Z0-9]-i18n-key$',
         },
       ],

pdf/src/CampPrint.vue

@@ -27,6 +27,7 @@ import Story from '@/campPrint/summary/Story.vue'
 import SafetyConsiderations from '@/campPrint/summary/SafetyConsiderations.vue'
 import Program from '@/campPrint/program/Program.vue'
 import Activity from '@/campPrint/activity/Activity.vue'
+import ActivityList from '@/campPrint/activityList/ActivityList.vue'
 import { wordHyphenation } from '@react-pdf/textkit'
 
 const originalHyphenationCallback = wordHyphenation()
@@ -47,6 +48,7 @@ export default {
         Activity,
         Story,
         SafetyConsiderations,
+        ActivityList,
       }
     },
   },