Merge branch 'dev' into 7136_vnselectFilter_paginate

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.22.0",
+    "version": "24.24.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

src/components/CreateManualInvoiceForm.vue

@@ -48,7 +48,11 @@ const onDataSaved = async (formData, requestResponse) => {
     />
     <FetchData
         url="Tickets"
-        :filter="{ fields: ['id', 'nickname'], order: 'shipped DESC', limit: 30 }"
+        :filter="{
+            fields: ['id', 'nickname'],
+            where: { refFk: null },
+            order: 'shipped DESC',
+        }"
         @on-fetch="(data) => (ticketsOptions = data)"
         auto-load
     />

src/components/common/VnDmsList.vue

@@ -35,7 +35,7 @@ const $props = defineProps({
     downloadModel: {
         type: String,
         required: false,
-        default: null,
+        default: undefined,
     },
     defaultDmsCode: {
         type: String,

src/components/common/VnInput.vue

@@ -37,14 +37,6 @@ const styleAttrs = computed(() => {
         : {};
 });
 
-const onEnterPress = () => {
-    emit('keyup.enter');
-};
-
-const handleValue = (val = null) => {
-    value.value = val;
-};
-
 const focus = () => {
     vnInputRef.value.focus();
 };
@@ -73,7 +65,7 @@ const inputRules = [
             v-bind="{ ...$attrs, ...styleAttrs }"
             :type="$attrs.type"
             :class="{ required: $attrs.required }"
-            @keyup.enter="onEnterPress()"
+            @keyup.enter="emit('keyup.enter')"
             :clearable="false"
             :rules="inputRules"
             :lazy-rules="true"
@@ -82,14 +74,14 @@ const inputRules = [
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
             </template>
-
-            <template #append v-if="!!$attrs.disabled">
-                <slot name="append" v-if="$slots.append" />
+            
+            <template #append>
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value"
-                    @click="handleValue(null)"
+                    v-if="$slots.append && hover && value && !$attrs.disabled"
+                    @click="value = null"
                 ></QIcon>
             </template>
         </QInput>

src/components/common/VnInputTime.vue

@@ -2,6 +2,7 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import isValidDate from 'filters/isValidDate';
+import VnInput from 'components/common/VnInput.vue';
 
 const props = defineProps({
     modelValue: {
@@ -74,7 +75,7 @@ const styleAttrs = computed(() => {
         @click="isPopupOpen = true"
     >
         <template #append>
-            <QIcon name="schedule" class="cursor-pointer">
+            <QIcon name="Schedule" class="cursor-pointer">
                 <QPopupProxy
                     v-model="isPopupOpen"
                     cover

src/components/common/VnSelect.vue

@@ -22,6 +22,10 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    optionFilter: {
+        type: String,
+        default: null,
+    },
     url: {
         type: String,
         default: '',
@@ -71,7 +75,7 @@ const $props = defineProps({
 const { t } = useI18n();
 const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
 
-const { optionLabel, optionValue, options, modelValue } = toRefs($props);
+const { optionLabel, optionValue, optionFilter, options, modelValue } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
@@ -124,9 +128,9 @@ async function fetchFilter(val) {
     const { fields, sortBy, limit } = $props;
     let key = optionLabel.value;
 
-    if (new RegExp(/\d/g).test(val)) key = optionValue.value;
+    if (new RegExp(/\d/g).test(val)) key = optionFilter.value ?? optionValue.value;
 
-    const where = { [key]: { like: `%${val}%` } };
+    const where = { ...{ [key]: { like: `%${val}%` } }, ...$props.where };
     return dataRef.value.fetch({ fields, where, order: sortBy, limit });
 }
 

src/components/ui/FetchedTags.vue

@@ -1,5 +1,7 @@
 <script setup>
-defineProps({
+import { computed } from 'vue';
+
+const $props = defineProps({
     maxLength: {
         type: Number,
         required: true,
@@ -8,53 +10,40 @@ defineProps({
         type: Object,
         required: true,
     },
+    tag: {
+        type: String,
+        required: false,
+        default: 'tag',
+    },
+    value: {
+        type: String,
+        required: false,
+        default: 'value',
+    },
+});
+const tags = computed(() => {
+    return Object.keys($props.item)
+        .filter((i) => i.startsWith(`${$props.tag}`))
+        .reduce((acc, tag) => {
+            const n = tag.split(`${$props.tag}`)[1];
+            const key = `${$props.tag}${n}`;
+            const value = `${$props.value}${n}`;
+            acc[$props.item[key] ?? key] = $props.item[value] ?? '';
+            return acc;
+        }, {});
 });
 </script>
 <template>
     <div class="fetchedTags">
         <div class="wrap">
             <div
+                v-for="(val, key) in tags"
+                :key="key"
                 class="inline-tag"
-                :class="{ empty: !$props.item.value5 }"
-                :title="$props.item.tag5 + ': ' + $props.item.value5"
+                :title="`${key}: ${val}`"
+                :class="{ empty: !val }"
             >
-                {{ $props.item.value5 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.tag6 }"
-                :title="$props.item.tag6 + ': ' + $props.item.value6"
-            >
-                {{ $props.item.value6 }}
-            </div>
-
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value7 }"
-                :title="$props.item.tag7 + ': ' + $props.item.value7"
-            >
-                {{ $props.item.value7 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value8 }"
-                :title="$props.item.tag8 + ': ' + $props.item.value8"
-            >
-                {{ $props.item.value8 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value9 }"
-                :title="$props.item.tag9 + ': ' + $props.item.value9"
-            >
-                {{ $props.item.value9 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value10 }"
-                :title="$props.item.tag10 + ': ' + $props.item.value10"
-            >
-                {{ $props.item.value10 }}
+                {{ val }}
             </div>
         </div>
     </div>
@@ -83,9 +72,8 @@ defineProps({
         min-width: 4rem;
         max-width: 4rem;
     }
-
     .empty {
-        border: 1px solid $color-spacer-light;
+        border: 1px solid #2b2b2b;
     }
 }
 </style>

src/components/ui/QCalendarMonthWrapper.vue

@@ -59,12 +59,10 @@ const containerClasses = computed(() => {
 // Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
 .q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
     background-color: $primary !important;
-    color: white !important;
 }
 
 .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
     background-color: $primary !important;
-    color: white !important;
 }
 
 .q-calendar-month__head--weekday {
@@ -108,11 +106,10 @@ const containerClasses = computed(() => {
         font-size: 13px;
 
         &:hover {
-            background-color: var(--vn-accent-color);
+            background-color: var(--vn-label-color);
             cursor: pointer;
         }
     }
-
     .q-calendar-month__week--days > div:nth-child(6),
     .q-calendar-month__week--days > div:nth-child(7) {
         // Cambia el color de los días sábado y domingo

src/composables/useArrayData.js

@@ -129,7 +129,8 @@ export function useArrayData(key, userOptions) {
         store.filter = {};
         if (params) store.userParams = Object.assign({}, params);
 
-        await fetch({ append: false });
+        const response = await fetch({ append: false });
+        return response;
     }
 
     async function addFilter({ filter, params }) {

src/css/app.scss

@@ -169,6 +169,13 @@ select:-webkit-autofill {
 
 /* q-notification row items-stretch q-notification--standard bg-negative text-white */
 
+.q-card,
+.q-table,
+.q-table__bottom,
+.q-drawer {
+    background-color: var(--vn-section-color);
+}
+
 input[type='number'] {
     -moz-appearance: textfield;
 }

src/filters/dateRange.js

@@ -1,7 +1,7 @@
 export default function dateRange(value) {
     const minHour = new Date(value);
     minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date(value);
+    const maxHour = new Date();
     maxHour.setHours(23, 59, 59, 59);
 
     return [minHour, maxHour];

src/i18n/locale/en.yml

@@ -830,6 +830,7 @@ worker:
         calendar: Calendar
         timeControl: Time control
         locker: Locker
+
     list:
         name: Name
         email: Email
@@ -861,6 +862,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
+        fiDueDate: Fecha de caducidad del DNI
+        sex: Sexo
+        seniority: Antigüedad
+        fi: DNI/NIE/NIF
+        birth: Fecha de nacimiento
+        isFreelance: Autónomo
+        isSsDiscounted: Bonificación SS
+        hasMachineryAuthorized: Autorizado para llevar maquinaria
+        isDisable: Trabajador desactivado
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -14,9 +14,10 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
+import axios from 'axios';
 const stateStore = useStateStore();
 
-const { t, locale } = useI18n();
+const { t } = useI18n();
 const quasar = useQuasar();
 const dataRef = ref(null);
 
@@ -26,7 +27,7 @@ const selected = ref([]);
 const tableColumnComponents = {
     client: {
         component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
         event: () => {},
     },
     isWorker: {
@@ -39,7 +40,12 @@ const tableColumnComponents = {
     },
     salesPerson: {
         component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
+        event: () => {},
+    },
+    department: {
+        component: 'span',
+        props: () => {},
         event: () => {},
     },
     country: {
@@ -59,7 +65,7 @@ const tableColumnComponents = {
     },
     author: {
         component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
         event: () => {},
     },
     lastObservation: {
@@ -82,6 +88,16 @@ const tableColumnComponents = {
         props: () => {},
         event: () => {},
     },
+    finished: {
+        component: QCheckbox,
+
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.value,
+            class: 'disabled-checkbox',
+        }),
+        event: () => {},
+    },
 };
 
 const columns = computed(() => [
@@ -105,6 +121,13 @@ const columns = computed(() => [
         name: 'salesPerson',
         sortable: true,
     },
+    {
+        align: 'left',
+        field: 'departmentName',
+        label: t('Department'),
+        name: 'department',
+        sortable: true,
+    },
     {
         align: 'left',
         field: 'country',
@@ -166,6 +189,12 @@ const columns = computed(() => [
         name: 'from',
         sortable: true,
     },
+    {
+        align: 'left',
+        field: 'finished',
+        label: t('Has recover'),
+        name: 'finished',
+    },
 ]);
 
 const viewAddObservation = (rowsSelected) => {
@@ -178,7 +207,39 @@ const viewAddObservation = (rowsSelected) => {
     });
 };
 
-const onFetch = (data) => {
+const departments = ref(new Map());
+
+const onFetch = async (data) => {
+    const salesPersonFks = data.map((item) => item.salesPersonFk);
+    const departmentNames = salesPersonFks.map(async (salesPersonFk) => {
+        try {
+            const { data: workerDepartment } = await axios.get(
+                `WorkerDepartments/${salesPersonFk}`
+            );
+            const { data: department } = await axios.get(
+                `Departments/${workerDepartment.departmentFk}`
+            );
+            departments.value.set(salesPersonFk, department.name);
+        } catch (error) {
+            console.error('Err: ', error);
+        }
+    });
+    const recoveryData = await axios.get('Recoveries');
+
+    const recoveries = recoveryData.data.map(({ clientFk, finished }) => ({
+        clientFk,
+        finished,
+    }));
+
+    await Promise.all(departmentNames);
+
+    data.forEach((item) => {
+        item.departmentName = departments.value.get(item.salesPersonFk);
+        item.isWorker = item.businessTypeFk === 'worker';
+        const recovery = recoveries.find(({ clientFk }) => clientFk === item.clientFk);
+        item.finished = recovery?.finished === null;
+    });
+
     for (const element of data) element.isWorker = element.businessTypeFk === 'worker';
 
     balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
@@ -191,6 +252,7 @@ function exprBuilder(param, value) {
         case 'creditInsurance':
         case 'amount':
         case 'workerFk':
+        case 'departmentFk':
         case 'countryFk':
         case 'payMethod':
         case 'salesPersonFk':
@@ -243,7 +305,6 @@ function exprBuilder(param, value) {
             </div>
         </template>
     </VnSubToolbar>
-
     <QPage class="column items-center q-pa-md">
         <VnPaginate
             ref="dataRef"
@@ -302,7 +363,7 @@ function exprBuilder(param, value) {
                                             )
                                         "
                                     >
-                                        <template v-if="props.col.name !== 'isWorker'">
+                                        <template v-if="typeof props.value !== 'boolean'">
                                             <div
                                                 v-if="
                                                     props.col.name === 'lastObservation'
@@ -354,6 +415,7 @@ es:
     Client: Cliente
     Is worker: Es trabajador
     Salesperson: Comercial
+    Department: Departamento
     Country: País
     P. Method: F. Pago
     Pay method: Forma de pago

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -45,11 +45,10 @@ const authors = ref();
             </div>
         </template>
 
-        <template #body="{ params }">
-            <QItem class="q-mb-sm q-mt-sm">
+        <template #body="{ params, searchFn }">
+            <QItem class="q-mb-sm">
                 <QItemSection v-if="clients">
                     <VnSelect
-                        :input-debounce="0"
                         :label="t('Client')"
                         :options="clients"
                         dense
@@ -62,6 +61,8 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.clientFk"
+                        @update:model-value="searchFn()"
+                        auto-load
                     />
                 </QItemSection>
                 <QItemSection v-else>
@@ -85,6 +86,7 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.salesPersonFk"
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection v-else>
@@ -108,6 +110,7 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.countryFk"
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection v-else>
@@ -153,6 +156,7 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.workerFk"
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection v-else>

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-
+import { useVnConfirm } from 'composables/useVnConfirm';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import useCardDescription from 'src/composables/useCardDescription';
@@ -43,30 +43,17 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.name, entity.id);
 };
 
-const removeDepartment = () => {
-    quasar
-        .dialog({
-            title: 'Are you sure you want to delete it?',
-            message: 'Delete department',
-            ok: {
-                push: true,
-                color: 'primary',
-            },
-            cancel: true,
-        })
-        .onOk(async () => {
-            try {
-                await axios.post(
-                    `/Departments/${entityId.value}/removeChild`,
-                    entityId.value
-                );
-                router.push({ name: 'WorkerDepartment' });
-                notify('department.departmentRemoved', 'positive');
-            } catch (err) {
-                console.error('Error removing department');
-            }
-        });
+const removeDepartment = async () => {
+    try {
+        await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
+        router.push({ name: 'WorkerDepartment' });
+        notify('department.departmentRemoved', 'positive');
+    } catch (err) {
+        console.error('Error removing department');
+    }
 };
+
+const { openConfirmationModal } = useVnConfirm();
 </script>
 <template>
     <CardDescriptor
@@ -84,7 +71,17 @@ const removeDepartment = () => {
         "
     >
         <template #menu="{}">
-            <QItem v-ripple clickable @click="removeDepartment()">
+            <QItem
+                v-ripple
+                clickable
+                @click="
+                    openConfirmationModal(
+                        t('Are you sure you want to delete it?'),
+                        t('Delete department'),
+                        removeDepartment
+                    )
+                "
+            >
                 <QItemSection>{{ t('Delete') }}</QItemSection>
             </QItem>
         </template>

src/pages/Entry/Card/EntryBuys.vue

@@ -410,7 +410,7 @@ const lockIconType = (groupingMode, mode) => {
                             <span v-if="props.row.item.subName" class="subName">
                                 {{ props.row.item.subName }}
                             </span>
-                            <fetched-tags :item="props.row.item" :max-length="5" />
+                            <FetchedTags :item="props.row.item" :max-length="5" />
                         </QTd>
                     </QTr>
                     <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->

src/pages/Entry/Card/EntrySummary.vue

@@ -338,7 +338,7 @@ const fetchEntryBuys = async () => {
                                 <span v-if="row.item.subName" class="subName">
                                     {{ row.item.subName }}
                                 </span>
-                                <fetched-tags :item="row.item" :max-length="5" />
+                                <FetchedTags :item="row.item" :max-length="5" />
                             </QTd>
                         </QTr>
                         <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->

src/pages/Entry/EntryLatestBuys.vue

@@ -707,7 +707,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-tags="{ row }">
                 <QTd>
-                    <fetched-tags :item="row" :max-length="6" />
+                    <FetchedTags :item="row" :max-length="6" />
                 </QTd>
             </template>
             <template #body-cell-entryFk="{ row }">

src/pages/Item/ItemFixedPrice.vue

@@ -459,7 +459,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         {{ row.name }}
                     </span>
                     <ItemDescriptorProxy :id="row.itemFk" />
-                    <fetched-tags :item="row" :max-length="6" />
+                    <FetchedTags :item="row" :max-length="6" />
                 </QTd>
             </template>
             <template #body-cell-groupingPrice="props">

src/pages/Item/ItemList.vue

@@ -521,7 +521,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     <template #body-cell-description="{ row }">
                         <QTd class="col">
                             <span>{{ row.name }} {{ row.subName }}</span>
-                            <fetched-tags :item="row" :max-length="6" />
+                            <FetchedTags :item="row" :max-length="6" />
                         </QTd>
                     </template>
                     <template #body-cell-isActive="{ row }">

src/pages/Item/locale/en.yml

@@ -81,3 +81,10 @@ itemTags:
 searchbar:
     label: Search item
     info: Search by item id
+itemType:
+    shared:
+        code: Code
+        name: Name
+        worker: Worker
+        category: Category
+        temperature: Temperature

src/pages/Item/locale/es.yml

@@ -81,3 +81,10 @@ itemTags:
 searchbar:
     label: Buscar artículo
     info: Buscar por id de artículo
+itemType:
+    shared:
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        category: Reino
+        temperature: Temperatura

src/pages/Order/Card/OrderSummary.vue

@@ -176,10 +176,7 @@ const detailsColumns = ref([
                                             {{ props.row.item.subName }}
                                         </span>
                                     </div>
-                                    <fetched-tags
-                                        :item="props.row.item"
-                                        :max-length="5"
-                                    />
+                                    <FetchedTags :item="props.row.item" :max-length="5" />
                                 </QTd>
                                 <QTd key="quantity" :props="props">
                                     {{ props.row.quantity }}

src/pages/Order/OrderLines.vue

@@ -160,7 +160,7 @@ async function confirmOrder() {
                                     <span class="text-uppercase subname">
                                         {{ row.item.subName }}
                                     </span>
-                                    <fetched-tags :item="row.item" :max-length="5" />
+                                    <FetchedTags :item="row.item" :max-length="5" />
                                 </div>
                                 <VnLv :label="t('item')" :value="String(row.item.id)" />
                                 <VnLv

src/pages/Order/OrderVolume.vue

@@ -77,7 +77,7 @@ const loadVolumes = async (rows) => {
                         >
                             <template #list-items>
                                 <div class="q-mb-sm">
-                                    <fetched-tags :item="row.item" :max-length="5" />
+                                    <FetchedTags :item="row.item" :max-length="5" />
                                 </div>
                                 <VnLv :label="t('item')" :value="row.item.id" />
                                 <VnLv :label="t('subName')">

src/pages/Route/Card/RouteForm.vue

@@ -28,7 +28,7 @@ const defaultInitialData = {
     workerFk: null,
     isOk: false,
 };
-
+const maxDistance = ref();
 const workerList = ref([]);
 const agencyList = ref([]);
 const vehicleList = ref([]);
@@ -81,12 +81,7 @@ const onSave = (data, response) => {
 };
 </script>
 <template>
-    <VnSubToolbar />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <RouteSearchbar />
-        </Teleport>
-    </template>
+    <VnSubToolbar v-if="isNew" />
     <FetchData
         url="Workers/search"
         :filter="{ fields: ['id', 'nickname'] }"
@@ -111,6 +106,12 @@ const onSave = (data, response) => {
         @on-fetch="(data) => (vehicleList = data)"
         auto-load
     />
+    <FetchData
+        url="RouteConfigs/findOne"
+        @on-fetch="({ kmMax }) => (maxDistance = kmMax)"
+        auto-load
+        sort-by="id ASC"
+    />
     <FormModel
         :url="isNew ? null : `Routes/${route.params?.id}`"
         :url-create="isNew ? 'Routes' : null"
@@ -174,7 +175,17 @@ const onSave = (data, response) => {
             <template v-if="!isNew">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
-                    <VnInput v-model="data.kmEnd" :label="t('Km End')" clearable />
+                    <QInput
+                        v-model.number="data.kmEnd"
+                        :label="t('Km End')"
+                        :rules="[
+                            (val) =>
+                                val < maxDistance ||
+                                t('Distance must be lesser than 4000'),
+                        ]"
+                        clearable
+                        type="number"
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnInputTime
@@ -221,4 +232,5 @@ es:
     Description: Descripción
     Is served: Se ha servido
     Created: Creado
+    Distance must be lesser than {maxDistance}: La distancia debe ser inferior a {maxDistance}
 </i18n>

src/pages/Route/RouteList.vue

@@ -12,6 +12,7 @@ import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import axios from 'axios';
 import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -19,6 +20,7 @@ import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import { useQuasar } from 'quasar';
+import { useArrayData } from 'composables/useArrayData';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -26,10 +28,7 @@ const { validate } = useValidator();
 const quasar = useQuasar();
 const session = useSession();
 const { viewSummary } = useSummaryDialog();
-
-onMounted(() => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));
-
+const visibleColumns = ref([]);
 const selectedRows = ref([]);
 const columns = computed(() => [
     {
@@ -83,14 +82,14 @@ const columns = computed(() => [
     },
     {
         name: 'started',
-        label: t('Hour started'),
+        label: t('hourStarted'),
         field: (row) => toHour(row.started),
         sortable: true,
         align: 'left',
     },
     {
         name: 'finished',
-        label: t('Hour finished'),
+        label: t('hourFinished'),
         field: (row) => toHour(row.finished),
         sortable: true,
         align: 'left',
@@ -109,7 +108,10 @@ const columns = computed(() => [
         align: 'right',
     },
 ]);
-
+const arrayData = useArrayData('EntryLatestBuys', {
+    url: 'Buys/latestBuysFilter',
+    order: ['itemFk DESC'],
+});
 const refreshKey = ref(0);
 const workers = ref([]);
 const agencyList = ref([]);
@@ -121,7 +123,7 @@ const updateRoute = async (route) => {
         return err;
     }
 };
-
+const allColumnNames = ref([]);
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
 
@@ -174,6 +176,13 @@ const openTicketsDialog = (id) => {
         })
         .onOk(() => refreshKey.value++);
 };
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    allColumnNames.value = columns.value.map((col) => col.name);
+    await arrayData.fetch({ append: false });
+});
+onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
@@ -231,7 +240,16 @@ const openTicketsDialog = (id) => {
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
     <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
     <QPage class="column items-center">
-        <VnSubToolbar class="justify-end">
+        <VnSubToolbar>
+            <template #st-data>
+                <TableVisibleColumns
+                    class="LeftIcon"
+                    :all-columns="allColumnNames"
+                    table-code="routesList"
+                    labels-traductions-path="globals"
+                    @on-config-saved="visibleColumns = [...$event]"
+                />
+            </template>
             <template #st-actions>
                 <QBtn
                     icon="vn:clone"
@@ -267,7 +285,7 @@ const openTicketsDialog = (id) => {
                 :key="refreshKey"
                 data-key="RouteList"
                 url="Routes/filter"
-                :order="['created DESC', 'id DESC']"
+                :order="['created ASC', 'started ASC', 'id ASC']"
                 :limit="20"
                 auto-load
             >
@@ -281,9 +299,10 @@ const openTicketsDialog = (id) => {
                             row-key="id"
                             selection="multiple"
                             :rows-per-page-options="[0]"
+                            :visible-columns="visibleColumns"
                             hide-pagination
-                            :pagination="{ sortBy: 'ID', descending: true }"
                             :no-data-label="t('globals.noResults')"
+                            style="max-height: 82vh"
                         >
                             <template #body-cell-worker="{ row }">
                                 <QTd class="table-input-cell">
@@ -336,7 +355,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-vehicle="{ row }">
-                                <QTd class="table-input-cell">
+                                <QTd class="table-input-cell small-column">
                                     <VnSelect
                                         :label="t('Vehicle')"
                                         v-model="row.vehicleFk"
@@ -353,7 +372,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-date="{ row }">
-                                <QTd class="table-input-cell">
+                                <QTd class="table-input-cell small-column">
                                     <VnInputDate
                                         v-model="row.created"
                                         hide-bottom-space
@@ -378,10 +397,10 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-started="{ row }">
-                                <QTd class="table-input-cell">
+                                <QTd class="table-input-cell small-column">
                                     <VnInputTime
                                         v-model="row.started"
-                                        :label="t('Hour started')"
+                                        :label="t('hourStarted')"
                                         :rules="validate('route.started')"
                                         :is-clearable="false"
                                         hide-bottom-space
@@ -391,11 +410,11 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-finished="{ row }">
-                                <QTd class="table-input-cell">
+                                <QTd class="table-input-cell small-column">
                                     <VnInputTime
                                         v-model="row.finished"
                                         autofocus
-                                        :label="t('Hour finished')"
+                                        :label="t('hourFinished')"
                                         :rules="validate('route.finished')"
                                         :is-clearable="false"
                                         hide-bottom-space
@@ -405,7 +424,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-isServed="props">
-                                <QTd>
+                                <QTd class="table-input-cell small-column">
                                     <QCheckbox v-model="props.value" disable>
                                         <QTooltip>
                                             {{
@@ -486,15 +505,18 @@ const openTicketsDialog = (id) => {
 .table-actions {
     gap: 12px;
 }
-
-.lock-icon-cell {
-    text-align: center;
-    margin-left: -20%;
+th:last-child,
+td:last-child {
+    background-color: var(--vn-section-color);
+    position: sticky;
+    right: 0;
 }
 </style>
 <i18n>
 en:
     newRoute: New Route
+    hourStarted: Started hour
+    hourFinished: Finished hour
 es:
     ID: ID
     Worker: Trabajador

src/pages/Route/RouteMain.vue

@@ -1,8 +1,10 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'src/components/LeftMenu.vue';
+import { onMounted } from 'vue';
 
 const stateStore = useStateStore();
+onMounted(() => (stateStore.leftDrawer = false));
 </script>
 
 <template>

src/pages/Route/RouteTickets.vue

@@ -222,11 +222,6 @@ const openSmsDialog = async () => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <RouteSearchbar />
-        </Teleport>
-    </template>
     <FetchData
         @on-fetch="(data) => (routeEntity = data)"
         auto-load

src/pages/Supplier/Card/SupplierConsumption.vue

@@ -204,7 +204,7 @@ onMounted(async () => {
 
                     <QTd no-hover>
                         <span>{{ buy.subName }}</span>
-                        <fetched-tags :item="buy" :max-length="5" />
+                        <FetchedTags :item="buy" :max-length="5" />
                     </QTd>
                     <QTd no-hover> {{ dashIfEmpty(buy.quantity) }}</QTd>
                     <QTd no-hover> {{ dashIfEmpty(buy.price) }}</QTd>

src/pages/Ticket/Card/TicketSummary.vue

@@ -13,6 +13,7 @@ import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -262,9 +263,12 @@ async function changeState(value) {
                     :url="ticketUrl + 'sale'"
                     :text="t('ticket.summary.saleLines')"
                 />
-                <QTable :rows="ticket.sales">
+                <QTable :rows="ticket.sales" style="text-align: center">
+                    <template #body-cell="{ value }">
+                        <QTd>{{ value }}</QTd>
+                    </template>
                     <template #header="props">
-                        <QTr :props="props">
+                        <QTr class="tr-header" :props="props">
                             <QTh auto-width></QTh>
                             <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.visible') }}</QTh>
@@ -360,23 +364,29 @@ async function changeState(value) {
                                     </QTooltip>
                                 </QIcon>
                             </QTd>
-                            <QTd class="link">{{ props.row.itemFk }}</QTd>
+                            <QTd>
+                                <QBtn class="link" flat>
+                                    {{ props.row.itemFk }}
+                                    <ItemDescriptorProxy :id="props.row.itemFk" />
+                                </QBtn>
+                            </QTd>
                             <QTd>{{ props.row.visible }}</QTd>
                             <QTd>{{ props.row.available }}</QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
-                            <QTd>
-                                <div class="fetched-tags">
-                                    <span>{{ props.row.item.name }}</span>
-                                    <span v-if="props.row.item.subName" class="subName">{{
-                                        props.row.item.subName
-                                    }}</span>
+                            <QTd class="description-cell">
+                                <div class="row full-width justify-between">
+                                    {{ props.row.item.name }}
+                                    <div v-if="props.row.item.subName" class="subName">
+                                        {{ props.row.item.subName.toUpperCase() }}
+                                    </div>
                                 </div>
-                                <fetched-tags
+                                <FetchedTags
+                                    class="fetched-tags"
                                     :item="props.row.item"
                                     :max-length="5"
-                                ></fetched-tags>
+                                ></FetchedTags>
                             </QTd>
-                            <QTd>{{ props.row.price }}</QTd>
+                            <QTd>{{ props.row.price }} €</QTd>
                             <QTd>{{ props.row.discount }} %</QTd>
                             <QTd
                                 >{{
@@ -453,4 +463,28 @@ async function changeState(value) {
         padding: 1%;
     }
 }
+.q-table {
+    tr,
+    th,
+    .q-td {
+        border-bottom: 1px solid black;
+    }
+}
+
+.subName {
+    margin-left: 10%;
+}
+
+.tr-header,
+.subName {
+    color: var(--vn-label-color);
+}
+
+.description-cell {
+    width: 25%;
+}
+
+.fetched-tags {
+    max-width: 70%;
+}
 </style>

src/pages/Worker/Card/WorkerBasicData.vue

@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
+import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -74,12 +74,11 @@ const maritalStatus = [
         model="Worker"
     >
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput :label="t('Name')" clearable v-model="data.firstName" />
                 <VnInput :label="t('Last name')" clearable v-model="data.lastName" />
             </VnRow>
-
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput v-model="data.phone" :label="t('Business phone')" clearable />
                 <VnInput
                     v-model="data.mobileExtension"
@@ -88,7 +87,7 @@ const maritalStatus = [
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Boss')"
                     :options="workersOptions"
@@ -119,7 +118,7 @@ const maritalStatus = [
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Origin country')"
                     :options="countriesOptions"
@@ -138,7 +137,7 @@ const maritalStatus = [
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput v-model="data.SSN" :label="t('SSN')" clearable />
                 <VnInput
                     v-model="data.locker"
@@ -147,6 +146,36 @@ const maritalStatus = [
                     clearable
                 />
             </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('fiDueDate')" v-model="data.fiDueDate" />
+
+                <VnInput v-model="data.sex" :label="t('sex')" clearable />
+            </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('seniority')" v-model="data.seniority" />
+                <VnInput v-model="data.fi" :label="t('fi')" />
+            </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('birth')" v-model="data.birth" />
+            </VnRow>
+            <VnRow>
+                <QCheckbox
+                    size="sm"
+                    :label="t('isFreelance')"
+                    v-model="data.isFreelance"
+                />
+                <QCheckbox
+                    size="sm"
+                    v-model="data.isSsDiscounted"
+                    :label="t(`isSsDiscounted`)"
+                />
+                <QCheckbox
+                    size="sm"
+                    v-model="data.hasMachineryAuthorized"
+                    :label="t(`hasMachineryAuthorized`)"
+                />
+                <QCheckbox size="sm" v-model="data.isDisable" :label="t(`isDisable`)" />
+            </VnRow>
         </template>
     </FormModel>
 </template>
@@ -165,4 +194,13 @@ es:
     Education level: Nivel educación
     SSN: NSS
     Locker: Taquilla
+    fiDueDate: Fecha de caducidad del DNI
+    seniority: Antigüedad
+    hasMachineryAuthorized: Autorizado para llevar maquinaria
+    isFreelance: Autónomo
+    isDisable: Trabajador desactivado
+    fi: DNI/NIE/NIF
+    sex: Sexo
+    birth: Fecha de Nacimiento
+    isSsDiscounted: Bonificación SS
 </i18n>

src/pages/Worker/Card/WorkerCalendar.vue

@@ -82,6 +82,7 @@ const onFetchAbsences = (data) => {
                 type: type.code,
                 absenceId: absence.id,
                 isFestive: false,
+                isHoliday: false,
             });
         });
     }
@@ -170,23 +171,6 @@ watch([year, businessFk], () => refreshData());
         ref="WorkerFreelanceRef"
         auto-load
     />
-    <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">
             <WorkerCalendarFilter

src/pages/Worker/Card/WorkerCalendarItem.vue

@@ -126,7 +126,7 @@ const handleEventSelected = (event, { year, month, day }) => {
     }
 
     const date = new Date(year, month - 1, day);
-    if (!event.absenceId) createEvent(date);
+    if (!event?.absenceId) createEvent(date);
     else if (event.type == props.absenceType.code) deleteEvent(event, date);
     else editEvent(event);
 };
@@ -136,24 +136,31 @@ const getEventByTimestamp = ({ year, month, day }) => {
     return props.events[stamp] || null;
 };
 
+const isFestive = (timestamp) => {
+    const event = getEventByTimestamp(timestamp);
+    if (!event) return false;
+
+    const { isFestive } = event;
+    return isFestive;
+};
 const getEventAttrs = (timestamp) => {
     const event = getEventByTimestamp(timestamp);
     if (!event) return {};
 
-    const { name, color, isFestive } = event;
+    const { name, color, isFestive, type } = event;
 
     // Atributos a asignar a cada slot que representa un evento en el calendario
 
     const attrs = {
         title: name,
-        style: color ? `background-color: ${color};` : '',
+        style: color ? `background-color: ${color};` : ``,
         label: timestamp.day,
     };
 
     if (isFestive) {
         attrs.class = '--festive';
-        attrs.label = event.absenceId ? timestamp.day : '';
-    }
+        attrs.label = event.absenceId ?? timestamp.day;
+    } else attrs.class = `--${type}`;
 
     return attrs;
 };
@@ -162,7 +169,6 @@ const isToday = (timestamp) => {
     const { year, month, day } = timestamp;
     return todayTimestamp.value === new Date(year, month - 1, day).getTime();
 };
-
 onBeforeMount(() => {
     updateSelectedDate(_year.value);
 });
@@ -203,7 +209,6 @@ watch(_year, (newValue) => {
                 <template #day="{ scope: { timestamp } }">
                     <!-- Este slot representa cada día del calendario y muestra un botón representando el correspondiente evento -->
                     <QBtn
-                        v-if="getEventByTimestamp(timestamp)"
                         v-bind="{ ...getEventAttrs(timestamp) }"
                         @click="
                             handleEventSelected(getEventByTimestamp(timestamp), timestamp)
@@ -223,6 +228,11 @@ watch(_year, (newValue) => {
 </template>
 
 <style lang="scss">
+.q-calendar-month__day:has(.q-calendar-month__day--content):has(.q-btn.--festive)
+    .q-calendar-month__day--label__wrapper
+    button {
+    color: transparent;
+}
 .calendar-event {
     display: flex;
     justify-content: center;
@@ -231,14 +241,19 @@ watch(_year, (newValue) => {
     font-size: 13px;
     line-height: 1.715em;
     cursor: pointer;
-    color: white;
 
     &.--today {
         border: 2px solid $info;
     }
 
     &.--festive {
-        border: 2px solid $negative;
+        color: $negative;
+    }
+
+    &.--holiday {
+        & > span:nth-child(2) .block {
+            color: white;
+        }
     }
 
     &:hover {

src/pages/Worker/Card/WorkerPda.vue

@@ -1,140 +1,187 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { onMounted, ref, computed } from 'vue';
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import useNotify from 'src/composables/useNotify.js';
-import axios from 'axios';
-import { useRole } from 'src/composables/useRole';
+import { ref, computed } from 'vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
-const route = useRoute();
 const { t } = useI18n();
 const { notify } = useNotify();
-const { hasAny } = useRole();
 
-const fetchCurrentDeviceRef = ref(null);
-const deviceProductionsFilter = {
-    fields: ['id', 'serialNumber', 'modelFk'],
-    where: { stateFk: 'idle' },
-    order: 'id',
-};
-const deviceProductionsOptions = ref([]);
-const newPDA = ref({});
-const currentPDA = ref(null);
+const paginate = ref();
+const dialog = ref();
+const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
+const routeId = computed(() => route.params.id);
 
-const isAllowedToEdit = computed(() => hasAny(['hr', 'productionAssi']));
+const initialData = computed(() => {
+    return {
+        userFk: routeId.value,
+        deviceProductionFk: null,
+        simSerialNumber: null,
+    };
+});
 
-const setCurrentPDA = (data) => {
-    currentPDA.value = data;
-    currentPDA.value.description = `ID: ${currentPDA.value.deviceProductionFk} ${t(
-        'worker.pda.model'
-    )}: ${currentPDA.value.deviceProduction.modelFk} ${t('worker.pda.serialNumber')}: ${
-        currentPDA.value.deviceProduction.serialNumber
-    }`;
-};
-
-const deallocatePDA = async (data) => {
+const deallocatePDA = async (deviceProductionFk) => {
     try {
         await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
-            pda: currentPDA.value.deviceProductionFk,
+            pda: deviceProductionFk,
         });
-        data.pda = null;
-        currentPDA.value = null;
-        await fetchCurrentDeviceRef.value.fetch();
         notify(t('PDA deallocated'), 'positive');
     } catch (err) {
         console.error('Error deallocating PDA');
     }
+    paginate.value.fetch();
 };
 
-onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
+function reloadData() {
+    initialData.value.deviceProductionFk = null;
+    initialData.value.simSerialNumber = null;
+    paginate.value.fetch();
+}
 </script>
 
 <template>
-    <FetchData
-        url="DeviceProductions"
-        :filter="deviceProductionsFilter"
-        auto-load
-        @on-fetch="(data) => (deviceProductionsOptions = data)"
-    />
-    <FetchData
-        ref="fetchCurrentDeviceRef"
-        url="DeviceProductionUsers"
-        :filter="{
-            where: { userFk: route.params.id },
-            include: { relation: 'deviceProduction' },
-        }"
-        auto-load
-        @on-fetch="(data) => setCurrentPDA(data[0])"
-    />
-    <QPage class="column items-center q-pa-md">
-        <FormModel
-            url="DeviceProductionUsers"
-            :url-create="`Workers/${route.params.id}/allocatePDA`"
-            model="DeviceProductionUser"
-            :form-initial-data="newPDA"
+    <QPage class="column items-center q-pa-md centerCard">
+        <FetchData
+            url="workers/getAvailablePda"
+            @on-fetch="(data) => (deviceProductions = data)"
+            auto-load
+        />
+        <VnPaginate
+            ref="paginate"
+            data-key="WorkerPda"
+            url="DeviceProductionUsers"
+            :filter="{ where: { userFk: routeId } }"
+            order="id"
             auto-load
-            :default-buttons="{ save: { label: 'globals.assign', color: 'primary' } }"
-            @on-data-saved="(_, data) => setCurrentPDA(data)"
         >
-            <template #form="{ data }">
-                <QField
-                    v-if="currentPDA && currentPDA.description"
-                    :label="t('worker.pda.currentPDA')"
-                    :model-value="currentPDA.description"
-                    :editable="false"
-                    class="full-width"
+            <template #body="{ rows }">
+                <QCard
+                    flat
+                    bordered
+                    :key="row.id"
+                    v-for="row of rows"
+                    class="card q-px-md q-mb-sm container"
                 >
-                    <template #control>
-                        <div tabindex="0">
-                            {{ currentPDA.description }}
-                        </div>
-                    </template>
-                    <template v-if="isAllowedToEdit" #append>
-                        <QIcon
-                            name="delete"
-                            size="sm"
-                            class="cursor-pointer"
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.pda.currentPDA')"
+                            :model-value="row?.deviceProductionFk"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Model')"
+                            :model-value="row?.deviceProduction?.modelFk"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Serial number')"
+                            :model-value="row?.deviceProduction?.serialNumber"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Current SIM')"
+                            :model-value="row?.simSerialNumber"
+                            disable
+                        />
+                        <QBtn
+                            flat
+                            icon="delete"
                             color="primary"
-                            @click="deallocatePDA(data)"
+                            class="btn-delete"
+                            @click="
+                                openConfirmationModal(
+                                    t(`Remove PDA`),
+                                    t('Do you want to remove this PDA?'),
+                                    () => deallocatePDA(row.deviceProductionFk)
+                                )
+                            "
                         >
                             <QTooltip>
                                 {{ t('worker.pda.removePDA') }}
                             </QTooltip>
-                        </QIcon>
-                    </template>
-                </QField>
-
-                <VnSelect
-                    v-else
-                    :label="t('worker.pda.newPDA')"
-                    v-model="data.pda"
-                    :options="deviceProductionsOptions"
-                    option-label="serialNumber"
-                    option-value="id"
-                    hide-selected
-                    :disable="!isAllowedToEdit"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>ID: {{ scope.opt?.id }}</QItemLabel>
-                                <QItemLabel caption>
-                                    {{ scope.opt?.modelFk }},
-                                    {{ scope.opt?.serialNumber }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                        </QBtn>
+                    </VnRow>
+                </QCard>
             </template>
-        </FormModel>
+        </VnPaginate>
+        <QPageSticky :offset="[18, 18]">
+            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+                <QDialog ref="dialog">
+                    <FormModelPopup
+                        :title="t('Add new device')"
+                        url-create="DeviceProductionUsers"
+                        model="DeviceProductionUser"
+                        :form-initial-data="initialData"
+                        @on-data-saved="reloadData()"
+                    >
+                        <template #form-inputs="{ data }">
+                            <VnRow class="row q-gutter-md q-mb-md">
+                                <VnSelect
+                                    :label="t('worker.pda.newPDA')"
+                                    v-model="data.deviceProductionFk"
+                                    :options="deviceProductions"
+                                    option-label="id"
+                                    option-value="id"
+                                    id="deviceProductionFk"
+                                    hide-selected
+                                >
+                                    <template #option="scope">
+                                        <QItem v-bind="scope.itemProps">
+                                            <QItemSection>
+                                                <QItemLabel
+                                                    >ID: {{ scope.opt?.id }}</QItemLabel
+                                                >
+                                                <QItemLabel caption>
+                                                    {{ scope.opt?.modelFk }},
+                                                    {{ scope.opt?.serialNumber }}
+                                                </QItemLabel>
+                                            </QItemSection>
+                                        </QItem>
+                                    </template>
+                                </VnSelect>
+                                <VnInput
+                                    v-model="data.simSerialNumber"
+                                    :label="t('SIM serial number')"
+                                    id="simSerialNumber"
+                                    use-input
+                                />
+                            </VnRow>
+                        </template>
+                    </FormModelPopup>
+                </QDialog>
+            </QBtn>
+            <QTooltip>
+                {{ t('globals.new') }}
+            </QTooltip>
+        </QPageSticky>
     </QPage>
 </template>
-
+<style lang="scss" scoped>
+.btn-delete {
+    max-width: 4%;
+    margin-top: 30px;
+}
+</style>
 <i18n>
 es:
+    Model: Modelo
+    Serial number: Número de serie
+    Current SIM: SIM actual
+    Add new device: Añadir nuevo dispositivo
     PDA deallocated: PDA desasignada
+    Remove PDA: Eliminar PDA
+    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
+    You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
+    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
 </i18n>

src/pages/Worker/Card/WorkerSummary.vue

@@ -2,7 +2,7 @@
 import { ref, onMounted, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { dashIfEmpty } from 'src/filters';
+import { dashIfEmpty, toDate } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
@@ -73,7 +73,7 @@ const filter = {
         <template #body="{ entity: worker }">
             <QCard class="vn-one">
                 <VnTitle
-                    :url="workerUrl + `basic-data`"
+                    :url="`#/worker/${entityId}/basic-data`"
                     :text="t('worker.summary.basicData')"
                 />
                 <VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
@@ -111,6 +111,47 @@ const filter = {
                 </VnLv>
                 <VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
             </QCard>
+            <QCard class="vn-one">
+                <VnTitle
+                    :url="`#/worker/${entityId}/basic-data`"
+                    :text="t('worker.summary.basicData')"
+                />
+                <VnLv
+                    :label="t('worker.summary.fiDueDate')"
+                    :value="toDate(worker.fiDueDate)"
+                />
+                <VnLv :label="t('worker.summary.sex')" :value="worker.sex" />
+                <VnLv
+                    :label="t('worker.summary.seniority')"
+                    :value="toDate(worker.seniority)"
+                />
+                <VnLv :label="t('worker.summary.fi')" :value="worker.fi" />
+                <VnLv :label="t('worker.summary.birth')" :value="toDate(worker.birth)" />
+                <QCheckbox
+                    class="padding-none"
+                    :label="t('worker.summary.isFreelance')"
+                    v-model="worker.isFreelance"
+                    :disable="true"
+                />
+                <QCheckbox
+                    class="padding-none"
+                    :label="t('worker.summary.isSsDiscounted')"
+                    v-model="worker.isSsDiscounted"
+                    :disable="true"
+                />
+                <QCheckbox
+                    class="padding-none"
+                    :label="t('worker.summary.hasMachineryAuthorized')"
+                    v-model="worker.hasMachineryAuthorized"
+                    :disable="true"
+                />
+                <QCheckbox
+                    class="padding-none"
+                    :label="t('worker.summary.isDisable')"
+                    v-model="worker.isDisable"
+                    :disable="true"
+                />
+            </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('worker.summary.userData')" />
                 <VnLv :label="t('worker.summary.userId')" :value="worker.user.id" />

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -489,23 +489,6 @@ onMounted(async () => {
             </QBtnGroup>
         </div>
     </Teleport>
-    <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="260" class="q-pa-md">
         <div class="q-pa-md q-mb-md" style="border: 2px solid #222">
             <QCardSection horizontal>

src/pages/Worker/WorkerCreate.vue

@@ -56,7 +56,7 @@ const onBankEntityCreated = (data) => {
 };
 
 function handleLocation(data, location) {
-    const { town, postcode: code, provinceFk, countryFk } = location ?? {};
+    const { town, code, provinceFk, countryFk } = location ?? {};
     data.postcode = code;
     data.city = town;
     data.provinceFk = provinceFk;

src/pages/Zone/Card/ZoneCard.vue

@@ -1,14 +1,41 @@
 <script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+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 searchBarDataKeys = {
+    ZoneWarehouses: 'ZoneWarehouses',
+    ZoneSummary: 'ZoneSummary',
+};
 </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-url="Zones"
         searchbar-label="Search zones"
         searchbar-info="You can search by zone reference"
     />

src/pages/Zone/Card/ZoneCreateWarehouse.vue

@@ -0,0 +1,47 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'components/FormPopup.vue';
+
+const emit = defineEmits(['onSubmitCreateWarehouse']);
+const { t } = useI18n();
+
+const ZoneWarehouseFormData = reactive({
+    warehouseFk: null,
+});
+
+const warehousesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="Warehouses"
+        :filter="{ order: 'name' }"
+        auto-load
+        @on-fetch="(data) => (warehousesOptions = data)"
+    />
+    <FormPopup
+        model="ZoneWarehouse"
+        @on-submit="emit('onSubmitCreateWarehouse', ZoneWarehouseFormData)"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelect
+                        :label="t('warehouses.warehouse')"
+                        v-model="ZoneWarehouseFormData.warehouseFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        :required="true"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormPopup>
+</template>

src/pages/Zone/Card/ZoneDescriptorMenuItems.vue

@@ -74,20 +74,20 @@ function openConfirmDialog(callback) {
         <QItemSection avatar>
             <QIcon name="delete" />
         </QItemSection>
-        <QItemSection>{{ t('deleteOrder') }}</QItemSection>
+        <QItemSection>{{ t('deleteZone') }}</QItemSection>
     </QItem>
 </template>
 
 <i18n>
 en:
-    deleteOrder: Delete order
+    deleteZone: Delete zone
     confirmDeletion: Confirm deletion
-    confirmDeletionMessage: Are you sure you want to delete this order?
+    confirmDeletionMessage: Are you sure you want to delete this zone?
 
 es:
     To clone zone: Clonar zone
-    deleteOrder: Eliminar pedido
+    deleteZone: Eliminar zona
     confirmDeletion: Confirmar eliminación
-    confirmDeletionMessage: Seguro que quieres eliminar este pedido?
+    confirmDeletionMessage: Seguro que quieres eliminar este zona?
 
 </i18n>

src/pages/Zone/Card/ZoneWarehouses.vue

@@ -1,53 +1,119 @@
 <script setup>
 import { useRoute } from 'vue-router';
+import { computed, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
 import VnPaginate from 'components/ui/VnPaginate.vue';
-import CardList from 'components/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import ZoneCreateWarehouse from './ZoneCreateWarehouse.vue';
 
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import axios from 'axios';
+
+const { t } = useI18n();
 const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
 
-const deleteWarehouse = () => {
-    return true;
+const paginateRef = ref(null);
+const createWarehouseDialogRef = ref(null);
+
+const arrayData = useArrayData('ZoneWarehouses');
+const store = arrayData.store;
+
+const data = computed(() => store.data);
+
+const urlPath = computed(() => `Zones/${route.params.id}/warehouses`);
+
+const columns = computed(() => [
+    {
+        name: 'name',
+    },
+    {
+        name: 'action',
+    },
+]);
+
+const deleteWarehouse = async (row) => {
+    try {
+        await axios.delete(`${urlPath.value}/${row.id}`);
+        fetchWarehouses();
+    } catch (error) {
+        console.error(error);
+    }
 };
+
+const createZoneWarehouse = async (ZoneWarehouseFormData) => {
+    try {
+        await axios.post(urlPath.value, ZoneWarehouseFormData);
+        fetchWarehouses();
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter.include = 'warehouse';
+        fetchWarehouses();
+    }
+);
+
+const fetchWarehouses = () => paginateRef.value.fetch();
+
+const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
 </script>
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
+        <div class="full-width" style="max-width: 400px">
             <VnPaginate
+                ref="paginateRef"
                 data-key="ZoneWarehouses"
-                :url="`Zones/${route.params.id}/warehouses`"
+                :filter="{ include: 'warehouse' }"
+                :url="urlPath"
                 auto-load
             >
                 <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="row.name"
-                        :id="row.id"
-                    >
-                        <template #list-items>
-                            <VnLv :value="row.name" />
-                            <QIcon
-                                name="delete"
-                                size="sm"
-                                class="cursor-pointer"
-                                color="primary"
-                                @click="deleteWarehouse()"
-                            >
-                                <QTooltip>
-                                    {{ t('Remove row') }}
-                                </QTooltip>
-                            </QIcon>
+                    <QTable :rows="data" :columns="columns" hide-header>
+                        <template #body="{ row, rowIndex }">
+                            <QTr>
+                                <QTd>
+                                    <span>{{ row.warehouse?.name }}</span>
+                                </QTd>
+                                <QTd style="width: 50px !important">
+                                    <QIcon
+                                        name="delete"
+                                        size="sm"
+                                        class="cursor-pointer"
+                                        color="primary"
+                                        @click="
+                                            openConfirmationModal(
+                                                t('warehouses.deleteTitle'),
+                                                t('warehouses.deleteSubtitle'),
+                                                () => deleteWarehouse(row, rows, rowIndex)
+                                            )
+                                        "
+                                    >
+                                        <QTooltip>
+                                            {{ t('warehouses.delete') }}
+                                        </QTooltip>
+                                    </QIcon>
+                                </QTd>
+                            </QTr>
                         </template>
-                    </CardList>
+                    </QTable>
                 </template>
             </VnPaginate>
         </div>
+        <QDialog ref="createWarehouseDialogRef">
+            <ZoneCreateWarehouse @on-submit-create-warehouse="createZoneWarehouse" />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="openCreateWarehouseForm()">
+                <QTooltip>{{ t('warehouses.add') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
     </QPage>
 </template>
-
-<i18n>
-    es:
-        Remove row: Eliminar fila
-</i18n>

src/pages/Zone/ZoneClosingTable.vue

@@ -0,0 +1,112 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { computed } from 'vue';
+import { toCurrency } from 'src/filters';
+
+import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
+
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { toTimeFormat } from 'filters/date.js';
+
+const { t } = useI18n();
+const router = useRouter();
+const { viewSummary } = useSummaryDialog();
+
+defineProps({
+    rows: {
+        type: Array,
+        required: true,
+        default: () => [],
+    },
+});
+
+const columns = computed(() => [
+    {
+        label: t('zoneClosingTable.id'),
+        name: 'id',
+        field: 'id',
+        sortable: true,
+        align: 'left',
+    },
+    {
+        label: t('zoneClosingTable.name'),
+        name: 'name',
+        field: 'name',
+        sortable: true,
+        align: 'left',
+    },
+    {
+        label: t('zoneClosingTable.agency'),
+        name: 'agency',
+        field: 'agencyModeName',
+        sortable: true,
+        align: 'left',
+    },
+    {
+        label: t('zoneClosingTable.closing'),
+        name: 'close',
+        field: 'hour',
+        sortable: true,
+        align: 'left',
+        format: (val) => toTimeFormat(val),
+    },
+    {
+        label: t('zoneClosingTable.price'),
+        name: 'price',
+        field: 'price',
+        sortable: true,
+        align: 'left',
+        format: (val) => toCurrency(val),
+    },
+    {
+        name: 'actions',
+        align: 'left',
+    },
+]);
+
+const redirectToZoneSummary = (id) => {
+    router.push({ name: 'ZoneSummary', params: { id } });
+};
+</script>
+
+<template>
+    <div>
+        <div class="header">
+            <span>{{ t('zoneClosingTable.zones') }}</span>
+        </div>
+        <QTable
+            :rows="rows"
+            :columns="columns"
+            @row-click="(_, row) => redirectToZoneSummary(row.id)"
+            style="max-height: 400px"
+        >
+            <template #body-cell-actions="props">
+                <QTd :props="props">
+                    <div class="table-actions">
+                        <QIcon
+                            name="preview"
+                            size="sm"
+                            color="primary"
+                            @click.stop="viewSummary(props.row.id, ZoneSummary)"
+                        >
+                            <QTooltip>{{ t('zoneClosingTable.preview') }}</QTooltip>
+                        </QIcon>
+                    </div>
+                </QTd>
+            </template>
+        </QTable>
+    </div>
+</template>
+
+<style scoped lang="scss">
+.header {
+    width: 100%;
+    height: 34px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: bold;
+    background-color: $primary;
+}
+</style>

src/pages/Zone/ZoneDeliveryCalendar.vue

@@ -0,0 +1,192 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { date } from 'quasar';
+
+import ZoneClosingTable from './ZoneClosingTable.vue';
+import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
+import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
+
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import axios from 'axios';
+
+const props = defineProps({
+    year: {
+        type: Number,
+        required: true,
+    },
+    month: {
+        type: Number,
+        required: true,
+    },
+    monthDate: {
+        type: Object,
+        default: null,
+    },
+    geoExclusions: {
+        type: Object,
+        default: () => {},
+    },
+    exclusions: {
+        type: Object,
+        default: () => {},
+    },
+    daysMap: {
+        type: Object,
+        default: null,
+    },
+});
+
+const { locale } = useI18n();
+
+const calendarRef = ref(null);
+const weekdayStore = useWeekdayStore();
+const showZoneClosingTable = ref(false);
+const zoneClosingData = ref(null);
+const today = ref(date.formatDate(Date.vnNew(), 'YYYY-MM-DD'));
+const todayTimestamp = computed(() => {
+    const date = Date.vnNew();
+    date.setHours(0, 0, 0, 0);
+    return date.getTime();
+});
+const _monthDate = computed(() => date.formatDate(props.monthDate, 'YYYY-MM-DD'));
+
+const onEventSelection = async ({ year, month, day }) => {
+    const date = new Date(year, month - 1, day);
+    const stamp = date.getTime();
+    const events = props.daysMap[stamp];
+    if (!events) return;
+
+    const zoneIds = [];
+    for (let event of events) zoneIds.push(event.zoneFk);
+
+    const params = {
+        zoneIds: zoneIds,
+        date: date,
+    };
+
+    const { data } = await axios.post('Zones/getZoneClosing', params);
+    zoneClosingData.value = data;
+    showZoneClosingTable.value = true;
+};
+
+const getEventByTimestamp = ({ year, month, day }) => {
+    const stamp = new Date(year, month - 1, day).getTime();
+    return (
+        props.daysMap[stamp] ||
+        props.exclusions[stamp] ||
+        props.geoExclusions[stamp] ||
+        null
+    );
+};
+
+const getEventAttrs = ({ year, month, day }) => {
+    const stamp = new Date(year, month - 1, day).getTime();
+
+    let colorClass = '--event';
+    if (props.geoExclusions[stamp]) colorClass = '--geoExcluded';
+    else if (props.exclusions[stamp]) colorClass = '--excluded';
+
+    const attrs = {
+        class: colorClass,
+        label: day,
+    };
+
+    return attrs;
+};
+
+const isToday = (timestamp) => {
+    const { year, month, day } = timestamp;
+    return todayTimestamp.value === new Date(year, month - 1, day).getTime();
+};
+
+const calendarHeaderTitle = computed(() => {
+    return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
+});
+</script>
+
+<template>
+    <QCalendarMonthWrapper
+        style="height: 290px; width: 290px"
+        transparent-background
+        view-customization="workerCalendar"
+    >
+        <template #header>
+            <span class="full-width text-center text-body1 q-py-sm">{{
+                calendarHeaderTitle
+            }}</span>
+        </template>
+        <template #calendar>
+            <QCalendarMonth
+                ref="calendarRef"
+                :model-value="_monthDate"
+                show-work-weeks
+                no-outside-days
+                no-active-date
+                :weekdays="[1, 2, 3, 4, 5, 6, 0]"
+                short-weekday-label
+                :locale="locale"
+                :now="today"
+                mini-mode
+            >
+                <template #day="{ scope: { timestamp } }">
+                    <!-- Este slot representa cada día del calendario y muestra un botón representando el correspondiente evento -->
+                    <QBtn
+                        v-if="getEventByTimestamp(timestamp)"
+                        v-bind="{ ...getEventAttrs(timestamp) }"
+                        @click="onEventSelection(timestamp)"
+                        rounded
+                        dense
+                        flat
+                        class="calendar-event"
+                        :class="{
+                            '--today': isToday(timestamp),
+                        }"
+                    >
+                        <QPopupProxy>
+                            <ZoneClosingTable
+                                v-if="zoneClosingData && zoneClosingData.length"
+                                :rows="zoneClosingData"
+                            />
+                        </QPopupProxy>
+                    </QBtn>
+                </template>
+            </QCalendarMonth>
+        </template>
+    </QCalendarMonthWrapper>
+</template>
+
+<style lang="scss">
+.calendar-event {
+    display: flex;
+    justify-content: center;
+    width: 32px;
+    height: 32px;
+    font-size: 13px;
+    line-height: 1.715em;
+    cursor: pointer;
+    color: white;
+
+    &.--today {
+        border: 2px solid $info;
+    }
+
+    &.--event {
+        background-color: $positive;
+        color: black;
+    }
+
+    &.--excluded {
+        background-color: $negative;
+    }
+
+    &.--geoExcluded {
+        background-color: $primary;
+    }
+
+    &:hover {
+        opacity: 0.8;
+    }
+}
+</style>

src/pages/Zone/ZoneDeliveryDays.vue

@@ -1 +1,257 @@
-<template>Zone Delivery days</template>
+<script setup>
+import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
+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">
+            <ZoneDeliveryPanel />
+        </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>

src/pages/Zone/ZoneDeliveryPanel.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>

src/pages/Zone/ZoneList.vue

@@ -6,8 +6,6 @@ import { toCurrency } from 'src/filters';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ZoneSummary from 'src/pages/Zone/Card/ZoneSummary.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import ZoneFilterPanel from './ZoneFilterPanel.vue';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toTimeFormat } from 'src/filters/date';
@@ -71,35 +69,6 @@ const columns = computed(() => [
     },
 ]);
 
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return {
-                name: { like: `%${value}%` },
-            };
-        case 'code':
-            return {
-                code: { like: `%${value}%` },
-            };
-        case 'agencyModeFk':
-            return {
-                agencyModeFk: value,
-            };
-        case 'search':
-            if (value) {
-                if (!isNaN(value)) {
-                    return { id: value };
-                } else {
-                    return {
-                        name: {
-                            like: `%${value}%`,
-                        },
-                    };
-                }
-            }
-    }
-};
-
 async function clone(id) {
     const { data } = await axios.post(`Zones/${id}/clone`);
     notify(t('globals.dataSaved'), 'positive');
@@ -116,25 +85,6 @@ onMounted(() => (stateStore.rightDrawer = true));
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="ZoneList"
-                url="Zones"
-                :filter="{
-                    include: { relation: 'agencyMode', scope: { fields: ['name'] } },
-                }"
-                :expr-builder="exprBuilder"
-                :label="t('list.searchZone')"
-                :info="t('list.searchInfo')"
-            />
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
-        </QScrollArea>
-    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Zone/ZoneMain.vue

@@ -1,11 +1,72 @@
 <script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'src/components/LeftMenu.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import ZoneFilterPanel from './ZoneFilterPanel.vue';
 
+const { t } = useI18n();
 const stateStore = useStateStore();
+const route = useRoute();
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'agencyModeFk':
+            return {
+                agencyModeFk: value,
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        name: {
+                            like: `%${value}%`,
+                        },
+                    };
+                }
+            }
+    }
+};
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="ZoneList"
+                url="Zones"
+                :filter="{
+                    include: { relation: 'agencyMode', scope: { fields: ['name'] } },
+                }"
+                :expr-builder="exprBuilder"
+                :label="t('list.searchZone')"
+                :info="t('list.searchInfo')"
+                custom-route-redirect-name="ZoneSummary"
+            />
+        </Teleport>
+    </template>
+    <QDrawer
+        v-if="route.name === 'ZoneList'"
+        v-model="stateStore.rightDrawer"
+        side="right"
+        :width="256"
+        show-if-above
+    >
+        <QScrollArea class="fit text-grey-8">
+            <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
+        </QScrollArea>
+    </QDrawer>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
             <LeftMenu />

src/pages/Zone/ZoneUpcoming.vue

@@ -1,53 +1,85 @@
 <script setup>
-import { ref, computed } from 'vue';
-import ZoneFilterPanel from 'components/InvoiceOutNegativeFilter.vue';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
+import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 
+import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
+import FetchData from 'components/FetchData.vue';
+
+import { toDateFormat } from 'src/filters/date.js';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+
 const { t } = useI18n();
-const arrayData = ref(null);
-const rows = computed(() => arrayData.value.store.data);
+const weekdayStore = useWeekdayStore();
+
+const details = ref([]);
 
 const columns = computed(() => [
     {
-        label: t('Province'),
-        //field: '',
-        //name: '',
+        label: t('upcomingDeliveries.province'),
+        name: 'province',
+        field: 'name',
         align: 'left',
     },
     {
-        label: t('Closing'),
-        //field: '',
-        //name: '',
+        label: t('upcomingDeliveries.closing'),
+        name: 'closing',
+        field: 'hour',
         align: 'left',
     },
     {
-        label: t('Id'),
-        //field: '',
-        //name: '',
+        label: t('upcomingDeliveries.id'),
+        name: 'id',
+        field: 'zoneFk',
         align: 'left',
     },
 ]);
 
-function getWeekDay(jsonDate) {
-    const weekDay = new Date(jsonDate).getDay();
+const getWeekDayName = (date) => {
+    const weekDay = new Date(date).getDay();
+    return t(`weekdays.${weekdayStore.weekdays[weekDay].code}`);
+};
 
-    return this.days[weekDay].locale;
-}
+const getHeaderTitle = (date) => {
+    return `${getWeekDayName(date)} - ${toDateFormat(date)}`;
+};
+
+onMounted(() => weekdayStore.initStore());
 </script>
 
 <template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <ZoneFilterPanel data-key="ZoneUpcoming" />
-        </QScrollArea>
-    </QDrawer>
+    <FetchData
+        url="Zones/getUpcomingDeliveries"
+        @on-fetch="(data) => (details = data)"
+        auto-load
+    />
     <VnSubToolbar />
     <QPage class="column items-center q-pa-md">
-        <span>
-            {{ t(`${getWeekDay(/*detail.shipped*/)}`) }} -
-            {{ t /*'detail.shipped'*/() }}
-        </span>
-        <QTable :columns="columns" :rows="rows" class="full-width q-mt-md"> </QTable>
+        <QCard class="full-width q-pa-md">
+            <div
+                v-for="(detail, index) in details"
+                :key="index"
+                class="full-width flex q-mb-lg"
+            >
+                <span class="header">
+                    {{ getHeaderTitle(detail.shipped) }}
+                </span>
+                <QTable flat :columns="columns" :rows="detail.lines" class="full-width" />
+            </div>
+        </QCard>
     </QPage>
 </template>
+
+<style scoped lang="scss">
+.header {
+    min-width: 100% !important;
+    display: flex;
+    align-items: center;
+    padding-left: 8px;
+    height: 35px;
+    border-bottom: 1px solid $primary;
+    background-color: var(--vn-page-color);
+    font-size: 19px;
+    font-weight: bold;
+    text-transform: uppercase;
+}
+</style>

src/pages/Zone/locale/en.yml

@@ -3,8 +3,10 @@ zone:
         zones: Zone
         zonesList: Zones
         zoneCreate: Create zone
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
+        locations: Locations
+        deliveryDays: Delivery days
+        upcomingDeliveries: Upcoming deliveries
+        warehouses: Warehouses
 list:
     clone: Clone
     id: Id
@@ -40,3 +42,29 @@ summary:
 filterPanel:
     name: Name
     agencyModeFk: Agency
+deliveryPanel:
+    pickup: Pick up
+    delivery: Delivery
+    postcode: Postcode
+    agency: Agency
+    warehouse: Warehouse
+    query: Query
+    noEventsWarning: No service for the specified zone
+zoneClosingTable:
+    id: Id
+    name: Name
+    agency: Agency
+    closing: Closing
+    price: Price
+    preview: Preview
+    zones: Zones
+warehouses:
+    delete: Delete
+    deleteTitle: This item will be deleted
+    deleteSubtitle: Are you sure you want to continue?
+    warehouse: Warehouse
+    add: Add
+upcomingDeliveries:
+    province: Province
+    closing: Closing
+    id: Id

src/pages/Zone/locale/es.yml

@@ -3,8 +3,10 @@ zone:
         zones: Zonas
         zonesList: Zonas
         zoneCreate: Nueva zona
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
+        locations: Localizaciones
+        deliveryDays: Días de entrega
+        upcomingDeliveries: Próximos repartos
+        warehouses: Almacenes
 list:
     clone: Clonar
     id: Id
@@ -40,3 +42,31 @@ summary:
 filterPanel:
     name: Nombre
     agencyModeFk: Agencia
+deliveryPanel:
+    pickup: Recogida
+    delivery: Entrega
+    postcode: Código postal
+    agency: Agencia
+    warehouse: Almacén
+    query: Consultar
+    noEventsWarning: No hay servicio para la zona especificada
+zoneClosingTable:
+    id: Id
+    name: Nombre
+    agency: Agencia
+    closing: Cierre
+    preview: Vista previa
+    price: Precio
+    zones: Zonas
+Search zones: Buscar zonas
+You can search by zone reference: Puedes buscar por referencia de la zona
+warehouses:
+    delete: Eliminar
+    deleteTitle: Este elemento será eliminado
+    deleteSubtitle: ¿Seguro que quieres continuar?
+    warehouse: Almacén
+    add: Añadir
+upcomingDeliveries:
+    province: Provincia
+    closing: Cierre
+    id: Id

src/router/modules/zone.js

@@ -11,8 +11,8 @@ export default {
     component: RouterView,
     redirect: { name: 'ZoneMain' },
     menus: {
-        main: ['ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'],
-        card: ['ZoneBasicData', 'ZoneHistory', 'ZoneLocations'],
+        main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingDeliveries'],
+        card: ['ZoneBasicData', 'ZoneWarehouses', 'ZoneHistory', 'ZoneLocations'],
     },
     children: [
         {
@@ -30,6 +30,15 @@ export default {
                     },
                     component: () => import('src/pages/Zone/ZoneList.vue'),
                 },
+                {
+                    path: 'delivery-days',
+                    name: 'ZoneDeliveryDays',
+                    meta: {
+                        title: 'deliveryDays',
+                        icon: 'vn:calendar',
+                    },
+                    component: () => import('src/pages/Zone/ZoneDeliveryDays.vue'),
+                },
                 {
                     path: 'create',
                     name: 'ZoneCreate',
@@ -57,6 +66,15 @@ export default {
                 //     },
                 //     component: () => import('src/pages/Zone/ZoneCounter.vue'),
                 // },
+                {
+                    name: 'ZoneUpcomingDeliveries',
+                    path: 'upcoming-deliveries',
+                    meta: {
+                        title: 'upcomingDeliveries',
+                        icon: 'vn:calendar',
+                    },
+                    component: () => import('src/pages/Zone/ZoneUpcoming.vue'),
+                },
             ],
         },
         {
@@ -74,6 +92,15 @@ export default {
                     },
                     component: () => import('src/pages/Zone/Card/ZoneSummary.vue'),
                 },
+                {
+                    name: 'ZoneBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneBasicData.vue'),
+                },
                 {
                     name: 'ZoneLocations',
                     path: 'location',
@@ -84,13 +111,13 @@ export default {
                     component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
                 },
                 {
-                    name: 'ZoneBasicData',
-                    path: 'basic-data',
+                    name: 'ZoneWarehouses',
+                    path: 'warehouses',
                     meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
+                        title: 'warehouses',
+                        icon: 'home',
                     },
-                    component: () => import('src/pages/Zone/Card/ZoneBasicData.vue'),
+                    component: () => import('src/pages/Zone/Card/ZoneWarehouses.vue'),
                 },
                 {
                     name: 'ZoneHistory',
@@ -101,83 +128,6 @@ export default {
                     },
                     component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
                 },
-
-                // {
-                //     path: '/zone/delivery',
-                //     name: 'ZoneDeliveryMain',
-                //     component: () => import('src/pages/Zone/ZoneMain.vue'),
-                //     redirect: { name: 'ZoneDeliveryList' },
-                //     children: [
-                //         {
-                //             path: 'list',
-                //             name: 'ZoneDeliveryList',
-                //             meta: {
-                //                 title: 'deliveryList',
-                //                 icon: 'today',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Delivery/ZoneDeliveryList.vue'),
-                //         },
-                //         {
-                //             path: 'create',
-                //             name: 'ZoneDeliveryCreate',
-                //             meta: {
-                //                 title: 'deliveryCreate',
-                //                 icon: 'create',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Delivery/ZoneDeliveryCreate.vue'),
-                //         },
-                //         {
-                //             path: ':id/edit',
-                //             name: 'ZoneDeliveryEdit',
-                //             meta: {
-                //                 title: 'deliveryEdit',
-                //                 icon: 'edit',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Delivery/ZoneDeliveryCreate.vue'),
-                //         },
-                //     ],
-                // },
-                // {
-                //     path: '/zone/upcoming',
-                //     name: 'ZoneUpcomingMain',
-                //     component: () => import('src/pages/Zone/ZoneMain.vue'),
-                //     redirect: { name: 'ZoneUpcomingList' },
-                //     children: [
-                //         {
-                //             path: 'list',
-                //             name: 'ZoneUpcomingList',
-                //             meta: {
-                //                 title: 'upcomingList',
-                //                 icon: 'today',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingList.vue'),
-                //         },
-                //         {
-                //             path: 'create',
-                //             name: 'ZoneUpcomingCreate',
-                //             meta: {
-                //                 title: 'upcomingCreate',
-                //                 icon: 'create',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue'),
-                //         },
-                //         {
-                //             path: ':id/edit',
-                //             name: 'ZoneUpcomingEdit',
-                //             meta: {
-                //                 title: 'upcomingEdit',
-                //                 icon: 'edit',
-                //             },
-                //             component: () =>
-                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue'),
-                //         },
-                //     ],
-                // },
             ],
         },
     ],

src/stores/useWeekdayStore.js

@@ -85,6 +85,27 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
         return locales;
     });
 
+    /**
+     * Transforms weekday set into an array whose indexes are weekday index
+     * with selected days set to %true.
+     *
+     * @param {String} weekDays Weekday codes separated by commas
+     * @return {Array<Boolean>} Array with selected days set to %true
+     */
+    const fromSet = (_weekDays) => {
+        let wdays = [];
+
+        if (_weekDays) {
+            let codes = _weekDays.split(',');
+            for (let code of codes) {
+                let data = weekdaysMap[code];
+                if (data) wdays[data.index] = true;
+            }
+        }
+
+        return wdays;
+    };
+
     return {
         initStore,
         weekdaysMap,
@@ -93,5 +114,6 @@ export const useWeekdayStore = defineStore('weekdayStore', () => {
         weekdays,
         monthCodes,
         getLocaleMonths,
+        fromSet,
     };
 });

test/cypress/integration/worker/workerPda.spec.js

@@ -0,0 +1,24 @@
+describe('WorkerPda', () => {
+    const deviceProductionField =
+        '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/worker/1110/pda`);
+    });
+
+    it('assign pda', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(deviceProductionField).type('{downArrow}{enter}');
+        cy.get('.vn-row > #simSerialNumber').type('123{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
+
+    it('delete pda', () => {
+        cy.get('.btn-delete').click();
+        cy.get(
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+        ).click();
+        cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
+    });
+});