From 84845b795837895f72a98ad179062eae3baf19e9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 21 May 2024 09:50:36 -0300
Subject: [PATCH 01/24] WIP

---
 src/components/common/VnCard.vue          |   4 +
 src/components/ui/VnSearchbar.vue         |  14 +-
 src/pages/Zone/Card/ZoneCalendar.vue      | 256 ++++++++++++++++++++++
 src/pages/Zone/Card/ZoneCalendarPanel.vue | 149 +++++++++++++
 src/pages/Zone/Card/ZoneCard.vue          |  30 +--
 src/pages/Zone/locale/en.yml              |   1 +
 src/pages/Zone/locale/es.yml              |   1 +
 src/router/modules/zone.js                |  17 +-
 8 files changed, 449 insertions(+), 23 deletions(-)
 create mode 100644 src/pages/Zone/Card/ZoneCalendarPanel.vue

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 58cb12708..e836badec 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -20,6 +20,8 @@ const props = defineProps({
     searchUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
+    searchCustomRouteRedirect: { type: String, default: undefined },
+    searchRedirect: { type: Boolean, default: false },
 });
 
 const stateStore = useStateStore();
@@ -62,6 +64,8 @@ watchEffect(() => {
                     :url="props.searchUrl"
                     :label="props.searchbarLabel"
                     :info="props.searchbarInfo"
+                    :custom-route-redirect-name="searchCustomRouteRedirect"
+                    :redirect="searchRedirect"
                 />
             </slot>
         </Teleport>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 38dcf97d1..e5b2f02d2 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -67,11 +67,19 @@ const props = defineProps({
     },
 });
 
-const arrayData = useArrayData(props.dataKey, { ...props });
-const { store } = arrayData;
+let arrayData = useArrayData(props.dataKey, { ...props });
+let store = arrayData.store;
 const searchText = ref('');
 const { navigate } = useRedirect();
 
+watch(
+    () => props.dataKey,
+    (val) => {
+        arrayData = useArrayData(val, { ...props });
+        store = arrayData.store;
+    }
+);
+
 onMounted(() => {
     const params = store.userParams;
     if (params && params.search) {
diff --git a/src/pages/Zone/Card/ZoneCalendar.vue b/src/pages/Zone/Card/ZoneCalendar.vue
index e69de29bb..00484712f 100644
--- a/src/pages/Zone/Card/ZoneCalendar.vue
+++ b/src/pages/Zone/Card/ZoneCalendar.vue
@@ -0,0 +1,256 @@
+<script setup>
+import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import ZoneDeliveryCalendar from '../ZoneDeliveryCalendar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+const weekdayStore = useWeekdayStore();
+
+const nMonths = ref(4);
+const _date = ref(Date.vnNew());
+const _data = ref(null);
+const firstDay = ref(null);
+const lastDay = ref(null);
+const months = ref([]);
+const days = ref({});
+const exclusions = ref({});
+const geoExclusions = ref({});
+const events = ref([]);
+const arrayData = useArrayData('ZoneDeliveryDays', {
+    url: 'Zones/getEvents',
+});
+const { store } = arrayData;
+
+const refreshEvents = () => {
+    days.value = {};
+    if (!data.value) return;
+
+    let day = new Date(firstDay.value.getTime());
+
+    while (day <= lastDay.value) {
+        let stamp = day.getTime();
+        let wday = day.getDay();
+        let dayEvents = [];
+        let _exclusions = exclusions.value[stamp] || [];
+
+        if (events.value) {
+            for (let event of events.value) {
+                let match;
+                switch (event.type) {
+                    case 'day':
+                        match = event.dated == stamp;
+                        break;
+                    default:
+                        match =
+                            event.wdays[wday] &&
+                            (!event.started || stamp >= event.started) &&
+                            (!event.ended || stamp <= event.ended);
+                        break;
+                }
+                if (match && !_exclusions.find((e) => e.zoneFk == event.zoneFk)) {
+                    dayEvents.push(event);
+                }
+            }
+        }
+        if (dayEvents.length) days.value[stamp] = dayEvents;
+
+        day.setDate(day.getDate() + 1);
+    }
+};
+
+const date = computed({
+    get: () => _date.value,
+    set: (value) => {
+        _date.value = value;
+        let stamp = value.getTime();
+
+        firstDay.value = new Date(stamp);
+        firstDay.value.setDate(1);
+
+        lastDay.value = new Date(stamp);
+        lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
+        lastDay.value.setDate(0);
+
+        months.value = [];
+        for (let i = 0; i < nMonths.value; i++) {
+            let monthDate = new Date(stamp);
+            monthDate.setMonth(value.getMonth() + i);
+            months.value.push(monthDate);
+        }
+        refreshEvents();
+    },
+});
+
+const data = computed({
+    get: () => {
+        return _data.value;
+    },
+    set: (value) => {
+        _data.value = value;
+
+        value = value || {};
+
+        events.value = value.events;
+        function toStamp(date) {
+            return date && new Date(date).setHours(0, 0, 0, 0);
+        }
+
+        exclusions.value = {};
+        let _exclusions = value.exclusions;
+
+        if (_exclusions) {
+            for (let exclusion of _exclusions) {
+                let stamp = toStamp(exclusion.dated);
+                if (!exclusions[stamp]) exclusions.value[stamp] = [];
+                exclusions.value[stamp].push(exclusion);
+            }
+        }
+
+        geoExclusions.value = {};
+        let _geoExclusions = value.geoExclusions;
+
+        if (_geoExclusions) {
+            for (let geoExclusion of _geoExclusions) {
+                let stamp = toStamp(geoExclusion.dated);
+                if (!geoExclusions[stamp]) geoExclusions.value[stamp] = [];
+                geoExclusions.value[stamp].push(geoExclusion);
+            }
+        }
+
+        let _events = value.events;
+        if (_events) {
+            for (let event of _events) {
+                event.dated = toStamp(event.dated);
+                event.ended = toStamp(event.ended);
+                event.started = toStamp(event.started);
+                event.wdays = weekdayStore.fromSet(event.weekDays || '');
+            }
+        }
+
+        refreshEvents();
+    },
+});
+
+watch(
+    () => store.data,
+    (value) => {
+        data.value = value;
+    },
+    { immediate: true }
+);
+
+const getMonthNameAndYear = (date) => {
+    const monthName = weekdayStore.getLocaleMonths[date.getMonth()].locale;
+    const year = date.getFullYear();
+    return `${monthName} ${year}`;
+};
+
+const headerTitle = computed(() => {
+    if (!months.value?.length) return;
+
+    const firstMonth = getMonthNameAndYear(months.value[0]);
+    const lastMonth = getMonthNameAndYear(months.value[months.value.length - 1]);
+
+    return `${firstMonth} - ${lastMonth}`;
+});
+
+const step = (direction) => {
+    const _date = new Date(date.value);
+    _date.setMonth(_date.getMonth() + nMonths.value * direction);
+    date.value = _date;
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    let initialDate = Date.vnNew();
+    initialDate.setDate(1);
+    initialDate.setHours(0, 0, 0, 0);
+    date.value = initialDate;
+    weekdayStore.initStore();
+});
+
+onUnmounted(() => arrayData.destroy());
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <!-- <ZoneCalendarPanel /> -->
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="q-pa-md flex justify-center">
+        <QCard style="height: max-content">
+            <div class="calendars-header">
+                <QBtn
+                    icon="arrow_left"
+                    size="sm"
+                    flat
+                    class="full-height"
+                    @click="step(-1)"
+                />
+                <span>{{ headerTitle }}</span>
+                <QBtn
+                    icon="arrow_right"
+                    size="sm"
+                    flat
+                    class="full-height"
+                    @click="step(1)"
+                />
+            </div>
+            <div class="calendars-container">
+                <ZoneDeliveryCalendar
+                    v-for="(month, index) in months"
+                    :key="index"
+                    :month="month.getMonth() + 1"
+                    :year="month.getFullYear()"
+                    :month-date="month"
+                    :geo-exclusions="geoExclusions"
+                    :exclusions="exclusions"
+                    :days-map="days"
+                />
+            </div>
+        </QCard>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.calendars-header {
+    height: 45px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: $primary;
+    font-weight: bold;
+    font-size: 16px;
+}
+
+.calendars-container {
+    max-width: 800px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+}
+</style>
diff --git a/src/pages/Zone/Card/ZoneCalendarPanel.vue b/src/pages/Zone/Card/ZoneCalendarPanel.vue
new file mode 100644
index 000000000..c754d484f
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneCalendarPanel.vue
@@ -0,0 +1,149 @@
+<script setup>
+import { onMounted, ref, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { watch } from 'vue';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const deliveryMethodFk = ref(null);
+const deliveryMethods = ref([]);
+const formData = reactive({});
+
+const arrayData = useArrayData('ZoneDeliveryDays', {
+    url: 'Zones/getEvents',
+});
+
+const fetchDeliveryMethods = async (filter) => {
+    try {
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get('DeliveryMethods', { params });
+        return data.map((deliveryMethod) => deliveryMethod.id);
+    } catch (err) {
+        console.error('Error fetching delivery methods: ', err);
+    }
+};
+
+watch(
+    () => deliveryMethodFk.value,
+    async (val) => {
+        let filter;
+        if (val === 'pickUp') filter = { where: { code: 'PICKUP' } };
+        else filter = { where: { code: { inq: ['DELIVERY', 'AGENCY'] } } };
+
+        deliveryMethods.value = await fetchDeliveryMethods(filter);
+    },
+    { immediate: true }
+);
+
+const fetchData = async (params) => {
+    try {
+        const { data } = params
+            ? await arrayData.applyFilter({
+                  params,
+              })
+            : await arrayData.fetch({ append: false });
+        if (!data.events || !data.events.length)
+            notify(t('deliveryPanel.noEventsWarning'), 'warning');
+    } catch (err) {
+        console.error('Error fetching events: ', err);
+    }
+};
+
+const onSubmit = async () => {
+    const params = { deliveryMethodFk: deliveryMethodFk.value, ...formData };
+    await fetchData(params);
+};
+
+onMounted(async () => {
+    deliveryMethodFk.value = 'delivery';
+    formData.geoFk = arrayData.store?.userParams?.geoFk;
+    formData.agencyModeFk = arrayData.store?.userParams?.agencyModeFk;
+    if (formData.geoFk || formData.agencyModeFk) await fetchData();
+});
+</script>
+
+<template>
+    <QForm @submit="onSubmit()" class="q-pa-md">
+        <div class="column q-gutter-y-sm">
+            <QRadio
+                v-model="deliveryMethodFk"
+                dense
+                val="pickUp"
+                :label="t('deliveryPanel.pickup')"
+            />
+            <QRadio
+                v-model="deliveryMethodFk"
+                dense
+                val="delivery"
+                :label="t('deliveryPanel.delivery')"
+                class="q-mb-sm"
+            />
+            <VnSelect
+                v-if="deliveryMethodFk === 'delivery'"
+                :label="t('deliveryPanel.postcode')"
+                v-model="formData.geoFk"
+                url="Postcodes/location"
+                :fields="['geoFk', 'code', 'townFk']"
+                sort-by="code, townFk"
+                option-value="geoFk"
+                option-label="code"
+                option-filter="code"
+                hide-selected
+                dense
+                outlined
+                rounded
+            >
+                <template #option="{ itemProps, opt }">
+                    <QItem v-bind="itemProps">
+                        <QItemSection v-if="opt.code">
+                            <QItemLabel>{{ opt.code }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ opt.town?.province?.name }},
+                                {{ opt.town?.province?.country?.country }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+            <VnSelect
+                :label="
+                    t(
+                        deliveryMethodFk === 'delivery'
+                            ? 'deliveryPanel.agency'
+                            : 'deliveryPanel.warehouse'
+                    )
+                "
+                v-model="formData.agencyModeFk"
+                url="AgencyModes/isActive"
+                :fields="['id', 'name']"
+                :where="{
+                    deliveryMethodFk: { inq: deliveryMethods },
+                }"
+                sort-by="name ASC"
+                option-value="id"
+                option-label="name"
+                hide-selected
+                dense
+                outlined
+                rounded
+            />
+        </div>
+        <QBtn
+            :label="t('deliveryPanel.query')"
+            type="submit"
+            color="primary"
+            class="q-mt-md full-width"
+            unelevated
+            rounded
+            dense
+        />
+    </QForm>
+</template>
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 6451fe00c..4c0da8d87 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -5,38 +5,30 @@ import { computed } from 'vue';
 
 import VnCard from 'components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
-import { useStateStore } from 'stores/useStateStore';
 
 const { t } = useI18n();
-const stateStore = useStateStore();
 const route = useRoute();
 
 const routeName = computed(() => route.name);
+const customRouteRedirectName = computed(() => {
+    if (routeName.value === 'ZoneLocations') return null;
+    return routeName.value;
+});
 const searchBarDataKeys = {
     ZoneWarehouses: 'ZoneWarehouses',
     ZoneSummary: 'ZoneSummary',
+    ZoneLocations: 'ZoneLocations',
+    ZoneCalendar: 'ZoneCalendar',
 };
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                :data-key="searchBarDataKeys[routeName]"
-                :custom-route-redirect-name="routeName"
-                :label="t('list.searchZone')"
-                :info="t('list.searchInfo')"
-            />
-        </Teleport>
-    </template>
     <VnCard
         data-key="Zone"
-        base-url="Zones"
         :descriptor="ZoneDescriptor"
-        searchbar-data-key="ZoneList"
-        searchbar-url="Zones/filter"
-        searchbar-label="Search zones"
-        searchbar-info="You can search by zone reference"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="customRouteRedirectName"
+        :search-redirect="!!customRouteRedirectName"
+        :searchbar-label="t('list.searchZone')"
+        :searchbar-info="t('list.searchInfo')"
     />
 </template>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index dd79f6ac4..363393996 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -7,6 +7,7 @@ zone:
         deliveryDays: Delivery days
         upcomingList: Upcoming deliveries
         warehouses: Warehouses
+        calendar: Calendar
 list:
     clone: Clone
     id: Id
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 43b636d4f..4c8eb6116 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -7,6 +7,7 @@ zone:
         deliveryDays: Días de entrega
         upcomingList: Próximos repartos
         warehouses: Almacenes
+        calendar: Calendario
 list:
     clone: Clonar
     id: Id
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index b79c430e5..a32ba2c49 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -12,7 +12,13 @@ export default {
     redirect: { name: 'ZoneMain' },
     menus: {
         main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingList'],
-        card: ['ZoneBasicData', 'ZoneWarehouses', 'ZoneHistory', 'ZoneLocations'],
+        card: [
+            'ZoneBasicData',
+            'ZoneWarehouses',
+            'ZoneHistory',
+            'ZoneLocations',
+            'ZoneCalendar',
+        ],
     },
     children: [
         {
@@ -110,6 +116,15 @@ export default {
                     },
                     component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
                 },
+                {
+                    name: 'ZoneCalendar',
+                    path: 'events',
+                    meta: {
+                        title: 'calendar',
+                        icon: 'vn:calendar',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneCalendar.vue'),
+                },
             ],
         },
     ],

From 790e69f65959cb18e8c2453fdffff54c47bba82b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 22 May 2024 08:08:43 -0300
Subject: [PATCH 02/24] WIP

---
 src/css/app.scss                              |   2 +-
 src/pages/Zone/Card/ZoneCalendarPanel.vue     | 149 -------------
 src/pages/Zone/Card/ZoneCard.vue              |   2 +-
 .../Card/{ZoneCalendar.vue => ZoneEvents.vue} |  25 ++-
 src/pages/Zone/Card/ZoneEventsPanel.vue       | 197 ++++++++++++++++++
 src/pages/Zone/locale/en.yml                  |  14 ++
 src/pages/Zone/locale/es.yml                  |  14 ++
 src/router/modules/zone.js                    |   6 +-
 src/stores/useWeekdayStore.js                 |  17 ++
 9 files changed, 267 insertions(+), 159 deletions(-)
 delete mode 100644 src/pages/Zone/Card/ZoneCalendarPanel.vue
 rename src/pages/Zone/Card/{ZoneCalendar.vue => ZoneEvents.vue} (92%)
 create mode 100644 src/pages/Zone/Card/ZoneEventsPanel.vue

diff --git a/src/css/app.scss b/src/css/app.scss
index 2e524e693..0b66ee38d 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -76,7 +76,7 @@ select:-webkit-autofill {
 }
 
 .color-vn-label {
-    color: var(--vn-label);
+    color: var(--vn-label-color);
 }
 
 .color-vn-text {
diff --git a/src/pages/Zone/Card/ZoneCalendarPanel.vue b/src/pages/Zone/Card/ZoneCalendarPanel.vue
deleted file mode 100644
index c754d484f..000000000
--- a/src/pages/Zone/Card/ZoneCalendarPanel.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<script setup>
-import { onMounted, ref, reactive } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-
-import { useArrayData } from 'src/composables/useArrayData';
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-import { watch } from 'vue';
-
-const { t } = useI18n();
-const { notify } = useNotify();
-
-const deliveryMethodFk = ref(null);
-const deliveryMethods = ref([]);
-const formData = reactive({});
-
-const arrayData = useArrayData('ZoneDeliveryDays', {
-    url: 'Zones/getEvents',
-});
-
-const fetchDeliveryMethods = async (filter) => {
-    try {
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get('DeliveryMethods', { params });
-        return data.map((deliveryMethod) => deliveryMethod.id);
-    } catch (err) {
-        console.error('Error fetching delivery methods: ', err);
-    }
-};
-
-watch(
-    () => deliveryMethodFk.value,
-    async (val) => {
-        let filter;
-        if (val === 'pickUp') filter = { where: { code: 'PICKUP' } };
-        else filter = { where: { code: { inq: ['DELIVERY', 'AGENCY'] } } };
-
-        deliveryMethods.value = await fetchDeliveryMethods(filter);
-    },
-    { immediate: true }
-);
-
-const fetchData = async (params) => {
-    try {
-        const { data } = params
-            ? await arrayData.applyFilter({
-                  params,
-              })
-            : await arrayData.fetch({ append: false });
-        if (!data.events || !data.events.length)
-            notify(t('deliveryPanel.noEventsWarning'), 'warning');
-    } catch (err) {
-        console.error('Error fetching events: ', err);
-    }
-};
-
-const onSubmit = async () => {
-    const params = { deliveryMethodFk: deliveryMethodFk.value, ...formData };
-    await fetchData(params);
-};
-
-onMounted(async () => {
-    deliveryMethodFk.value = 'delivery';
-    formData.geoFk = arrayData.store?.userParams?.geoFk;
-    formData.agencyModeFk = arrayData.store?.userParams?.agencyModeFk;
-    if (formData.geoFk || formData.agencyModeFk) await fetchData();
-});
-</script>
-
-<template>
-    <QForm @submit="onSubmit()" class="q-pa-md">
-        <div class="column q-gutter-y-sm">
-            <QRadio
-                v-model="deliveryMethodFk"
-                dense
-                val="pickUp"
-                :label="t('deliveryPanel.pickup')"
-            />
-            <QRadio
-                v-model="deliveryMethodFk"
-                dense
-                val="delivery"
-                :label="t('deliveryPanel.delivery')"
-                class="q-mb-sm"
-            />
-            <VnSelect
-                v-if="deliveryMethodFk === 'delivery'"
-                :label="t('deliveryPanel.postcode')"
-                v-model="formData.geoFk"
-                url="Postcodes/location"
-                :fields="['geoFk', 'code', 'townFk']"
-                sort-by="code, townFk"
-                option-value="geoFk"
-                option-label="code"
-                option-filter="code"
-                hide-selected
-                dense
-                outlined
-                rounded
-            >
-                <template #option="{ itemProps, opt }">
-                    <QItem v-bind="itemProps">
-                        <QItemSection v-if="opt.code">
-                            <QItemLabel>{{ opt.code }}</QItemLabel>
-                            <QItemLabel caption
-                                >{{ opt.town?.province?.name }},
-                                {{ opt.town?.province?.country?.country }}</QItemLabel
-                            >
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
-            <VnSelect
-                :label="
-                    t(
-                        deliveryMethodFk === 'delivery'
-                            ? 'deliveryPanel.agency'
-                            : 'deliveryPanel.warehouse'
-                    )
-                "
-                v-model="formData.agencyModeFk"
-                url="AgencyModes/isActive"
-                :fields="['id', 'name']"
-                :where="{
-                    deliveryMethodFk: { inq: deliveryMethods },
-                }"
-                sort-by="name ASC"
-                option-value="id"
-                option-label="name"
-                hide-selected
-                dense
-                outlined
-                rounded
-            />
-        </div>
-        <QBtn
-            :label="t('deliveryPanel.query')"
-            type="submit"
-            color="primary"
-            class="q-mt-md full-width"
-            unelevated
-            rounded
-            dense
-        />
-    </QForm>
-</template>
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 4c0da8d87..fc427c8cd 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -18,7 +18,7 @@ const searchBarDataKeys = {
     ZoneWarehouses: 'ZoneWarehouses',
     ZoneSummary: 'ZoneSummary',
     ZoneLocations: 'ZoneLocations',
-    ZoneCalendar: 'ZoneCalendar',
+    ZoneEvents: 'ZoneEvents',
 };
 </script>
 <template>
diff --git a/src/pages/Zone/Card/ZoneCalendar.vue b/src/pages/Zone/Card/ZoneEvents.vue
similarity index 92%
rename from src/pages/Zone/Card/ZoneCalendar.vue
rename to src/pages/Zone/Card/ZoneEvents.vue
index 00484712f..12b2387bb 100644
--- a/src/pages/Zone/Card/ZoneCalendar.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -2,11 +2,13 @@
 import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 
+import ZoneEventsPanel from './ZoneEventsPanel.vue';
 import ZoneDeliveryCalendar from '../ZoneDeliveryCalendar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useArrayData } from 'src/composables/useArrayData';
+import { nextTick } from 'vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -22,11 +24,11 @@ const days = ref({});
 const exclusions = ref({});
 const geoExclusions = ref({});
 const events = ref([]);
-const arrayData = useArrayData('ZoneDeliveryDays', {
-    url: 'Zones/getEvents',
-});
+const arrayData = useArrayData('ZoneEvents');
 const { store } = arrayData;
 
+// const urlPath = computed(() => `Zones/${route.params.id}/events`);
+
 const refreshEvents = () => {
     days.value = {};
     if (!data.value) return;
@@ -83,6 +85,9 @@ const date = computed({
             monthDate.setMonth(value.getMonth() + i);
             months.value.push(monthDate);
         }
+
+        console.log('firstDay', firstDay.value);
+        console.log('lastDay', lastDay.value);
         refreshEvents();
     },
 });
@@ -166,13 +171,18 @@ const step = (direction) => {
     date.value = _date;
 };
 
+const openEditMode = (mode) => {
+    console.log('openEditMode', mode);
+};
+
 onMounted(async () => {
-    stateStore.rightDrawer = true;
     let initialDate = Date.vnNew();
     initialDate.setDate(1);
     initialDate.setHours(0, 0, 0, 0);
     date.value = initialDate;
     weekdayStore.initStore();
+    await nextTick();
+    stateStore.rightDrawer = true;
 });
 
 onUnmounted(() => arrayData.destroy());
@@ -198,7 +208,12 @@ onUnmounted(() => arrayData.destroy());
     </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <!-- <ZoneCalendarPanel /> -->
+            <ZoneEventsPanel
+                :first-day="firstDay"
+                :last-day="lastDay"
+                :events="events"
+                @open-edit-mode="openEditMode"
+            />
         </QScrollArea>
     </QDrawer>
     <QPage class="q-pa-md flex justify-center">
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
new file mode 100644
index 000000000..88bf6eaa7
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -0,0 +1,197 @@
+<script setup>
+import { onMounted, ref, computed, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { toDateFormat } from 'src/filters/date.js';
+import { toCurrency } from 'filters/index';
+import { dashIfEmpty } from 'src/filters';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+const props = defineProps({
+    firstDay: {
+        type: Date,
+        required: true,
+        default: null,
+    },
+    lastDay: {
+        type: Date,
+        required: true,
+        default: null,
+    },
+    events: {
+        type: Array,
+        required: true,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['openEditMode']);
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const route = useRoute();
+const weekdayStore = useWeekdayStore();
+const { openConfirmationModal } = useVnConfirm();
+
+const editMode = ref('include');
+
+const params = computed(() => ({
+    zoneFk: route.params.id,
+    started: props.firstDay,
+    ended: props.lastDay,
+}));
+const arrayData = useArrayData('ZoneEvents', {
+    params: params,
+    url: `Zones/getEventsFiltered`,
+});
+const { store } = arrayData;
+
+const fetchData = async () => {
+    try {
+        await arrayData.applyFilter({
+            params: params.value,
+        });
+    } catch (err) {
+        console.error('Error fetching events: ', err);
+    }
+};
+
+const formatWdays = (event) => {
+    if (!event.weekDays) return;
+
+    let abrWdays = event.weekDays
+        .split(',')
+        .map((wday) => weekdayStore.getLocalesMap[wday].localeAbr);
+
+    return abrWdays.length < 7 ? abrWdays.join(', ') : t('eventsPanel.everyday');
+};
+
+const deleteEvent = async (id) => {
+    try {
+        if (!id) return;
+        await axios.delete(`Zones/${route.params.id}/events/${id}`);
+        await fetchData();
+    } catch (err) {
+        console.error('Error deleting event: ', err);
+    }
+};
+
+const openEditMode = () => {
+    console.log('editMode.value', editMode.value);
+    // emit('openEditMode', editMode.value);
+};
+
+onMounted(async () => {
+    weekdayStore.initStore();
+    console.log('weekdayStore', weekdayStore.getLocalesMap);
+    await nextTick();
+    await fetchData();
+});
+</script>
+
+<template>
+    <pre> {{ params }}</pre>
+    <QForm @submit="onSubmit()">
+        <div class="column q-pa-md q-gutter-y-sm">
+            <span class="color-vn-label">{{ t('eventsPanel.editMode') }}</span>
+            <QRadio
+                v-model="editMode"
+                dense
+                val="include"
+                :label="t('eventsPanel.include')"
+            />
+            <QRadio
+                v-model="editMode"
+                dense
+                val="exclude"
+                :label="t('eventsPanel.exclude')"
+                class="q-mb-sm"
+            />
+        </div>
+        <span class="color-vn-label q-px-md">{{ t('eventsPanel.events') }}</span>
+        <QList>
+            <QItem v-for="(event, index) in events" :key="index" class="event-card">
+                <QItemSection left @click="openEditMode()">
+                    <div v-if="event.type == 'day'" class="vn-mb-sm">
+                        {{ toDateFormat(event.dated) }}
+                    </div>
+                    <div v-if="event.type != 'day'" class="q-mb-sm">
+                        <span v-if="event.weekDays">
+                            {{ formatWdays(event) }}
+                        </span>
+                        <span v-if="event.type == 'range'">
+                            ({{ toDateFormat(event.started) }} -
+                            {{ toDateFormat(event.ended) }})
+                        </span>
+                    </div>
+                    <span class="color-vn-label">
+                        {{ t('eventsPanel.closing') }}:
+                        <span class="color-vn-text q-ml-xs">
+                            {{ dashIfEmpty(event.hour) }}
+                        </span>
+                    </span>
+                    <span class="color-vn-label">
+                        {{ t('eventsPanel.travelingDays') }}:
+                        <span class="color-vn-text">
+                            {{ dashIfEmpty(event.travelingDays) }}
+                        </span>
+                    </span>
+                    <span class="color-vn-label">
+                        {{ t('eventsPanel.price') }}:
+                        <span class="color-vn-text"> {{ dashIfEmpty(event.price) }}</span>
+                    </span>
+                    <span class="color-vn-label">
+                        {{ t('eventsPanel.bonus') }}:
+                        <span class="color-vn-text"> {{ toCurrency(event.bonus) }}</span>
+                    </span>
+                    <span class="color-vn-label">
+                        {{ t('eventsPanel.m3Max') }}:
+                        <span class="color-vn-text"> {{ dashIfEmpty(event.m3Max) }}</span>
+                    </span>
+                </QItemSection>
+                <QItemSection side @click="openEditMode()">
+                    <QBtn
+                        icon="delete"
+                        flat
+                        dense
+                        size="md"
+                        color="primary"
+                        @click.stop="
+                            openConfirmationModal(
+                                t('eventsPanel.deleteTitle'),
+                                t('eventsPanel.deleteSubtitle'),
+                                () => deleteEvent(event.id)
+                            )
+                        "
+                    >
+                        <QTooltip>{{ t('eventsPanel.delete') }}</QTooltip>
+                    </QBtn>
+                </QItemSection>
+            </QItem>
+            <span
+                v-if="!events.length"
+                class="flex justify-center text-h5 color-vn-label"
+            >
+                {{ t('globals.noResults') }}
+            </span>
+        </QList>
+    </QForm>
+</template>
+
+<style scoped lang="scss">
+.event-card {
+    display: flex;
+    border-bottom: $border-thin-light;
+    margin: 0;
+
+    &:hover {
+        background-color: var(--vn-accent-color);
+        cursor: pointer;
+    }
+}
+</style>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 363393996..ed07861f8 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -65,3 +65,17 @@ warehouses:
     deleteSubtitle: Are you sure you want to continue?
     warehouse: Warehouse
     add: Add
+eventsPanel:
+    editMode: Edit mode
+    include: Include
+    exclude: Exclude
+    events: Events
+    closing: Closing
+    travelingDays: Traveling days
+    price: Price
+    bonus: Bonus
+    m3Max: Max m³
+    everyday: Everyday
+    delete: Delete
+    deleteTitle: This item will be deleted
+    deleteSubtitle: Are you sure you want to continue?
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 4c8eb6116..5c4addaf8 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -67,3 +67,17 @@ warehouses:
     deleteSubtitle: ¿Seguro que quieres continuar?
     warehouse: Almacén
     add: Añadir
+eventsPanel:
+    editMode: Modo edición
+    include: Incluir
+    exclude: Excluir
+    events: Eventos
+    closing: Cierre
+    travelingDays: Días de viaje
+    price: Precio
+    bonus: Bonificación
+    m3Max: Meidida máxima
+    everyday: Todos los días
+    delete: Eliminar
+    deleteTitle: Este elemento será eliminado
+    deleteSubtitle: ¿Seguro que quieres continuar?
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index a32ba2c49..5979049a3 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -17,7 +17,7 @@ export default {
             'ZoneWarehouses',
             'ZoneHistory',
             'ZoneLocations',
-            'ZoneCalendar',
+            'ZoneEvents',
         ],
     },
     children: [
@@ -117,13 +117,13 @@ export default {
                     component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
                 },
                 {
-                    name: 'ZoneCalendar',
+                    name: 'ZoneEvents',
                     path: 'events',
                     meta: {
                         title: 'calendar',
                         icon: 'vn:calendar',
                     },
-                    component: () => import('src/pages/Zone/Card/ZoneCalendar.vue'),
+                    component: () => import('src/pages/Zone/Card/ZoneEvents.vue'),
                 },
             ],
         },
diff --git a/src/stores/useWeekdayStore.js b/src/stores/useWeekdayStore.js
index ac17356ae..33acaa09e 100644
--- a/src/stores/useWeekdayStore.js
+++ b/src/stores/useWeekdayStore.js
@@ -73,6 +73,22 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
         return locales;
     });
 
+    const getLocalesMap = computed(() => {
+        const locales = {};
+        for (let code of localeOrder.es) {
+            const weekDay = weekdaysMap[code];
+            const locale = t(`weekdays.${weekdaysMap[code].code}`);
+            const obj = {
+                ...weekDay,
+                locale,
+                localeChar: locale.substr(0, 1),
+                localeAbr: locale.substr(0, 3),
+            };
+            locales[weekDay.code] = obj;
+        }
+        return locales;
+    });
+
     const getLocaleMonths = computed(() => {
         const locales = [];
         for (let code of monthCodes) {
@@ -115,5 +131,6 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
         monthCodes,
         getLocaleMonths,
         fromSet,
+        getLocalesMap,
     };
 });

From 9b3135fd97909be06b6353d0d32ccb4f975d9d20 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 24 May 2024 08:18:38 -0300
Subject: [PATCH 03/24] WIP

---
 src/components/common/VnWeekdayPicker.vue     |  37 +++
 .../Zone/Card/ZoneEventExclusionForm.vue      |   1 +
 .../Zone/Card/ZoneEventInclusionForm.vue      | 214 ++++++++++++++++++
 src/pages/Zone/Card/ZoneEvents.vue            |  50 +++-
 src/pages/Zone/Card/ZoneEventsPanel.vue       |  64 ++++--
 src/pages/Zone/ZoneDeliveryCalendar.vue       |  35 ++-
 src/pages/Zone/ZoneDeliveryDays.vue           |   1 +
 src/pages/Zone/locale/en.yml                  |  19 ++
 src/pages/Zone/locale/es.yml                  |  19 ++
 src/stores/useWeekdayStore.js                 |  23 ++
 10 files changed, 437 insertions(+), 26 deletions(-)
 create mode 100644 src/components/common/VnWeekdayPicker.vue
 create mode 100644 src/pages/Zone/Card/ZoneEventExclusionForm.vue
 create mode 100644 src/pages/Zone/Card/ZoneEventInclusionForm.vue

diff --git a/src/components/common/VnWeekdayPicker.vue b/src/components/common/VnWeekdayPicker.vue
new file mode 100644
index 000000000..bbeb3d9ba
--- /dev/null
+++ b/src/components/common/VnWeekdayPicker.vue
@@ -0,0 +1,37 @@
+<script setup>
+import { ref } from 'vue';
+
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+
+const props = defineProps({
+    wdays: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['update:wdays']);
+
+const weekdayStore = useWeekdayStore();
+
+const selectedWDays = ref(props.wdays);
+
+const toggleDay = (index) => {
+    selectedWDays.value[index] = !selectedWDays.value[index];
+    emit('update:wdays', selectedWDays.value);
+};
+</script>
+
+<template>
+    <div class="q-gutter-x-sm" style="width: max-content">
+        <QBtn
+            v-for="(weekday, index) in weekdayStore.getLocalesMap"
+            :key="index"
+            :label="weekday.localeChar"
+            rounded
+            style="max-width: 36px"
+            :color="selectedWDays[weekday.index] ? 'primary' : ''"
+            @click="toggleDay(weekday.index)"
+        />
+    </div>
+</template>
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
new file mode 100644
index 000000000..aee6ddb00
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -0,0 +1 @@
+<template>Zone event exclusion form</template>
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
new file mode 100644
index 000000000..b8ad5b4fe
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -0,0 +1,214 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
+import { useRoute } from 'vue-router';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'components/FormPopup.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnWeekdayPicker from 'src/components/common/VnWeekdayPicker.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import axios from 'axios';
+import { onMounted } from 'vue';
+
+const props = defineProps({
+    date: {
+        type: Date,
+        required: true,
+        default: null,
+    },
+    event: {
+        type: Object,
+        default: null,
+    },
+    isNewMode: {
+        type: Boolean,
+        default: true,
+    },
+});
+
+const emit = defineEmits(['onSubmit']);
+
+const route = useRoute();
+const { t } = useI18n();
+const weekdayStore = useWeekdayStore();
+
+const isNew = computed(() => props.isNewMode);
+const eventInclusionFormData = ref({});
+
+const _eventType = ref('day');
+const eventType = computed({
+    get: () => _eventType.value,
+    set: (val) => {
+        _eventType.value = val;
+        eventInclusionFormData.value.type = val;
+    },
+});
+
+const arrayData = useArrayData('ZoneEvents');
+
+const createEvent = async () => {
+    try {
+        eventInclusionFormData.value.weekDays = weekdayStore.toSet(
+            eventInclusionFormData.value.wdays
+        );
+
+        if (eventType.value == 'day') eventInclusionFormData.value.weekDays = '';
+        else eventInclusionFormData.value.dated = null;
+
+        if (eventType.value != 'range') {
+            eventInclusionFormData.value.started = null;
+            eventInclusionFormData.value.ended = null;
+        }
+
+        if (isNew.value)
+            await axios.post(
+                `Zones/${route.params.id}/events`,
+                eventInclusionFormData.value
+            );
+        else
+            await axios.put(
+                `Zones/${route.params.id}/events/${props.event?.id}`,
+                eventInclusionFormData.value
+            );
+
+        await refetchEvents();
+        emit('onSubmit');
+
+        // case 'delete':
+        //     return this.onDelete(this.selected.id).then(
+        //         (response) => response == 'accept'
+        //     );
+    } catch (err) {
+        console.error('Error creating event', err);
+    }
+};
+
+const refetchEvents = async () => {
+    await arrayData.refresh({ append: false });
+};
+
+onMounted(() => {
+    console.log('props.event', props.event);
+    if (props.event) {
+        eventInclusionFormData.value = { ...props.event };
+        eventType.value = props.event.type;
+    } else if (props.date) eventInclusionFormData.value.dated = props.date;
+
+    console.log('eventInclusionFormData', eventInclusionFormData.value);
+});
+</script>
+
+<template>
+    <FormPopup
+        :title="
+            isNew ? t('eventsInclusionForm.addEvent') : t('eventsInclusionForm.editEvent')
+        "
+        :custom-submit-button-label="isNew ? t('globals.save') : t('globals.add')"
+        @on-submit="createEvent()"
+    >
+        <template #form-inputs>
+            <div class="column q-gutter-y-sm q-mb-md">
+                <pre>{{ isNew }}</pre>
+
+                <QRadio
+                    v-model="eventType"
+                    dense
+                    val="day"
+                    :label="t('eventsInclusionForm.oneDay')"
+                />
+                <QRadio
+                    v-model="eventType"
+                    dense
+                    val="indefinitely"
+                    :label="t('eventsInclusionForm.indefinitely')"
+                />
+                <QRadio
+                    v-model="eventType"
+                    dense
+                    val="range"
+                    :label="t('eventsInclusionForm.rangeOfDates')"
+                    class="q-mb-sm"
+                />
+            </div>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col flex justify-center">
+                    <VnInputDate
+                        v-if="eventType === 'day'"
+                        :label="t('eventsInclusionForm.day')"
+                        v-model="eventInclusionFormData.dated"
+                        class="full-width"
+                    />
+                    <VnWeekdayPicker
+                        v-else
+                        v-model:wdays="eventInclusionFormData.wdays"
+                    />
+                </div>
+            </VnRow>
+            <VnRow v-if="eventType === 'range'" class="row q-gutter-md q-mb-md">
+                <VnInputDate
+                    :label="t('eventsInclusionForm.from')"
+                    v-model="eventInclusionFormData.started"
+                />
+                <VnInputDate
+                    :label="t('eventsInclusionForm.to')"
+                    v-model="eventInclusionFormData.ended"
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputTime
+                    v-model="eventInclusionFormData.hour"
+                    :label="t('eventsInclusionForm.closing')"
+                />
+                <VnInput
+                    v-model="eventInclusionFormData.travelingDays"
+                    :label="t('eventsInclusionForm.travelingDays')"
+                    type="number"
+                    min="0"
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    v-model="eventInclusionFormData.price"
+                    :label="t('eventsInclusionForm.price')"
+                    type="number"
+                    min="0"
+                />
+                <VnInput
+                    v-model="eventInclusionFormData.bonus"
+                    :label="t('eventsInclusionForm.bonus')"
+                    type="number"
+                    min="0"
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    v-model="eventInclusionFormData.m3Max"
+                    :label="t('eventsInclusionForm.m3Max')"
+                    type="number"
+                    min="0"
+                />
+            </VnRow>
+        </template>
+    </FormPopup>
+</template>
+
+<i18n>
+en:
+    title: New bank entity
+    subtitle: Please, ensure you put the correct data!
+    name: Name
+    swift: Swift
+    country: Country
+    id: Entity code
+es:
+    title: Nueva entidad bancaria
+    subtitle: ¡Por favor, asegúrate de poner los datos correctos!
+    name: Nombre
+    swift: Swift
+    country: País
+    id: Código de la entidad
+</i18n>
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 12b2387bb..4bd028981 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -4,11 +4,14 @@ import { useI18n } from 'vue-i18n';
 
 import ZoneEventsPanel from './ZoneEventsPanel.vue';
 import ZoneDeliveryCalendar from '../ZoneDeliveryCalendar.vue';
+import ZoneEventInclusionForm from './ZoneEventInclusionForm.vue';
+import ZoneEventExclusionForm from './ZoneEventExclusionForm.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useArrayData } from 'src/composables/useArrayData';
 import { nextTick } from 'vue';
+import { reactive } from 'vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -24,11 +27,16 @@ const days = ref({});
 const exclusions = ref({});
 const geoExclusions = ref({});
 const events = ref([]);
+const formModeName = ref('include');
+const showZoneEventForm = ref(false);
+const zoneEventsFormProps = reactive({
+    isNewMode: true,
+    date: null,
+});
+
 const arrayData = useArrayData('ZoneEvents');
 const { store } = arrayData;
 
-// const urlPath = computed(() => `Zones/${route.params.id}/events`);
-
 const refreshEvents = () => {
     days.value = {};
     if (!data.value) return;
@@ -171,8 +179,29 @@ const step = (direction) => {
     date.value = _date;
 };
 
-const openEditMode = (mode) => {
-    console.log('openEditMode', mode);
+const openEventIncludeForm = ({ date, isNewMode, event }) => {
+    zoneEventsFormProps.date = date;
+    zoneEventsFormProps.isNewMode = isNewMode;
+    zoneEventsFormProps.event = event;
+    showZoneEventForm.value = true;
+    console.log('zoneEventsFormProps: ', zoneEventsFormProps);
+};
+
+const handleEventModeOpen = ({ date, isNewMode, event }) => {
+    if (formModeName.value === 'include')
+        openEventIncludeForm({ date, isNewMode, event });
+    else openEventExcludeForm({ date, isNewMode });
+};
+
+const openEventExcludeForm = ({ date, isNewMode }) => {
+    // zoneEventsFormProps.date = date;
+    // zoneEventsFormProps.isNewMode = isNewMode;
+    showZoneEventForm.value = true;
+    // console.log('zoneEventsFormProps: ', zoneEventsFormProps);
+};
+
+const onZoneEventFormClose = () => {
+    zoneEventsFormProps.date = null;
 };
 
 onMounted(async () => {
@@ -212,7 +241,8 @@ onUnmounted(() => arrayData.destroy());
                 :first-day="firstDay"
                 :last-day="lastDay"
                 :events="events"
-                @open-edit-mode="openEditMode"
+                v-model:formModeName="formModeName"
+                @open-zone-form="openEventIncludeForm"
             />
         </QScrollArea>
     </QDrawer>
@@ -245,9 +275,19 @@ onUnmounted(() => arrayData.destroy());
                     :geo-exclusions="geoExclusions"
                     :exclusions="exclusions"
                     :days-map="days"
+                    :form-mode-name="formModeName"
+                    @open-zone-form="handleEventModeOpen"
                 />
             </div>
         </QCard>
+        <QDialog v-model="showZoneEventForm" @hide="onZoneEventFormClose()">
+            <ZoneEventInclusionForm
+                v-if="formModeName === 'include'"
+                @on-data-saved="refetch()"
+                v-bind="zoneEventsFormProps"
+            />
+            <ZoneEventExclusionForm v-else />
+        </QDialog>
     </QPage>
 </template>
 
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index 88bf6eaa7..ba2b4c87f 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -1,12 +1,12 @@
 <script setup>
-import { onMounted, ref, computed, nextTick } from 'vue';
+import { onMounted, watch, computed, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { useArrayData } from 'src/composables/useArrayData';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import { toDateFormat } from 'src/filters/date.js';
+import { toDateFormat, toTimeFormat } from 'src/filters/date.js';
 import { toCurrency } from 'filters/index';
 import { dashIfEmpty } from 'src/filters';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
@@ -28,9 +28,14 @@ const props = defineProps({
         required: true,
         default: () => [],
     },
+    formModeName: {
+        type: String,
+        required: true,
+        default: 'include',
+    },
 });
 
-const emit = defineEmits(['openEditMode']);
+const emit = defineEmits(['openZoneForm', 'update:formModeName']);
 
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -38,7 +43,10 @@ const route = useRoute();
 const weekdayStore = useWeekdayStore();
 const { openConfirmationModal } = useVnConfirm();
 
-const editMode = ref('include');
+const formName = computed({
+    get: () => props.formModeName,
+    set: (value) => emit('update:formModeName', value),
+});
 
 const params = computed(() => ({
     zoneFk: route.params.id,
@@ -49,7 +57,16 @@ const arrayData = useArrayData('ZoneEvents', {
     params: params,
     url: `Zones/getEventsFiltered`,
 });
-const { store } = arrayData;
+
+const startParamsWatcher = () => {
+    watch(
+        params,
+        async () => {
+            await fetchData();
+        },
+        { deep: true }
+    );
+};
 
 const fetchData = async () => {
     try {
@@ -81,9 +98,14 @@ const deleteEvent = async (id) => {
     }
 };
 
-const openEditMode = () => {
-    console.log('editMode.value', editMode.value);
-    // emit('openEditMode', editMode.value);
+const openIncludeForm = (event) => {
+    console.log('zone event panel EVENT: ', event);
+    formName.value = 'include';
+    emit('openZoneForm', {
+        date: event.dated,
+        event,
+        isNewMode: false,
+    });
 };
 
 onMounted(async () => {
@@ -91,36 +113,40 @@ onMounted(async () => {
     console.log('weekdayStore', weekdayStore.getLocalesMap);
     await nextTick();
     await fetchData();
+    startParamsWatcher();
 });
 </script>
 
 <template>
-    <pre> {{ params }}</pre>
     <QForm @submit="onSubmit()">
         <div class="column q-pa-md q-gutter-y-sm">
-            <span class="color-vn-label">{{ t('eventsPanel.editMode') }}</span>
+            <span class="color-vn-label text-subtitle1">{{
+                t('eventsPanel.editMode')
+            }}</span>
             <QRadio
-                v-model="editMode"
+                v-model="formName"
                 dense
                 val="include"
                 :label="t('eventsPanel.include')"
             />
             <QRadio
-                v-model="editMode"
+                v-model="formName"
                 dense
                 val="exclude"
                 :label="t('eventsPanel.exclude')"
                 class="q-mb-sm"
             />
         </div>
-        <span class="color-vn-label q-px-md">{{ t('eventsPanel.events') }}</span>
+        <span class="color-vn-label text-subtitle1 q-px-md">{{
+            t('eventsPanel.events')
+        }}</span>
         <QList>
             <QItem v-for="(event, index) in events" :key="index" class="event-card">
-                <QItemSection left @click="openEditMode()">
-                    <div v-if="event.type == 'day'" class="vn-mb-sm">
+                <QItemSection left @click="openIncludeForm(event)">
+                    <div v-if="event.type == 'day'" class="q-mb-xs">
                         {{ toDateFormat(event.dated) }}
                     </div>
-                    <div v-if="event.type != 'day'" class="q-mb-sm">
+                    <div v-if="event.type != 'day'" class="q-mb-xs">
                         <span v-if="event.weekDays">
                             {{ formatWdays(event) }}
                         </span>
@@ -132,7 +158,7 @@ onMounted(async () => {
                     <span class="color-vn-label">
                         {{ t('eventsPanel.closing') }}:
                         <span class="color-vn-text q-ml-xs">
-                            {{ dashIfEmpty(event.hour) }}
+                            {{ dashIfEmpty(toTimeFormat(event.hour)) }}
                         </span>
                     </span>
                     <span class="color-vn-label">
@@ -143,7 +169,7 @@ onMounted(async () => {
                     </span>
                     <span class="color-vn-label">
                         {{ t('eventsPanel.price') }}:
-                        <span class="color-vn-text"> {{ dashIfEmpty(event.price) }}</span>
+                        <span class="color-vn-text"> {{ toCurrency(event.price) }}</span>
                     </span>
                     <span class="color-vn-label">
                         {{ t('eventsPanel.bonus') }}:
@@ -154,7 +180,7 @@ onMounted(async () => {
                         <span class="color-vn-text"> {{ dashIfEmpty(event.m3Max) }}</span>
                     </span>
                 </QItemSection>
-                <QItemSection side @click="openEditMode()">
+                <QItemSection side @click="openIncludeForm(event)">
                     <QBtn
                         icon="delete"
                         flat
diff --git a/src/pages/Zone/ZoneDeliveryCalendar.vue b/src/pages/Zone/ZoneDeliveryCalendar.vue
index 96a62086e..ffddd0e66 100644
--- a/src/pages/Zone/ZoneDeliveryCalendar.vue
+++ b/src/pages/Zone/ZoneDeliveryCalendar.vue
@@ -36,8 +36,18 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    isZoneDeliveryView: {
+        type: Boolean,
+        default: false,
+    },
+    formModeName: {
+        type: String,
+        default: 'include',
+    },
 });
 
+const emit = defineEmits(['openZoneForm']);
+
 const { locale } = useI18n();
 
 const calendarRef = ref(null);
@@ -53,6 +63,8 @@ const todayTimestamp = computed(() => {
 const _monthDate = computed(() => date.formatDate(props.monthDate, 'YYYY-MM-DD'));
 
 const onEventSelection = async ({ year, month, day }) => {
+    if (!props.isZoneDeliveryView) return;
+
     const date = new Date(year, month - 1, day);
     const stamp = date.getTime();
     const events = props.daysMap[stamp];
@@ -104,6 +116,20 @@ const isToday = (timestamp) => {
 const calendarHeaderTitle = computed(() => {
     return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
 });
+
+const handleDateClick = (timestamp) => {
+    if (props.isZoneDeliveryView) return;
+
+    const event = getEventByTimestamp(timestamp);
+    console.log('eventTTTTTTTT: ', event);
+    const { year, month, day } = timestamp;
+    const date = new Date(year, month - 1, day);
+    emit('openZoneForm', {
+        date,
+        isNewMode: !event,
+        event: event && event.length > 0 ? event[0] : null,
+    });
+};
 </script>
 
 <template>
@@ -128,6 +154,7 @@ const calendarHeaderTitle = computed(() => {
                 short-weekday-label
                 :locale="locale"
                 :now="today"
+                @click-date="handleDateClick($event.scope.timestamp)"
                 mini-mode
             >
                 <template #day="{ scope: { timestamp } }">
@@ -135,7 +162,11 @@ const calendarHeaderTitle = computed(() => {
                     <QBtn
                         v-if="getEventByTimestamp(timestamp)"
                         v-bind="{ ...getEventAttrs(timestamp) }"
-                        @click="onEventSelection(timestamp)"
+                        @click="
+                            isZoneDeliveryView
+                                ? onEventSelection(timestamp)
+                                : handleDateClick(timestamp)
+                        "
                         rounded
                         dense
                         flat
@@ -144,7 +175,7 @@ const calendarHeaderTitle = computed(() => {
                             '--today': isToday(timestamp),
                         }"
                     >
-                        <QPopupProxy>
+                        <QPopupProxy v-if="isZoneDeliveryView">
                             <ZoneClosingTable
                                 v-if="zoneClosingData && zoneClosingData.length"
                                 :rows="zoneClosingData"
diff --git a/src/pages/Zone/ZoneDeliveryDays.vue b/src/pages/Zone/ZoneDeliveryDays.vue
index d6ce70f6d..dd0e23a2d 100644
--- a/src/pages/Zone/ZoneDeliveryDays.vue
+++ b/src/pages/Zone/ZoneDeliveryDays.vue
@@ -231,6 +231,7 @@ onUnmounted(() => arrayData.destroy());
                     :geo-exclusions="geoExclusions"
                     :exclusions="exclusions"
                     :days-map="days"
+                    is-zone-delivery-view
                 />
             </div>
         </QCard>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index ed07861f8..7f2b12680 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -79,3 +79,22 @@ eventsPanel:
     delete: Delete
     deleteTitle: This item will be deleted
     deleteSubtitle: Are you sure you want to continue?
+eventsExclusionForm:
+    addExclusion: Add exclusion
+    day: Day
+    all: All
+    specificLocations: Specific locations
+eventsInclusionForm:
+    addEvent: Add event
+    editEvent: Edit event
+    oneDay: One day
+    indefinitely: Indefinitely
+    rangeOfDates: Range of dates
+    day: Day
+    closing: Closing
+    travelingDays: Traveling days
+    price: Price
+    bonus: Bonus
+    m3Max: Max m³
+    from: From
+    to: To
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 5c4addaf8..ad33705b6 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -81,3 +81,22 @@ eventsPanel:
     delete: Eliminar
     deleteTitle: Este elemento será eliminado
     deleteSubtitle: ¿Seguro que quieres continuar?
+eventsExclusionForm:
+    addExclusion: Añadir exclusión
+    day: Día
+    all: Todo
+    specificLocations: Localizaciones concretas
+eventsInclusionForm:
+    addEvent: Añadir evento
+    editEvent: Editar evento
+    oneDay: Un día
+    indefinitely: Indefinido
+    rangeOfDates: Rango de fechas
+    day: Día
+    closing: Cierre
+    travelingDays: Días de viaje
+    price: Precio
+    bonus: Bonificación
+    m3Max: Medida máxima
+    from: Desde
+    to: Hasta
diff --git a/src/stores/useWeekdayStore.js b/src/stores/useWeekdayStore.js
index 33acaa09e..57a302dc1 100644
--- a/src/stores/useWeekdayStore.js
+++ b/src/stores/useWeekdayStore.js
@@ -122,6 +122,28 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
         return wdays;
     };
 
+    /**
+     * Perform the inverse operation of fromSet() method. Transforms an
+     * array whose indexes are weekday index with selected days set to %true to
+     * weekday codes separated by commas.
+     *
+     * @param {Array<Boolean>} _weekDays Array with selected days set to %true
+     * @return {String} weekDays Weekday codes separated by commas
+     */
+    const toSet = (_weekDays) => {
+        let wdays = [];
+
+        if (_weekDays) {
+            for (let i = 0; i < _weekDays.length; i++) {
+                if (!_weekDays[i]) continue;
+                let data = weekdays[i];
+                if (data) wdays.push(data.code);
+            }
+        }
+
+        return wdays.join(',');
+    };
+
     return {
         initStore,
         weekdaysMap,
@@ -131,6 +153,7 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
         monthCodes,
         getLocaleMonths,
         fromSet,
+        toSet,
         getLocalesMap,
     };
 });

From 68bb4251a45a603084f445246d363f1b2fb51439 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 24 May 2024 14:12:17 -0300
Subject: [PATCH 04/24] WIP

---
 src/components/FormPopup.vue                  |  2 +-
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Zone/Card/ZoneEventInclusionForm.vue      | 60 +++++++++++++++----
 src/pages/Zone/Card/ZoneEvents.vue            |  3 +-
 src/pages/Zone/Card/ZoneEventsPanel.vue       |  2 -
 6 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/src/components/FormPopup.vue b/src/components/FormPopup.vue
index 2da986006..d7f744984 100644
--- a/src/components/FormPopup.vue
+++ b/src/components/FormPopup.vue
@@ -74,7 +74,7 @@ const closeForm = () => {
                     :disabled="isLoading"
                     :loading="isLoading"
                 />
-                <slot name="customButtons" />
+                <slot name="custom-buttons" />
             </div>
         </QCard>
     </QForm>
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 0e6edeab2..6c0020a34 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -17,6 +17,7 @@ globals:
     date: Date
     dataSaved: Data saved
     dataDeleted: Data deleted
+    delete: Delete
     search: Search
     changes: Changes
     dataCreated: Data created
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index d78e1762c..40065a9f3 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -17,6 +17,7 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
+    delete: Eliminar
     search: Buscar
     changes: Cambios
     dataCreated: Datos creados
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index b8ad5b4fe..a8b35267e 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 import { useRoute } from 'vue-router';
@@ -11,8 +11,8 @@ import VnWeekdayPicker from 'src/components/common/VnWeekdayPicker.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
-import { onMounted } from 'vue';
 
 const props = defineProps({
     date: {
@@ -30,11 +30,12 @@ const props = defineProps({
     },
 });
 
-const emit = defineEmits(['onSubmit']);
+const emit = defineEmits(['onSubmit', 'closeForm']);
 
 const route = useRoute();
 const { t } = useI18n();
 const weekdayStore = useWeekdayStore();
+const { openConfirmationModal } = useVnConfirm();
 
 const isNew = computed(() => props.isNewMode);
 const eventInclusionFormData = ref({});
@@ -77,25 +78,35 @@ const createEvent = async () => {
 
         await refetchEvents();
         emit('onSubmit');
-
-        // case 'delete':
-        //     return this.onDelete(this.selected.id).then(
-        //         (response) => response == 'accept'
-        //     );
     } catch (err) {
         console.error('Error creating event', err);
     }
 };
 
+const deleteEvent = async () => {
+    try {
+        if (!props.event) return;
+        await axios.delete(`Zones/${route.params.id}/events/${props.event?.id}`);
+        await refetchEvents();
+    } catch (err) {
+        console.error('Error deleting event: ', err);
+    }
+};
+
+const closeForm = () => {
+    emit('closeForm');
+};
+
 const refetchEvents = async () => {
     await arrayData.refresh({ append: false });
+    closeForm();
 };
 
 onMounted(() => {
     console.log('props.event', props.event);
     if (props.event) {
         eventInclusionFormData.value = { ...props.event };
-        eventType.value = props.event.type;
+        eventType.value = props.event?.type || 'day';
     } else if (props.date) eventInclusionFormData.value.dated = props.date;
 
     console.log('eventInclusionFormData', eventInclusionFormData.value);
@@ -107,8 +118,9 @@ onMounted(() => {
         :title="
             isNew ? t('eventsInclusionForm.addEvent') : t('eventsInclusionForm.editEvent')
         "
-        :custom-submit-button-label="isNew ? t('globals.save') : t('globals.add')"
         @on-submit="createEvent()"
+        :default-cancel-button="false"
+        :default-submit-button="false"
     >
         <template #form-inputs>
             <div class="column q-gutter-y-sm q-mb-md">
@@ -193,6 +205,34 @@ onMounted(() => {
                 />
             </VnRow>
         </template>
+        <template #custom-buttons>
+            <QBtn
+                :label="t('globals.cancel')"
+                color="primary"
+                flat
+                class="q-mr-sm"
+                v-close-popup
+            />
+            <QBtn
+                v-if="!isNew"
+                :label="t('globals.delete')"
+                color="primary"
+                flat
+                class="q-mr-sm"
+                @click="
+                    openConfirmationModal(
+                        t('eventsPanel.deleteTitle'),
+                        t('eventsPanel.deleteSubtitle'),
+                        () => deleteEvent()
+                    )
+                "
+            />
+            <QBtn
+                :label="isNew ? t('globals.save') : t('globals.add')"
+                type="submit"
+                color="primary"
+            />
+        </template>
     </FormPopup>
 </template>
 
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 4bd028981..1dcfc516a 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -201,6 +201,7 @@ const openEventExcludeForm = ({ date, isNewMode }) => {
 };
 
 const onZoneEventFormClose = () => {
+    showZoneEventForm.value = false;
     zoneEventsFormProps.date = null;
 };
 
@@ -283,8 +284,8 @@ onUnmounted(() => arrayData.destroy());
         <QDialog v-model="showZoneEventForm" @hide="onZoneEventFormClose()">
             <ZoneEventInclusionForm
                 v-if="formModeName === 'include'"
-                @on-data-saved="refetch()"
                 v-bind="zoneEventsFormProps"
+                @close-form="onZoneEventFormClose()"
             />
             <ZoneEventExclusionForm v-else />
         </QDialog>
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index ba2b4c87f..d9b85bb88 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -5,7 +5,6 @@ import { useRoute } from 'vue-router';
 
 import { useArrayData } from 'src/composables/useArrayData';
 import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
 import { toDateFormat, toTimeFormat } from 'src/filters/date.js';
 import { toCurrency } from 'filters/index';
 import { dashIfEmpty } from 'src/filters';
@@ -38,7 +37,6 @@ const props = defineProps({
 const emit = defineEmits(['openZoneForm', 'update:formModeName']);
 
 const { t } = useI18n();
-const { notify } = useNotify();
 const route = useRoute();
 const weekdayStore = useWeekdayStore();
 const { openConfirmationModal } = useVnConfirm();

From a1fde3f6452a32868b8a0498e4d8bb855c07570f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 24 May 2024 15:25:00 -0300
Subject: [PATCH 05/24] WIP

---
 .../Zone/Card/ZoneEventExclusionForm.vue      | 172 +++++++++++++-
 .../Zone/Card/ZoneEventInclusionForm.vue      |  29 +--
 src/pages/Zone/Card/ZoneEvents.vue            |  29 +--
 src/pages/Zone/Card/ZoneLocationsTree.vue     | 215 ++++++++++++++++++
 src/pages/Zone/ZoneDeliveryCalendar.vue       |   7 +
 src/pages/Zone/locale/en.yml                  |   1 +
 src/pages/Zone/locale/es.yml                  |   1 +
 7 files changed, 411 insertions(+), 43 deletions(-)
 create mode 100644 src/pages/Zone/Card/ZoneLocationsTree.vue

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index aee6ddb00..f75745c7a 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -1 +1,171 @@
-<template>Zone event exclusion form</template>
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'components/FormPopup.vue';
+import ZoneLocationsTree from './ZoneLocationsTree.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import axios from 'axios';
+
+const props = defineProps({
+    date: {
+        type: Date,
+        required: true,
+        default: null,
+    },
+    event: {
+        type: Object,
+        default: null,
+    },
+    isNewMode: {
+        type: Boolean,
+        default: true,
+    },
+    isExclusion: {
+        type: Boolean,
+        default: true,
+    },
+});
+
+const emit = defineEmits(['onSubmit', 'closeForm']);
+
+const route = useRoute();
+const { t } = useI18n();
+const weekdayStore = useWeekdayStore();
+const { openConfirmationModal } = useVnConfirm();
+
+const isNew = computed(() => props.isNewMode);
+const dated = ref(null);
+
+const _excludeType = ref('all');
+const excludeType = computed({
+    get: () => _excludeType.value,
+    set: (val) => {
+        _excludeType.value = val;
+    },
+});
+
+const arrayData = useArrayData('ZoneEvents');
+
+const exclusionGeoCreate = async () => {
+    try {
+        console.log('exclusionGeoCreate');
+    } catch (err) {
+        console.error('Error creating exclusion geo: ', err);
+    }
+};
+
+const exclusionCreate = async () => {
+    try {
+        if (isNew.value)
+            await axios.post(`Zones/${route.params.id}/exclusions`, [
+                { dated: dated.value },
+            ]);
+        else
+            await axios.put(`Zones/${route.params.id}/exclusions/${props.event?.id}`, {
+                dated: dated.value,
+            });
+
+        await refetchEvents();
+    } catch (err) {
+        console.error('Error creating exclusion: ', err);
+    }
+};
+
+const onSubmit = async () => {
+    if (excludeType.value === 'all') exclusionCreate();
+    else exclusionGeoCreate();
+};
+
+const deleteEvent = async () => {
+    try {
+        if (!props.event) return;
+        await axios.delete(`Zones/${route.params.id}/exclusions/${props.event?.id}`);
+        await refetchEvents();
+    } catch (err) {
+        console.error('Error deleting event: ', err);
+    }
+};
+
+const closeForm = () => emit('closeForm');
+
+const refetchEvents = async () => {
+    await arrayData.refresh({ append: false });
+    closeForm();
+};
+
+onMounted(() => {
+    console.log('props.event', props.event);
+    if (props.event) {
+        dated.value = props.event?.dated;
+        excludeType.value = props.event?.type || 'all';
+    } else if (props.date) dated.value = props.date;
+});
+</script>
+
+<template>
+    <FormPopup
+        :title="
+            isNew
+                ? t('eventsExclusionForm.addExclusion')
+                : t('eventsExclusionForm.editExclusion')
+        "
+        @on-submit="onSubmit()"
+        :default-cancel-button="false"
+        :default-submit-button="false"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-lg">
+                <VnInputDate :label="t('eventsInclusionForm.day')" v-model="dated" />
+            </VnRow>
+            <div class="column q-gutter-y-sm q-mb-md">
+                <QRadio
+                    v-model="excludeType"
+                    dense
+                    val="all"
+                    :label="t('eventsExclusionForm.all')"
+                />
+                <QRadio
+                    v-model="excludeType"
+                    dense
+                    val="specificLocations"
+                    :label="t('eventsExclusionForm.specificLocations')"
+                />
+            </div>
+        </template>
+        <template #custom-buttons>
+            <QBtn
+                :label="t('globals.cancel')"
+                color="primary"
+                flat
+                class="q-mr-sm"
+                v-close-popup
+            />
+            <QBtn
+                v-if="!isNew && isExclusion"
+                :label="t('globals.delete')"
+                color="primary"
+                flat
+                class="q-mr-sm"
+                @click="
+                    openConfirmationModal(
+                        t('eventsPanel.deleteTitle'),
+                        t('eventsPanel.deleteSubtitle'),
+                        () => deleteEvent()
+                    )
+                "
+            />
+            <QBtn
+                :label="isNew ? t('globals.add') : t('globals.save')"
+                type="submit"
+                color="primary"
+            />
+        </template>
+    </FormPopup>
+</template>
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index a8b35267e..daecac6ef 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -9,6 +9,7 @@ import FormPopup from 'components/FormPopup.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnWeekdayPicker from 'src/components/common/VnWeekdayPicker.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
+
 import { useArrayData } from 'src/composables/useArrayData';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useVnConfirm } from 'composables/useVnConfirm';
@@ -28,6 +29,10 @@ const props = defineProps({
         type: Boolean,
         default: true,
     },
+    isExclusion: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emit = defineEmits(['onSubmit', 'closeForm']);
@@ -103,13 +108,10 @@ const refetchEvents = async () => {
 };
 
 onMounted(() => {
-    console.log('props.event', props.event);
     if (props.event) {
         eventInclusionFormData.value = { ...props.event };
         eventType.value = props.event?.type || 'day';
     } else if (props.date) eventInclusionFormData.value.dated = props.date;
-
-    console.log('eventInclusionFormData', eventInclusionFormData.value);
 });
 </script>
 
@@ -124,8 +126,6 @@ onMounted(() => {
     >
         <template #form-inputs>
             <div class="column q-gutter-y-sm q-mb-md">
-                <pre>{{ isNew }}</pre>
-
                 <QRadio
                     v-model="eventType"
                     dense
@@ -214,7 +214,7 @@ onMounted(() => {
                 v-close-popup
             />
             <QBtn
-                v-if="!isNew"
+                v-if="!isNew && !isExclusion"
                 :label="t('globals.delete')"
                 color="primary"
                 flat
@@ -235,20 +235,3 @@ onMounted(() => {
         </template>
     </FormPopup>
 </template>
-
-<i18n>
-en:
-    title: New bank entity
-    subtitle: Please, ensure you put the correct data!
-    name: Name
-    swift: Swift
-    country: Country
-    id: Entity code
-es:
-    title: Nueva entidad bancaria
-    subtitle: ¡Por favor, asegúrate de poner los datos correctos!
-    name: Nombre
-    swift: Swift
-    country: País
-    id: Código de la entidad
-</i18n>
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 1dcfc516a..bc02e7ab5 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -179,30 +179,17 @@ const step = (direction) => {
     date.value = _date;
 };
 
-const openEventIncludeForm = ({ date, isNewMode, event }) => {
+const openForm = ({ date, isNewMode, event, isExclusion }) => {
     zoneEventsFormProps.date = date;
     zoneEventsFormProps.isNewMode = isNewMode;
     zoneEventsFormProps.event = event;
+    zoneEventsFormProps.isExclusion = isExclusion;
     showZoneEventForm.value = true;
-    console.log('zoneEventsFormProps: ', zoneEventsFormProps);
-};
-
-const handleEventModeOpen = ({ date, isNewMode, event }) => {
-    if (formModeName.value === 'include')
-        openEventIncludeForm({ date, isNewMode, event });
-    else openEventExcludeForm({ date, isNewMode });
-};
-
-const openEventExcludeForm = ({ date, isNewMode }) => {
-    // zoneEventsFormProps.date = date;
-    // zoneEventsFormProps.isNewMode = isNewMode;
-    showZoneEventForm.value = true;
-    // console.log('zoneEventsFormProps: ', zoneEventsFormProps);
 };
 
 const onZoneEventFormClose = () => {
     showZoneEventForm.value = false;
-    zoneEventsFormProps.date = null;
+    zoneEventsFormProps.value = {};
 };
 
 onMounted(async () => {
@@ -243,7 +230,7 @@ onUnmounted(() => arrayData.destroy());
                 :last-day="lastDay"
                 :events="events"
                 v-model:formModeName="formModeName"
-                @open-zone-form="openEventIncludeForm"
+                @open-zone-form="openForm"
             />
         </QScrollArea>
     </QDrawer>
@@ -277,7 +264,7 @@ onUnmounted(() => arrayData.destroy());
                     :exclusions="exclusions"
                     :days-map="days"
                     :form-mode-name="formModeName"
-                    @open-zone-form="handleEventModeOpen"
+                    @open-zone-form="openForm"
                 />
             </div>
         </QCard>
@@ -287,7 +274,11 @@ onUnmounted(() => arrayData.destroy());
                 v-bind="zoneEventsFormProps"
                 @close-form="onZoneEventFormClose()"
             />
-            <ZoneEventExclusionForm v-else />
+            <ZoneEventExclusionForm
+                v-else
+                v-bind="zoneEventsFormProps"
+                @close-form="onZoneEventFormClose()"
+            />
         </QDialog>
     </QPage>
 </template>
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
new file mode 100644
index 000000000..3057c5dff
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -0,0 +1,215 @@
+<script setup>
+import { onMounted, ref, computed, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+import { useArrayData } from 'composables/useArrayData';
+
+const { t } = useI18n();
+const route = useRoute();
+const state = useState();
+
+const treeRef = ref();
+const expanded = ref([]);
+
+const arrayData = useArrayData('ZoneLocations', {
+    url: `Zones/${route.params.id}/getLeaves`,
+});
+const { store } = arrayData;
+const storeData = computed(() => store.data);
+
+const nodes = ref([
+    { id: null, name: t('zoneLocations.locations'), sons: true, children: [{}] },
+]);
+
+const previousExpandedNodes = ref(new Set());
+
+const onNodeExpanded = async (nodeKeysArray) => {
+    const nodeKeysSet = new Set(nodeKeysArray);
+    const lastNodeKey = nodeKeysArray.at(-1);
+    const wasExpanded = !previousExpandedNodes.value.has(lastNodeKey);
+
+    if (wasExpanded) await fetchNodeLeaves(lastNodeKey);
+    else {
+        const difference = new Set(
+            [...previousExpandedNodes.value].filter((x) => !nodeKeysSet.has(x))
+        );
+        const collapsedNode = Array.from(difference).pop();
+        const node = treeRef.value?.getNodeByKey(collapsedNode);
+        const allNodeIds = getNodeIds(node);
+        expanded.value = expanded.value.filter((id) => !allNodeIds.includes(id));
+    }
+
+    previousExpandedNodes.value = nodeKeysSet;
+};
+
+const formatNodeSelected = (node) => {
+    if (node.selected === 1) node.selected = true;
+    else if (node.selected === 0) node.selected = false;
+};
+
+const fetchNodeLeaves = async (nodeKey) => {
+    try {
+        const node = treeRef.value?.getNodeByKey(nodeKey);
+        if (!node || node.sons === 0) return;
+
+        const params = { parentId: node.id };
+        const response = await axios.get(`Zones/${route.params.id}/getLeaves`, {
+            params,
+        });
+        if (response.data) {
+            node.children = response.data.map((n) => {
+                const hasChildrens = n.sons > 0;
+                n.children = hasChildrens ? [{}] : null;
+                formatNodeSelected(n);
+
+                if (n.child && n.child.length > 0) {
+                    n.child.forEach((childNode) => {
+                        formatNodeSelected(childNode);
+                    });
+                }
+                return n;
+            });
+        }
+
+        state.set('Tree', node);
+    } catch (err) {
+        console.error('Error fetching department leaves', err);
+        throw new Error();
+    }
+};
+
+const onSelected = async (val, node) => {
+    try {
+        if (val === null) val = undefined;
+        const params = { geoId: node.id, isIncluded: val };
+        await axios.post(`Zones/${route.params.id}/toggleIsIncluded`, params);
+    } catch (err) {
+        console.error('Error updating included', err);
+    }
+};
+
+function getNodeIds(node) {
+    let ids = [];
+    if (node.id) ids.push(node.id);
+
+    const children = node.childs || node.children;
+    if (children) {
+        children.forEach((child) => {
+            ids = ids.concat(getNodeIds(child));
+        });
+    }
+    return ids;
+}
+
+watch(storeData, async (val) => {
+    // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
+    nodes.value[0].children = [...val];
+    const fetchedNodeKeys = val.flatMap(getNodeIds);
+    state.set('Tree', [...fetchedNodeKeys]);
+    for (let n of state.get('Tree')) {
+        await fetchNodeLeaves(n);
+    }
+    expanded.value = [null, 1, ...fetchedNodeKeys];
+});
+
+onMounted(async () => {
+    if (store.userParams?.search) {
+        await arrayData.fetch({ append: false });
+        return;
+    }
+    const stateTree = state.get('Tree');
+    const tree = stateTree ? [...state.get('Tree'), 1] : [null, 1];
+    const lastStateTree = state.get('TreeState');
+    if (tree) {
+        for (let n of tree) {
+            await fetchNodeLeaves(n);
+        }
+        expanded.value = tree;
+
+        if (lastStateTree) {
+            tree.push(lastStateTree);
+            await fetchNodeLeaves(lastStateTree);
+        }
+    }
+
+    setTimeout(() => {
+        if (lastStateTree) {
+            document.getElementById(lastStateTree).scrollIntoView();
+        }
+    }, 1000);
+});
+</script>
+
+<template>
+    <QCard class="full-width" style="max-width: 800px">
+        <QTree
+            ref="treeRef"
+            :nodes="nodes"
+            node-key="id"
+            label-key="name"
+            v-model:expanded="expanded"
+            @update:expanded="onNodeExpanded($event)"
+            :default-expand-all="true"
+        >
+            <template #default-header="{ node }">
+                <div
+                    :id="node.id"
+                    class="qtr row justify-between full-width q-pr-md cursor-pointer"
+                >
+                    <span v-if="!node.id">{{ node.name }}</span>
+                    <QCheckbox
+                        v-else
+                        v-model="node.selected"
+                        :label="node.name"
+                        @update:model-value="($event) => onSelected($event, node)"
+                        toggle-indeterminate
+                        color="transparent"
+                        :class="[
+                            'checkbox',
+                            node.selected
+                                ? '--checked'
+                                : node.selected == false
+                                ? '--unchecked'
+                                : '--indeterminate',
+                        ]"
+                    />
+                </div>
+            </template>
+        </QTree>
+    </QCard>
+</template>
+
+<style lang="scss">
+.checkbox {
+    &.--checked {
+        .q-checkbox__bg {
+            border: 1px solid $info !important;
+        }
+        .q-checkbox__svg {
+            color: white !important;
+            background-color: $info !important;
+        }
+    }
+
+    &.--unchecked {
+        .q-checkbox__bg {
+            border: 1px solid $negative !important;
+        }
+        .q-checkbox__svg {
+            background-color: $negative !important;
+        }
+    }
+
+    &.--indeterminate {
+        .q-checkbox__bg {
+            border: 1px solid $white !important;
+        }
+        .q-checkbox__svg {
+            color: transparent !important;
+        }
+    }
+}
+</style>
diff --git a/src/pages/Zone/ZoneDeliveryCalendar.vue b/src/pages/Zone/ZoneDeliveryCalendar.vue
index ffddd0e66..64651743a 100644
--- a/src/pages/Zone/ZoneDeliveryCalendar.vue
+++ b/src/pages/Zone/ZoneDeliveryCalendar.vue
@@ -93,6 +93,12 @@ const getEventByTimestamp = ({ year, month, day }) => {
     );
 };
 
+const eventIsAnyExclusion = ({ year, month, day }) => {
+    if (!event) return false;
+    const stamp = new Date(year, month - 1, day).getTime();
+    return !!props.exclusions[stamp] || !!props.geoExclusions[stamp];
+};
+
 const getEventAttrs = ({ year, month, day }) => {
     const stamp = new Date(year, month - 1, day).getTime();
 
@@ -128,6 +134,7 @@ const handleDateClick = (timestamp) => {
         date,
         isNewMode: !event,
         event: event && event.length > 0 ? event[0] : null,
+        isExclusion: eventIsAnyExclusion(timestamp),
     });
 };
 </script>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 7f2b12680..6113dde08 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -81,6 +81,7 @@ eventsPanel:
     deleteSubtitle: Are you sure you want to continue?
 eventsExclusionForm:
     addExclusion: Add exclusion
+    editExclusion: Edit exclusion
     day: Day
     all: All
     specificLocations: Specific locations
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index ad33705b6..a9fd45704 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -83,6 +83,7 @@ eventsPanel:
     deleteSubtitle: ¿Seguro que quieres continuar?
 eventsExclusionForm:
     addExclusion: Añadir exclusión
+    editExclusion: Editar exclusión
     day: Día
     all: Todo
     specificLocations: Localizaciones concretas

From 097197b8dc1fd8f1b78b5ca3c81b0fb1ba9e4315 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 26 May 2024 17:17:58 -0300
Subject: [PATCH 06/24] Zone exclude form and tree implementation

---
 .../Zone/Card/ZoneEventExclusionForm.vue      |  47 +++++--
 .../Zone/Card/ZoneEventInclusionForm.vue      |  28 ++---
 src/pages/Zone/Card/ZoneEvents.vue            |   9 +-
 src/pages/Zone/Card/ZoneLocationsTree.vue     | 117 ++++++++++++------
 src/pages/Zone/ZoneDeliveryCalendar.vue       |  18 ++-
 src/pages/Zone/locale/en.yml                  |   1 +
 src/pages/Zone/locale/es.yml                  |   1 +
 7 files changed, 151 insertions(+), 70 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index f75745c7a..1573614a6 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -9,7 +9,6 @@ import ZoneLocationsTree from './ZoneLocationsTree.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
-import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
 
@@ -27,9 +26,13 @@ const props = defineProps({
         type: Boolean,
         default: true,
     },
-    isExclusion: {
-        type: Boolean,
-        default: true,
+    eventType: {
+        type: String,
+        default: '',
+    },
+    geoIds: {
+        type: Array,
+        default: () => [],
     },
 });
 
@@ -37,11 +40,11 @@ const emit = defineEmits(['onSubmit', 'closeForm']);
 
 const route = useRoute();
 const { t } = useI18n();
-const weekdayStore = useWeekdayStore();
 const { openConfirmationModal } = useVnConfirm();
 
 const isNew = computed(() => props.isNewMode);
 const dated = ref(null);
+const tickedNodes = ref();
 
 const _excludeType = ref('all');
 const excludeType = computed({
@@ -55,7 +58,21 @@ const arrayData = useArrayData('ZoneEvents');
 
 const exclusionGeoCreate = async () => {
     try {
-        console.log('exclusionGeoCreate');
+        if (isNew.value) {
+            const params = {
+                zoneFk: parseInt(route.params.id),
+                date: dated.value,
+                geoIds: tickedNodes.value,
+            };
+            await axios.post('Zones/exclusionGeo', params);
+        } else {
+            const params = {
+                zoneExclusionFk: props.event?.id,
+                geoIds: tickedNodes.value,
+            };
+            await axios.post('Zones/updateExclusionGeo', params);
+        }
+        await refetchEvents();
     } catch (err) {
         console.error('Error creating exclusion geo: ', err);
     }
@@ -86,7 +103,9 @@ const onSubmit = async () => {
 const deleteEvent = async () => {
     try {
         if (!props.event) return;
-        await axios.delete(`Zones/${route.params.id}/exclusions/${props.event?.id}`);
+        await axios.delete(
+            `Zones/${route.params.id}/exclusions/${props.event?.zoneExclusionFk}`
+        );
         await refetchEvents();
     } catch (err) {
         console.error('Error deleting event: ', err);
@@ -104,7 +123,8 @@ onMounted(() => {
     console.log('props.event', props.event);
     if (props.event) {
         dated.value = props.event?.dated;
-        excludeType.value = props.event?.type || 'all';
+        excludeType.value = props.geoIds.length ? 'specificLocations' : 'all';
+        tickedNodes.value = props.geoIds || [];
     } else if (props.date) dated.value = props.date;
 });
 </script>
@@ -138,6 +158,13 @@ onMounted(() => {
                     :label="t('eventsExclusionForm.specificLocations')"
                 />
             </div>
+            <div v-if="excludeType === 'specificLocations'">
+                <ZoneLocationsTree
+                    :toggle-indeterminate="false"
+                    :root-label="t('eventsExclusionForm.rootTreeLabel')"
+                    v-model:tickedNodes="tickedNodes"
+                />
+            </div>
         </template>
         <template #custom-buttons>
             <QBtn
@@ -148,7 +175,9 @@ onMounted(() => {
                 v-close-popup
             />
             <QBtn
-                v-if="!isNew && isExclusion"
+                v-if="
+                    !isNew && (eventType === 'exclusion' || eventType === 'geoExclusion')
+                "
                 :label="t('globals.delete')"
                 color="primary"
                 flat
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index daecac6ef..ca0157238 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -29,7 +29,7 @@ const props = defineProps({
         type: Boolean,
         default: true,
     },
-    isExclusion: {
+    eventType: {
         type: Boolean,
         default: true,
     },
@@ -45,11 +45,11 @@ const { openConfirmationModal } = useVnConfirm();
 const isNew = computed(() => props.isNewMode);
 const eventInclusionFormData = ref({});
 
-const _eventType = ref('day');
-const eventType = computed({
-    get: () => _eventType.value,
+const _inclusionType = ref('day');
+const inclusionType = computed({
+    get: () => _inclusionType.value,
     set: (val) => {
-        _eventType.value = val;
+        _inclusionType.value = val;
         eventInclusionFormData.value.type = val;
     },
 });
@@ -62,10 +62,10 @@ const createEvent = async () => {
             eventInclusionFormData.value.wdays
         );
 
-        if (eventType.value == 'day') eventInclusionFormData.value.weekDays = '';
+        if (inclusionType.value == 'day') eventInclusionFormData.value.weekDays = '';
         else eventInclusionFormData.value.dated = null;
 
-        if (eventType.value != 'range') {
+        if (inclusionType.value != 'range') {
             eventInclusionFormData.value.started = null;
             eventInclusionFormData.value.ended = null;
         }
@@ -110,7 +110,7 @@ const refetchEvents = async () => {
 onMounted(() => {
     if (props.event) {
         eventInclusionFormData.value = { ...props.event };
-        eventType.value = props.event?.type || 'day';
+        inclusionType.value = props.event?.type || 'day';
     } else if (props.date) eventInclusionFormData.value.dated = props.date;
 });
 </script>
@@ -127,19 +127,19 @@ onMounted(() => {
         <template #form-inputs>
             <div class="column q-gutter-y-sm q-mb-md">
                 <QRadio
-                    v-model="eventType"
+                    v-model="inclusionType"
                     dense
                     val="day"
                     :label="t('eventsInclusionForm.oneDay')"
                 />
                 <QRadio
-                    v-model="eventType"
+                    v-model="inclusionType"
                     dense
                     val="indefinitely"
                     :label="t('eventsInclusionForm.indefinitely')"
                 />
                 <QRadio
-                    v-model="eventType"
+                    v-model="inclusionType"
                     dense
                     val="range"
                     :label="t('eventsInclusionForm.rangeOfDates')"
@@ -149,7 +149,7 @@ onMounted(() => {
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col flex justify-center">
                     <VnInputDate
-                        v-if="eventType === 'day'"
+                        v-if="inclusionType === 'day'"
                         :label="t('eventsInclusionForm.day')"
                         v-model="eventInclusionFormData.dated"
                         class="full-width"
@@ -160,7 +160,7 @@ onMounted(() => {
                     />
                 </div>
             </VnRow>
-            <VnRow v-if="eventType === 'range'" class="row q-gutter-md q-mb-md">
+            <VnRow v-if="inclusionType === 'range'" class="row q-gutter-md q-mb-md">
                 <VnInputDate
                     :label="t('eventsInclusionForm.from')"
                     v-model="eventInclusionFormData.started"
@@ -214,7 +214,7 @@ onMounted(() => {
                 v-close-popup
             />
             <QBtn
-                v-if="!isNew && !isExclusion"
+                v-if="!isNew && isExclusion === 'event'"
                 :label="t('globals.delete')"
                 color="primary"
                 flat
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index bc02e7ab5..91df130ca 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -127,11 +127,10 @@ const data = computed({
 
         geoExclusions.value = {};
         let _geoExclusions = value.geoExclusions;
-
         if (_geoExclusions) {
             for (let geoExclusion of _geoExclusions) {
                 let stamp = toStamp(geoExclusion.dated);
-                if (!geoExclusions[stamp]) geoExclusions.value[stamp] = [];
+                if (!geoExclusions.value[stamp]) geoExclusions.value[stamp] = [];
                 geoExclusions.value[stamp].push(geoExclusion);
             }
         }
@@ -179,11 +178,13 @@ const step = (direction) => {
     date.value = _date;
 };
 
-const openForm = ({ date, isNewMode, event, isExclusion }) => {
+const openForm = ({ date, isNewMode, event, eventType, geoIds = [] }) => {
     zoneEventsFormProps.date = date;
     zoneEventsFormProps.isNewMode = isNewMode;
     zoneEventsFormProps.event = event;
-    zoneEventsFormProps.isExclusion = isExclusion;
+    zoneEventsFormProps.eventType = eventType;
+    if (geoIds.length) zoneEventsFormProps.geoIds = geoIds;
+
     showZoneEventForm.value = true;
 };
 
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 3057c5dff..9591e1678 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, watch } from 'vue';
+import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -7,6 +7,27 @@ import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
 
+const props = defineProps({
+    toggleIndeterminate: {
+        type: Boolean,
+        default: false,
+    },
+    isZoneLocationsView: {
+        type: Boolean,
+        default: false,
+    },
+    rootLabel: {
+        type: String,
+        default: 'Locations',
+    },
+    tickedNodes: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['update:tickedNodes']);
+
 const { t } = useI18n();
 const route = useRoute();
 const state = useState();
@@ -21,9 +42,20 @@ const { store } = arrayData;
 const storeData = computed(() => store.data);
 
 const nodes = ref([
-    { id: null, name: t('zoneLocations.locations'), sons: true, children: [{}] },
+    {
+        id: null,
+        name: props.rootLabel,
+        sons: true,
+        tickable: false,
+        noTick: true,
+        children: [{}],
+    },
 ]);
 
+const _tickedNodes = computed({
+    get: () => props.tickedNodes,
+    set: (value) => emit('update:tickedNodes', value),
+});
 const previousExpandedNodes = ref(new Set());
 
 const onNodeExpanded = async (nodeKeysArray) => {
@@ -46,6 +78,10 @@ const onNodeExpanded = async (nodeKeysArray) => {
 };
 
 const formatNodeSelected = (node) => {
+    if (!props.isZoneLocationsView) {
+        node.selected = false;
+        return;
+    }
     if (node.selected === 1) node.selected = true;
     else if (node.selected === 0) node.selected = false;
 };
@@ -83,6 +119,7 @@ const fetchNodeLeaves = async (nodeKey) => {
 
 const onSelected = async (val, node) => {
     try {
+        if (!props.isZoneLocationsView) return;
         if (val === null) val = undefined;
         const params = { geoId: node.id, isIncluded: val };
         await axios.post(`Zones/${route.params.id}/toggleIsIncluded`, params);
@@ -141,45 +178,49 @@ onMounted(async () => {
         }
     }, 1000);
 });
+
+onUnmounted(() => {
+    state.set('Tree', undefined);
+});
 </script>
 
 <template>
-    <QCard class="full-width" style="max-width: 800px">
-        <QTree
-            ref="treeRef"
-            :nodes="nodes"
-            node-key="id"
-            label-key="name"
-            v-model:expanded="expanded"
-            @update:expanded="onNodeExpanded($event)"
-            :default-expand-all="true"
-        >
-            <template #default-header="{ node }">
-                <div
-                    :id="node.id"
-                    class="qtr row justify-between full-width q-pr-md cursor-pointer"
-                >
-                    <span v-if="!node.id">{{ node.name }}</span>
-                    <QCheckbox
-                        v-else
-                        v-model="node.selected"
-                        :label="node.name"
-                        @update:model-value="($event) => onSelected($event, node)"
-                        toggle-indeterminate
-                        color="transparent"
-                        :class="[
-                            'checkbox',
-                            node.selected
-                                ? '--checked'
-                                : node.selected == false
-                                ? '--unchecked'
-                                : '--indeterminate',
-                        ]"
-                    />
-                </div>
-            </template>
-        </QTree>
-    </QCard>
+    <QTree
+        ref="treeRef"
+        :nodes="nodes"
+        node-key="id"
+        label-key="name"
+        v-model:expanded="expanded"
+        tick-strategy="strict"
+        v-model:ticked="_tickedNodes"
+        @update:expanded="onNodeExpanded($event)"
+        :default-expand-all="true"
+    >
+        <template #default-header="{ node }">
+            <div
+                :id="node.id"
+                class="qtr row justify-between full-width q-pr-md cursor-pointer"
+            >
+                <span v-if="!isZoneLocationsView">{{ node.name }}</span>
+                <QCheckbox
+                    v-else
+                    v-model="node.selected"
+                    :label="node.name"
+                    @update:model-value="($event) => onSelected($event, node)"
+                    toggle-indeterminate
+                    color="transparent"
+                    :class="[
+                        'checkbox',
+                        node.selected
+                            ? '--checked'
+                            : node.selected == false
+                            ? '--unchecked'
+                            : '--indeterminate',
+                    ]"
+                />
+            </div>
+        </template>
+    </QTree>
 </template>
 
 <style lang="scss">
diff --git a/src/pages/Zone/ZoneDeliveryCalendar.vue b/src/pages/Zone/ZoneDeliveryCalendar.vue
index 64651743a..9e273d2cf 100644
--- a/src/pages/Zone/ZoneDeliveryCalendar.vue
+++ b/src/pages/Zone/ZoneDeliveryCalendar.vue
@@ -93,10 +93,11 @@ const getEventByTimestamp = ({ year, month, day }) => {
     );
 };
 
-const eventIsAnyExclusion = ({ year, month, day }) => {
-    if (!event) return false;
+const getEventType = ({ year, month, day }) => {
     const stamp = new Date(year, month - 1, day).getTime();
-    return !!props.exclusions[stamp] || !!props.geoExclusions[stamp];
+    if (props.exclusions[stamp]) return 'exclusion';
+    if (props.geoExclusions[stamp]) return 'geoExclusion';
+    return 'event';
 };
 
 const getEventAttrs = ({ year, month, day }) => {
@@ -127,14 +128,21 @@ const handleDateClick = (timestamp) => {
     if (props.isZoneDeliveryView) return;
 
     const event = getEventByTimestamp(timestamp);
-    console.log('eventTTTTTTTT: ', event);
     const { year, month, day } = timestamp;
     const date = new Date(year, month - 1, day);
+    const stamp = date.getTime();
+    const eventType = getEventType(timestamp);
+
+    let geoIds = [];
+    if (eventType === 'geoExclusion')
+        geoIds = props.geoExclusions[stamp].map((geoExclusion) => geoExclusion.geoFk);
+
     emit('openZoneForm', {
         date,
         isNewMode: !event,
         event: event && event.length > 0 ? event[0] : null,
-        isExclusion: eventIsAnyExclusion(timestamp),
+        eventType,
+        geoIds,
     });
 };
 </script>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 6113dde08..d13f1ecf5 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -85,6 +85,7 @@ eventsExclusionForm:
     day: Day
     all: All
     specificLocations: Specific locations
+    rootTreeLabel: Locations where it is not distributed
 eventsInclusionForm:
     addEvent: Add event
     editEvent: Edit event
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index a9fd45704..c38d29386 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -87,6 +87,7 @@ eventsExclusionForm:
     day: Día
     all: Todo
     specificLocations: Localizaciones concretas
+    rootTreeLabel: Localizaciones en las que no se reparte
 eventsInclusionForm:
     addEvent: Añadir evento
     editEvent: Editar evento

From bfba4875ccc097e33b29efa6f1d1411cd07d9185 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 26 May 2024 18:54:59 -0300
Subject: [PATCH 07/24] Minor change in exclusion form

---
 src/pages/Zone/Card/ZoneEventExclusionForm.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 1573614a6..66bbeaaad 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -123,7 +123,8 @@ onMounted(() => {
     console.log('props.event', props.event);
     if (props.event) {
         dated.value = props.event?.dated;
-        excludeType.value = props.geoIds.length ? 'specificLocations' : 'all';
+        excludeType.value =
+            props.eventType === 'geoExclusion' ? 'specificLocations' : 'all';
         tickedNodes.value = props.geoIds || [];
     } else if (props.date) dated.value = props.date;
 });

From 3cb17eeb669b21cac983b725395369313ae3c9f9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 26 May 2024 18:55:35 -0300
Subject: [PATCH 08/24] remove console.logs

---
 src/pages/Zone/Card/ZoneEventExclusionForm.vue | 1 -
 src/pages/Zone/Card/ZoneEvents.vue             | 2 --
 src/pages/Zone/Card/ZoneEventsPanel.vue        | 2 --
 3 files changed, 5 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 66bbeaaad..d8dc6eab5 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -120,7 +120,6 @@ const refetchEvents = async () => {
 };
 
 onMounted(() => {
-    console.log('props.event', props.event);
     if (props.event) {
         dated.value = props.event?.dated;
         excludeType.value =
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 91df130ca..af0a7544b 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -94,8 +94,6 @@ const date = computed({
             months.value.push(monthDate);
         }
 
-        console.log('firstDay', firstDay.value);
-        console.log('lastDay', lastDay.value);
         refreshEvents();
     },
 });
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index d9b85bb88..5f282c968 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -97,7 +97,6 @@ const deleteEvent = async (id) => {
 };
 
 const openIncludeForm = (event) => {
-    console.log('zone event panel EVENT: ', event);
     formName.value = 'include';
     emit('openZoneForm', {
         date: event.dated,
@@ -108,7 +107,6 @@ const openIncludeForm = (event) => {
 
 onMounted(async () => {
     weekdayStore.initStore();
-    console.log('weekdayStore', weekdayStore.getLocalesMap);
     await nextTick();
     await fetchData();
     startParamsWatcher();

From dbcd701725985509085d24cb80c960a9190e956f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 26 May 2024 18:59:16 -0300
Subject: [PATCH 09/24] Change Zone Calendar name

---
 src/pages/Zone/Card/ZoneEvents.vue                            | 4 ++--
 src/pages/Zone/{ZoneDeliveryCalendar.vue => ZoneCalendar.vue} | 0
 src/pages/Zone/ZoneDeliveryDays.vue                           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/pages/Zone/{ZoneDeliveryCalendar.vue => ZoneCalendar.vue} (100%)

diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index af0a7544b..473a8960f 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -3,7 +3,7 @@ import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ZoneEventsPanel from './ZoneEventsPanel.vue';
-import ZoneDeliveryCalendar from '../ZoneDeliveryCalendar.vue';
+import ZoneCalendar from '../ZoneCalendar.vue';
 import ZoneEventInclusionForm from './ZoneEventInclusionForm.vue';
 import ZoneEventExclusionForm from './ZoneEventExclusionForm.vue';
 
@@ -253,7 +253,7 @@ onUnmounted(() => arrayData.destroy());
                 />
             </div>
             <div class="calendars-container">
-                <ZoneDeliveryCalendar
+                <ZoneCalendar
                     v-for="(month, index) in months"
                     :key="index"
                     :month="month.getMonth() + 1"
diff --git a/src/pages/Zone/ZoneDeliveryCalendar.vue b/src/pages/Zone/ZoneCalendar.vue
similarity index 100%
rename from src/pages/Zone/ZoneDeliveryCalendar.vue
rename to src/pages/Zone/ZoneCalendar.vue
diff --git a/src/pages/Zone/ZoneDeliveryDays.vue b/src/pages/Zone/ZoneDeliveryDays.vue
index dd0e23a2d..be51a8d77 100644
--- a/src/pages/Zone/ZoneDeliveryDays.vue
+++ b/src/pages/Zone/ZoneDeliveryDays.vue
@@ -3,7 +3,7 @@ import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
-import ZoneDeliveryCalendar from './ZoneDeliveryCalendar.vue';
+import ZoneCalendar from './ZoneCalendar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
@@ -222,7 +222,7 @@ onUnmounted(() => arrayData.destroy());
                 />
             </div>
             <div class="calendars-container">
-                <ZoneDeliveryCalendar
+                <ZoneCalendar
                     v-for="(month, index) in months"
                     :key="index"
                     :month="month.getMonth() + 1"

From f52f5df78bfceef92f8a7cdc46bfb58ae6c9e8b7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 26 May 2024 19:35:12 -0300
Subject: [PATCH 10/24] Make searchbar work

---
 src/components/common/VnCard.vue        |  2 ++
 src/components/ui/VnSearchbar.vue       | 18 ++++++++++++------
 src/pages/Zone/Card/ZoneCard.vue        |  2 ++
 src/pages/Zone/Card/ZoneEventsPanel.vue |  1 +
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index e836badec..929c24c58 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -22,6 +22,7 @@ const props = defineProps({
     searchbarInfo: { type: String, default: '' },
     searchCustomRouteRedirect: { type: String, default: undefined },
     searchRedirect: { type: Boolean, default: false },
+    searchMakeFetch: { type: Boolean, default: true },
 });
 
 const stateStore = useStateStore();
@@ -66,6 +67,7 @@ watchEffect(() => {
                     :info="props.searchbarInfo"
                     :custom-route-redirect-name="searchCustomRouteRedirect"
                     :redirect="searchRedirect"
+                    :make-fetch="props.searchMakeFetch"
                 />
             </slot>
         </Teleport>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index e5b2f02d2..34fc880d2 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -65,6 +65,10 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    makeFetch: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 let arrayData = useArrayData(props.dataKey, { ...props });
@@ -92,12 +96,14 @@ async function search() {
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
     store.skip = 0;
-    await arrayData.applyFilter({
-        params: {
-            ...Object.fromEntries(staticParams),
-            search: searchText.value,
-        },
-    });
+
+    if (props.makeFetch)
+        await arrayData.applyFilter({
+            params: {
+                ...Object.fromEntries(staticParams),
+                search: searchText.value,
+            },
+        });
 
     if (!props.redirect) return;
 
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index fc427c8cd..1cbc01dd7 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -14,6 +14,7 @@ const customRouteRedirectName = computed(() => {
     if (routeName.value === 'ZoneLocations') return null;
     return routeName.value;
 });
+const searchbarMakeFetch = computed(() => routeName.value !== 'ZoneEvents');
 const searchBarDataKeys = {
     ZoneWarehouses: 'ZoneWarehouses',
     ZoneSummary: 'ZoneSummary',
@@ -28,6 +29,7 @@ const searchBarDataKeys = {
         :search-data-key="searchBarDataKeys[routeName]"
         :search-custom-route-redirect="customRouteRedirectName"
         :search-redirect="!!customRouteRedirectName"
+        :search-make-fetch="searchbarMakeFetch"
         :searchbar-label="t('list.searchZone')"
         :searchbar-info="t('list.searchInfo')"
     />
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index 5f282c968..1ec82c54c 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -68,6 +68,7 @@ const startParamsWatcher = () => {
 
 const fetchData = async () => {
     try {
+        if (!params.value.zoneFk || !params.value.started || !params.value.ended) return;
         await arrayData.applyFilter({
             params: params.value,
         });

From 62443ff44b1752bdfc77ea7d4bdc574d22b3e0a0 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 26 May 2024 20:52:46 -0300
Subject: [PATCH 11/24] Abstract ZoneCalendarGrid in a component and reuse it

---
 src/pages/Zone/Card/ZoneEvents.vue      | 232 ++--------------------
 src/pages/Zone/Card/ZoneEventsPanel.vue |  24 +--
 src/pages/Zone/ZoneCalendar.vue         |  20 +-
 src/pages/Zone/ZoneCalendarGrid.vue     | 250 ++++++++++++++++++++++++
 src/pages/Zone/ZoneDeliveryDays.vue     | 225 +--------------------
 src/pages/Zone/ZoneDeliveryPanel.vue    |   1 -
 6 files changed, 288 insertions(+), 464 deletions(-)
 create mode 100644 src/pages/Zone/ZoneCalendarGrid.vue

diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 473a8960f..a63bd8573 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -1,31 +1,21 @@
 <script setup>
-import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ZoneEventsPanel from './ZoneEventsPanel.vue';
-import ZoneCalendar from '../ZoneCalendar.vue';
+import ZoneCalendarGrid from '../ZoneCalendarGrid.vue';
 import ZoneEventInclusionForm from './ZoneEventInclusionForm.vue';
 import ZoneEventExclusionForm from './ZoneEventExclusionForm.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { useWeekdayStore } from 'src/stores/useWeekdayStore';
-import { useArrayData } from 'src/composables/useArrayData';
-import { nextTick } from 'vue';
 import { reactive } from 'vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
-const weekdayStore = useWeekdayStore();
 
-const nMonths = ref(4);
-const _date = ref(Date.vnNew());
-const _data = ref(null);
 const firstDay = ref(null);
 const lastDay = ref(null);
-const months = ref([]);
-const days = ref({});
-const exclusions = ref({});
-const geoExclusions = ref({});
+
 const events = ref([]);
 const formModeName = ref('include');
 const showZoneEventForm = ref(false);
@@ -34,149 +24,8 @@ const zoneEventsFormProps = reactive({
     date: null,
 });
 
-const arrayData = useArrayData('ZoneEvents');
-const { store } = arrayData;
-
-const refreshEvents = () => {
-    days.value = {};
-    if (!data.value) return;
-
-    let day = new Date(firstDay.value.getTime());
-
-    while (day <= lastDay.value) {
-        let stamp = day.getTime();
-        let wday = day.getDay();
-        let dayEvents = [];
-        let _exclusions = exclusions.value[stamp] || [];
-
-        if (events.value) {
-            for (let event of events.value) {
-                let match;
-                switch (event.type) {
-                    case 'day':
-                        match = event.dated == stamp;
-                        break;
-                    default:
-                        match =
-                            event.wdays[wday] &&
-                            (!event.started || stamp >= event.started) &&
-                            (!event.ended || stamp <= event.ended);
-                        break;
-                }
-                if (match && !_exclusions.find((e) => e.zoneFk == event.zoneFk)) {
-                    dayEvents.push(event);
-                }
-            }
-        }
-        if (dayEvents.length) days.value[stamp] = dayEvents;
-
-        day.setDate(day.getDate() + 1);
-    }
-};
-
-const date = computed({
-    get: () => _date.value,
-    set: (value) => {
-        _date.value = value;
-        let stamp = value.getTime();
-
-        firstDay.value = new Date(stamp);
-        firstDay.value.setDate(1);
-
-        lastDay.value = new Date(stamp);
-        lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
-        lastDay.value.setDate(0);
-
-        months.value = [];
-        for (let i = 0; i < nMonths.value; i++) {
-            let monthDate = new Date(stamp);
-            monthDate.setMonth(value.getMonth() + i);
-            months.value.push(monthDate);
-        }
-
-        refreshEvents();
-    },
-});
-
-const data = computed({
-    get: () => {
-        return _data.value;
-    },
-    set: (value) => {
-        _data.value = value;
-
-        value = value || {};
-
-        events.value = value.events;
-        function toStamp(date) {
-            return date && new Date(date).setHours(0, 0, 0, 0);
-        }
-
-        exclusions.value = {};
-        let _exclusions = value.exclusions;
-
-        if (_exclusions) {
-            for (let exclusion of _exclusions) {
-                let stamp = toStamp(exclusion.dated);
-                if (!exclusions[stamp]) exclusions.value[stamp] = [];
-                exclusions.value[stamp].push(exclusion);
-            }
-        }
-
-        geoExclusions.value = {};
-        let _geoExclusions = value.geoExclusions;
-        if (_geoExclusions) {
-            for (let geoExclusion of _geoExclusions) {
-                let stamp = toStamp(geoExclusion.dated);
-                if (!geoExclusions.value[stamp]) geoExclusions.value[stamp] = [];
-                geoExclusions.value[stamp].push(geoExclusion);
-            }
-        }
-
-        let _events = value.events;
-        if (_events) {
-            for (let event of _events) {
-                event.dated = toStamp(event.dated);
-                event.ended = toStamp(event.ended);
-                event.started = toStamp(event.started);
-                event.wdays = weekdayStore.fromSet(event.weekDays || '');
-            }
-        }
-
-        refreshEvents();
-    },
-});
-
-watch(
-    () => store.data,
-    (value) => {
-        data.value = value;
-    },
-    { immediate: true }
-);
-
-const getMonthNameAndYear = (date) => {
-    const monthName = weekdayStore.getLocaleMonths[date.getMonth()].locale;
-    const year = date.getFullYear();
-    return `${monthName} ${year}`;
-};
-
-const headerTitle = computed(() => {
-    if (!months.value?.length) return;
-
-    const firstMonth = getMonthNameAndYear(months.value[0]);
-    const lastMonth = getMonthNameAndYear(months.value[months.value.length - 1]);
-
-    return `${firstMonth} - ${lastMonth}`;
-});
-
-const step = (direction) => {
-    const _date = new Date(date.value);
-    _date.setMonth(_date.getMonth() + nMonths.value * direction);
-    date.value = _date;
-};
-
-const openForm = ({ date, isNewMode, event, eventType, geoIds = [] }) => {
+const openForm = (data) => {
+    const { date, isNewMode, event, eventType, geoIds = [] } = data;
     zoneEventsFormProps.date = date;
     zoneEventsFormProps.isNewMode = isNewMode;
     zoneEventsFormProps.event = event;
@@ -190,18 +39,6 @@ const onZoneEventFormClose = () => {
     showZoneEventForm.value = false;
     zoneEventsFormProps.value = {};
 };
-
-onMounted(async () => {
-    let initialDate = Date.vnNew();
-    initialDate.setDate(1);
-    initialDate.setHours(0, 0, 0, 0);
-    date.value = initialDate;
-    weekdayStore.initStore();
-    await nextTick();
-    stateStore.rightDrawer = true;
-});
-
-onUnmounted(() => arrayData.destroy());
 </script>
 
 <template>
@@ -234,39 +71,13 @@ onUnmounted(() => arrayData.destroy());
         </QScrollArea>
     </QDrawer>
     <QPage class="q-pa-md flex justify-center">
-        <QCard style="height: max-content">
-            <div class="calendars-header">
-                <QBtn
-                    icon="arrow_left"
-                    size="sm"
-                    flat
-                    class="full-height"
-                    @click="step(-1)"
-                />
-                <span>{{ headerTitle }}</span>
-                <QBtn
-                    icon="arrow_right"
-                    size="sm"
-                    flat
-                    class="full-height"
-                    @click="step(1)"
-                />
-            </div>
-            <div class="calendars-container">
-                <ZoneCalendar
-                    v-for="(month, index) in months"
-                    :key="index"
-                    :month="month.getMonth() + 1"
-                    :year="month.getFullYear()"
-                    :month-date="month"
-                    :geo-exclusions="geoExclusions"
-                    :exclusions="exclusions"
-                    :days-map="days"
-                    :form-mode-name="formModeName"
-                    @open-zone-form="openForm"
-                />
-            </div>
-        </QCard>
+        <ZoneCalendarGrid
+            v-model:events="events"
+            v-model:firstDay="firstDay"
+            v-model:lastDay="lastDay"
+            data-key="ZoneEvents"
+            @on-date-selected="openForm"
+        />
         <QDialog v-model="showZoneEventForm" @hide="onZoneEventFormClose()">
             <ZoneEventInclusionForm
                 v-if="formModeName === 'include'"
@@ -281,22 +92,3 @@ onUnmounted(() => arrayData.destroy());
         </QDialog>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.calendars-header {
-    height: 45px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background-color: $primary;
-    font-weight: bold;
-    font-size: 16px;
-}
-
-.calendars-container {
-    max-width: 800px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-evenly;
-}
-</style>
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index 1ec82c54c..6cb31a093 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, watch, computed, nextTick } from 'vue';
+import { onMounted, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -56,19 +56,10 @@ const arrayData = useArrayData('ZoneEvents', {
     url: `Zones/getEventsFiltered`,
 });
 
-const startParamsWatcher = () => {
-    watch(
-        params,
-        async () => {
-            await fetchData();
-        },
-        { deep: true }
-    );
-};
-
 const fetchData = async () => {
     try {
         if (!params.value.zoneFk || !params.value.started || !params.value.ended) return;
+
         await arrayData.applyFilter({
             params: params.value,
         });
@@ -77,6 +68,14 @@ const fetchData = async () => {
     }
 };
 
+watch(
+    params,
+    async () => {
+        await fetchData();
+    },
+    { immediate: true, deep: true }
+);
+
 const formatWdays = (event) => {
     if (!event.weekDays) return;
 
@@ -108,9 +107,6 @@ const openIncludeForm = (event) => {
 
 onMounted(async () => {
     weekdayStore.initStore();
-    await nextTick();
-    await fetchData();
-    startParamsWatcher();
 });
 </script>
 
diff --git a/src/pages/Zone/ZoneCalendar.vue b/src/pages/Zone/ZoneCalendar.vue
index 9e273d2cf..f336415a4 100644
--- a/src/pages/Zone/ZoneCalendar.vue
+++ b/src/pages/Zone/ZoneCalendar.vue
@@ -2,6 +2,7 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
+import { useRoute } from 'vue-router';
 
 import ZoneClosingTable from './ZoneClosingTable.vue';
 import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
@@ -36,19 +37,12 @@ const props = defineProps({
         type: Object,
         default: null,
     },
-    isZoneDeliveryView: {
-        type: Boolean,
-        default: false,
-    },
-    formModeName: {
-        type: String,
-        default: 'include',
-    },
 });
 
-const emit = defineEmits(['openZoneForm']);
+const emit = defineEmits(['onDateSelected']);
 
 const { locale } = useI18n();
+const route = useRoute();
 
 const calendarRef = ref(null);
 const weekdayStore = useWeekdayStore();
@@ -62,8 +56,10 @@ const todayTimestamp = computed(() => {
 });
 const _monthDate = computed(() => date.formatDate(props.monthDate, 'YYYY-MM-DD'));
 
+const isZoneDeliveryView = computed(() => route.name === 'ZoneDeliveryDays');
+
 const onEventSelection = async ({ year, month, day }) => {
-    if (!props.isZoneDeliveryView) return;
+    if (!isZoneDeliveryView.value) return;
 
     const date = new Date(year, month - 1, day);
     const stamp = date.getTime();
@@ -125,7 +121,7 @@ const calendarHeaderTitle = computed(() => {
 });
 
 const handleDateClick = (timestamp) => {
-    if (props.isZoneDeliveryView) return;
+    if (isZoneDeliveryView.value) return;
 
     const event = getEventByTimestamp(timestamp);
     const { year, month, day } = timestamp;
@@ -137,7 +133,7 @@ const handleDateClick = (timestamp) => {
     if (eventType === 'geoExclusion')
         geoIds = props.geoExclusions[stamp].map((geoExclusion) => geoExclusion.geoFk);
 
-    emit('openZoneForm', {
+    emit('onDateSelected', {
         date,
         isNewMode: !event,
         event: event && event.length > 0 ? event[0] : null,
diff --git a/src/pages/Zone/ZoneCalendarGrid.vue b/src/pages/Zone/ZoneCalendarGrid.vue
new file mode 100644
index 000000000..98916e7c4
--- /dev/null
+++ b/src/pages/Zone/ZoneCalendarGrid.vue
@@ -0,0 +1,250 @@
+<script setup>
+import { computed, onMounted, ref, watch, onUnmounted, nextTick } from 'vue';
+
+import ZoneCalendar from './ZoneCalendar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const props = defineProps({
+    dataKey: {
+        type: Number,
+        required: true,
+    },
+});
+
+const emit = defineEmits([
+    'update:firstDay',
+    'update:lastDay',
+    'update:events',
+    'onDateSelected',
+]);
+
+const stateStore = useStateStore();
+const weekdayStore = useWeekdayStore();
+
+const nMonths = ref(4);
+const _date = ref(Date.vnNew());
+const _data = ref(null);
+const firstDay = ref(null);
+const lastDay = ref(null);
+const months = ref([]);
+const days = ref({});
+const exclusions = ref({});
+const geoExclusions = ref({});
+const events = ref([]);
+
+const arrayData = useArrayData(props.dataKey);
+const { store } = arrayData;
+
+const refreshEvents = () => {
+    days.value = {};
+    if (!data.value) return;
+
+    let day = new Date(firstDay.value.getTime());
+
+    while (day <= lastDay.value) {
+        let stamp = day.getTime();
+        let wday = day.getDay();
+        let dayEvents = [];
+        let _exclusions = exclusions.value[stamp] || [];
+
+        if (events.value) {
+            for (let event of events.value) {
+                let match;
+                switch (event.type) {
+                    case 'day':
+                        match = event.dated == stamp;
+                        break;
+                    default:
+                        match =
+                            event.wdays[wday] &&
+                            (!event.started || stamp >= event.started) &&
+                            (!event.ended || stamp <= event.ended);
+                        break;
+                }
+                if (match && !_exclusions.find((e) => e.zoneFk == event.zoneFk)) {
+                    dayEvents.push(event);
+                }
+            }
+        }
+        if (dayEvents.length) days.value[stamp] = dayEvents;
+
+        day.setDate(day.getDate() + 1);
+    }
+    emit('update:events', events.value);
+};
+
+const date = computed({
+    get: () => _date.value,
+    set: (value) => {
+        _date.value = value;
+        let stamp = value.getTime();
+
+        firstDay.value = new Date(stamp);
+        firstDay.value.setDate(1);
+
+        lastDay.value = new Date(stamp);
+        lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
+        lastDay.value.setDate(0);
+
+        months.value = [];
+        for (let i = 0; i < nMonths.value; i++) {
+            let monthDate = new Date(stamp);
+            monthDate.setMonth(value.getMonth() + i);
+            months.value.push(monthDate);
+        }
+
+        emit('update:firstDay', firstDay.value);
+        emit('update:lastDay', lastDay.value);
+        refreshEvents();
+    },
+});
+
+const data = computed({
+    get: () => {
+        return _data.value;
+    },
+    set: (value) => {
+        _data.value = value;
+
+        value = value || {};
+
+        events.value = value.events;
+        function toStamp(date) {
+            return date && new Date(date).setHours(0, 0, 0, 0);
+        }
+
+        exclusions.value = {};
+        let _exclusions = value.exclusions;
+
+        if (_exclusions) {
+            for (let exclusion of _exclusions) {
+                let stamp = toStamp(exclusion.dated);
+                if (!exclusions[stamp]) exclusions.value[stamp] = [];
+                exclusions.value[stamp].push(exclusion);
+            }
+        }
+
+        geoExclusions.value = {};
+        let _geoExclusions = value.geoExclusions;
+        if (_geoExclusions) {
+            for (let geoExclusion of _geoExclusions) {
+                let stamp = toStamp(geoExclusion.dated);
+                if (!geoExclusions.value[stamp]) geoExclusions.value[stamp] = [];
+                geoExclusions.value[stamp].push(geoExclusion);
+            }
+        }
+
+        let _events = value.events;
+        if (_events) {
+            for (let event of _events) {
+                event.dated = toStamp(event.dated);
+                event.ended = toStamp(event.ended);
+                event.started = toStamp(event.started);
+                event.wdays = weekdayStore.fromSet(event.weekDays || '');
+            }
+        }
+
+        refreshEvents();
+    },
+});
+
+watch(
+    () => store.data,
+    (value) => {
+        data.value = value;
+    },
+    { immediate: true }
+);
+
+const getMonthNameAndYear = (date) => {
+    const monthName = weekdayStore.getLocaleMonths[date.getMonth()].locale;
+    const year = date.getFullYear();
+    return `${monthName} ${year}`;
+};
+
+const headerTitle = computed(() => {
+    if (!months.value?.length) return;
+
+    const firstMonth = getMonthNameAndYear(months.value[0]);
+    const lastMonth = getMonthNameAndYear(months.value[months.value.length - 1]);
+
+    return `${firstMonth} - ${lastMonth}`;
+});
+
+const step = (direction) => {
+    const _date = new Date(date.value);
+    _date.setMonth(_date.getMonth() + nMonths.value * direction);
+    date.value = _date;
+};
+
+const onDateSelected = (data) => emit('onDateSelected', data);
+
+onMounted(async () => {
+    let initialDate = Date.vnNew();
+    initialDate.setDate(1);
+    initialDate.setHours(0, 0, 0, 0);
+    date.value = initialDate;
+    weekdayStore.initStore();
+    await nextTick();
+    stateStore.rightDrawer = true;
+});
+
+onUnmounted(() => arrayData.destroy());
+</script>
+
+<template>
+    <QCard style="height: max-content">
+        <div class="calendars-header">
+            <QBtn
+                icon="arrow_left"
+                size="sm"
+                flat
+                class="full-height"
+                @click="step(-1)"
+            />
+            <span>{{ headerTitle }}</span>
+            <QBtn
+                icon="arrow_right"
+                size="sm"
+                flat
+                class="full-height"
+                @click="step(1)"
+            />
+        </div>
+        <div class="calendars-container">
+            <ZoneCalendar
+                v-for="(month, index) in months"
+                :key="index"
+                :month="month.getMonth() + 1"
+                :year="month.getFullYear()"
+                :month-date="month"
+                :geo-exclusions="geoExclusions"
+                :exclusions="exclusions"
+                :days-map="days"
+                @on-date-selected="onDateSelected"
+            />
+        </div>
+    </QCard>
+</template>
+
+<style lang="scss" scoped>
+.calendars-header {
+    height: 45px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: $primary;
+    font-weight: bold;
+    font-size: 16px;
+}
+
+.calendars-container {
+    max-width: 800px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+}
+</style>
diff --git a/src/pages/Zone/ZoneDeliveryDays.vue b/src/pages/Zone/ZoneDeliveryDays.vue
index be51a8d77..3c985c98a 100644
--- a/src/pages/Zone/ZoneDeliveryDays.vue
+++ b/src/pages/Zone/ZoneDeliveryDays.vue
@@ -1,182 +1,18 @@
 <script setup>
-import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
-import ZoneCalendar from './ZoneCalendar.vue';
+import ZoneCalendarGrid from './ZoneCalendarGrid.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { useWeekdayStore } from 'src/stores/useWeekdayStore';
-import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
-const weekdayStore = useWeekdayStore();
 
-const nMonths = ref(4);
-const _date = ref(Date.vnNew());
-const _data = ref(null);
 const firstDay = ref(null);
 const lastDay = ref(null);
-const months = ref([]);
-const days = ref({});
-const exclusions = ref({});
-const geoExclusions = ref({});
 const events = ref([]);
-const arrayData = useArrayData('ZoneDeliveryDays', {
-    url: 'Zones/getEvents',
-});
-const { store } = arrayData;
-
-const refreshEvents = () => {
-    days.value = {};
-    if (!data.value) return;
-
-    let day = new Date(firstDay.value.getTime());
-
-    while (day <= lastDay.value) {
-        let stamp = day.getTime();
-        let wday = day.getDay();
-        let dayEvents = [];
-        let _exclusions = exclusions.value[stamp] || [];
-
-        if (events.value) {
-            for (let event of events.value) {
-                let match;
-                switch (event.type) {
-                    case 'day':
-                        match = event.dated == stamp;
-                        break;
-                    default:
-                        match =
-                            event.wdays[wday] &&
-                            (!event.started || stamp >= event.started) &&
-                            (!event.ended || stamp <= event.ended);
-                        break;
-                }
-                if (match && !_exclusions.find((e) => e.zoneFk == event.zoneFk)) {
-                    dayEvents.push(event);
-                }
-            }
-        }
-        if (dayEvents.length) days.value[stamp] = dayEvents;
-
-        day.setDate(day.getDate() + 1);
-    }
-};
-
-const date = computed({
-    get: () => _date.value,
-    set: (value) => {
-        _date.value = value;
-        let stamp = value.getTime();
-
-        firstDay.value = new Date(stamp);
-        firstDay.value.setDate(1);
-
-        lastDay.value = new Date(stamp);
-        lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
-        lastDay.value.setDate(0);
-
-        months.value = [];
-        for (let i = 0; i < nMonths.value; i++) {
-            let monthDate = new Date(stamp);
-            monthDate.setMonth(value.getMonth() + i);
-            months.value.push(monthDate);
-        }
-        refreshEvents();
-    },
-});
-
-const data = computed({
-    get: () => {
-        return _data.value;
-    },
-    set: (value) => {
-        _data.value = value;
-
-        value = value || {};
-
-        events.value = value.events;
-        function toStamp(date) {
-            return date && new Date(date).setHours(0, 0, 0, 0);
-        }
-
-        exclusions.value = {};
-        let _exclusions = value.exclusions;
-
-        if (_exclusions) {
-            for (let exclusion of _exclusions) {
-                let stamp = toStamp(exclusion.dated);
-                if (!exclusions[stamp]) exclusions.value[stamp] = [];
-                exclusions.value[stamp].push(exclusion);
-            }
-        }
-
-        geoExclusions.value = {};
-        let _geoExclusions = value.geoExclusions;
-
-        if (_geoExclusions) {
-            for (let geoExclusion of _geoExclusions) {
-                let stamp = toStamp(geoExclusion.dated);
-                if (!geoExclusions[stamp]) geoExclusions.value[stamp] = [];
-                geoExclusions.value[stamp].push(geoExclusion);
-            }
-        }
-
-        let _events = value.events;
-        if (_events) {
-            for (let event of _events) {
-                event.dated = toStamp(event.dated);
-                event.ended = toStamp(event.ended);
-                event.started = toStamp(event.started);
-                event.wdays = weekdayStore.fromSet(event.weekDays || '');
-            }
-        }
-
-        refreshEvents();
-    },
-});
-
-watch(
-    () => store.data,
-    (value) => {
-        data.value = value;
-    },
-    { immediate: true }
-);
-
-const getMonthNameAndYear = (date) => {
-    const monthName = weekdayStore.getLocaleMonths[date.getMonth()].locale;
-    const year = date.getFullYear();
-    return `${monthName} ${year}`;
-};
-
-const headerTitle = computed(() => {
-    if (!months.value?.length) return;
-
-    const firstMonth = getMonthNameAndYear(months.value[0]);
-    const lastMonth = getMonthNameAndYear(months.value[months.value.length - 1]);
-
-    return `${firstMonth} - ${lastMonth}`;
-});
-
-const step = (direction) => {
-    const _date = new Date(date.value);
-    _date.setMonth(_date.getMonth() + nMonths.value * direction);
-    date.value = _date;
-};
-
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-    let initialDate = Date.vnNew();
-    initialDate.setDate(1);
-    initialDate.setHours(0, 0, 0, 0);
-    date.value = initialDate;
-    weekdayStore.initStore();
-});
-
-onUnmounted(() => arrayData.destroy());
 </script>
 
 <template>
@@ -203,56 +39,11 @@ onUnmounted(() => arrayData.destroy());
         </QScrollArea>
     </QDrawer>
     <QPage class="q-pa-md flex justify-center">
-        <QCard style="height: max-content">
-            <div class="calendars-header">
-                <QBtn
-                    icon="arrow_left"
-                    size="sm"
-                    flat
-                    class="full-height"
-                    @click="step(-1)"
-                />
-                <span>{{ headerTitle }}</span>
-                <QBtn
-                    icon="arrow_right"
-                    size="sm"
-                    flat
-                    class="full-height"
-                    @click="step(1)"
-                />
-            </div>
-            <div class="calendars-container">
-                <ZoneCalendar
-                    v-for="(month, index) in months"
-                    :key="index"
-                    :month="month.getMonth() + 1"
-                    :year="month.getFullYear()"
-                    :month-date="month"
-                    :geo-exclusions="geoExclusions"
-                    :exclusions="exclusions"
-                    :days-map="days"
-                    is-zone-delivery-view
-                />
-            </div>
-        </QCard>
+        <ZoneCalendarGrid
+            v-model:events="events"
+            v-model:firstDay="firstDay"
+            v-model:lastDay="lastDay"
+            data-key="ZoneDeliveryDays"
+        />
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.calendars-header {
-    height: 45px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background-color: $primary;
-    font-weight: bold;
-    font-size: 16px;
-}
-
-.calendars-container {
-    max-width: 800px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-evenly;
-}
-</style>
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index c754d484f..03f534701 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -2,7 +2,6 @@
 import { onMounted, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';

From cff434c1a6a8d44e49129bd344ba8350d94094e8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 27 May 2024 13:20:42 -0300
Subject: [PATCH 12/24] Add sticky form button

---
 src/pages/Zone/Card/ZoneEventInclusionForm.vue |  7 +++++--
 src/pages/Zone/Card/ZoneEvents.vue             | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index ca0157238..00ad63aee 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -45,7 +45,7 @@ const { openConfirmationModal } = useVnConfirm();
 const isNew = computed(() => props.isNewMode);
 const eventInclusionFormData = ref({});
 
-const _inclusionType = ref('day');
+const _inclusionType = ref('indefinitely');
 const inclusionType = computed({
     get: () => _inclusionType.value,
     set: (val) => {
@@ -111,7 +111,10 @@ onMounted(() => {
     if (props.event) {
         eventInclusionFormData.value = { ...props.event };
         inclusionType.value = props.event?.type || 'day';
-    } else if (props.date) eventInclusionFormData.value.dated = props.date;
+    } else if (props.date) {
+        eventInclusionFormData.value.dated = props.date;
+        inclusionType.value = 'day';
+    } else inclusionType.value = 'indefinitely';
 });
 </script>
 
diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index a63bd8573..90a5cef8f 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -25,7 +25,7 @@ const zoneEventsFormProps = reactive({
 });
 
 const openForm = (data) => {
-    const { date, isNewMode, event, eventType, geoIds = [] } = data;
+    const { date = null, isNewMode, event, eventType, geoIds = [] } = data;
     zoneEventsFormProps.date = date;
     zoneEventsFormProps.isNewMode = isNewMode;
     zoneEventsFormProps.event = event;
@@ -90,5 +90,20 @@ const onZoneEventFormClose = () => {
                 @close-form="onZoneEventFormClose()"
             />
         </QDialog>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn
+                @click="
+                    openForm({
+                        isNewMode: true,
+                    })
+                "
+                color="primary"
+                fab
+                icon="add"
+            />
+            <QTooltip class="text-no-wrap">
+                {{ t('eventsInclusionForm.addEvent') }}
+            </QTooltip>
+        </QPageSticky>
     </QPage>
 </template>

From c4b88fae412b739ffc1a5829b773d946e02fff1e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 27 May 2024 14:30:36 -0300
Subject: [PATCH 13/24] adapt tree

---
 .../Zone/Card/ZoneEventExclusionForm.vue      |   6 +-
 src/pages/Zone/Card/ZoneLocationsTree.vue     | 134 +++++-------------
 2 files changed, 43 insertions(+), 97 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index d8dc6eab5..456c16373 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -163,7 +163,11 @@ onMounted(() => {
                     :toggle-indeterminate="false"
                     :root-label="t('eventsExclusionForm.rootTreeLabel')"
                     v-model:tickedNodes="tickedNodes"
-                />
+                >
+                    <template #content="{ node }">
+                        <span>{{ node.name }}</span>
+                    </template>
+                </ZoneLocationsTree>
             </div>
         </template>
         <template #custom-buttons>
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 9591e1678..8b96bfae5 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -8,14 +8,6 @@ import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
 
 const props = defineProps({
-    toggleIndeterminate: {
-        type: Boolean,
-        default: false,
-    },
-    isZoneLocationsView: {
-        type: Boolean,
-        default: false,
-    },
     rootLabel: {
         type: String,
         default: 'Locations',
@@ -56,13 +48,16 @@ const _tickedNodes = computed({
     get: () => props.tickedNodes,
     set: (value) => emit('update:tickedNodes', value),
 });
+
 const previousExpandedNodes = ref(new Set());
 
 const onNodeExpanded = async (nodeKeysArray) => {
-    const nodeKeysSet = new Set(nodeKeysArray);
+    let nodeKeysSet = new Set(nodeKeysArray);
     const lastNodeKey = nodeKeysArray.at(-1);
-    const wasExpanded = !previousExpandedNodes.value.has(lastNodeKey);
 
+    if (!nodeKeysSet.has(null)) return;
+
+    const wasExpanded = !previousExpandedNodes.value.has(lastNodeKey);
     if (wasExpanded) await fetchNodeLeaves(lastNodeKey);
     else {
         const difference = new Set(
@@ -73,17 +68,22 @@ const onNodeExpanded = async (nodeKeysArray) => {
         const allNodeIds = getNodeIds(node);
         expanded.value = expanded.value.filter((id) => !allNodeIds.includes(id));
     }
-
     previousExpandedNodes.value = nodeKeysSet;
 };
 
 const formatNodeSelected = (node) => {
-    if (!props.isZoneLocationsView) {
-        node.selected = false;
-        return;
-    }
     if (node.selected === 1) node.selected = true;
     else if (node.selected === 0) node.selected = false;
+
+    if (node.childs && node.childs.length > 0) {
+        expanded.value.push(node.id);
+
+        node.childs.forEach((childNode) => {
+            formatNodeSelected(childNode);
+        });
+    }
+
+    if (node.sons > 0 && !node.childs) node.childs = [{}];
 };
 
 const fetchNodeLeaves = async (nodeKey) => {
@@ -96,16 +96,8 @@ const fetchNodeLeaves = async (nodeKey) => {
             params,
         });
         if (response.data) {
-            node.children = response.data.map((n) => {
-                const hasChildrens = n.sons > 0;
-                n.children = hasChildrens ? [{}] : null;
+            node.childs = response.data.map((n) => {
                 formatNodeSelected(n);
-
-                if (n.child && n.child.length > 0) {
-                    n.child.forEach((childNode) => {
-                        formatNodeSelected(childNode);
-                    });
-                }
                 return n;
             });
         }
@@ -117,39 +109,34 @@ const fetchNodeLeaves = async (nodeKey) => {
     }
 };
 
-const onSelected = async (val, node) => {
-    try {
-        if (!props.isZoneLocationsView) return;
-        if (val === null) val = undefined;
-        const params = { geoId: node.id, isIncluded: val };
-        await axios.post(`Zones/${route.params.id}/toggleIsIncluded`, params);
-    } catch (err) {
-        console.error('Error updating included', err);
-    }
-};
-
 function getNodeIds(node) {
     let ids = [];
     if (node.id) ids.push(node.id);
 
-    const children = node.childs || node.children;
-    if (children) {
-        children.forEach((child) => {
+    if (node.childs)
+        node.childs.forEach((child) => {
             ids = ids.concat(getNodeIds(child));
         });
-    }
     return ids;
 }
 
 watch(storeData, async (val) => {
     // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
-    nodes.value[0].children = [...val];
+    nodes.value[0].childs = [...val];
     const fetchedNodeKeys = val.flatMap(getNodeIds);
     state.set('Tree', [...fetchedNodeKeys]);
-    for (let n of state.get('Tree')) {
-        await fetchNodeLeaves(n);
+
+    if (store.userParams?.search === '') {
+        val.forEach((n) => {
+            formatNodeSelected(n);
+        });
+    } else {
+        for (let n of state.get('Tree')) {
+            await fetchNodeLeaves(n);
+        }
+        expanded.value = [null];
     }
-    expanded.value = [null, 1, ...fetchedNodeKeys];
+    previousExpandedNodes.value = new Set(expanded.value);
 });
 
 onMounted(async () => {
@@ -158,13 +145,12 @@ onMounted(async () => {
         return;
     }
     const stateTree = state.get('Tree');
-    const tree = stateTree ? [...state.get('Tree'), 1] : [null, 1];
+    const tree = stateTree ? [...state.get('Tree')] : [null];
     const lastStateTree = state.get('TreeState');
     if (tree) {
         for (let n of tree) {
             await fetchNodeLeaves(n);
         }
-        expanded.value = tree;
 
         if (lastStateTree) {
             tree.push(lastStateTree);
@@ -177,6 +163,9 @@ onMounted(async () => {
             document.getElementById(lastStateTree).scrollIntoView();
         }
     }, 1000);
+
+    expanded.value = [null];
+    previousExpandedNodes.value = new Set(expanded.value);
 });
 
 onUnmounted(() => {
@@ -190,10 +179,11 @@ onUnmounted(() => {
         :nodes="nodes"
         node-key="id"
         label-key="name"
-        v-model:expanded="expanded"
+        children-key="childs"
         tick-strategy="strict"
-        v-model:ticked="_tickedNodes"
+        v-model:expanded="expanded"
         @update:expanded="onNodeExpanded($event)"
+        v-model:ticked="_tickedNodes"
         :default-expand-all="true"
     >
         <template #default-header="{ node }">
@@ -201,56 +191,8 @@ onUnmounted(() => {
                 :id="node.id"
                 class="qtr row justify-between full-width q-pr-md cursor-pointer"
             >
-                <span v-if="!isZoneLocationsView">{{ node.name }}</span>
-                <QCheckbox
-                    v-else
-                    v-model="node.selected"
-                    :label="node.name"
-                    @update:model-value="($event) => onSelected($event, node)"
-                    toggle-indeterminate
-                    color="transparent"
-                    :class="[
-                        'checkbox',
-                        node.selected
-                            ? '--checked'
-                            : node.selected == false
-                            ? '--unchecked'
-                            : '--indeterminate',
-                    ]"
-                />
+                <slot name="content" :node="node" />
             </div>
         </template>
     </QTree>
 </template>
-
-<style lang="scss">
-.checkbox {
-    &.--checked {
-        .q-checkbox__bg {
-            border: 1px solid $info !important;
-        }
-        .q-checkbox__svg {
-            color: white !important;
-            background-color: $info !important;
-        }
-    }
-
-    &.--unchecked {
-        .q-checkbox__bg {
-            border: 1px solid $negative !important;
-        }
-        .q-checkbox__svg {
-            background-color: $negative !important;
-        }
-    }
-
-    &.--indeterminate {
-        .q-checkbox__bg {
-            border: 1px solid $white !important;
-        }
-        .q-checkbox__svg {
-            color: transparent !important;
-        }
-    }
-}
-</style>

From 7cd2bf231911dc22214d72cdc26380c9adf86c0d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 27 May 2024 14:44:44 -0300
Subject: [PATCH 14/24] watch fix

---
 src/pages/Zone/Card/ZoneLocationsTree.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 8b96bfae5..4f594cb03 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -134,7 +134,7 @@ watch(storeData, async (val) => {
         for (let n of state.get('Tree')) {
             await fetchNodeLeaves(n);
         }
-        expanded.value = [null];
+        expanded.value = [null, ...fetchedNodeKeys];
     }
     previousExpandedNodes.value = new Set(expanded.value);
 });

From b783adfc318afb7f578e858d213689851cda1850 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 28 May 2024 09:30:13 -0300
Subject: [PATCH 15/24] several changes

---
 src/components/common/VnWeekdayPicker.vue     | 12 ++++-----
 .../Zone/Card/ZoneEventExclusionForm.vue      | 10 +++----
 .../Zone/Card/ZoneEventInclusionForm.vue      |  6 ++---
 src/pages/Zone/Card/ZoneEventsPanel.vue       |  7 ++---
 src/pages/Zone/Card/ZoneLocationsTree.vue     | 27 ++++++++++++++++---
 src/pages/Zone/ZoneCalendarGrid.vue           |  2 +-
 6 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/components/common/VnWeekdayPicker.vue b/src/components/common/VnWeekdayPicker.vue
index bbeb3d9ba..10e6b2c4d 100644
--- a/src/components/common/VnWeekdayPicker.vue
+++ b/src/components/common/VnWeekdayPicker.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { computed } from 'vue';
 
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 
@@ -14,12 +14,12 @@ const emit = defineEmits(['update:wdays']);
 
 const weekdayStore = useWeekdayStore();
 
-const selectedWDays = ref(props.wdays);
+const selectedWDays = computed({
+    get: () => props.wdays,
+    set: (value) => emit('update:wdays', value),
+});
 
-const toggleDay = (index) => {
-    selectedWDays.value[index] = !selectedWDays.value[index];
-    emit('update:wdays', selectedWDays.value);
-};
+const toggleDay = (index) => (selectedWDays.value[index] = !selectedWDays.value[index]);
 </script>
 
 <template>
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 456c16373..6b253067a 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -67,7 +67,7 @@ const exclusionGeoCreate = async () => {
             await axios.post('Zones/exclusionGeo', params);
         } else {
             const params = {
-                zoneExclusionFk: props.event?.id,
+                zoneExclusionFk: props.event?.zoneExclusionFk,
                 geoIds: tickedNodes.value,
             };
             await axios.post('Zones/updateExclusionGeo', params);
@@ -103,9 +103,8 @@ const onSubmit = async () => {
 const deleteEvent = async () => {
     try {
         if (!props.event) return;
-        await axios.delete(
-            `Zones/${route.params.id}/exclusions/${props.event?.zoneExclusionFk}`
-        );
+        const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
+        await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
         await refetchEvents();
     } catch (err) {
         console.error('Error deleting event: ', err);
@@ -120,6 +119,7 @@ const refetchEvents = async () => {
 };
 
 onMounted(() => {
+    console.log('event.eventType: ', props.eventType);
     if (props.event) {
         dated.value = props.event?.dated;
         excludeType.value =
@@ -160,9 +160,9 @@ onMounted(() => {
             </div>
             <div v-if="excludeType === 'specificLocations'">
                 <ZoneLocationsTree
-                    :toggle-indeterminate="false"
                     :root-label="t('eventsExclusionForm.rootTreeLabel')"
                     v-model:tickedNodes="tickedNodes"
+                    show-search-bar
                 >
                     <template #content="{ node }">
                         <span>{{ node.name }}</span>
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index 00ad63aee..808f14a53 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnInput from 'src/components/common/VnInput.vue';
 import { useRoute } from 'vue-router';
 
 import VnRow from 'components/ui/VnRow.vue';
@@ -9,6 +8,7 @@ import FormPopup from 'components/FormPopup.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnWeekdayPicker from 'src/components/common/VnWeekdayPicker.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
@@ -43,7 +43,7 @@ const weekdayStore = useWeekdayStore();
 const { openConfirmationModal } = useVnConfirm();
 
 const isNew = computed(() => props.isNewMode);
-const eventInclusionFormData = ref({});
+const eventInclusionFormData = ref({ wdays: [] });
 
 const _inclusionType = ref('indefinitely');
 const inclusionType = computed({
@@ -217,7 +217,7 @@ onMounted(() => {
                 v-close-popup
             />
             <QBtn
-                v-if="!isNew && isExclusion === 'event'"
+                v-if="!isNew && eventType === 'event'"
                 :label="t('globals.delete')"
                 color="primary"
                 flat
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index 6cb31a093..10f59eee5 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -96,12 +96,13 @@ const deleteEvent = async (id) => {
     }
 };
 
-const openIncludeForm = (event) => {
+const openInclusionForm = (event) => {
     formName.value = 'include';
     emit('openZoneForm', {
         date: event.dated,
         event,
         isNewMode: false,
+        eventType: 'event',
     });
 };
 
@@ -135,7 +136,7 @@ onMounted(async () => {
         }}</span>
         <QList>
             <QItem v-for="(event, index) in events" :key="index" class="event-card">
-                <QItemSection left @click="openIncludeForm(event)">
+                <QItemSection left @click="openInclusionForm(event)">
                     <div v-if="event.type == 'day'" class="q-mb-xs">
                         {{ toDateFormat(event.dated) }}
                     </div>
@@ -173,7 +174,7 @@ onMounted(async () => {
                         <span class="color-vn-text"> {{ dashIfEmpty(event.m3Max) }}</span>
                     </span>
                 </QItemSection>
-                <QItemSection side @click="openIncludeForm(event)">
+                <QItemSection side @click="openInclusionForm(event)">
                     <QBtn
                         icon="delete"
                         flat
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 4f594cb03..1ff5dba4a 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -3,6 +3,8 @@ import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
+import VnInput from 'src/components/common/VnInput.vue';
+
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
@@ -16,6 +18,10 @@ const props = defineProps({
         type: Array,
         default: () => [],
     },
+    showSearchBar: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const emit = defineEmits(['update:tickedNodes']);
@@ -131,17 +137,20 @@ watch(storeData, async (val) => {
             formatNodeSelected(n);
         });
     } else {
-        for (let n of state.get('Tree')) {
-            await fetchNodeLeaves(n);
-        }
+        if (!props.showSearchBar)
+            for (let n of state.get('Tree')) await fetchNodeLeaves(n);
         expanded.value = [null, ...fetchedNodeKeys];
     }
     previousExpandedNodes.value = new Set(expanded.value);
 });
 
+const reFetch = async () => {
+    await arrayData.fetch({ append: false });
+};
+
 onMounted(async () => {
     if (store.userParams?.search) {
-        await arrayData.fetch({ append: false });
+        await reFetch();
         return;
     }
     const stateTree = state.get('Tree');
@@ -174,6 +183,16 @@ onUnmounted(() => {
 </script>
 
 <template>
+    <VnInput
+        v-if="showSearchBar"
+        v-model="store.userParams.search"
+        :placeholder="t('globals.search')"
+        @keydown.enter.prevent="reFetch()"
+    >
+        <template #prepend>
+            <QIcon class="cursor-pointer" name="search" />
+        </template>
+    </VnInput>
     <QTree
         ref="treeRef"
         :nodes="nodes"
diff --git a/src/pages/Zone/ZoneCalendarGrid.vue b/src/pages/Zone/ZoneCalendarGrid.vue
index 98916e7c4..91d2cc7eb 100644
--- a/src/pages/Zone/ZoneCalendarGrid.vue
+++ b/src/pages/Zone/ZoneCalendarGrid.vue
@@ -9,7 +9,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 
 const props = defineProps({
     dataKey: {
-        type: Number,
+        type: String,
         required: true,
     },
 });

From e80b9a71c6433b1758a3880dc802b7e1740b2167 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 28 May 2024 11:24:52 -0300
Subject: [PATCH 16/24] Hide panel when ZoneEvent view unmounts

---
 src/pages/Zone/Card/ZoneEvents.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 90a5cef8f..e4fe5ff22 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ZoneEventsPanel from './ZoneEventsPanel.vue';
@@ -39,6 +39,8 @@ const onZoneEventFormClose = () => {
     showZoneEventForm.value = false;
     zoneEventsFormProps.value = {};
 };
+
+onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>

From 21879b54abedeeb8419f35f219abc03b0fcf2c3b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 28 May 2024 17:41:17 -0300
Subject: [PATCH 17/24] remove console.log

---
 src/pages/Zone/Card/ZoneEventExclusionForm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 541c2bfae..c0247de4a 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -119,7 +119,6 @@ const refetchEvents = async () => {
 };
 
 onMounted(() => {
-    console.log('event.eventType: ', props.eventType);
     if (props.event) {
         dated.value = props.event?.dated;
         excludeType.value =

From f9fa68b0b121e6988276da762d24299ceca44649 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 29 May 2024 12:12:07 +0200
Subject: [PATCH 18/24] feat: dashOrCurrency filter

---
 src/filters/dashOrCurrency.js | 6 ++++++
 src/filters/index.js          | 2 ++
 2 files changed, 8 insertions(+)
 create mode 100644 src/filters/dashOrCurrency.js

diff --git a/src/filters/dashOrCurrency.js b/src/filters/dashOrCurrency.js
new file mode 100644
index 000000000..9873990ab
--- /dev/null
+++ b/src/filters/dashOrCurrency.js
@@ -0,0 +1,6 @@
+import toCurrency from './toCurrency';
+
+export default function (value) {
+    if (value == null || value === '') return () => '-';
+    return toCurrency;
+}
diff --git a/src/filters/index.js b/src/filters/index.js
index 43bfc2d40..940788ed1 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -10,6 +10,7 @@ import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
 import dateRange from './dateRange';
 import toHour from './toHour';
+import dashOrCurrency from './dashOrCurrency';
 
 export {
     toLowerCase,
@@ -17,6 +18,7 @@ export {
     toDate,
     toHour,
     toDateString,
+    dashOrCurrency,
     toDateHourMin,
     toDateHourMinSec,
     toRelativeDate,

From c5e2a40d3e78b9256b641ac4587bbf602da8b065 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 29 May 2024 12:12:40 +0200
Subject: [PATCH 19/24] feat: add router.meta.moduleName as default param

---
 src/composables/useArrayData.js                 | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInBasicData.vue | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue    | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue | 4 +---
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue   | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInVat.vue       | 5 ++---
 src/pages/InvoiceIn/InvoiceInToBook.vue         | 2 +-
 src/pages/Zone/Card/ZoneEventExclusionForm.vue  | 2 +-
 8 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index e2465f5ba..d9bcb4904 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -6,7 +6,7 @@ import { buildFilter } from 'filters/filterPanel';
 
 const arrayDataStore = useArrayDataStore();
 
-export function useArrayData(key, userOptions) {
+export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index bd7d758b4..06e79340a 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -19,7 +19,7 @@ const { t } = useI18n();
 const dms = ref({});
 const route = useRoute();
 const editDownloadDisabled = ref(false);
-const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
+const invoiceIn = computed(() => useArrayData().store.data);
 const userConfig = ref(null);
 const invoiceId = computed(() => +route.params.id);
 
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index de59b142e..9325a5b41 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -13,7 +13,7 @@ import { toCurrency } from 'src/filters';
 
 const route = useRoute();
 const { t } = useI18n();
-const arrayData = useArrayData(route.meta.moduleName);
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 
 const rowsSelected = ref([]);
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 1d1205d9e..67c197636 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -11,9 +11,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 const { t } = useI18n();
 
 const route = useRoute();
-const currency = computed(
-    () => useArrayData(route.meta.moduleName).store.data?.currency?.code
-);
+const currency = computed(() => useArrayData().store.data?.currency?.code);
 const invoceInIntrastat = ref([]);
 const rowsSelected = ref([]);
 const countries = ref([]);
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 3ee90b5c2..b7f8adf50 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -16,7 +16,7 @@ const { t } = useI18n();
 const route = useRoute();
 
 const entityId = computed(() => props.id || +route.params.id);
-const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
+const invoiceIn = computed(() => useArrayData().store.data);
 const currency = computed(() => invoiceIn.value?.currency?.code);
 const invoiceInUrl = ref();
 const amountsNotMatch = ref(null);
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 6fc844eff..58f6e0d01 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -11,13 +11,12 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'src/components/CrudModel.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
-const router = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
 
-const arrayData = useArrayData(router.meta.moduleName);
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
-const invoiceId = +router.params.id;
+const invoiceId = +useRoute().params.id;
 const currency = computed(() => invoiceIn.value?.currency?.code);
 const expenses = ref([]);
 const sageTaxTypes = ref([]);
diff --git a/src/pages/InvoiceIn/InvoiceInToBook.vue b/src/pages/InvoiceIn/InvoiceInToBook.vue
index 26fdb641b..1ab6ccdda 100644
--- a/src/pages/InvoiceIn/InvoiceInToBook.vue
+++ b/src/pages/InvoiceIn/InvoiceInToBook.vue
@@ -10,7 +10,7 @@ const { t } = useI18n();
 
 defineExpose({ checkToBook });
 
-const { store } = useArrayData(useRoute().meta.moduleName);
+const { store } = useArrayData();
 
 async function checkToBook(id) {
     let directBooking = true;
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index c0247de4a..03fc157be 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -54,7 +54,7 @@ const excludeType = computed({
     },
 });
 
-const arrayData = useArrayData('ZoneEvents');
+const arrayData = useArrayData();
 
 const exclusionGeoCreate = async () => {
     try {

From b7bc82aa3c1da227bf4c19cb137febc27233cbbb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 29 May 2024 12:12:50 +0200
Subject: [PATCH 20/24] feat: use new filter

---
 src/pages/Zone/Card/ZoneEventsPanel.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index 10f59eee5..7e286f4fe 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import axios from 'axios';
 import { toDateFormat, toTimeFormat } from 'src/filters/date.js';
-import { toCurrency } from 'filters/index';
+import { dashOrCurrency, toCurrency } from 'filters/index';
 import { dashIfEmpty } from 'src/filters';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useVnConfirm } from 'composables/useVnConfirm';
@@ -163,11 +163,15 @@ onMounted(async () => {
                     </span>
                     <span class="color-vn-label">
                         {{ t('eventsPanel.price') }}:
-                        <span class="color-vn-text"> {{ toCurrency(event.price) }}</span>
+                        <span class="color-vn-text">
+                            {{ dashOrCurrency(event.price)() }}</span
+                        >
                     </span>
                     <span class="color-vn-label">
                         {{ t('eventsPanel.bonus') }}:
-                        <span class="color-vn-text"> {{ toCurrency(event.bonus) }}</span>
+                        <span class="color-vn-text">
+                            {{ dashOrCurrency(event.bonus)() }}</span
+                        >
                     </span>
                     <span class="color-vn-label">
                         {{ t('eventsPanel.m3Max') }}:

From ed566e6ece411b2068d7fc910f58bb9d1ffe11f8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 29 May 2024 12:13:11 +0200
Subject: [PATCH 21/24] style: increase height

---
 src/pages/Zone/Card/ZoneEventExclusionForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 03fc157be..c737766f3 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -159,7 +159,7 @@ onMounted(() => {
             </div>
             <div
                 v-if="excludeType === 'specificLocations'"
-                style="max-height: 400px; overflow-y: scroll"
+                style="min-height: 60vh; overflow-y: scroll"
             >
                 <ZoneLocationsTree
                     :root-label="t('eventsExclusionForm.rootTreeLabel')"

From 3f76aea680125ab7b8c58ff3c9cb83fcab63606a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 29 May 2024 12:17:45 +0200
Subject: [PATCH 22/24] fix: dashOrCurrency filter

---
 src/filters/dashOrCurrency.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/filters/dashOrCurrency.js b/src/filters/dashOrCurrency.js
index 9873990ab..00243921c 100644
--- a/src/filters/dashOrCurrency.js
+++ b/src/filters/dashOrCurrency.js
@@ -2,5 +2,5 @@ import toCurrency from './toCurrency';
 
 export default function (value) {
     if (value == null || value === '') return () => '-';
-    return toCurrency;
+    return () => toCurrency(value);
 }

From 17c3a892644a36433f245dd952ebb935dcf0157e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 7 Jun 2024 00:01:35 +0200
Subject: [PATCH 23/24] fix: show exclusionEvent in Calendar

---
 src/pages/Zone/Card/ZoneEventExclusionForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index c737766f3..721f4bbc3 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -54,7 +54,7 @@ const excludeType = computed({
     },
 });
 
-const arrayData = useArrayData();
+const arrayData = useArrayData('ZoneEvents');
 
 const exclusionGeoCreate = async () => {
     try {

From 1237dd5c10129ff4a7e26a31c828309bd66e0f05 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 7 Jun 2024 00:13:49 +0200
Subject: [PATCH 24/24] fix: style workweek

---
 src/components/ui/QCalendarMonthWrapper.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue
index 25491417d..bced893fe 100644
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@@ -147,7 +147,7 @@ const containerClasses = computed(() => {
     .q-calendar-month__head--workweek,
     .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
         text-transform: capitalize;
-        color: var(---color-font-secondary);
+        color: $color-font-secondary;
         font-weight: bold;
         font-size: 0.8rem;
         text-align: center;