From dd5356f45cb32f8727e3426629f4c63e00a5965a Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 7 Mar 2025 13:13:18 +0100 Subject: [PATCH] fix: refs #7869 fixed dated when adding an indefinetely or range event --- src/pages/Zone/Card/ZoneEventInclusionForm.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue index bb329b0a3..bb9f57a18 100644 --- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue +++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue @@ -54,7 +54,7 @@ const { openConfirmationModal } = useVnConfirm(); const quasar = useQuasar(); const isNew = computed(() => props.isNewMode); const eventInclusionFormData = ref({ wdays: [] }); - +const dated = ref(props.date || Date.vnNew()); const _inclusionType = ref('indefinitely'); const inclusionType = computed({ get: () => _inclusionType.value, @@ -82,7 +82,9 @@ const createEvent = async () => { const zoneIds = props.zoneIds?.length ? props.zoneIds : [route.params.id]; for (const id of zoneIds) { - let today = moment(eventInclusionFormData.value.dated); + let today = eventInclusionFormData.value.dated + ? moment(eventInclusionFormData.value.dated) + : moment(dated.value); let lastDay = today.clone().add(4, 'months').endOf('month'); const { data } = await axios.get(`Zones/getEventsFiltered`, { @@ -136,9 +138,11 @@ const refetchEvents = async () => { onMounted(() => { if (props.event) { + dated.value = props.event?.dated; eventInclusionFormData.value = { ...props.event }; inclusionType.value = props.event?.type || 'day'; } else if (props.date) { + dated.value = props.date; eventInclusionFormData.value.dated = props.date; inclusionType.value = 'day'; } else inclusionType.value = 'indefinitely';