verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 82 Releases Wiki Activity

Merge pull request 'Hotfix[ZoneEventInclusion]: Fixed event inclusion duplicateKey' (!1710) from Hotfix-ZoneInclusionDeleteEvent into master
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1710
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Jon Elias 2025-04-15 07:12:52 +00:00
parent d171c7dd94 dcf6d3cad4
commit e6e43ccfc4
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/pages/Zone/Card/ZoneEventInclusionForm.vue
View File

@ -56,6 +56,7 @@ const isNew = computed(() => props.isNewMode);
const eventInclusionFormData = ref({ wdays: [] }); const eventInclusionFormData = ref({ wdays: [] });
const dated = ref(props.date || Date.vnNew()); const dated = ref(props.date || Date.vnNew());
const _inclusionType = ref('indefinitely'); const _inclusionType = ref('indefinitely');
const hasDeletedEvent = ref(false);
const inclusionType = computed({ const inclusionType = computed({
get: () => _inclusionType.value, get: () => _inclusionType.value,
set: (val) => { set: (val) => {
@ -84,7 +85,7 @@ const createEvent = async () => {
} }
const zoneIds = props.zoneIds?.length ? props.zoneIds : [route.params.id]; const zoneIds = props.zoneIds?.length ? props.zoneIds : [route.params.id];
for (const id of zoneIds) { for (const zoneId of zoneIds) {
let today = eventInclusionFormData.value.dated let today = eventInclusionFormData.value.dated
? moment(eventInclusionFormData.value.dated) ? moment(eventInclusionFormData.value.dated)
: moment(dated.value); : moment(dated.value);
@ -92,7 +93,7 @@ const createEvent = async () => {
const { data } = await axios.get(`Zones/getEventsFiltered`, { const { data } = await axios.get(`Zones/getEventsFiltered`, {
params: { params: {
zoneFk: id, zoneFk: zoneId,
started: today, started: today,
ended: lastDay, ended: lastDay,
}, },
@ -106,28 +107,19 @@ const createEvent = async () => {
await axios.delete( await axios.delete(
`Zones/${existsExclusion?.zoneFk}/exclusions/${existsExclusion?.id}`, `Zones/${existsExclusion?.zoneFk}/exclusions/${existsExclusion?.id}`,
); );
await refetchEvents();
hasDeletedEvent.value = true;
} }
const {
dated: formDated,
started,
ended,
type,
weekDays,
wdays,
} = eventInclusionFormData.value;
const payload = { delete eventInclusionFormData.value.id;
dated: formDated, if (isNew.value || hasDeletedEvent.value)
started, await axios.post(`Zones/${zoneId}/events`, eventInclusionFormData.value);
ended, else
type, await axios.put(
weekDays, `Zones/${zoneId}/events/${props.event?.id}`,
wdays, eventInclusionFormData.value,
}; );
hasDeletedEvent.value = false;
if (isNew.value || props.eventType === 'exclusion')
await axios.post(`Zones/${id}/events`, payload);
else await axios.put(`Zones/${id}/events/${props.event?.id}`, payload);
} }
quasar.notify({ quasar.notify({
message: t('globals.dataSaved'), message: t('globals.dataSaved'),