diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue index 3b33d5036..582a8bbad 100644 --- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue +++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue @@ -80,6 +80,8 @@ const exclusionGeoCreate = async () => { }; const exclusionCreate = async () => { + const defaultMonths = await axios.get('ZoneConfigs'); + const nMonths = defaultMonths.data[0].defaultMonths; const body = { dated: dated.value, }; @@ -87,7 +89,7 @@ const exclusionCreate = async () => { for (const id of zoneIds) { const url = `Zones/${id}/exclusions`; let today = moment(dated.value); - let lastDay = today.clone().add(4, 'months').endOf('month'); + let lastDay = today.clone().add(nMonths, 'months').endOf('month'); const { data } = await axios.get(`Zones/getEventsFiltered`, { params: { diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue index bb9f57a18..8b02c2d84 100644 --- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue +++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue @@ -67,6 +67,9 @@ const inclusionType = computed({ const arrayData = useArrayData('ZoneEvents'); const createEvent = async () => { + const defaultMonths = await axios.get('ZoneConfigs'); + const nMonths = defaultMonths.data[0].defaultMonths; + eventInclusionFormData.value.weekDays = weekdayStore.toSet( eventInclusionFormData.value.wdays, eventInclusionFormData.value.wdays, @@ -85,7 +88,7 @@ const createEvent = async () => { let today = eventInclusionFormData.value.dated ? moment(eventInclusionFormData.value.dated) : moment(dated.value); - let lastDay = today.clone().add(4, 'months').endOf('month'); + let lastDay = today.clone().add(nMonths, 'months').endOf('month'); const { data } = await axios.get(`Zones/getEventsFiltered`, { params: {