From c0c94ff924bdd94d5301243cbc9f14286d30bdeb Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 27 Mar 2024 13:09:10 +0100
Subject: [PATCH 01/76] refs #6111 fix qtable, actions, scroll

---
 src/components/common/VnInputTime.vue | 11 +++--------
 src/css/app.scss                      | 15 ++++++++-------
 src/pages/Route/RouteList.vue         | 26 +++++++++++++++++++++++---
 src/pages/Route/RouteMain.vue         |  2 ++
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index aefee1a4d..6b0c99743 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -2,7 +2,7 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import isValidDate from 'filters/isValidDate';
-import VnInput from "components/common/VnInput.vue";
+import VnInput from 'components/common/VnInput.vue';
 
 const props = defineProps({
     modelValue: {
@@ -27,12 +27,7 @@ const value = computed({
     set(value) {
         const [hours, minutes] = value.split(':');
         const date = new Date(props.modelValue);
-        date.setHours(
-            Number.parseInt(hours) || 0,
-            Number.parseInt(minutes) || 0,
-            0,
-            0
-        );
+        date.setHours(Number.parseInt(hours) || 0, Number.parseInt(minutes) || 0, 0, 0);
         emit('update:modelValue', value ? date.toISOString() : null);
     },
 });
@@ -79,7 +74,7 @@ const styleAttrs = computed(() => {
         @click="isPopupOpen = true"
     >
         <template #append>
-            <QIcon name="event" class="cursor-pointer">
+            <QIcon name="Schedule" class="cursor-pointer">
                 <QPopupProxy
                     v-model="isPopupOpen"
                     cover
diff --git a/src/css/app.scss b/src/css/app.scss
index 540fad175..38c9ac070 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -14,12 +14,6 @@ body.body--light {
     .q-header .q-toolbar {
         color: var(--font-color);
     }
-    .q-card,
-    .q-table,
-    .q-table__bottom,
-    .q-drawer {
-        background-color: var(--vn-section-color);
-    }
 }
 
 body.body--dark {
@@ -122,6 +116,13 @@ select:-webkit-autofill {
     color: black;
 }
 
+.q-card,
+.q-table,
+.q-table__bottom,
+.q-drawer {
+    background-color: var(--vn-section-color);
+}
+
 input[type='number'] {
     -moz-appearance: textfield;
 }
@@ -130,4 +131,4 @@ input::-webkit-inner-spin-button {
     appearance: none;
     -webkit-appearance: none;
     -moz-appearance: none;
-}
\ No newline at end of file
+}
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 94c05ad54..a96b09a38 100644
--- a/src/pages/Route/RouteList.vue
+++ b/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';
@@ -224,8 +225,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">
+        <QToolbar class="justify-end"> </QToolbar>
         <VnSubToolbar class="justify-end">
             <template #st-actions>
+                <TableVisibleColumns
+                    class="LeftIcon"
+                    :all-columns="allColumnNames"
+                    table-code="latestBuys"
+                    labels-traductions-path="entry.latestBuys"
+                    @on-config-saved="visibleColumns = ['picture', ...$event]"
+                />
                 <QBtn
                     icon="vn:clone"
                     color="primary"
@@ -260,7 +269,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
             >
@@ -275,7 +284,6 @@ const openTicketsDialog = (id) => {
                             selection="multiple"
                             :rows-per-page-options="[0]"
                             hide-pagination
-                            :pagination="{ sortBy: 'ID', descending: true }"
                             :no-data-label="t('globals.noResults')"
                         >
                             <template #body-cell-worker="{ row }">
@@ -329,7 +337,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-vehicle="{ row }">
-                                <QTd>
+                                <QTd class="vehicle">
                                     <VnSelectFilter
                                         :label="t('Vehicle')"
                                         v-model="row.vehicleFk"
@@ -466,6 +474,18 @@ const openTicketsDialog = (id) => {
 .table-actions {
     gap: 12px;
 }
+
+.vehicle {
+    max-width: 150px;
+}
+
+th:last-child,
+td:last-child {
+    background-color: var(--vn-section-color);
+    position: sticky;
+    right: 0;
+    z-index: 1;
+}
 </style>
 <i18n>
 en:
diff --git a/src/pages/Route/RouteMain.vue b/src/pages/Route/RouteMain.vue
index 66ce78f23..bbf19068e 100644
--- a/src/pages/Route/RouteMain.vue
+++ b/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>

From 9833a5946ae59ba4913a1001d50395db7b450de1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 2 Apr 2024 12:48:39 +0200
Subject: [PATCH 02/76] refs #6111 create visible columns

---
 src/pages/Route/RouteList.vue | 126 ++++++++++++++++++++++++++++++----
 1 file changed, 113 insertions(+), 13 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index a96b09a38..b3c198094 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -2,7 +2,7 @@
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { computed, onMounted, onUnmounted, ref } from 'vue';
+import { computed, onMounted, reactive, onUnmounted, ref } from 'vue';
 import { dashIfEmpty, toHour } from 'src/filters';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
@@ -20,6 +20,8 @@ import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import { useQuasar } from 'quasar';
+import { useRouter } from 'vue-router';
+import { useArrayData } from 'composables/useArrayData';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -27,8 +29,13 @@ const { validate } = useValidator();
 const quasar = useQuasar();
 const session = useSession();
 const { viewSummary } = useSummaryDialog();
-
-onMounted(() => (stateStore.rightDrawer = true));
+const router = useRouter();
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    const filteredColumns = columns.value.filter((col) => col.name !== 'picture');
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+    await arrayData.fetch({ append: false });
+});
 onUnmounted(() => (stateStore.rightDrawer = false));
 
 const selectedRows = ref([]);
@@ -39,6 +46,15 @@ const columns = computed(() => [
         field: (row) => row.id,
         sortable: true,
         align: 'center',
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
     },
     {
         name: 'worker',
@@ -46,6 +62,18 @@ const columns = computed(() => [
         field: (row) => row.workerUserName,
         sortable: true,
         align: 'left',
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: workers,
+                'option-value': 'id',
+                'option-label': 'nickname',
+                dense: true,
+            },
+        },
     },
     {
         name: 'agency',
@@ -53,6 +81,18 @@ const columns = computed(() => [
         field: (row) => row.agencyName,
         sortable: true,
         align: 'left',
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: agencyList,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
     },
     {
         name: 'vehicle',
@@ -60,6 +100,18 @@ const columns = computed(() => [
         field: (row) => row.vehiclePlateNumber,
         sortable: true,
         align: 'left',
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: vehicleList,
+                'option-value': 'id',
+                'option-label': 'numberPlate',
+                dense: true,
+            },
+        },
     },
     {
         name: 'date',
@@ -67,6 +119,12 @@ const columns = computed(() => [
         field: (row) => row.created,
         sortable: true,
         align: 'left',
+        columnFilter: {
+            component: VnInputDate,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+        },
     },
     {
         name: 'volume',
@@ -81,6 +139,12 @@ const columns = computed(() => [
         field: (row) => row.description,
         sortable: true,
         align: 'left',
+        columnFilter: {
+            component: VnInput,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+        },
     },
     {
         name: 'started',
@@ -88,6 +152,12 @@ const columns = computed(() => [
         field: (row) => toHour(row.started),
         sortable: true,
         align: 'left',
+        columnFilter: {
+            component: VnInputTime,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+        },
     },
     {
         name: 'finished',
@@ -95,6 +165,12 @@ const columns = computed(() => [
         field: (row) => toHour(row.finished),
         sortable: true,
         align: 'left',
+        columnFilter: {
+            component: VnInputDate,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+        },
     },
     {
         name: 'actions',
@@ -103,7 +179,11 @@ const columns = computed(() => [
         align: 'right',
     },
 ]);
-
+const params = reactive({});
+const arrayData = useArrayData('EntryLatestBuys', {
+    url: 'Buys/latestBuysFilter',
+    order: ['itemFk DESC'],
+});
 const refreshKey = ref(0);
 const workers = ref([]);
 const agencyList = ref([]);
@@ -115,9 +195,29 @@ const updateRoute = async (route) => {
         return err;
     }
 };
-
+const allColumnNames = ref([]);
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
+const store = arrayData.store;
+const rows = computed(() => store.data);
+const rowsSelected = ref([]);
+
+const getInputEvents = (col) => {
+    return col.columnFilter.type === 'select'
+        ? { 'update:modelValue': () => applyColumnFilter(col) }
+        : {
+              'keyup.enter': () => applyColumnFilter(col),
+          };
+};
+
+const applyColumnFilter = async (col) => {
+    try {
+        params[col.field] = col.columnFilter.filterValue;
+        await arrayData.addFilter({ params });
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
 
 const cloneRoutes = () => {
     axios.post('Routes/clone', {
@@ -225,16 +325,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">
-        <QToolbar class="justify-end"> </QToolbar>
+        <QToolbar
+            ><TableVisibleColumns
+                class="LeftIcon"
+                :all-columns="allColumnNames"
+                table-code="routes"
+                @on-config-saved="visibleColumns = ['picture', ...$event]"
+            />
+        </QToolbar>
         <VnSubToolbar class="justify-end">
             <template #st-actions>
-                <TableVisibleColumns
-                    class="LeftIcon"
-                    :all-columns="allColumnNames"
-                    table-code="latestBuys"
-                    labels-traductions-path="entry.latestBuys"
-                    @on-config-saved="visibleColumns = ['picture', ...$event]"
-                />
                 <QBtn
                     icon="vn:clone"
                     color="primary"

From 0cfcda706289c809fabdbc95e753c7e2d6e9d6c3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Apr 2024 15:00:36 +0200
Subject: [PATCH 03/76] refs #6111 fix visibleColumns

---
 src/pages/Route/RouteList.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index b3c198094..4494c67ea 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -34,6 +34,7 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     const filteredColumns = columns.value.filter((col) => col.name !== 'picture');
     allColumnNames.value = filteredColumns.map((col) => col.name);
+    allColumnNames.value = columns.value;
     await arrayData.fetch({ append: false });
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -325,15 +326,7 @@ 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">
-        <QToolbar
-            ><TableVisibleColumns
-                class="LeftIcon"
-                :all-columns="allColumnNames"
-                table-code="routes"
-                @on-config-saved="visibleColumns = ['picture', ...$event]"
-            />
-        </QToolbar>
-        <VnSubToolbar class="justify-end">
+        <VnSubToolbar>
             <template #st-actions>
                 <QBtn
                     icon="vn:clone"
@@ -362,6 +355,12 @@ const openTicketsDialog = (id) => {
                 >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
+                <TableVisibleColumns
+                    class="LeftIcon"
+                    :all-columns="allColumnNames"
+                    table-code="routes"
+                    @on-config-saved="visibleColumns = [...$event]"
+                />
             </template>
         </VnSubToolbar>
         <div class="route-list">
@@ -383,6 +382,7 @@ const openTicketsDialog = (id) => {
                             row-key="id"
                             selection="multiple"
                             :rows-per-page-options="[0]"
+                            :visible-columns="visibleColumns"
                             hide-pagination
                             :no-data-label="t('globals.noResults')"
                         >

From ce02d21b3b963abbbde309ec8efbd1a3923403cf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 5 Apr 2024 08:50:33 +0200
Subject: [PATCH 04/76] refs #6111 fix routeList

---
 src/components/common/TableVisibleColumns.vue |  4 ++++
 src/pages/Route/RouteList.vue                 | 18 +++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 7aa696a07..56d0b08df 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -43,6 +43,7 @@ const setUserConfigViewData = (data) => {
         name: col,
         active: data[col] == undefined ? true : data[col],
     }));
+    console.log('formattedCols: ', formattedCols.value);
     emitSavedConfig();
 };
 
@@ -63,6 +64,7 @@ const fetchViewConfigData = async () => {
             where: { tableCode: $props.tableCode, userFk: user.id },
         };
         const userConfig = await getConfig('UserConfigViews', userConfigFilter);
+        console.log('userConfig: ', userConfig);
 
         if (userConfig) {
             initialUserConfigViewData.value = userConfig;
@@ -72,6 +74,7 @@ const fetchViewConfigData = async () => {
 
         const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
         const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
+        console.log('defaultConfig: ', defaultConfig);
 
         if (defaultConfig) {
             setUserConfigViewData(defaultConfig.columns);
@@ -131,6 +134,7 @@ const emitSavedConfig = () => {
     const activeColumns = formattedCols.value
         .filter((col) => col.active)
         .map((col) => col.name);
+    console.log('activeColumns: ', activeColumns);
     emit('onConfigSaved', activeColumns);
 };
 
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 4494c67ea..a8a63d86c 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -32,9 +32,7 @@ const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 onMounted(async () => {
     stateStore.rightDrawer = true;
-    const filteredColumns = columns.value.filter((col) => col.name !== 'picture');
-    allColumnNames.value = filteredColumns.map((col) => col.name);
-    allColumnNames.value = columns.value;
+    allColumnNames.value = columns.value.map((col) => col.name);
     await arrayData.fetch({ append: false });
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -327,6 +325,14 @@ const openTicketsDialog = (id) => {
     <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
     <QPage class="column items-center">
         <VnSubToolbar>
+            <template #st-data>
+                <TableVisibleColumns
+                    class="LeftIcon"
+                    :all-columns="allColumnNames"
+                    table-code="routesList"
+                    @on-config-saved="visibleColumns = [...$event]"
+                />
+            </template>
             <template #st-actions>
                 <QBtn
                     icon="vn:clone"
@@ -355,12 +361,6 @@ const openTicketsDialog = (id) => {
                 >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
-                <TableVisibleColumns
-                    class="LeftIcon"
-                    :all-columns="allColumnNames"
-                    table-code="routes"
-                    @on-config-saved="visibleColumns = [...$event]"
-                />
             </template>
         </VnSubToolbar>
         <div class="route-list">

From da24b4d836b6b524ba46bbf3b0f94ebed9cc4325 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 5 Apr 2024 13:39:43 +0200
Subject: [PATCH 05/76] refs #6111 onMounted

---
 src/pages/Route/RouteList.vue | 54 +++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index a8a63d86c..9fa6f58d8 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -29,13 +29,6 @@ const { validate } = useValidator();
 const quasar = useQuasar();
 const session = useSession();
 const { viewSummary } = useSummaryDialog();
-const router = useRouter();
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-    allColumnNames.value = columns.value.map((col) => col.name);
-    await arrayData.fetch({ append: false });
-});
-onUnmounted(() => (stateStore.rightDrawer = false));
 
 const selectedRows = ref([]);
 const columns = computed(() => [
@@ -46,7 +39,7 @@ const columns = computed(() => [
         sortable: true,
         align: 'center',
         columnFilter: {
-            component: VnInput,
+            component: 'VnInput',
             type: 'text',
             filterValue: null,
             event: getInputEvents,
@@ -62,7 +55,7 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
         columnFilter: {
-            component: VnSelectFilter,
+            component: 'VnSelectFilter',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -81,7 +74,7 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
         columnFilter: {
-            component: VnSelectFilter,
+            component: 'VnSelectFilter',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -100,7 +93,7 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
         columnFilter: {
-            component: VnSelectFilter,
+            component: 'VnSelectFilter',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -119,7 +112,7 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
         columnFilter: {
-            component: VnInputDate,
+            component: 'VnInputDate',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -139,7 +132,7 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
         columnFilter: {
-            component: VnInput,
+            component: 'VnInput',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -152,7 +145,7 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
         columnFilter: {
-            component: VnInputTime,
+            component: 'VnInputTime',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -165,7 +158,7 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
         columnFilter: {
-            component: VnInputDate,
+            component: 'VnInputDate',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -197,9 +190,6 @@ const updateRoute = async (route) => {
 const allColumnNames = ref([]);
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
-const store = arrayData.store;
-const rows = computed(() => store.data);
-const rowsSelected = ref([]);
 
 const getInputEvents = (col) => {
     return col.columnFilter.type === 'select'
@@ -267,6 +257,14 @@ const openTicketsDialog = (id) => {
         })
         .onOk(() => refreshKey.value++);
 };
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    allColumnNames.value = columns.value.map((col) => col.name);
+    console.log('les columnes', allColumnNames.value);
+    await arrayData.fetch({ append: false });
+});
+onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
@@ -330,6 +328,7 @@ const openTicketsDialog = (id) => {
                     class="LeftIcon"
                     :all-columns="allColumnNames"
                     table-code="routesList"
+                    labels-traductions-path="route.list"
                     @on-config-saved="visibleColumns = [...$event]"
                 />
             </template>
@@ -386,6 +385,25 @@ const openTicketsDialog = (id) => {
                             hide-pagination
                             :no-data-label="t('globals.noResults')"
                         >
+                            <template #top-row="{ cols }">
+                                <QTr>
+                                    <QTd />
+                                    <QTd
+                                        v-for="(col, index) in cols"
+                                        :key="index"
+                                        style="max-width: 100px"
+                                    >
+                                        <component
+                                            :is="col.columnFilter.component"
+                                            v-if="col.name !== 'picture'"
+                                            v-model="col.columnFilter.filterValue"
+                                            v-bind="col.columnFilter.attrs"
+                                            v-on="col.columnFilter.event(col)"
+                                            dense
+                                        />
+                                    </QTd>
+                                </QTr>
+                            </template>
                             <template #body-cell-worker="{ row }">
                                 <QTd>
                                     <VnSelectFilter

From a78e86a0b9972a50bf598cae6aa9aaca6ce9b8aa Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 5 Apr 2024 14:25:32 +0200
Subject: [PATCH 06/76] refs #6111 routeList fix

---
 src/i18n/es/index.js          |  9 +++++++++
 src/pages/Route/RouteList.vue | 22 ++++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index abcc2a1bd..1d1b29f4f 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -91,6 +91,15 @@ export default {
             log: 'Historial',
             parkingList: 'Listado de parkings',
         },
+        worker: 'Trabajador',
+        vehicle: 'Vehículo',
+        hourStarted: 'Hora inicio',
+        hourFinished: 'Hora fin',
+        newRoute: 'Nueva Ruta',
+        StatingDate: 'Fecha de inicio',
+        Cancel: 'Cancelar',
+        Clone: 'Clonar',
+        ID: 'ID',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 9fa6f58d8..2bb66df53 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -29,7 +29,7 @@ const { validate } = useValidator();
 const quasar = useQuasar();
 const session = useSession();
 const { viewSummary } = useSummaryDialog();
-
+const visibleColumns = ref([]);
 const selectedRows = ref([]);
 const columns = computed(() => [
     {
@@ -139,8 +139,8 @@ const columns = computed(() => [
         },
     },
     {
-        name: 'started',
-        label: t('Hour started'),
+        name: 'hourStarted',
+        label: t('hourStarted'),
         field: (row) => toHour(row.started),
         sortable: true,
         align: 'left',
@@ -152,8 +152,8 @@ const columns = computed(() => [
         },
     },
     {
-        name: 'finished',
-        label: t('Hour finished'),
+        name: 'hourFinished',
+        label: t('hourFinished'),
         field: (row) => toHour(row.finished),
         sortable: true,
         align: 'left',
@@ -328,7 +328,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     class="LeftIcon"
                     :all-columns="allColumnNames"
                     table-code="routesList"
-                    labels-traductions-path="route.list"
+                    labels-traductions-path="globals"
                     @on-config-saved="visibleColumns = [...$event]"
                 />
             </template>
@@ -385,7 +385,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             hide-pagination
                             :no-data-label="t('globals.noResults')"
                         >
-                            <template #top-row="{ cols }">
+                            <!-- <template #top-row="{ cols }">
                                 <QTr>
                                     <QTd />
                                     <QTd
@@ -394,8 +394,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                         style="max-width: 100px"
                                     >
                                         <component
-                                            :is="col.columnFilter.component"
-                                            v-if="col.name !== 'picture'"
+                                            :is="col?.columnFilter?.component"
+                                            v-if="
+                                                col.columnFilter && col.name !== 'actions'
+                                            "
                                             v-model="col.columnFilter.filterValue"
                                             v-bind="col.columnFilter.attrs"
                                             v-on="col.columnFilter.event(col)"
@@ -403,7 +405,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                         />
                                     </QTd>
                                 </QTr>
-                            </template>
+                            </template> -->
                             <template #body-cell-worker="{ row }">
                                 <QTd>
                                     <VnSelectFilter

From 2eaa184fe07eca77823cf47d509a3f04c3bdf576 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 10 Apr 2024 13:20:56 +0200
Subject: [PATCH 07/76] refs #6111 fix trad remove logs

---
 src/components/common/TableVisibleColumns.vue |  4 --
 src/pages/Route/RouteList.vue                 | 40 +++++++------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 56d0b08df..7aa696a07 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -43,7 +43,6 @@ const setUserConfigViewData = (data) => {
         name: col,
         active: data[col] == undefined ? true : data[col],
     }));
-    console.log('formattedCols: ', formattedCols.value);
     emitSavedConfig();
 };
 
@@ -64,7 +63,6 @@ const fetchViewConfigData = async () => {
             where: { tableCode: $props.tableCode, userFk: user.id },
         };
         const userConfig = await getConfig('UserConfigViews', userConfigFilter);
-        console.log('userConfig: ', userConfig);
 
         if (userConfig) {
             initialUserConfigViewData.value = userConfig;
@@ -74,7 +72,6 @@ const fetchViewConfigData = async () => {
 
         const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
         const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
-        console.log('defaultConfig: ', defaultConfig);
 
         if (defaultConfig) {
             setUserConfigViewData(defaultConfig.columns);
@@ -134,7 +131,6 @@ const emitSavedConfig = () => {
     const activeColumns = formattedCols.value
         .filter((col) => col.active)
         .map((col) => col.name);
-    console.log('activeColumns: ', activeColumns);
     emit('onConfigSaved', activeColumns);
 };
 
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 2bb66df53..6196ff398 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -20,7 +20,6 @@ import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import { useQuasar } from 'quasar';
-import { useRouter } from 'vue-router';
 import { useArrayData } from 'composables/useArrayData';
 
 const stateStore = useStateStore();
@@ -385,27 +384,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             hide-pagination
                             :no-data-label="t('globals.noResults')"
                         >
-                            <!-- <template #top-row="{ cols }">
-                                <QTr>
-                                    <QTd />
-                                    <QTd
-                                        v-for="(col, index) in cols"
-                                        :key="index"
-                                        style="max-width: 100px"
-                                    >
-                                        <component
-                                            :is="col?.columnFilter?.component"
-                                            v-if="
-                                                col.columnFilter && col.name !== 'actions'
-                                            "
-                                            v-model="col.columnFilter.filterValue"
-                                            v-bind="col.columnFilter.attrs"
-                                            v-on="col.columnFilter.event(col)"
-                                            dense
-                                        />
-                                    </QTd>
-                                </QTr>
-                            </template> -->
                             <template #body-cell-worker="{ row }">
                                 <QTd>
                                     <VnSelectFilter
@@ -502,7 +480,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 <QTd class="table-input-cell">
                                     <VnInputTime
                                         v-model="row.started"
-                                        :label="t('Hour started')"
+                                        :label="t('hourStarted')"
                                         :rules="validate('route.started')"
                                         :is-clearable="false"
                                         hide-bottom-space
@@ -512,6 +490,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 </QTd>
                             </template>
                             <template #body-cell-finished="{ row }">
+                                <QTd class="table-input-cell">
+                                    <VnInputTime
+                                        v-model="row.finished"
+                                        autofocus
+                                        :label="t('hourFinished')"
+                                        :rules="validate('route.finished')"
+                                        :is-clearable="false"
+                                        hide-bottom-space
+                                        dense
+                                        @update:model-value="updateRoute(row)"
+                                    />
+                                </QTd>
                                 <QTd class="table-input-cell">
                                     <VnInputTime
                                         v-model="row.finished"
@@ -617,8 +607,8 @@ es:
     Vehicle: Vehículo
     Date: Fecha
     Description: Descripción
-    Hour started: Hora inicio
-    Hour finished: Hora fin
+    hourStarted: Hora inicio
+    hourFinished: Hora fin
     newRoute: Nueva Ruta
     Clone Selected Routes: Clonar rutas seleccionadas
     Select the starting date: Seleccione la fecha de inicio

From 40a3815e85ea0a643e9f009e744c0c1aa6fdd989 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 12 Apr 2024 10:27:30 +0200
Subject: [PATCH 08/76] refs #6111 clean code fix changes

---
 src/i18n/en/index.js          |   4 ++
 src/pages/Route/RouteList.vue | 119 +++-------------------------------
 2 files changed, 14 insertions(+), 109 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 685591c2d..e9bfbe67a 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -91,6 +91,10 @@ export default {
             log: 'Logs',
             parkingList: 'Parkings list',
         },
+        actions: 'Acciones',
+        started: 'Hora inicio',
+        finished: 'Hora fin',
+        volume: 'Volumen',
     },
     errors: {
         statusUnauthorized: 'Access denied',
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 6196ff398..b20c72807 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -2,7 +2,7 @@
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { computed, onMounted, reactive, onUnmounted, ref } from 'vue';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { dashIfEmpty, toHour } from 'src/filters';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
@@ -37,15 +37,6 @@ const columns = computed(() => [
         field: (row) => row.id,
         sortable: true,
         align: 'center',
-        columnFilter: {
-            component: 'VnInput',
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
     },
     {
         name: 'worker',
@@ -53,18 +44,6 @@ const columns = computed(() => [
         field: (row) => row.workerUserName,
         sortable: true,
         align: 'left',
-        columnFilter: {
-            component: 'VnSelectFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: workers,
-                'option-value': 'id',
-                'option-label': 'nickname',
-                dense: true,
-            },
-        },
     },
     {
         name: 'agency',
@@ -72,18 +51,6 @@ const columns = computed(() => [
         field: (row) => row.agencyName,
         sortable: true,
         align: 'left',
-        columnFilter: {
-            component: 'VnSelectFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: agencyList,
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
-            },
-        },
     },
     {
         name: 'vehicle',
@@ -91,18 +58,6 @@ const columns = computed(() => [
         field: (row) => row.vehiclePlateNumber,
         sortable: true,
         align: 'left',
-        columnFilter: {
-            component: 'VnSelectFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                options: vehicleList,
-                'option-value': 'id',
-                'option-label': 'numberPlate',
-                dense: true,
-            },
-        },
     },
     {
         name: 'date',
@@ -110,12 +65,6 @@ const columns = computed(() => [
         field: (row) => row.created,
         sortable: true,
         align: 'left',
-        columnFilter: {
-            component: 'VnInputDate',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-        },
     },
     {
         name: 'volume',
@@ -130,38 +79,20 @@ const columns = computed(() => [
         field: (row) => row.description,
         sortable: true,
         align: 'left',
-        columnFilter: {
-            component: 'VnInput',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-        },
     },
     {
-        name: 'hourStarted',
+        name: 'started',
         label: t('hourStarted'),
         field: (row) => toHour(row.started),
         sortable: true,
         align: 'left',
-        columnFilter: {
-            component: 'VnInputTime',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-        },
     },
     {
-        name: 'hourFinished',
+        name: 'finished',
         label: t('hourFinished'),
         field: (row) => toHour(row.finished),
         sortable: true,
         align: 'left',
-        columnFilter: {
-            component: 'VnInputDate',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-        },
     },
     {
         name: 'actions',
@@ -170,7 +101,6 @@ const columns = computed(() => [
         align: 'right',
     },
 ]);
-const params = reactive({});
 const arrayData = useArrayData('EntryLatestBuys', {
     url: 'Buys/latestBuysFilter',
     order: ['itemFk DESC'],
@@ -190,23 +120,6 @@ const allColumnNames = ref([]);
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
 
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
-
-const applyColumnFilter = async (col) => {
-    try {
-        params[col.field] = col.columnFilter.filterValue;
-        await arrayData.addFilter({ params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
 const cloneRoutes = () => {
     axios.post('Routes/clone', {
         created: startingDate.value,
@@ -260,7 +173,6 @@ const openTicketsDialog = (id) => {
 onMounted(async () => {
     stateStore.rightDrawer = true;
     allColumnNames.value = columns.value.map((col) => col.name);
-    console.log('les columnes', allColumnNames.value);
     await arrayData.fetch({ append: false });
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -435,7 +347,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 </QTd>
                             </template>
                             <template #body-cell-vehicle="{ row }">
-                                <QTd class="vehicle">
+                                <QTd class="small-column">
                                     <VnSelectFilter
                                         :label="t('Vehicle')"
                                         v-model="row.vehicleFk"
@@ -452,7 +364,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 </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
@@ -477,7 +389,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 </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('hourStarted')"
@@ -490,7 +402,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 </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
@@ -502,18 +414,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                         @update:model-value="updateRoute(row)"
                                     />
                                 </QTd>
-                                <QTd class="table-input-cell">
-                                    <VnInputTime
-                                        v-model="row.finished"
-                                        autofocus
-                                        :label="t('Hour finished')"
-                                        :rules="validate('route.finished')"
-                                        :is-clearable="false"
-                                        hide-bottom-space
-                                        dense
-                                        @update:model-value="updateRoute(row)"
-                                    />
-                                </QTd>
                             </template>
                             <template #body-cell-actions="props">
                                 <QTd :props="props">
@@ -585,7 +485,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     gap: 12px;
 }
 
-.vehicle {
+.small-column {
     max-width: 150px;
 }
 
@@ -594,12 +494,13 @@ td:last-child {
     background-color: var(--vn-section-color);
     position: sticky;
     right: 0;
-    z-index: 1;
 }
 </style>
 <i18n>
 en:
     newRoute: New Route
+    hourStarted: Started hour
+    hourFinished: Finished hour
 es:
     ID: ID
     Worker: Trabajador

From 4e8f524f49cc234e128af6c93af9297112c9310d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 9 May 2024 22:47:13 +0200
Subject: [PATCH 09/76] feat: add new list form with popup

---
 src/pages/Worker/Card/WorkerPda.vue | 264 ++++++++++++++++------------
 1 file changed, 155 insertions(+), 109 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 5e7c89326..c903cd6cc 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -1,140 +1,186 @@
 <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 { ref, computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+import FetchData from 'components/FetchData.vue';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnLv from 'src/components/ui/VnLv.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 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());
 </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="deviceProductions"
+            :filter="{ where: { stateFk: 'idle' } }"
+            @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-pt-xs q-mb-sm"
                 >
-                    <template #control>
-                        <div tabindex="0">
-                            {{ currentPDA.description }}
-                        </div>
-                    </template>
-                    <template v-if="isAllowedToEdit" #append>
-                        <QIcon
-                            name="delete"
-                            size="sm"
-                            class="cursor-pointer"
-                            color="primary"
-                            @click="deallocatePDA(data)"
-                        >
-                            <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>
+                    <QItem>
+                        <QItemSection side-left>
+                            <VnRow>
+                                <QField
+                                    :label="t('worker.pda.currentPDA')"
+                                    :model-value="row?.deviceProductionFk"
+                                    disable
+                                >
+                                    <template #control>
+                                        <div tabindex="0">
+                                            {{
+                                                row?.deviceProductionFk +
+                                                ' - ' +
+                                                row?.deviceProduction?.modelFk
+                                            }}
+                                        </div>
+                                    </template>
+                                </QField>
+                                <QField
+                                    :label="t('Current SIM')"
+                                    :model-value="row?.simSerialNumber"
+                                    disable
+                                >
+                                    <template #control>
+                                        <div tabindex="0">{{ row?.simSerialNumber }}</div>
+                                    </template>
+                                </QField>
+                            </VnRow>
+                        </QItemSection>
+                        <QItemSection side>
+                            <QIcon
+                                name="delete"
+                                size="sm"
+                                class="cursor-pointer"
+                                color="primary"
+                                @click="deallocatePDA(row.deviceProductionFk)"
+                            >
+                                <QTooltip>
+                                    {{ t('worker.pda.removePDA') }}
+                                </QTooltip>
+                            </QIcon>
+                        </QItemSection>
+                    </QItem>
+                </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="paginate.fetch()"
+                    >
+                        <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"
+                                    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')"
+                                    use-input
+                                />
+                            </VnRow>
+                        </template>
+                    </FormModelPopup>
+                </QDialog>
+            </QBtn>
+            <QTooltip>
+                {{ t('globals.new') }}
+            </QTooltip>
+        </QPageSticky>
     </QPage>
 </template>
-
+<style lang="scss" scoped>
+.centerCard {
+    padding: 5%;
+    width: 100%;
+    max-width: 60%;
+    margin: 0 auto;
+}
+.label {
+    color: red;
+}
+.q-field {
+    margin-bottom: 0px;
+    padding-bottom: 0px;
+}
+</style>
 <i18n>
 es:
     PDA deallocated: PDA desasignada
+    Current SIM: SIM actual
 </i18n>

From 071e6a7296eb704a1825d84cc794321ce891e2eb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 10 May 2024 12:00:16 +0200
Subject: [PATCH 10/76] refactor: refs #7361 ticket/summary like salix

---
 src/pages/Ticket/Card/TicketSummary.vue | 55 ++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index af501240b..ab20a2b94 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/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,15 +263,19 @@ 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>
                             <QTh auto-width>{{ t('ticket.summary.available') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
+                            <QTh auto-width></QTh>
                             <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.discount') }}</QTh>
                             <QTh auto-width>{{ t('globals.amount') }}</QTh>
@@ -360,23 +365,31 @@ 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>
-                                </div>
+                                <span>
+                                    {{ props.row.item.name }}
+                                </span>
                                 <fetched-tags
+                                    class="fetched-tags"
                                     :item="props.row.item"
                                     :max-length="5"
                                 ></fetched-tags>
                             </QTd>
-                            <QTd>{{ props.row.price }}</QTd>
+                            <QTd>
+                                <span v-if="props.row.item.subName" class="subName">
+                                    {{ props.row.item.subName.toUpperCase() }}
+                                </span>
+                            </QTd>
+                            <QTd>{{ props.row.price }} €</QTd>
                             <QTd>{{ props.row.discount }} %</QTd>
                             <QTd
                                 >{{
@@ -453,4 +466,26 @@ async function changeState(value) {
         padding: 1%;
     }
 }
+
+.q-table {
+    tr,
+    th,
+    .q-td {
+        border-bottom: 1px solid black;
+    }
+}
+
+.tr-header {
+    color: var(--vn-label-color);
+}
+
+.subName {
+    color: var(--vn-label-color);
+    margin-left: -40%;
+}
+
+.fetched-tags {
+    width: 70%;
+    margin-left: 19%;
+}
 </style>

From 2859a7bad6fad9bc5314c31575054941240aebd9 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 13 May 2024 13:57:51 +0200
Subject: [PATCH 11/76] style: refs #7361 style refactor

---
 src/pages/Ticket/Card/TicketSummary.vue | 36 +++++++++++++------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index ab20a2b94..ed117b2ba 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -275,7 +275,6 @@ async function changeState(value) {
                             <QTh auto-width>{{ t('ticket.summary.available') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
-                            <QTh auto-width></QTh>
                             <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.discount') }}</QTh>
                             <QTh auto-width>{{ t('globals.amount') }}</QTh>
@@ -374,20 +373,19 @@ async function changeState(value) {
                             <QTd>{{ props.row.visible }}</QTd>
                             <QTd>{{ props.row.available }}</QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
-                            <QTd>
+                            <QTd class="description-cell">
                                 <span>
                                     {{ props.row.item.name }}
                                 </span>
-                                <fetched-tags
-                                    class="fetched-tags"
-                                    :item="props.row.item"
-                                    :max-length="5"
-                                ></fetched-tags>
-                            </QTd>
-                            <QTd>
                                 <span v-if="props.row.item.subName" class="subName">
                                     {{ props.row.item.subName.toUpperCase() }}
                                 </span>
+                                <div class="fetched-tags">
+                                    <FetchedTags
+                                        :item="props.row.item"
+                                        :max-length="5"
+                                    ></FetchedTags>
+                                </div>
                             </QTd>
                             <QTd>{{ props.row.price }} €</QTd>
                             <QTd>{{ props.row.discount }} %</QTd>
@@ -466,7 +464,6 @@ async function changeState(value) {
         padding: 1%;
     }
 }
-
 .q-table {
     tr,
     th,
@@ -475,17 +472,22 @@ async function changeState(value) {
     }
 }
 
-.tr-header {
-    color: var(--vn-label-color);
+.subName {
+    margin-left: 10%;
 }
-
+.tr-header,
 .subName {
     color: var(--vn-label-color);
-    margin-left: -40%;
 }
-
+.description-cell {
+    width: 30%;
+}
 .fetched-tags {
-    width: 70%;
-    margin-left: 19%;
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: 10%;
+}
+.fetched-tags > * {
+    max-width: calc(100% / 2);
 }
 </style>

From 9304b511bce405a1c9036401e87fb47ddec1347d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 13 May 2024 10:14:36 -0300
Subject: [PATCH 12/76] Zone delivery

---
 src/pages/Zone/Card/ZoneSummary.vue     |   2 +-
 src/pages/Zone/ZoneClosingTable.vue     | 111 +++++++++++
 src/pages/Zone/ZoneDeliveryCalendar.vue | 197 +++++++++++++++++++
 src/pages/Zone/ZoneDeliveryDays.vue     | 243 +++++++++++++++++++++++-
 src/pages/Zone/ZoneDeliveryPanel.vue    | 158 +++++++++++++++
 src/pages/Zone/locale/en.yml            |  18 +-
 src/pages/Zone/locale/es.yml            |  19 +-
 src/router/modules/zone.js              |  11 +-
 src/stores/useWeekdayStore.js           |  22 +++
 9 files changed, 774 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/Zone/ZoneClosingTable.vue
 create mode 100644 src/pages/Zone/ZoneDeliveryCalendar.vue
 create mode 100644 src/pages/Zone/ZoneDeliveryPanel.vue

diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index b39d2aaab..d46282c10 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -32,7 +32,7 @@ const filter = computed(() => {
             fields: ['name'],
         },
         where: {
-            id: route.params.id,
+            id: entityId,
         },
     };
     return filter;
diff --git a/src/pages/Zone/ZoneClosingTable.vue b/src/pages/Zone/ZoneClosingTable.vue
new file mode 100644
index 000000000..ec8ad48c6
--- /dev/null
+++ b/src/pages/Zone/ZoneClosingTable.vue
@@ -0,0 +1,111 @@
+<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: Number,
+        required: true,
+    },
+});
+
+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>
diff --git a/src/pages/Zone/ZoneDeliveryCalendar.vue b/src/pages/Zone/ZoneDeliveryCalendar.vue
new file mode 100644
index 000000000..7403d86a3
--- /dev/null
+++ b/src/pages/Zone/ZoneDeliveryCalendar.vue
@@ -0,0 +1,197 @@
+<script setup>
+import { ref, computed, onMounted } 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,
+    },
+    events: {
+        type: Object,
+        default: null,
+    },
+    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}`;
+});
+
+onMounted(() => {});
+</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;
+    }
+
+    &.--excluded {
+        background-color: $negative;
+    }
+
+    &.--geoExcluded {
+        background-color: $primary;
+    }
+
+    &:hover {
+        opacity: 0.8;
+    }
+}
+</style>
diff --git a/src/pages/Zone/ZoneDeliveryDays.vue b/src/pages/Zone/ZoneDeliveryDays.vue
index 485500dba..3535eefec 100644
--- a/src/pages/Zone/ZoneDeliveryDays.vue
+++ b/src/pages/Zone/ZoneDeliveryDays.vue
@@ -1 +1,242 @@
-<template>Zone Delivery days</template>
+<script setup>
+import { computed, onMounted, ref } 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';
+
+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 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();
+    },
+});
+
+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();
+});
+</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 @on-fetch-events="($event) => (data = $event)" />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="q-pa-md flex justify-center">
+        <QCard style="height: max-content">
+            <div class="calendars-header">
+                <QBtn
+                    icon="arrow_left"
+                    size="sm"
+                    flat
+                    class="full-height"
+                    @click="step(-1)"
+                />
+                <span>{{ headerTitle }}</span>
+                <QBtn
+                    icon="arrow_right"
+                    size="sm"
+                    flat
+                    class="full-height"
+                    @click="step(1)"
+                />
+            </div>
+            <div class="calendars-container">
+                <ZoneDeliveryCalendar
+                    v-for="(month, index) in months"
+                    :key="index"
+                    :month="month.getMonth() + 1"
+                    :year="month.getFullYear()"
+                    :month-date="month"
+                    :geo-exclusions="geoExclusions"
+                    :exclusions="exclusions"
+                    :days-map="days"
+                />
+            </div>
+        </QCard>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.calendars-header {
+    height: 45px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: $primary;
+    font-weight: bold;
+    font-size: 16px;
+}
+
+.calendars-container {
+    max-width: 800px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+}
+</style>
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
new file mode 100644
index 000000000..ff2a4c5d5
--- /dev/null
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -0,0 +1,158 @@
+<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 axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { watch } from 'vue';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const emit = defineEmits(['onFetchEvents']);
+
+const deliveryMethodFk = ref(null);
+const postcodesOptions = ref([]);
+const agencyModesOptions = ref([]);
+const formData = reactive({});
+const agencyFilter = ref({
+    fields: ['id', 'name'],
+    where: {
+        deliveryMethodFk: null,
+    },
+    order: 'name ASC',
+    limit: 30,
+});
+
+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'] } } };
+
+        const deliveryMethods = await fetchDeliveryMethods(filter);
+        agencyFilter.value.where = {
+            deliveryMethodFk: { inq: deliveryMethods },
+        };
+        await fetchAgencyModes(agencyFilter.value);
+    },
+    { immediate: true }
+);
+
+const fetchAgencyModes = async (filter) => {
+    try {
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get('AgencyModes/isActive', { params });
+        agencyModesOptions.value = data;
+    } catch (err) {
+        console.error('Error fetching agency modes: ', err);
+    }
+};
+
+const fetchData = async () => {
+    try {
+        const params = { deliveryMethodFk: deliveryMethodFk.value, ...formData };
+        const { data } = await axios.get('Zones/getEvents', { params });
+        if (!data.events || !data.events.length) {
+            notify(t('deliveryPanel.noEventsWarning'), 'warning');
+            return;
+        }
+        emit('onFetchEvents', data);
+    } catch (err) {
+        console.error('Error fetching events: ', err);
+    }
+};
+
+onMounted(async () => {
+    deliveryMethodFk.value = 'delivery';
+});
+</script>
+
+<template>
+    <FetchData
+        url="Postcodes/location"
+        :filter="{ fields: ['geoFk', 'code', 'townFk'], order: 'code, townFk' }"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
+    <QForm @submit="fetchData()" 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"
+                :options="postcodesOptions"
+                option-value="geoFk"
+                option-label="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"
+                :options="agencyModesOptions"
+                option-value="id"
+                option-label="name"
+                hide-selected
+                dense
+                outlined
+                rounded
+            />
+        </div>
+        <QBtn
+            :label="t('deliveryPanel.query')"
+            type="submit"
+            color="primary"
+            class="q-mt-md full-width"
+            unelevated
+            rounded
+            dense
+        />
+    </QForm>
+</template>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index d0a22ebcd..61eff5cb2 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -2,7 +2,7 @@ zone:
     pageTitles:
         zones: Zone
         zonesList: Zones
-        deliveryList: Delivery days
+        deliveryDays: Delivery days
         upcomingList: Upcoming deliveries
 list:
     clone: Clone
@@ -38,3 +38,19 @@ 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: Precio
+    preview: Preview
+    zones: Zones
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index ad740d5f7..7f5df416c 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -2,7 +2,7 @@ zone:
     pageTitles:
         zones: Zonas
         zonesList: Zonas
-        deliveryList: Días de entrega
+        deliveryDays: Días de entrega
         upcomingList: Próximos repartos
 list:
     clone: Clonar
@@ -38,5 +38,18 @@ summary:
 filterPanel:
     name: Nombre
     agencyModeFk: Agencia
-Search zones: Buscar zonas
-You can search by zone reference: Puedes buscar por referencia de la zona
+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
+    price: Precio
+    zones: Zonas
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index d39ed82d0..b6e2822fb 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ZoneMain' },
     menus: {
-        main: ['ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'],
+        main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingList'],
         card: ['ZoneBasicData'],
     },
     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',
diff --git a/src/stores/useWeekdayStore.js b/src/stores/useWeekdayStore.js
index a7b0496c6..ac17356ae 100644
--- a/src/stores/useWeekdayStore.js
+++ b/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,
     };
 });

From cbe44c97f6ad844cf0a9d43e78f294cbd0311499 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 14 May 2024 12:03:43 -0300
Subject: [PATCH 13/76] Upcoming deliveries

---
 src/components/ui/VnSearchbar.vue      | 13 ++--
 src/pages/Zone/Card/ZoneCard.vue       |  2 +-
 src/pages/Zone/Card/ZoneDescriptor.vue |  1 -
 src/pages/Zone/ZoneList.vue            | 54 +---------------
 src/pages/Zone/ZoneMain.vue            | 61 ++++++++++++++++++
 src/pages/Zone/ZoneUpcoming.vue        | 87 +++++++++++++++++---------
 src/pages/Zone/locale/en.yml           | 14 +++--
 src/pages/Zone/locale/es.yml           | 16 ++---
 src/router/modules/zone.js             | 87 +++-----------------------
 9 files changed, 155 insertions(+), 180 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index aaf197d74..568a35c61 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -91,12 +91,6 @@ async function search() {
 
     if (!props.redirect) return;
 
-    if (props.customRouteRedirectName)
-        return router.push({
-            name: props.customRouteRedirectName,
-            params: { id: searchText.value },
-        });
-
     const { matched: matches } = router.currentRoute.value;
     const { path } = matches.at(-1);
     const [, moduleName] = path.split('/');
@@ -105,6 +99,13 @@ async function search() {
         return router.push({ path: `/${moduleName}/list` });
 
     const targetId = store.data[0].id;
+
+    if (props.customRouteRedirectName && targetId)
+        return router.push({
+            name: props.customRouteRedirectName,
+            params: { id: targetId },
+        });
+
     let targetUrl;
 
     if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 9d6895f36..d8c51afe7 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -8,7 +8,7 @@ import ZoneDescriptor from './ZoneDescriptor.vue';
         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"
     />
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 8f0aa9e07..aee6174a3 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -73,7 +73,6 @@ const setData = (entity) => {
             <ZoneDescriptorMenuItems :zone="entity" />
         </template> -->
         <template #body="{ entity }">
-            {{ console.log('entity', entity) }}
             <VnLv :label="t('summary.agency')" :value="entity.agencyMode.name" />
             <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(entity.hour)" />
             <VnLv :label="t('summary.travelingDays')" :value="entity.travelingDays" />
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 3806a519e..718671038 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -2,14 +2,10 @@
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { onMounted, computed } from 'vue';
-import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
+import { toCurrency } from 'src/filters';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.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';
@@ -76,35 +72,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');
@@ -123,25 +90,6 @@ onMounted(async () => {
 </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
diff --git a/src/pages/Zone/ZoneMain.vue b/src/pages/Zone/ZoneMain.vue
index 66ce78f23..a96cf72a0 100644
--- a/src/pages/Zone/ZoneMain.vue
+++ b/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 />
diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index d405c95f6..7af72b683 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -1,53 +1,84 @@
 <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">
+            <div
+                v-for="(detail, index) in details"
+                :key="index"
+                class="full-width flex q-mb-lg"
+            >
+                <span class="header">
+                    {{ getHeaderTitle(detail.shipped) }}
+                </span>
+                <QTable :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: black;
+    font-size: 19px;
+    font-weight: bold;
+}
+</style>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index d0a22ebcd..414c6cda0 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -2,8 +2,9 @@ zone:
     pageTitles:
         zones: Zone
         zonesList: Zones
+        zoneCreate: Create zone
         deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
+        upcomingDeliveries: Upcoming deliveries
 list:
     clone: Clone
     id: Id
@@ -13,18 +14,15 @@ list:
     price: Price
     create: Create zone
     openSummary: Details
-    confirmCloneTitle: All it's properties will be copied
-    confirmCloneSubtitle: Do you want to clone this zone?
     searchZone: Search zones
     searchInfo: Search zone by id or name
+    confirmCloneTitle: All it's properties will be copied
+    confirmCloneSubtitle: Do you want to clone this zone?
 create:
     name: Name
     agency: Agency
     close: Close
     price: Price
-type:
-    submit: Save
-    reset: Reset
 summary:
     agency: Agency
     price: Price
@@ -38,3 +36,7 @@ summary:
 filterPanel:
     name: Name
     agencyModeFk: Agency
+upcomingDeliveries:
+    province: Province
+    closing: Closing
+    id: Id
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index ad740d5f7..5c19e155c 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -2,8 +2,9 @@ zone:
     pageTitles:
         zones: Zonas
         zonesList: Zonas
+        zoneCreate: Nueva zona
         deliveryList: Días de entrega
-        upcomingList: Próximos repartos
+        upcomingDeliveries: Próximos repartos
 list:
     clone: Clonar
     id: Id
@@ -13,18 +14,15 @@ list:
     price: Precio
     create: Crear zona
     openSummary: Detalles
-    confirmCloneTitle: Todas sus propiedades serán copiadas
-    confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
     searchZone: Buscar zonas
     searchInfo: Buscar zonas por identificador o nombre
+    confirmCloneTitle: Todas sus propiedades serán copiadas
+    confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
 create:
     name: Nombre
     agency: Agencia
     close: Cierre
     price: Precio
-type:
-    submit: Guardar
-    reset: Reiniciar
 summary:
     agency: Agencia
     price: Precio
@@ -38,5 +36,7 @@ summary:
 filterPanel:
     name: Nombre
     agencyModeFk: Agencia
-Search zones: Buscar zonas
-You can search by zone reference: Puedes buscar por referencia de la zona
+upcomingDeliveries:
+    province: Provincia
+    closing: Cierre
+    id: Id
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index d39ed82d0..2ff5715c9 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ZoneMain' },
     menus: {
-        main: ['ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'],
+        main: ['ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingDeliveries'],
         card: ['ZoneBasicData'],
     },
     children: [
@@ -57,6 +57,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'),
+                },
             ],
         },
         {
@@ -83,82 +92,6 @@ export default {
                     },
                     component: () => import('src/pages/Zone/Card/ZoneBasicData.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'),
-                //         },
-                //     ],
-                // },
             ],
         },
     ],

From ccaf993841370d5ab2f79f171997c35541cded65 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 15 May 2024 14:35:08 +0200
Subject: [PATCH 14/76] refactor: refs #7361 requested changes

---
 src/pages/Ticket/Card/TicketSummary.vue | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index ed117b2ba..83d47a950 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -374,18 +374,17 @@ async function changeState(value) {
                             <QTd>{{ props.row.available }}</QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
                             <QTd class="description-cell">
-                                <span>
+                                <div class="row full-width justify-between">
                                     {{ props.row.item.name }}
-                                </span>
-                                <span v-if="props.row.item.subName" class="subName">
-                                    {{ props.row.item.subName.toUpperCase() }}
-                                </span>
-                                <div class="fetched-tags">
-                                    <FetchedTags
-                                        :item="props.row.item"
-                                        :max-length="5"
-                                    ></FetchedTags>
+                                    <div v-if="props.row.item.subName" class="subName">
+                                        {{ props.row.item.subName.toUpperCase() }}
+                                    </div>
                                 </div>
+                                <FetchedTags
+                                    class="fetched-tags"
+                                    :item="props.row.item"
+                                    :max-length="5"
+                                ></FetchedTags>
                             </QTd>
                             <QTd>{{ props.row.price }} €</QTd>
                             <QTd>{{ props.row.discount }} %</QTd>
@@ -480,12 +479,10 @@ async function changeState(value) {
     color: var(--vn-label-color);
 }
 .description-cell {
-    width: 30%;
+    width: 25%;
 }
 .fetched-tags {
-    display: flex;
-    flex-wrap: wrap;
-    margin-left: 10%;
+    max-width: 70%;
 }
 .fetched-tags > * {
     max-width: calc(100% / 2);

From cd8095d3b892a4bc01b187076396917e03e3456b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 15 May 2024 09:39:15 -0300
Subject: [PATCH 15/76] Last changes

---
 src/composables/useArrayData.js         |  3 ++-
 src/pages/Zone/Card/ZoneDescriptor.vue  |  1 -
 src/pages/Zone/ZoneClosingTable.vue     |  3 ++-
 src/pages/Zone/ZoneDeliveryCalendar.vue |  4 ----
 src/pages/Zone/ZoneDeliveryDays.vue     | 16 +++++++++++--
 src/pages/Zone/ZoneDeliveryPanel.vue    | 32 ++++++++++++++++++-------
 src/pages/Zone/locale/en.yml            |  2 +-
 src/pages/Zone/locale/es.yml            |  3 ++-
 8 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 525cf6e6b..fcaa40ebf 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -127,7 +127,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 }) {
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 8f0aa9e07..aee6174a3 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -73,7 +73,6 @@ const setData = (entity) => {
             <ZoneDescriptorMenuItems :zone="entity" />
         </template> -->
         <template #body="{ entity }">
-            {{ console.log('entity', entity) }}
             <VnLv :label="t('summary.agency')" :value="entity.agencyMode.name" />
             <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(entity.hour)" />
             <VnLv :label="t('summary.travelingDays')" :value="entity.travelingDays" />
diff --git a/src/pages/Zone/ZoneClosingTable.vue b/src/pages/Zone/ZoneClosingTable.vue
index ec8ad48c6..ce0c91af7 100644
--- a/src/pages/Zone/ZoneClosingTable.vue
+++ b/src/pages/Zone/ZoneClosingTable.vue
@@ -15,8 +15,9 @@ const { viewSummary } = useSummaryDialog();
 
 defineProps({
     rows: {
-        type: Number,
+        type: Array,
         required: true,
+        default: () => [],
     },
 });
 
diff --git a/src/pages/Zone/ZoneDeliveryCalendar.vue b/src/pages/Zone/ZoneDeliveryCalendar.vue
index 7403d86a3..74f4f0a04 100644
--- a/src/pages/Zone/ZoneDeliveryCalendar.vue
+++ b/src/pages/Zone/ZoneDeliveryCalendar.vue
@@ -20,10 +20,6 @@ const props = defineProps({
         type: Number,
         required: true,
     },
-    events: {
-        type: Object,
-        default: null,
-    },
     monthDate: {
         type: Object,
         default: null,
diff --git a/src/pages/Zone/ZoneDeliveryDays.vue b/src/pages/Zone/ZoneDeliveryDays.vue
index 3535eefec..872b62184 100644
--- a/src/pages/Zone/ZoneDeliveryDays.vue
+++ b/src/pages/Zone/ZoneDeliveryDays.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
@@ -7,6 +7,7 @@ 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();
@@ -22,6 +23,9 @@ const days = ref({});
 const exclusions = ref({});
 const geoExclusions = ref({});
 const events = ref([]);
+const { store } = useArrayData('ZoneDeliveryDays', {
+    url: 'Zones/getEvents',
+});
 
 const refreshEvents = () => {
     days.value = {};
@@ -133,6 +137,14 @@ const data = computed({
     },
 });
 
+watch(
+    () => store.data,
+    (value) => {
+        data.value = value;
+    },
+    { immediate: true }
+);
+
 const getMonthNameAndYear = (date) => {
     const monthName = weekdayStore.getLocaleMonths[date.getMonth()].locale;
     const year = date.getFullYear();
@@ -184,7 +196,7 @@ onMounted(async () => {
     </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <ZoneDeliveryPanel @on-fetch-events="($event) => (data = $event)" />
+            <ZoneDeliveryPanel />
         </QScrollArea>
     </QDrawer>
     <QPage class="q-pa-md flex justify-center">
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index ff2a4c5d5..9b307c6ed 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -5,13 +5,13 @@ 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 emit = defineEmits(['onFetchEvents']);
 
 const deliveryMethodFk = ref(null);
 const postcodesOptions = ref([]);
@@ -26,6 +26,10 @@ const agencyFilter = ref({
     limit: 30,
 });
 
+const arrayData = useArrayData('ZoneDeliveryDays', {
+    url: 'Zones/getEvents',
+});
+
 const fetchDeliveryMethods = async (filter) => {
     try {
         const params = { filter: JSON.stringify(filter) };
@@ -62,22 +66,32 @@ const fetchAgencyModes = async (filter) => {
     }
 };
 
-const fetchData = async () => {
+const fetchData = async (params) => {
     try {
-        const params = { deliveryMethodFk: deliveryMethodFk.value, ...formData };
-        const { data } = await axios.get('Zones/getEvents', { params });
-        if (!data.events || !data.events.length) {
+        const { data } = params
+            ? await arrayData.applyFilter({
+                  params,
+              })
+            : await arrayData.fetch({ append: false });
+        if (!data.events || !data.events.length)
             notify(t('deliveryPanel.noEventsWarning'), 'warning');
-            return;
-        }
-        emit('onFetchEvents', data);
     } 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';
+    await fetchData();
+    if (arrayData?.store?.userParams && arrayData?.store?.userParams) {
+        formData.geoFk = arrayData.store?.userParams?.geoFk;
+        formData.agencyModeFk = arrayData.store?.userParams?.agencyModeFk;
+    }
 });
 </script>
 
@@ -88,7 +102,7 @@ onMounted(async () => {
         @on-fetch="(data) => (postcodesOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchData()" class="q-pa-md">
+    <QForm @submit="onSubmit()" class="q-pa-md">
         <div class="column q-gutter-y-sm">
             <QRadio
                 v-model="deliveryMethodFk"
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 61eff5cb2..fb0d7436f 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -51,6 +51,6 @@ zoneClosingTable:
     name: Name
     agency: Agency
     closing: Closing
-    price: Precio
+    price: Price
     preview: Preview
     zones: Zones
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 7f5df416c..742764e3f 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -46,10 +46,11 @@ deliveryPanel:
     warehouse: Almacén
     query: Consultar
     noEventsWarning: No hay servicio para la zona especificada
-ZoneClosingTable:
+zoneClosingTable:
     id: Id
     name: Nombre
     agency: Agencia
     closing: Cierre
+    preview: Vista previa
     price: Precio
     zones: Zonas

From f3a5ebbcec8cfdd3eb1fedcd4b0c336c223e21f3 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 15 May 2024 10:27:45 -0300
Subject: [PATCH 16/76] Bug fix

---
 src/pages/Zone/ZoneDeliveryDays.vue  | 7 +++++--
 src/pages/Zone/ZoneDeliveryPanel.vue | 8 +++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/Zone/ZoneDeliveryDays.vue b/src/pages/Zone/ZoneDeliveryDays.vue
index 872b62184..d6ce70f6d 100644
--- a/src/pages/Zone/ZoneDeliveryDays.vue
+++ b/src/pages/Zone/ZoneDeliveryDays.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
@@ -23,9 +23,10 @@ const days = ref({});
 const exclusions = ref({});
 const geoExclusions = ref({});
 const events = ref([]);
-const { store } = useArrayData('ZoneDeliveryDays', {
+const arrayData = useArrayData('ZoneDeliveryDays', {
     url: 'Zones/getEvents',
 });
+const { store } = arrayData;
 
 const refreshEvents = () => {
     days.value = {};
@@ -174,6 +175,8 @@ onMounted(async () => {
     date.value = initialDate;
     weekdayStore.initStore();
 });
+
+onUnmounted(() => arrayData.destroy());
 </script>
 
 <template>
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 9b307c6ed..1295bb63d 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -87,11 +87,9 @@ const onSubmit = async () => {
 
 onMounted(async () => {
     deliveryMethodFk.value = 'delivery';
-    await fetchData();
-    if (arrayData?.store?.userParams && arrayData?.store?.userParams) {
-        formData.geoFk = arrayData.store?.userParams?.geoFk;
-        formData.agencyModeFk = arrayData.store?.userParams?.agencyModeFk;
-    }
+    formData.geoFk = arrayData.store?.userParams?.geoFk;
+    formData.agencyModeFk = arrayData.store?.userParams?.agencyModeFk;
+    if (formData.geoFk || formData.agencyModeFk) await fetchData();
 });
 </script>
 

From 5677a1af1b873bf85aa1cd677d1cdd99207f1f2b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 15 May 2024 10:31:33 -0300
Subject: [PATCH 17/76] remove unused onMounted

---
 src/pages/Zone/ZoneDeliveryCalendar.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Zone/ZoneDeliveryCalendar.vue b/src/pages/Zone/ZoneDeliveryCalendar.vue
index 74f4f0a04..c7c7fbd99 100644
--- a/src/pages/Zone/ZoneDeliveryCalendar.vue
+++ b/src/pages/Zone/ZoneDeliveryCalendar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 
@@ -104,8 +104,6 @@ const isToday = (timestamp) => {
 const calendarHeaderTitle = computed(() => {
     return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
 });
-
-onMounted(() => {});
 </script>
 
 <template>

From adde8d1ab86718b87aa6947d4e74521dc1d34803 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 15 May 2024 16:00:56 +0200
Subject: [PATCH 18/76] refs #6332 fix colors

---
 src/components/ui/QCalendarMonthWrapper.vue  | 2 --
 src/pages/Worker/Card/WorkerCalendarItem.vue | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue
index 24255ea1a..5e3cdadc7 100644
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/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 {
diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 950557656..4787c3fd3 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -231,7 +231,6 @@ watch(_year, (newValue) => {
     font-size: 13px;
     line-height: 1.715em;
     cursor: pointer;
-    color: white;
 
     &.--today {
         border: 2px solid $info;

From bc9c1fdf8e5b70a6d14c865d9704688fca9fd6fb Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 15 May 2024 22:17:40 +0200
Subject: [PATCH 19/76] feat: pda duplicates

---
 src/pages/Customer/Card/CustomerBasicData.vue |  1 +
 src/pages/Worker/Card/WorkerPda.vue           | 39 ++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index d646b810e..9048bc4ee 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -135,6 +135,7 @@ const filterOptions = {
                         :rules="validate('client.mobile')"
                         clearable
                         v-model="data.mobile"
+                        type="number"
                     />
                 </div>
             </VnRow>
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index c903cd6cc..435502ee9 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -2,16 +2,14 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { ref, computed } from 'vue';
-import { useRole } from 'src/composables/useRole';
+
 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 VnPaginate from 'src/components/ui/VnPaginate.vue';
-import FormModelPopup from 'src/components/FormModelPopup.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -47,8 +45,7 @@ const deallocatePDA = async (deviceProductionFk) => {
 <template>
     <QPage class="column items-center q-pa-md centerCard">
         <FetchData
-            url="deviceProductions"
-            :filter="{ where: { stateFk: 'idle' } }"
+            url="workers/getAvailablePDAs"
             @on-fetch="(data) => (deviceProductions = data)"
             auto-load
         />
@@ -77,12 +74,21 @@ const deallocatePDA = async (deviceProductionFk) => {
                                     disable
                                 >
                                     <template #control>
-                                        <div tabindex="0">
-                                            {{
-                                                row?.deviceProductionFk +
-                                                ' - ' +
-                                                row?.deviceProduction?.modelFk
-                                            }}
+                                        <div tabindex="0" style="padding: none">
+                                            <span>Id: </span>
+                                            <span>
+                                                {{ row?.deviceProductionFk }}&nbsp;
+                                            </span>
+                                            <span>{{ t('Model') }}: </span>
+                                            <span>
+                                                {{ row?.deviceProduction?.modelFk }}&nbsp;
+                                            </span>
+                                            <span>{{ t('Serial number') }}: </span>
+                                            <span>
+                                                {{
+                                                    row?.deviceProduction?.serialNumber
+                                                }}&nbsp;
+                                            </span>
                                         </div>
                                     </template>
                                 </QField>
@@ -168,19 +174,22 @@ const deallocatePDA = async (deviceProductionFk) => {
 .centerCard {
     padding: 5%;
     width: 100%;
-    max-width: 60%;
+    max-width: 70%;
     margin: 0 auto;
 }
 .label {
     color: red;
 }
 .q-field {
-    margin-bottom: 0px;
-    padding-bottom: 0px;
+    height: 65px;
 }
 </style>
 <i18n>
 es:
     PDA deallocated: PDA desasignada
     Current SIM: SIM actual
+    Model: Modelo
+    Serial number: Número de serie
+    This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+    Add new device: Añadir nuevo dispositivo
 </i18n>

From 2855499148b5a551e385453b8d92695a27dad8fe Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 16 May 2024 12:07:47 +0200
Subject: [PATCH 20/76] fix: refs #6891 hide across only on disable

---
 src/components/common/VnInput.vue | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 9d5849b68..8358cd6e6 100644
--- a/src/components/common/VnInput.vue
+++ b/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>

From 108533d4751298f32683abed2df1e73cec68638b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 16 May 2024 12:57:35 +0200
Subject: [PATCH 21/76] fix: delete translates

---
 src/pages/Worker/Card/WorkerPda.vue           |  9 ++++----
 .../integration/worker/workerPda.spec.js      | 21 +++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 test/cypress/integration/worker/workerPda.spec.js

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 435502ee9..fceaaf1d7 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -45,7 +45,7 @@ const deallocatePDA = async (deviceProductionFk) => {
 <template>
     <QPage class="column items-center q-pa-md centerCard">
         <FetchData
-            url="workers/getAvailablePDAs"
+            url="workers/getAvailablePda"
             @on-fetch="(data) => (deviceProductions = data)"
             auto-load
         />
@@ -83,7 +83,7 @@ const deallocatePDA = async (deviceProductionFk) => {
                                             <span>
                                                 {{ row?.deviceProduction?.modelFk }}&nbsp;
                                             </span>
-                                            <span>{{ t('Serial number') }}: </span>
+                                            <span>{{ t('SIM serial number') }}: </span>
                                             <span>
                                                 {{
                                                     row?.deviceProduction?.serialNumber
@@ -138,6 +138,7 @@ const deallocatePDA = async (deviceProductionFk) => {
                                     :options="deviceProductions"
                                     option-label="id"
                                     option-value="id"
+                                    id="deviceProductionFk"
                                     hide-selected
                                 >
                                     <template #option="scope">
@@ -157,6 +158,7 @@ const deallocatePDA = async (deviceProductionFk) => {
                                 <VnInput
                                     v-model="data.simSerialNumber"
                                     :label="t('SIM serial number')"
+                                    id="simSerialNumber"
                                     use-input
                                 />
                             </VnRow>
@@ -187,9 +189,8 @@ const deallocatePDA = async (deviceProductionFk) => {
 <i18n>
 es:
     PDA deallocated: PDA desasignada
-    Current SIM: SIM actual
+    SIM serial number: Número de serie de la SIM
     Model: Modelo
-    Serial number: Número de serie
     This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
     Add new device: Añadir nuevo dispositivo
 </i18n>
diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
new file mode 100644
index 000000000..3b3eff290
--- /dev/null
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -0,0 +1,21 @@
+describe('AgencyWorkCenter', () => {
+    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('.q-card > .q-item > .q-item__section--side > .q-icon').click();
+        cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
+    });
+});

From b19d9ec4732af2378578c2cd1060e67ab6c0a679 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 16 May 2024 14:18:41 +0200
Subject: [PATCH 22/76] refs #6914 fix VnLocationCountry

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

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 064ad1631..25a61a0ca 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -134,7 +134,7 @@ const onProvinceCreated = async ({ name }, formData) => {
                     :label="t('Country')"
                     :options="countriesOptions"
                     hide-selected
-                    option-label="country"
+                    option-label="name"
                     option-value="id"
                     v-model="data.countryFk"
                     :rules="validate('postcode.countryFk')"

From 660577c9fee1a5e6c8fdd5f21fddc91726bc2aca Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 16 May 2024 16:02:38 +0200
Subject: [PATCH 23/76] refs #6914 fix vnLocation workerCreate

---
 src/pages/Worker/WorkerCreate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 85259c043..5d1d601ff 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -57,7 +57,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;

From 77a454b5903dbdd030961b14de05df632228cb6b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 16 May 2024 20:59:51 +0000
Subject: [PATCH 24/76] feat: refactor template

---
 src/components/ui/FetchedTags.vue | 67 +++++++++++++------------------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue
index 12bce9d4b..5d8d72efb 100644
--- a/src/components/ui/FetchedTags.vue
+++ b/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,38 @@ 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];
+            acc[$props.item[`${$props.tag}${n}`]] = $props.item[`${$props.value}${n}`];
+            return acc;
+        }, {});
 });
 </script>
 <template>
     <div class="fetchedTags">
         <div class="wrap">
             <div
+                v-for="(value, key) in tags"
+                :key="key"
                 class="inline-tag"
-                :class="{ empty: !$props.item.value5 }"
-                :title="$props.item.tag5 + ': ' + $props.item.value5"
+                :title="`${key}: ${value}`"
+                :class="{ empty: !value }"
             >
-                {{ $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 }}
+                {{ value }}
             </div>
         </div>
     </div>

From 38d7c96c00fea40a344d50eb79fdf2a645d10cb1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 16 May 2024 23:00:57 +0200
Subject: [PATCH 25/76] feat: #6957: Rename FetchedTags instance tag

---
 src/pages/Entry/Card/EntryBuys.vue              | 2 +-
 src/pages/Entry/Card/EntrySummary.vue           | 2 +-
 src/pages/Entry/EntryLatestBuys.vue             | 2 +-
 src/pages/Item/ItemFixedPrice.vue               | 2 +-
 src/pages/Item/ItemList.vue                     | 2 +-
 src/pages/Order/Card/OrderSummary.vue           | 5 +----
 src/pages/Order/OrderLines.vue                  | 2 +-
 src/pages/Order/OrderVolume.vue                 | 2 +-
 src/pages/Supplier/Card/SupplierConsumption.vue | 2 +-
 src/pages/Ticket/Card/TicketSummary.vue         | 4 ++--
 10 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index fd431043f..a378266aa 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/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 -->
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 766587bde..5c56146b9 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/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 -->
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index da4190a04..79d118b96 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/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 }">
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index e74f7f828..8412021e7 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/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">
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 27acf3fdd..fb812258b 100644
--- a/src/pages/Item/ItemList.vue
+++ b/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 }">
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 426cdc712..d26b799df 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/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 }}
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index 5a31598e1..f089c0e85 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/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
diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue
index 67f409b45..35d68de16 100644
--- a/src/pages/Order/OrderVolume.vue
+++ b/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')">
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 4eac24469..dea720a61 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/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>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index af501240b..5750223be 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -371,10 +371,10 @@ async function changeState(value) {
                                         props.row.item.subName
                                     }}</span>
                                 </div>
-                                <fetched-tags
+                                <FetchedTags
                                     :item="props.row.item"
                                     :max-length="5"
-                                ></fetched-tags>
+                                ></FetchedTags>
                             </QTd>
                             <QTd>{{ props.row.price }}</QTd>
                             <QTd>{{ props.row.discount }} %</QTd>

From dba42a6001bf8f0dd74020e09796fafc4b175f40 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 16 May 2024 23:02:49 +0200
Subject: [PATCH 26/76] feat: #6957: Rename FetchedTags instance tag

---
 src/components/ui/FetchedTags.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue
index 5d8d72efb..8a01c1e79 100644
--- a/src/components/ui/FetchedTags.vue
+++ b/src/components/ui/FetchedTags.vue
@@ -35,13 +35,13 @@ const tags = computed(() => {
     <div class="fetchedTags">
         <div class="wrap">
             <div
-                v-for="(value, key) in tags"
+                v-for="(val, key) in tags"
                 :key="key"
                 class="inline-tag"
-                :title="`${key}: ${value}`"
-                :class="{ empty: !value }"
+                :title="`${key}: ${val}`"
+                :class="{ empty: !val }"
             >
-                {{ value }}
+                {{ val }}
             </div>
         </div>
     </div>

From e8ba975be2142543e6418fe4c1985bd9efe42937 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 17 May 2024 08:55:07 +0200
Subject: [PATCH 27/76] fix: spec name

---
 test/cypress/integration/worker/workerPda.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
index 3b3eff290..79940232b 100644
--- a/test/cypress/integration/worker/workerPda.spec.js
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -1,4 +1,4 @@
-describe('AgencyWorkCenter', () => {
+describe('WorkerPda', () => {
     const deviceProductionField =
         '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
     beforeEach(() => {

From dc597f73e25b04b17fc9cad0f5de691ca40b10d8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 17 May 2024 09:50:18 +0200
Subject: [PATCH 28/76] fix: style

---
 src/components/ui/QCalendarMonthWrapper.vue | 2 +-
 src/pages/Zone/ZoneDeliveryCalendar.vue     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue
index 24255ea1a..3ecea89c2 100644
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@@ -108,7 +108,7 @@ const containerClasses = computed(() => {
         font-size: 13px;
 
         &:hover {
-            background-color: var(--vn-accent-color);
+            background-color: var(--vn-label-color);
             cursor: pointer;
         }
     }
diff --git a/src/pages/Zone/ZoneDeliveryCalendar.vue b/src/pages/Zone/ZoneDeliveryCalendar.vue
index c7c7fbd99..96a62086e 100644
--- a/src/pages/Zone/ZoneDeliveryCalendar.vue
+++ b/src/pages/Zone/ZoneDeliveryCalendar.vue
@@ -174,6 +174,7 @@ const calendarHeaderTitle = computed(() => {
 
     &.--event {
         background-color: $positive;
+        color: black;
     }
 
     &.--excluded {

From 4ca7df5bfb5b2cffe18530b85b68f4fa660a5e3b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 17 May 2024 10:30:50 +0200
Subject: [PATCH 29/76] refactor: refs #7361 changes in css

---
 src/pages/Ticket/Card/TicketSummary.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 83d47a950..f55669619 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -474,17 +474,17 @@ async function changeState(value) {
 .subName {
     margin-left: 10%;
 }
+
 .tr-header,
 .subName {
     color: var(--vn-label-color);
 }
+
 .description-cell {
     width: 25%;
 }
+
 .fetched-tags {
     max-width: 70%;
 }
-.fetched-tags > * {
-    max-width: calc(100% / 2);
-}
 </style>

From 676e0209284d48e81113a7211c58e73750815f33 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 17 May 2024 10:55:43 +0200
Subject: [PATCH 30/76] fix: refs #6095 add reFfk null on search

---
 src/components/CreateManualInvoiceForm.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
index f3d4de605..5af01c6dd 100644
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@@ -48,7 +48,12 @@ 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',
+            limit: 30,
+        }"
         @on-fetch="(data) => (ticketsOptions = data)"
         auto-load
     />

From 8e4c74c1cceda2e26d55f0522a1af3691a91d817 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 17 May 2024 12:26:45 +0200
Subject: [PATCH 31/76] fix: style

---
 src/pages/Zone/ZoneUpcoming.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index 7af72b683..86d934e7e 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -54,7 +54,7 @@ onMounted(() => weekdayStore.initStore());
     />
     <VnSubToolbar />
     <QPage class="column items-center q-pa-md">
-        <QCard class="full-width">
+        <QCard class="full-width q-pa-md">
             <div
                 v-for="(detail, index) in details"
                 :key="index"
@@ -77,8 +77,9 @@ onMounted(() => weekdayStore.initStore());
     padding-left: 8px;
     height: 35px;
     border-bottom: 1px solid $primary;
-    background-color: black;
+    background-color: var(--vn-page-color);
     font-size: 19px;
     font-weight: bold;
+    text-transform: uppercase;
 }
 </style>

From d7e3303d680fb8b0a54dc9fd5c16049585d1c46d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 17 May 2024 13:19:59 +0200
Subject: [PATCH 32/76] refs #7396 add fiDueDate, machine

---
 src/pages/Worker/Card/WorkerBasicData.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index d1c27beda..12ad7956b 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/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';
@@ -78,7 +78,7 @@ const maritalStatus = [
                 <VnInput :label="t('Name')" clearable v-model="data.firstName" />
                 <VnInput :label="t('Last name')" clearable v-model="data.lastName" />
             </VnRow>
-
+            {{ data }}
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput v-model="data.phone" :label="t('Business phone')" clearable />
                 <VnInput
@@ -147,6 +147,14 @@ const maritalStatus = [
                     clearable
                 />
             </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputDate :label="t('fiDueDate')" v-model="data.fiDueDate" />
+                <QCheckbox
+                    size="sm"
+                    v-model="data.hasMachineryAuthorized"
+                    :label="t(`hasMachineryAuthorized`)"
+                />
+            </VnRow>
         </template>
     </FormModel>
 </template>
@@ -165,4 +173,5 @@ es:
     Education level: Nivel educación
     SSN: NSS
     Locker: Taquilla
+    fiDueDate: Fecha de caducidad del DNI
 </i18n>

From 24eeb5519ad8f0a0ef938a03f493a31f4d3ba520 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 17 May 2024 13:52:45 +0200
Subject: [PATCH 33/76] style updates

---
 src/components/ui/FetchedTags.vue | 32 +++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue
index 8a01c1e79..2e2e9b6e3 100644
--- a/src/components/ui/FetchedTags.vue
+++ b/src/components/ui/FetchedTags.vue
@@ -26,7 +26,9 @@ const tags = computed(() => {
         .filter((i) => i.startsWith(`${$props.tag}`))
         .reduce((acc, tag) => {
             const n = tag.split(`${$props.tag}`)[1];
-            acc[$props.item[`${$props.tag}${n}`]] = $props.item[`${$props.value}${n}`];
+            const key = `${$props.tag}${n}`;
+            const value = `${$props.value}${n}`;
+            acc[$props.item[key] ?? key] = $props.item[value] ?? '';
             return acc;
         }, {});
 });
@@ -49,11 +51,29 @@ const tags = computed(() => {
 
 <style lang="scss" scoped>
 .fetchedTags {
-    align-items: center;
+    // display: flex;
+    /* width: 100%; */
+    /* flex: 2; */
+    /* flex-direction: column; */
+    /* flex-wrap: wrap; */
+    /* align-items: flex-start; */
+    /* align-content: flex-end; */
+    // justify-content: flex-start;
+    display: grid;
+    grid-template-columns: repeat(3, 0.15fr); /* Tres columnas de igual tamaño */
+    grid-template-rows: repeat(2, auto); /* Dos filas con alto automático */
+    // gap: 5px; /* Espacio entre las celdas */
     .wrap {
-        width: 100%;
-        flex-wrap: wrap;
-        display: flex;
+        /* width: 100%; */
+        /* flex-wrap: wrap; */
+        // display: flex;
+        /* flex-direction: row; */
+        /* flex: 1; */
+        //  flex: 0 50%;
+        /* padding: 5px; */
+        /* box-sizing: border-box; */
+        /* border: 1px solid #000;*/
+        display: contents;
     }
 
     .inline-tag {
@@ -67,7 +87,7 @@ const tags = computed(() => {
         border: 1px solid $color-spacer;
         text-overflow: ellipsis;
         overflow: hidden;
-        min-width: 4rem;
+        min-width: 7rem;
         max-width: 4rem;
     }
 

From 08e67038533e03ee2083c9fae698a0f8d2389da9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 17 May 2024 13:57:01 +0200
Subject: [PATCH 34/76] style updates

---
 src/components/ui/FetchedTags.vue | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue
index 2e2e9b6e3..a2dbf0c16 100644
--- a/src/components/ui/FetchedTags.vue
+++ b/src/components/ui/FetchedTags.vue
@@ -51,28 +51,12 @@ const tags = computed(() => {
 
 <style lang="scss" scoped>
 .fetchedTags {
-    // display: flex;
-    /* width: 100%; */
-    /* flex: 2; */
-    /* flex-direction: column; */
-    /* flex-wrap: wrap; */
-    /* align-items: flex-start; */
-    /* align-content: flex-end; */
-    // justify-content: flex-start;
     display: grid;
-    grid-template-columns: repeat(3, 0.15fr); /* Tres columnas de igual tamaño */
-    grid-template-rows: repeat(2, auto); /* Dos filas con alto automático */
-    // gap: 5px; /* Espacio entre las celdas */
+    grid-template-columns: repeat(3, 0fr);
+    grid-template-rows: repeat(2, auto);
+
+    max-width: 300px;
     .wrap {
-        /* width: 100%; */
-        /* flex-wrap: wrap; */
-        // display: flex;
-        /* flex-direction: row; */
-        /* flex: 1; */
-        //  flex: 0 50%;
-        /* padding: 5px; */
-        /* box-sizing: border-box; */
-        /* border: 1px solid #000;*/
         display: contents;
     }
 

From cd21d7817dde0be4f28b60b61c1608c7d1ce8b30 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 17 May 2024 14:16:06 +0200
Subject: [PATCH 35/76] refs #7396 fix summary basicData

---
 src/i18n/locale/en.yml                    | 10 ++++++
 src/pages/Worker/Card/WorkerBasicData.vue | 31 ++++++++++++++++++-
 src/pages/Worker/Card/WorkerSummary.vue   | 37 ++++++++++++++++++++++-
 3 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7d680c681..0e6edeab2 100644
--- a/src/i18n/locale/en.yml
+++ b/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: Cumpleaños
+        isFreelance: Autónomo
+        isSsDiscounted: Bonificación SS
+        hasMachineryAuthorized: Autorizado para llevar maquinaria
+        isDisable: Trabajador desactivado
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 12ad7956b..2f69de318 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -78,7 +78,6 @@ const maritalStatus = [
                 <VnInput :label="t('Name')" clearable v-model="data.firstName" />
                 <VnInput :label="t('Last name')" clearable v-model="data.lastName" />
             </VnRow>
-            {{ data }}
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput v-model="data.phone" :label="t('Business phone')" clearable />
                 <VnInput
@@ -149,11 +148,33 @@ const maritalStatus = [
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInputDate :label="t('fiDueDate')" v-model="data.fiDueDate" />
+
+                <VnInput v-model="data.sex" :label="t('sex')" clearable />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputDate :label="t('seniority')" v-model="data.seniority" />
+                <VnInput v-model="data.fi" :label="t('fi')" />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputDate :label="t('birth')" v-model="data.birth" />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <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>
@@ -174,4 +195,12 @@ es:
     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: Cumpleaños
+    isSsDiscounted: Bonificación SS
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 5b25fe335..65375373a 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/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';
@@ -110,6 +110,41 @@ const filter = {
                     </template>
                 </VnLv>
                 <VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
+                <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
+                    style="padding: 0"
+                    :label="t('worker.summary.isFreelance')"
+                    v-model="worker.isFreelance"
+                    :disable="true"
+                />
+                <QCheckbox
+                    style="padding: 0"
+                    :label="t('worker.summary.isSsDiscounted')"
+                    v-model="worker.isSsDiscounted"
+                    :disable="true"
+                />
+                <QCheckbox
+                    style="padding: 0"
+                    :label="t('worker.summary.hasMachineryAuthorized')"
+                    v-model="worker.hasMachineryAuthorized"
+                    :disable="true"
+                />
+                <QCheckbox
+                    style="padding: 0"
+                    :label="t('worker.summary.isDisable')"
+                    v-model="worker.isDisable"
+                    :disable="true"
+                />
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('worker.summary.userData')" />

From ce444c7e5c3f76a0497e15899d86696a34b68702 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 17 May 2024 14:19:29 +0200
Subject: [PATCH 36/76] first approach

---
 quasar.config.js                      | 11 +++-
 src/boot/customQInput.js              | 77 +++++++++++++++++++++++++++
 src/boot/customQTh.js                 | 34 ++++++++++++
 src/boot/defaults/qTable.js           | 46 ++++++++++++++++
 src/components/common/VnInput.vue     |  1 -
 src/pages/Claim/Card/ClaimSummary.vue | 27 +---------
 src/pages/Customer/CustomerFilter.vue |  2 +-
 src/pages/Ticket/TicketFilter.vue     |  2 -
 8 files changed, 169 insertions(+), 31 deletions(-)
 create mode 100644 src/boot/customQInput.js
 create mode 100644 src/boot/customQTh.js

diff --git a/quasar.config.js b/quasar.config.js
index b59c62eeb..ddfe41c82 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -29,7 +29,16 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
+        boot: [
+            'i18n',
+            'axios',
+            'vnDate',
+            'validations',
+            'quasar',
+            'quasar.defaults',
+            'customQTh',
+            'customQInput',
+        ],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
diff --git a/src/boot/customQInput.js b/src/boot/customQInput.js
new file mode 100644
index 000000000..51dcd9179
--- /dev/null
+++ b/src/boot/customQInput.js
@@ -0,0 +1,77 @@
+// src/boot/customQTh.js
+
+import { boot } from 'quasar/wrappers';
+import { QInput } from 'quasar';
+import i18n from 'src/i18n';
+const TR_HEADER = 'tr-header';
+
+export default boot((b) => {
+    const { app } = b;
+    app.use(i18n);
+    app.mixin({
+        // mounted() {
+        //     this.applyMixinLogic();
+        // },
+        mounted() {
+            this.applyMixinLogic();
+            // if (this.$options.name === QInput.name) {
+            //     console.table([this.$options.name]);
+            //     if (this.label) this.label = this.$t(this.label);
+            //     // this.addClassToQTh(this);
+            // }
+        },
+        methods: {
+            applyMixinLogic() {
+                if (this.$options.name === 'QInput') {
+                    // Traducción de la etiqueta
+                    if (this.label) {
+                        const el = this.$el;
+                        // Recorrer los elementos hijos
+                        const children = el.children || [];
+                        for (let i = 0; i < children.length; i++) {
+                            const child = children[i];
+                            if (
+                                child.tagName === 'DIV' &&
+                                child.classList.contains('q-field__inner')
+                            ) {
+                                const input = child.querySelector('input');
+                                const filterAvailableText = (element) =>
+                                    element.__vueParentComponent.type.name === 'QInput' &&
+                                    element.__vueParentComponent?.attrs?.class !==
+                                        'vn-input-date';
+
+                                if (
+                                    input &&
+                                    input.__vueParentComponent.type.name === 'QInput'
+                                ) {
+                                    // Añadir clase CSS
+                                    input.classList.add('input-default');
+
+                                    // Traducción de la etiqueta
+                                    const labelElement =
+                                        child.querySelector('.q-field__label');
+                                    if (labelElement) {
+                                        const labelKey = labelElement.textContent.trim();
+                                        labelElement.textContent = this.$t(labelKey);
+                                    }
+                                }
+                            }
+                        }
+                        // Traducción de la etiqueta
+                        // const label = this.$el.getAttribute('label');
+                        // if (label) {
+                        //     this.$el = this.$el.setAttribute('label', 'sasd');
+                        // }
+                        // this.$props.label = this.$t(`*${this.$props.label}`);
+                        // this.label = this.$t(`*${this.$props.label}`);
+                        // this.getNativeElement().ariaLabel = '++++';
+                    }
+                    // // Añadir clase CSS
+                    // if (!this.$el.classList.contains('input-default')) {
+                    //     this.$el.classList.add('input-default');
+                    // }
+                }
+            },
+        },
+    });
+});
diff --git a/src/boot/customQTh.js b/src/boot/customQTh.js
new file mode 100644
index 000000000..ae3aa1011
--- /dev/null
+++ b/src/boot/customQTh.js
@@ -0,0 +1,34 @@
+// src/boot/customQTh.js
+
+import { QTable } from 'quasar';
+import { boot } from 'quasar/wrappers';
+
+import i18n from 'src/i18n';
+const TR_HEADER = 'tr-header';
+
+export default boot((b) => {
+    const { app } = b;
+    app.use(i18n);
+    app.mixin({
+        mounted() {
+            if (this.$options.name === QTable.name) {
+                console.table([this.$options.name]);
+                this.addClassToQTh(this.columns ?? []);
+            }
+        },
+        methods: {
+            addClassToQTh(columns) {
+                for (const column of columns) {
+                    let { headerClasses, label, sortable } = column ?? [];
+                    if (!headerClasses) headerClasses = TR_HEADER;
+                    if (!Array.isArray(headerClasses)) headerClasses = [headerClasses];
+                    else headerClasses.push(TR_HEADER);
+                    column.headerClasses = headerClasses;
+                    if (sortable === undefined) column.sortable = true;
+                    column.label = this.$t(label);
+                    console.table([headerClasses, column.headerClasses]);
+                }
+            },
+        },
+    });
+});
diff --git a/src/boot/defaults/qTable.js b/src/boot/defaults/qTable.js
index 8902d4266..23bc7d922 100644
--- a/src/boot/defaults/qTable.js
+++ b/src/boot/defaults/qTable.js
@@ -1,5 +1,51 @@
 import { QTable } from 'quasar';
+import { QInput } from 'quasar';
 import setDefault from './setDefault';
+import { QSelect } from 'quasar';
 
 setDefault(QTable, 'pagination', { rowsPerPage: 0 });
 setDefault(QTable, 'hidePagination', true);
+QInput.props.outlined = {
+    type: QInput.props.outlined,
+    default: false,
+};
+QInput.props.dense = {
+    type: QInput.props.dense,
+    default: false,
+};
+QInput.props.stackLabel = {
+    type: QInput.props.stackLabel,
+    default: true,
+};
+QSelect.props.optionLabel = {
+    type: QSelect.props.optionLabel,
+    default: 'name',
+};
+QSelect.props.optionValue = {
+    type: QSelect.props.optionValue,
+    default: 'id',
+};
+QInput.props.hideBottomSpace = {
+    type: QInput.props.hideBottomSpace,
+    default: true,
+};
+QTable.props.columns = {
+    type: QTable.props.columns,
+    align: 'right',
+    format: (value) => `${value}*`,
+};
+QTable.props.noDataLabel = {
+    default: 'asd',
+};
+
+setDefault(QInput, 'outlined', false);
+// setDefault(QTable, "noDataLabel", t('globalfs.noResults'));
+setDefault(QTable, 'gridHeader', true);
+setDefault(QTable, 'color', 'red-8');
+setDefault(QTable, 'pagination', { rowsPerPage: 25 });
+setDefault(QTable, 'rowKey', 'id');
+// setDefault(QTable, 'columns', (data) => {
+//     console.log(this);
+// });
+// setDefault(QSelect, 'optionValue', 'id');
+// setDefault(QSelect, 'optionLabel', 'name');
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 8358cd6e6..67a4fd958 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -69,7 +69,6 @@ const inputRules = [
             :clearable="false"
             :rules="inputRules"
             :lazy-rules="true"
-            hide-bottom-space
         >
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 36a26008e..930f0d8c5 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -52,51 +52,45 @@ const detailsColumns = ref([
         name: 'item',
         label: 'claim.summary.item',
         field: (row) => row.sale.itemFk,
-        sortable: true,
     },
     {
         name: 'landed',
         label: 'claim.summary.landed',
         field: (row) => row.sale.ticket.landed,
         format: (value) => toDate(value),
-        sortable: true,
     },
     {
         name: 'quantity',
         label: 'claim.summary.quantity',
         field: (row) => row.sale.quantity,
-        sortable: true,
     },
     {
         name: 'claimed',
         label: 'claim.summary.claimed',
         field: (row) => row.quantity,
-        sortable: true,
     },
     {
         name: 'description',
         label: 'globals.description',
         field: (row) => row.sale.concept,
+        sortable: false,
     },
     {
         name: 'price',
         label: 'claim.summary.price',
         field: (row) => row.sale.price,
-        sortable: true,
     },
     {
         name: 'discount',
         label: 'claim.summary.discount',
         field: (row) => row.sale.discount,
         format: (value) => `${value} %`,
-        sortable: true,
     },
     {
         name: 'total',
         label: 'claim.summary.total',
         field: ({ sale }) =>
             toCurrency(sale.quantity * sale.price * ((100 - sale.discount) / 100)),
-        sortable: true,
     },
 ]);
 
@@ -115,31 +109,26 @@ const developmentColumns = ref([
         name: 'claimReason',
         label: 'claim.summary.reason',
         field: (row) => row.claimReason.description,
-        sortable: true,
     },
     {
         name: 'claimResult',
         label: 'claim.summary.result',
         field: (row) => row.claimResult.description,
-        sortable: true,
     },
     {
         name: 'claimResponsible',
         label: 'claim.summary.responsible',
         field: (row) => row.claimResponsible.description,
-        sortable: true,
     },
     {
         name: 'worker',
         label: 'claim.summary.worker',
         field: (row) => row.worker?.user.nickname,
-        sortable: true,
     },
     {
         name: 'claimRedelivery',
         label: 'claim.summary.redelivery',
         field: (row) => row.claimRedelivery.description,
-        sortable: true,
     },
 ]);
 const claimDms = ref([]);
@@ -290,13 +279,6 @@ async function changeState(value) {
                     :rows-per-page-options="[0]"
                     hide-bottom
                 >
-                    <template #header="props">
-                        <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                                {{ t(col.label) }}
-                            </QTh>
-                        </QTr>
-                    </template>
                     <template #body="props">
                         <QTr :props="props">
                             <QTh v-for="col in props.cols" :key="col.name" :props="props">
@@ -374,13 +356,6 @@ async function changeState(value) {
                     :rows-per-page-options="[0]"
                     hide-bottom
                 >
-                    <template #header="props">
-                        <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                                {{ t(col.label) }}
-                            </QTh>
-                        </QTr>
-                    </template>
                 </QTable>
             </QCard>
             <QCard class="vn-max">
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 206832f46..cc8190ac4 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -49,7 +49,7 @@ const zones = ref();
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('customerFilter.filter.name')"
+                        label="customerFilter.filter.name"
                         v-model="params.name"
                         is-outlined
                     />
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 7b74117bb..a0224acec 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -89,8 +89,6 @@ const warehouses = ref();
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         :options="workers"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input

From d359063e5db40a84824a8ea1c42da09d74b2ee48 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 17 May 2024 14:23:00 +0200
Subject: [PATCH 37/76] refs #7396 fix summary

---
 src/pages/Worker/Card/WorkerSummary.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 65375373a..bcf3fdb16 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -110,6 +110,12 @@ const filter = {
                     </template>
                 </VnLv>
                 <VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
+            </QCard>
+            <QCard class="vn-one">
+                <VnTitle
+                    :url="workerUrl + `basic-data`"
+                    :text="t('worker.summary.basicData')"
+                />
                 <VnLv
                     :label="t('worker.summary.fiDueDate')"
                     :value="toDate(worker.fiDueDate)"

From 75f3d4f410ae0ebe28698e435c70bf9e5abaa2de Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 17 May 2024 14:32:39 +0200
Subject: [PATCH 38/76] fix: refs #6539 VnSelect use url

---
 src/components/common/VnSelect.vue   | 10 +++++--
 src/pages/Zone/ZoneDeliveryPanel.vue | 45 ++++++++--------------------
 2 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index e8083dec2..493f094ce 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -22,6 +22,10 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    optionFilter: {
+        type: String,
+        default: null,
+    },
     url: {
         type: String,
         default: '',
@@ -59,7 +63,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();
@@ -109,9 +113,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 });
 }
 
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 1295bb63d..c754d484f 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -14,17 +14,8 @@ const { t } = useI18n();
 const { notify } = useNotify();
 
 const deliveryMethodFk = ref(null);
-const postcodesOptions = ref([]);
-const agencyModesOptions = ref([]);
+const deliveryMethods = ref([]);
 const formData = reactive({});
-const agencyFilter = ref({
-    fields: ['id', 'name'],
-    where: {
-        deliveryMethodFk: null,
-    },
-    order: 'name ASC',
-    limit: 30,
-});
 
 const arrayData = useArrayData('ZoneDeliveryDays', {
     url: 'Zones/getEvents',
@@ -47,25 +38,11 @@ watch(
         if (val === 'pickUp') filter = { where: { code: 'PICKUP' } };
         else filter = { where: { code: { inq: ['DELIVERY', 'AGENCY'] } } };
 
-        const deliveryMethods = await fetchDeliveryMethods(filter);
-        agencyFilter.value.where = {
-            deliveryMethodFk: { inq: deliveryMethods },
-        };
-        await fetchAgencyModes(agencyFilter.value);
+        deliveryMethods.value = await fetchDeliveryMethods(filter);
     },
     { immediate: true }
 );
 
-const fetchAgencyModes = async (filter) => {
-    try {
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get('AgencyModes/isActive', { params });
-        agencyModesOptions.value = data;
-    } catch (err) {
-        console.error('Error fetching agency modes: ', err);
-    }
-};
-
 const fetchData = async (params) => {
     try {
         const { data } = params
@@ -94,12 +71,6 @@ onMounted(async () => {
 </script>
 
 <template>
-    <FetchData
-        url="Postcodes/location"
-        :filter="{ fields: ['geoFk', 'code', 'townFk'], order: 'code, townFk' }"
-        @on-fetch="(data) => (postcodesOptions = data)"
-        auto-load
-    />
     <QForm @submit="onSubmit()" class="q-pa-md">
         <div class="column q-gutter-y-sm">
             <QRadio
@@ -119,9 +90,12 @@ onMounted(async () => {
                 v-if="deliveryMethodFk === 'delivery'"
                 :label="t('deliveryPanel.postcode')"
                 v-model="formData.geoFk"
-                :options="postcodesOptions"
+                url="Postcodes/location"
+                :fields="['geoFk', 'code', 'townFk']"
+                sort-by="code, townFk"
                 option-value="geoFk"
                 option-label="code"
+                option-filter="code"
                 hide-selected
                 dense
                 outlined
@@ -148,7 +122,12 @@ onMounted(async () => {
                     )
                 "
                 v-model="formData.agencyModeFk"
-                :options="agencyModesOptions"
+                url="AgencyModes/isActive"
+                :fields="['id', 'name']"
+                :where="{
+                    deliveryMethodFk: { inq: deliveryMethods },
+                }"
+                sort-by="name ASC"
                 option-value="id"
                 option-label="name"
                 hide-selected

From e196cf8fd57a98db9cc2e1287d521df10f95a1e2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 17 May 2024 10:57:20 -0300
Subject: [PATCH 39/76] Zone warehouses

---
 src/pages/Zone/Card/ZoneCard.vue            |  26 +++++
 src/pages/Zone/Card/ZoneCreateWarehouse.vue |  63 ++++++++++
 src/pages/Zone/Card/ZoneWarehouses.vue      | 122 +++++++++++++++-----
 src/pages/Zone/locale/en.yml                |   7 ++
 src/pages/Zone/locale/es.yml                |   7 ++
 src/router/modules/zone.js                  | 107 +++--------------
 6 files changed, 209 insertions(+), 123 deletions(-)
 create mode 100644 src/pages/Zone/Card/ZoneCreateWarehouse.vue

diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 9d6895f36..90f6e72ab 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -1,8 +1,34 @@
 <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',
+};
 </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"
diff --git a/src/pages/Zone/Card/ZoneCreateWarehouse.vue b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
new file mode 100644
index 000000000..461f907ff
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
@@ -0,0 +1,63 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+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';
+
+import axios from 'axios';
+
+const emit = defineEmits(['onSubmit']);
+const { t } = useI18n();
+const route = useRoute();
+
+const ZoneWarehouseFormData = reactive({
+    warehouseFk: null,
+});
+const closeButton = ref(null);
+
+const warehousesOptions = ref([]);
+
+const createZoneWarehouse = () => {
+    try {
+        axios.post(`Zones/${route.params.id}/warehouses`, ZoneWarehouseFormData);
+        emit('onSubmit');
+    } catch (error) {
+        console.error(error);
+    }
+    closeForm();
+};
+
+const closeForm = () => {
+    if (closeButton.value) closeButton.value.click();
+};
+</script>
+
+<template>
+    <FetchData
+        url="Warehouses"
+        :filter="{ order: 'name' }"
+        auto-load
+        @on-fetch="(data) => (warehousesOptions = data)"
+    />
+    <FormPopup model="ZoneWarehouse" @on-submit="createZoneWarehouse()">
+        <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>
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 7ff73a5e9..44b68b70b 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -1,53 +1,113 @@
 <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', {
+    url: `Zones/${route.params.id}/warehouses`,
+    filter: { include: 'warehouse' },
+});
+const store = arrayData.store;
+
+const urlPath = computed(() => `Zones/${route.params.id}/warehouses`);
+
+const columns = computed(() => [
+    {
+        name: 'name',
+    },
+    {
+        name: 'action',
+    },
+]);
+
+const deleteWarehouse = async (row, rows, rowIndex) => {
+    try {
+        await axios.delete(`${urlPath.value}/${row.id}`);
+        if (rowIndex || rowIndex === 0) rows.splice(rowIndex, 1);
+    } catch (error) {
+        console.error(error);
+    }
 };
+
+const openCreateWarehouseForm = () => {
+    createWarehouseDialogRef.value.show();
+};
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter.include = 'warehouse';
+        fetchWarehouses();
+    }
+);
+
+const fetchWarehouses = async () => await paginateRef.value.fetch();
 </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="rows" :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>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="openCreateWarehouseForm()">
+                <QTooltip>{{ t('warehouses.add') }}</QTooltip>
+                <QDialog ref="createWarehouseDialogRef">
+                    <ZoneCreateWarehouse @on-submit="fetchWarehouses()" />
+                </QDialog>
+            </QBtn>
+        </QPageSticky>
     </QPage>
 </template>
-
-<i18n>
-    es:
-        Remove row: Eliminar fila
-</i18n>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 746d3f2e7..86479d99b 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -5,6 +5,7 @@ zone:
         zoneCreate: Create zone
         deliveryList: Delivery days
         upcomingList: Upcoming deliveries
+        warehouses: Warehouses
 list:
     clone: Clone
     id: Id
@@ -40,3 +41,9 @@ summary:
 filterPanel:
     name: Name
     agencyModeFk: Agency
+warehouses:
+    delete: Delete
+    deleteTitle: This item will be deleted
+    deleteSubtitle: Are you sure you want to continue?
+    warehouse: Warehouse
+    add: Add
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index d9266b150..1bb6e08d5 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -5,6 +5,7 @@ zone:
         zoneCreate: Nueva zona
         deliveryList: Días de entrega
         upcomingList: Próximos repartos
+        warehouses: Almacenes
 list:
     clone: Clonar
     id: Id
@@ -40,3 +41,9 @@ summary:
 filterPanel:
     name: Nombre
     agencyModeFk: Agencia
+warehouses:
+    delete: Eliminar
+    deleteTitle: Este elemento será eliminado
+    deleteSubtitle: ¿Seguro que quieres continuar?
+    warehouse: Almacén
+    add: Añadir
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index 9c917c301..414af34c5 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'ZoneMain' },
     menus: {
         main: ['ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingList'],
-        card: ['ZoneBasicData', 'ZoneHistory', 'ZoneLocations'],
+        card: ['ZoneBasicData', 'ZoneWarehouses', 'ZoneHistory', 'ZoneLocations'],
     },
     children: [
         {
@@ -48,15 +48,6 @@ export default {
                     },
                     component: () => import('src/pages/Zone/ZoneCreate.vue'),
                 },
-                // {
-                //     path: 'counter',
-                //     name: 'ZoneCounter',
-                //     meta: {
-                //         title: 'zoneCounter',
-                //         icon: 'add_circle',
-                //     },
-                //     component: () => import('src/pages/Zone/ZoneCounter.vue'),
-                // },
             ],
         },
         {
@@ -74,6 +65,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 +84,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 +101,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'),
-                //         },
-                //     ],
-                // },
             ],
         },
     ],

From 9604599b33c0f2b7cfa7457b3d5683d54a38d5fb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 17 May 2024 17:53:26 +0200
Subject: [PATCH 40/76] first approach

---
 quasar.config.js                      | 11 +++-
 src/boot/customQInput.js              | 77 +++++++++++++++++++++++++++
 src/boot/customQTh.js                 | 34 ++++++++++++
 src/boot/defaults/qTable.js           | 46 ++++++++++++++++
 src/components/common/VnInput.vue     |  1 -
 src/pages/Claim/Card/ClaimSummary.vue | 27 +---------
 src/pages/Customer/CustomerFilter.vue |  2 +-
 src/pages/Ticket/TicketFilter.vue     |  2 -
 8 files changed, 169 insertions(+), 31 deletions(-)
 create mode 100644 src/boot/customQInput.js
 create mode 100644 src/boot/customQTh.js

diff --git a/quasar.config.js b/quasar.config.js
index b59c62eeb..ddfe41c82 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -29,7 +29,16 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
+        boot: [
+            'i18n',
+            'axios',
+            'vnDate',
+            'validations',
+            'quasar',
+            'quasar.defaults',
+            'customQTh',
+            'customQInput',
+        ],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
diff --git a/src/boot/customQInput.js b/src/boot/customQInput.js
new file mode 100644
index 000000000..51dcd9179
--- /dev/null
+++ b/src/boot/customQInput.js
@@ -0,0 +1,77 @@
+// src/boot/customQTh.js
+
+import { boot } from 'quasar/wrappers';
+import { QInput } from 'quasar';
+import i18n from 'src/i18n';
+const TR_HEADER = 'tr-header';
+
+export default boot((b) => {
+    const { app } = b;
+    app.use(i18n);
+    app.mixin({
+        // mounted() {
+        //     this.applyMixinLogic();
+        // },
+        mounted() {
+            this.applyMixinLogic();
+            // if (this.$options.name === QInput.name) {
+            //     console.table([this.$options.name]);
+            //     if (this.label) this.label = this.$t(this.label);
+            //     // this.addClassToQTh(this);
+            // }
+        },
+        methods: {
+            applyMixinLogic() {
+                if (this.$options.name === 'QInput') {
+                    // Traducción de la etiqueta
+                    if (this.label) {
+                        const el = this.$el;
+                        // Recorrer los elementos hijos
+                        const children = el.children || [];
+                        for (let i = 0; i < children.length; i++) {
+                            const child = children[i];
+                            if (
+                                child.tagName === 'DIV' &&
+                                child.classList.contains('q-field__inner')
+                            ) {
+                                const input = child.querySelector('input');
+                                const filterAvailableText = (element) =>
+                                    element.__vueParentComponent.type.name === 'QInput' &&
+                                    element.__vueParentComponent?.attrs?.class !==
+                                        'vn-input-date';
+
+                                if (
+                                    input &&
+                                    input.__vueParentComponent.type.name === 'QInput'
+                                ) {
+                                    // Añadir clase CSS
+                                    input.classList.add('input-default');
+
+                                    // Traducción de la etiqueta
+                                    const labelElement =
+                                        child.querySelector('.q-field__label');
+                                    if (labelElement) {
+                                        const labelKey = labelElement.textContent.trim();
+                                        labelElement.textContent = this.$t(labelKey);
+                                    }
+                                }
+                            }
+                        }
+                        // Traducción de la etiqueta
+                        // const label = this.$el.getAttribute('label');
+                        // if (label) {
+                        //     this.$el = this.$el.setAttribute('label', 'sasd');
+                        // }
+                        // this.$props.label = this.$t(`*${this.$props.label}`);
+                        // this.label = this.$t(`*${this.$props.label}`);
+                        // this.getNativeElement().ariaLabel = '++++';
+                    }
+                    // // Añadir clase CSS
+                    // if (!this.$el.classList.contains('input-default')) {
+                    //     this.$el.classList.add('input-default');
+                    // }
+                }
+            },
+        },
+    });
+});
diff --git a/src/boot/customQTh.js b/src/boot/customQTh.js
new file mode 100644
index 000000000..ae3aa1011
--- /dev/null
+++ b/src/boot/customQTh.js
@@ -0,0 +1,34 @@
+// src/boot/customQTh.js
+
+import { QTable } from 'quasar';
+import { boot } from 'quasar/wrappers';
+
+import i18n from 'src/i18n';
+const TR_HEADER = 'tr-header';
+
+export default boot((b) => {
+    const { app } = b;
+    app.use(i18n);
+    app.mixin({
+        mounted() {
+            if (this.$options.name === QTable.name) {
+                console.table([this.$options.name]);
+                this.addClassToQTh(this.columns ?? []);
+            }
+        },
+        methods: {
+            addClassToQTh(columns) {
+                for (const column of columns) {
+                    let { headerClasses, label, sortable } = column ?? [];
+                    if (!headerClasses) headerClasses = TR_HEADER;
+                    if (!Array.isArray(headerClasses)) headerClasses = [headerClasses];
+                    else headerClasses.push(TR_HEADER);
+                    column.headerClasses = headerClasses;
+                    if (sortable === undefined) column.sortable = true;
+                    column.label = this.$t(label);
+                    console.table([headerClasses, column.headerClasses]);
+                }
+            },
+        },
+    });
+});
diff --git a/src/boot/defaults/qTable.js b/src/boot/defaults/qTable.js
index 8902d4266..23bc7d922 100644
--- a/src/boot/defaults/qTable.js
+++ b/src/boot/defaults/qTable.js
@@ -1,5 +1,51 @@
 import { QTable } from 'quasar';
+import { QInput } from 'quasar';
 import setDefault from './setDefault';
+import { QSelect } from 'quasar';
 
 setDefault(QTable, 'pagination', { rowsPerPage: 0 });
 setDefault(QTable, 'hidePagination', true);
+QInput.props.outlined = {
+    type: QInput.props.outlined,
+    default: false,
+};
+QInput.props.dense = {
+    type: QInput.props.dense,
+    default: false,
+};
+QInput.props.stackLabel = {
+    type: QInput.props.stackLabel,
+    default: true,
+};
+QSelect.props.optionLabel = {
+    type: QSelect.props.optionLabel,
+    default: 'name',
+};
+QSelect.props.optionValue = {
+    type: QSelect.props.optionValue,
+    default: 'id',
+};
+QInput.props.hideBottomSpace = {
+    type: QInput.props.hideBottomSpace,
+    default: true,
+};
+QTable.props.columns = {
+    type: QTable.props.columns,
+    align: 'right',
+    format: (value) => `${value}*`,
+};
+QTable.props.noDataLabel = {
+    default: 'asd',
+};
+
+setDefault(QInput, 'outlined', false);
+// setDefault(QTable, "noDataLabel", t('globalfs.noResults'));
+setDefault(QTable, 'gridHeader', true);
+setDefault(QTable, 'color', 'red-8');
+setDefault(QTable, 'pagination', { rowsPerPage: 25 });
+setDefault(QTable, 'rowKey', 'id');
+// setDefault(QTable, 'columns', (data) => {
+//     console.log(this);
+// });
+// setDefault(QSelect, 'optionValue', 'id');
+// setDefault(QSelect, 'optionLabel', 'name');
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 8358cd6e6..67a4fd958 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -69,7 +69,6 @@ const inputRules = [
             :clearable="false"
             :rules="inputRules"
             :lazy-rules="true"
-            hide-bottom-space
         >
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 36a26008e..930f0d8c5 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -52,51 +52,45 @@ const detailsColumns = ref([
         name: 'item',
         label: 'claim.summary.item',
         field: (row) => row.sale.itemFk,
-        sortable: true,
     },
     {
         name: 'landed',
         label: 'claim.summary.landed',
         field: (row) => row.sale.ticket.landed,
         format: (value) => toDate(value),
-        sortable: true,
     },
     {
         name: 'quantity',
         label: 'claim.summary.quantity',
         field: (row) => row.sale.quantity,
-        sortable: true,
     },
     {
         name: 'claimed',
         label: 'claim.summary.claimed',
         field: (row) => row.quantity,
-        sortable: true,
     },
     {
         name: 'description',
         label: 'globals.description',
         field: (row) => row.sale.concept,
+        sortable: false,
     },
     {
         name: 'price',
         label: 'claim.summary.price',
         field: (row) => row.sale.price,
-        sortable: true,
     },
     {
         name: 'discount',
         label: 'claim.summary.discount',
         field: (row) => row.sale.discount,
         format: (value) => `${value} %`,
-        sortable: true,
     },
     {
         name: 'total',
         label: 'claim.summary.total',
         field: ({ sale }) =>
             toCurrency(sale.quantity * sale.price * ((100 - sale.discount) / 100)),
-        sortable: true,
     },
 ]);
 
@@ -115,31 +109,26 @@ const developmentColumns = ref([
         name: 'claimReason',
         label: 'claim.summary.reason',
         field: (row) => row.claimReason.description,
-        sortable: true,
     },
     {
         name: 'claimResult',
         label: 'claim.summary.result',
         field: (row) => row.claimResult.description,
-        sortable: true,
     },
     {
         name: 'claimResponsible',
         label: 'claim.summary.responsible',
         field: (row) => row.claimResponsible.description,
-        sortable: true,
     },
     {
         name: 'worker',
         label: 'claim.summary.worker',
         field: (row) => row.worker?.user.nickname,
-        sortable: true,
     },
     {
         name: 'claimRedelivery',
         label: 'claim.summary.redelivery',
         field: (row) => row.claimRedelivery.description,
-        sortable: true,
     },
 ]);
 const claimDms = ref([]);
@@ -290,13 +279,6 @@ async function changeState(value) {
                     :rows-per-page-options="[0]"
                     hide-bottom
                 >
-                    <template #header="props">
-                        <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                                {{ t(col.label) }}
-                            </QTh>
-                        </QTr>
-                    </template>
                     <template #body="props">
                         <QTr :props="props">
                             <QTh v-for="col in props.cols" :key="col.name" :props="props">
@@ -374,13 +356,6 @@ async function changeState(value) {
                     :rows-per-page-options="[0]"
                     hide-bottom
                 >
-                    <template #header="props">
-                        <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                                {{ t(col.label) }}
-                            </QTh>
-                        </QTr>
-                    </template>
                 </QTable>
             </QCard>
             <QCard class="vn-max">
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 206832f46..cc8190ac4 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -49,7 +49,7 @@ const zones = ref();
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('customerFilter.filter.name')"
+                        label="customerFilter.filter.name"
                         v-model="params.name"
                         is-outlined
                     />
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 7b74117bb..a0224acec 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -89,8 +89,6 @@ const warehouses = ref();
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         :options="workers"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input

From cda59116ff2f76869c71e0df42933353cc730ee2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 17 May 2024 18:04:48 +0200
Subject: [PATCH 41/76] Revert "first approach"

This reverts commit 9604599b33c0f2b7cfa7457b3d5683d54a38d5fb.
---
 quasar.config.js                      | 11 +---
 src/boot/customQInput.js              | 77 ---------------------------
 src/boot/customQTh.js                 | 34 ------------
 src/boot/defaults/qTable.js           | 46 ----------------
 src/components/common/VnInput.vue     |  1 +
 src/pages/Claim/Card/ClaimSummary.vue | 27 +++++++++-
 src/pages/Customer/CustomerFilter.vue |  2 +-
 src/pages/Ticket/TicketFilter.vue     |  2 +
 8 files changed, 31 insertions(+), 169 deletions(-)
 delete mode 100644 src/boot/customQInput.js
 delete mode 100644 src/boot/customQTh.js

diff --git a/quasar.config.js b/quasar.config.js
index ddfe41c82..b59c62eeb 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -29,16 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: [
-            'i18n',
-            'axios',
-            'vnDate',
-            'validations',
-            'quasar',
-            'quasar.defaults',
-            'customQTh',
-            'customQInput',
-        ],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
diff --git a/src/boot/customQInput.js b/src/boot/customQInput.js
deleted file mode 100644
index 51dcd9179..000000000
--- a/src/boot/customQInput.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// src/boot/customQTh.js
-
-import { boot } from 'quasar/wrappers';
-import { QInput } from 'quasar';
-import i18n from 'src/i18n';
-const TR_HEADER = 'tr-header';
-
-export default boot((b) => {
-    const { app } = b;
-    app.use(i18n);
-    app.mixin({
-        // mounted() {
-        //     this.applyMixinLogic();
-        // },
-        mounted() {
-            this.applyMixinLogic();
-            // if (this.$options.name === QInput.name) {
-            //     console.table([this.$options.name]);
-            //     if (this.label) this.label = this.$t(this.label);
-            //     // this.addClassToQTh(this);
-            // }
-        },
-        methods: {
-            applyMixinLogic() {
-                if (this.$options.name === 'QInput') {
-                    // Traducción de la etiqueta
-                    if (this.label) {
-                        const el = this.$el;
-                        // Recorrer los elementos hijos
-                        const children = el.children || [];
-                        for (let i = 0; i < children.length; i++) {
-                            const child = children[i];
-                            if (
-                                child.tagName === 'DIV' &&
-                                child.classList.contains('q-field__inner')
-                            ) {
-                                const input = child.querySelector('input');
-                                const filterAvailableText = (element) =>
-                                    element.__vueParentComponent.type.name === 'QInput' &&
-                                    element.__vueParentComponent?.attrs?.class !==
-                                        'vn-input-date';
-
-                                if (
-                                    input &&
-                                    input.__vueParentComponent.type.name === 'QInput'
-                                ) {
-                                    // Añadir clase CSS
-                                    input.classList.add('input-default');
-
-                                    // Traducción de la etiqueta
-                                    const labelElement =
-                                        child.querySelector('.q-field__label');
-                                    if (labelElement) {
-                                        const labelKey = labelElement.textContent.trim();
-                                        labelElement.textContent = this.$t(labelKey);
-                                    }
-                                }
-                            }
-                        }
-                        // Traducción de la etiqueta
-                        // const label = this.$el.getAttribute('label');
-                        // if (label) {
-                        //     this.$el = this.$el.setAttribute('label', 'sasd');
-                        // }
-                        // this.$props.label = this.$t(`*${this.$props.label}`);
-                        // this.label = this.$t(`*${this.$props.label}`);
-                        // this.getNativeElement().ariaLabel = '++++';
-                    }
-                    // // Añadir clase CSS
-                    // if (!this.$el.classList.contains('input-default')) {
-                    //     this.$el.classList.add('input-default');
-                    // }
-                }
-            },
-        },
-    });
-});
diff --git a/src/boot/customQTh.js b/src/boot/customQTh.js
deleted file mode 100644
index ae3aa1011..000000000
--- a/src/boot/customQTh.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// src/boot/customQTh.js
-
-import { QTable } from 'quasar';
-import { boot } from 'quasar/wrappers';
-
-import i18n from 'src/i18n';
-const TR_HEADER = 'tr-header';
-
-export default boot((b) => {
-    const { app } = b;
-    app.use(i18n);
-    app.mixin({
-        mounted() {
-            if (this.$options.name === QTable.name) {
-                console.table([this.$options.name]);
-                this.addClassToQTh(this.columns ?? []);
-            }
-        },
-        methods: {
-            addClassToQTh(columns) {
-                for (const column of columns) {
-                    let { headerClasses, label, sortable } = column ?? [];
-                    if (!headerClasses) headerClasses = TR_HEADER;
-                    if (!Array.isArray(headerClasses)) headerClasses = [headerClasses];
-                    else headerClasses.push(TR_HEADER);
-                    column.headerClasses = headerClasses;
-                    if (sortable === undefined) column.sortable = true;
-                    column.label = this.$t(label);
-                    console.table([headerClasses, column.headerClasses]);
-                }
-            },
-        },
-    });
-});
diff --git a/src/boot/defaults/qTable.js b/src/boot/defaults/qTable.js
index 23bc7d922..8902d4266 100644
--- a/src/boot/defaults/qTable.js
+++ b/src/boot/defaults/qTable.js
@@ -1,51 +1,5 @@
 import { QTable } from 'quasar';
-import { QInput } from 'quasar';
 import setDefault from './setDefault';
-import { QSelect } from 'quasar';
 
 setDefault(QTable, 'pagination', { rowsPerPage: 0 });
 setDefault(QTable, 'hidePagination', true);
-QInput.props.outlined = {
-    type: QInput.props.outlined,
-    default: false,
-};
-QInput.props.dense = {
-    type: QInput.props.dense,
-    default: false,
-};
-QInput.props.stackLabel = {
-    type: QInput.props.stackLabel,
-    default: true,
-};
-QSelect.props.optionLabel = {
-    type: QSelect.props.optionLabel,
-    default: 'name',
-};
-QSelect.props.optionValue = {
-    type: QSelect.props.optionValue,
-    default: 'id',
-};
-QInput.props.hideBottomSpace = {
-    type: QInput.props.hideBottomSpace,
-    default: true,
-};
-QTable.props.columns = {
-    type: QTable.props.columns,
-    align: 'right',
-    format: (value) => `${value}*`,
-};
-QTable.props.noDataLabel = {
-    default: 'asd',
-};
-
-setDefault(QInput, 'outlined', false);
-// setDefault(QTable, "noDataLabel", t('globalfs.noResults'));
-setDefault(QTable, 'gridHeader', true);
-setDefault(QTable, 'color', 'red-8');
-setDefault(QTable, 'pagination', { rowsPerPage: 25 });
-setDefault(QTable, 'rowKey', 'id');
-// setDefault(QTable, 'columns', (data) => {
-//     console.log(this);
-// });
-// setDefault(QSelect, 'optionValue', 'id');
-// setDefault(QSelect, 'optionLabel', 'name');
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 67a4fd958..8358cd6e6 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -69,6 +69,7 @@ const inputRules = [
             :clearable="false"
             :rules="inputRules"
             :lazy-rules="true"
+            hide-bottom-space
         >
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 930f0d8c5..36a26008e 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -52,45 +52,51 @@ const detailsColumns = ref([
         name: 'item',
         label: 'claim.summary.item',
         field: (row) => row.sale.itemFk,
+        sortable: true,
     },
     {
         name: 'landed',
         label: 'claim.summary.landed',
         field: (row) => row.sale.ticket.landed,
         format: (value) => toDate(value),
+        sortable: true,
     },
     {
         name: 'quantity',
         label: 'claim.summary.quantity',
         field: (row) => row.sale.quantity,
+        sortable: true,
     },
     {
         name: 'claimed',
         label: 'claim.summary.claimed',
         field: (row) => row.quantity,
+        sortable: true,
     },
     {
         name: 'description',
         label: 'globals.description',
         field: (row) => row.sale.concept,
-        sortable: false,
     },
     {
         name: 'price',
         label: 'claim.summary.price',
         field: (row) => row.sale.price,
+        sortable: true,
     },
     {
         name: 'discount',
         label: 'claim.summary.discount',
         field: (row) => row.sale.discount,
         format: (value) => `${value} %`,
+        sortable: true,
     },
     {
         name: 'total',
         label: 'claim.summary.total',
         field: ({ sale }) =>
             toCurrency(sale.quantity * sale.price * ((100 - sale.discount) / 100)),
+        sortable: true,
     },
 ]);
 
@@ -109,26 +115,31 @@ const developmentColumns = ref([
         name: 'claimReason',
         label: 'claim.summary.reason',
         field: (row) => row.claimReason.description,
+        sortable: true,
     },
     {
         name: 'claimResult',
         label: 'claim.summary.result',
         field: (row) => row.claimResult.description,
+        sortable: true,
     },
     {
         name: 'claimResponsible',
         label: 'claim.summary.responsible',
         field: (row) => row.claimResponsible.description,
+        sortable: true,
     },
     {
         name: 'worker',
         label: 'claim.summary.worker',
         field: (row) => row.worker?.user.nickname,
+        sortable: true,
     },
     {
         name: 'claimRedelivery',
         label: 'claim.summary.redelivery',
         field: (row) => row.claimRedelivery.description,
+        sortable: true,
     },
 ]);
 const claimDms = ref([]);
@@ -279,6 +290,13 @@ async function changeState(value) {
                     :rows-per-page-options="[0]"
                     hide-bottom
                 >
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                {{ t(col.label) }}
+                            </QTh>
+                        </QTr>
+                    </template>
                     <template #body="props">
                         <QTr :props="props">
                             <QTh v-for="col in props.cols" :key="col.name" :props="props">
@@ -356,6 +374,13 @@ async function changeState(value) {
                     :rows-per-page-options="[0]"
                     hide-bottom
                 >
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                {{ t(col.label) }}
+                            </QTh>
+                        </QTr>
+                    </template>
                 </QTable>
             </QCard>
             <QCard class="vn-max">
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index cc8190ac4..206832f46 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -49,7 +49,7 @@ const zones = ref();
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        label="customerFilter.filter.name"
+                        :label="t('customerFilter.filter.name')"
                         v-model="params.name"
                         is-outlined
                     />
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index a0224acec..7b74117bb 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -89,6 +89,8 @@ const warehouses = ref();
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         :options="workers"
+                        option-value="id"
+                        option-label="name"
                         emit-value
                         map-options
                         use-input

From 6afafb2f11911cba6bfce6f650e94b9c1934f907 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 17 May 2024 18:44:25 +0200
Subject: [PATCH 42/76] minor changes

---
 src/pages/Zone/Card/ZoneCard.vue                |  1 +
 src/pages/Zone/Card/ZoneDescriptorMenuItems.vue | 10 +++++-----
 src/pages/Zone/locale/en.yml                    |  1 +
 src/pages/Zone/locale/es.yml                    |  1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 90f6e72ab..6451fe00c 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -16,6 +16,7 @@ const route = useRoute();
 const routeName = computed(() => route.name);
 const searchBarDataKeys = {
     ZoneWarehouses: 'ZoneWarehouses',
+    ZoneSummary: 'ZoneSummary',
 };
 </script>
 <template>
diff --git a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue b/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
index b6c7f28b3..8f1168ce9 100644
--- a/src/pages/Zone/Card/ZoneDescriptorMenuItems.vue
+++ b/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>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 86479d99b..1bfe06386 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -3,6 +3,7 @@ zone:
         zones: Zone
         zonesList: Zones
         zoneCreate: Create zone
+        locations: Locations
         deliveryList: Delivery days
         upcomingList: Upcoming deliveries
         warehouses: Warehouses
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 1bb6e08d5..c86a018ef 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -3,6 +3,7 @@ zone:
         zones: Zonas
         zonesList: Zonas
         zoneCreate: Nueva zona
+        locations: Localizaciones
         deliveryList: Días de entrega
         upcomingList: Próximos repartos
         warehouses: Almacenes

From 7c5b61cca8bc15516f69ae0be529c9e2021507c0 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 17 May 2024 14:35:15 -0300
Subject: [PATCH 43/76] Handle onsubmit

---
 src/pages/Zone/Card/ZoneCreateWarehouse.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneCreateWarehouse.vue b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
index 461f907ff..ff8473d47 100644
--- a/src/pages/Zone/Card/ZoneCreateWarehouse.vue
+++ b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
@@ -21,14 +21,17 @@ const closeButton = ref(null);
 
 const warehousesOptions = ref([]);
 
+const onSubmit = async () => await createZoneWarehouse();
+
 const createZoneWarehouse = () => {
     try {
         axios.post(`Zones/${route.params.id}/warehouses`, ZoneWarehouseFormData);
         emit('onSubmit');
     } catch (error) {
         console.error(error);
+    } finally {
+        closeForm();
     }
-    closeForm();
 };
 
 const closeForm = () => {
@@ -43,7 +46,7 @@ const closeForm = () => {
         auto-load
         @on-fetch="(data) => (warehousesOptions = data)"
     />
-    <FormPopup model="ZoneWarehouse" @on-submit="createZoneWarehouse()">
+    <FormPopup model="ZoneWarehouse" @on-submit="onSubmit">
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">

From 6e499825314d905d9c5fdb214a6131d0c3fdf891 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 17 May 2024 15:18:10 -0300
Subject: [PATCH 44/76] Revert "Handle onsubmit"

This reverts commit 7c5b61cca8bc15516f69ae0be529c9e2021507c0.
---
 src/pages/Zone/Card/ZoneCreateWarehouse.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneCreateWarehouse.vue b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
index ff8473d47..461f907ff 100644
--- a/src/pages/Zone/Card/ZoneCreateWarehouse.vue
+++ b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
@@ -21,17 +21,14 @@ const closeButton = ref(null);
 
 const warehousesOptions = ref([]);
 
-const onSubmit = async () => await createZoneWarehouse();
-
 const createZoneWarehouse = () => {
     try {
         axios.post(`Zones/${route.params.id}/warehouses`, ZoneWarehouseFormData);
         emit('onSubmit');
     } catch (error) {
         console.error(error);
-    } finally {
-        closeForm();
     }
+    closeForm();
 };
 
 const closeForm = () => {
@@ -46,7 +43,7 @@ const closeForm = () => {
         auto-load
         @on-fetch="(data) => (warehousesOptions = data)"
     />
-    <FormPopup model="ZoneWarehouse" @on-submit="onSubmit">
+    <FormPopup model="ZoneWarehouse" @on-submit="createZoneWarehouse()">
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">

From 6c374061d07556dd2d54582fefe71299843caa35 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 17 May 2024 15:24:17 -0300
Subject: [PATCH 45/76] Handle request orders

---
 src/pages/Zone/Card/ZoneCreateWarehouse.vue | 6 ------
 src/pages/Zone/Card/ZoneWarehouses.vue      | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneCreateWarehouse.vue b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
index 461f907ff..7625b18e4 100644
--- a/src/pages/Zone/Card/ZoneCreateWarehouse.vue
+++ b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
@@ -17,7 +17,6 @@ const route = useRoute();
 const ZoneWarehouseFormData = reactive({
     warehouseFk: null,
 });
-const closeButton = ref(null);
 
 const warehousesOptions = ref([]);
 
@@ -28,11 +27,6 @@ const createZoneWarehouse = () => {
     } catch (error) {
         console.error(error);
     }
-    closeForm();
-};
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
 };
 </script>
 
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 44b68b70b..461b54b8a 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -56,7 +56,7 @@ watch(
     }
 );
 
-const fetchWarehouses = async () => await paginateRef.value.fetch();
+const fetchWarehouses = () => paginateRef.value.fetch();
 </script>
 
 <template>

From 78e81c6f754ef5289bb6b5fc2614e4fbb78eb3e3 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 17 May 2024 17:16:58 -0300
Subject: [PATCH 46/76] ZoneWarehouses and ZoneWareousesCreate refactor

---
 src/pages/Zone/Card/ZoneCreateWarehouse.vue | 20 ++++---------
 src/pages/Zone/Card/ZoneWarehouses.vue      | 31 +++++++++++++--------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneCreateWarehouse.vue b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
index 7625b18e4..0f35ee679 100644
--- a/src/pages/Zone/Card/ZoneCreateWarehouse.vue
+++ b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
@@ -1,33 +1,20 @@
 <script setup>
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
 
 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';
 
-import axios from 'axios';
-
-const emit = defineEmits(['onSubmit']);
+const emit = defineEmits(['onSubmitCreateWarehouse']);
 const { t } = useI18n();
-const route = useRoute();
 
 const ZoneWarehouseFormData = reactive({
     warehouseFk: null,
 });
 
 const warehousesOptions = ref([]);
-
-const createZoneWarehouse = () => {
-    try {
-        axios.post(`Zones/${route.params.id}/warehouses`, ZoneWarehouseFormData);
-        emit('onSubmit');
-    } catch (error) {
-        console.error(error);
-    }
-};
 </script>
 
 <template>
@@ -37,7 +24,10 @@ const createZoneWarehouse = () => {
         auto-load
         @on-fetch="(data) => (warehousesOptions = data)"
     />
-    <FormPopup model="ZoneWarehouse" @on-submit="createZoneWarehouse()">
+    <FormPopup
+        model="ZoneWarehouse"
+        @on-submit="emit('onSubmitCreateWarehouse', ZoneWarehouseFormData)"
+    >
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 461b54b8a..87b7ef93e 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -17,12 +17,11 @@ const { openConfirmationModal } = useVnConfirm();
 const paginateRef = ref(null);
 const createWarehouseDialogRef = ref(null);
 
-const arrayData = useArrayData('ZoneWarehouses', {
-    url: `Zones/${route.params.id}/warehouses`,
-    filter: { include: 'warehouse' },
-});
+const arrayData = useArrayData('ZoneWarehouses');
 const store = arrayData.store;
 
+const data = computed(() => store.data);
+
 const urlPath = computed(() => `Zones/${route.params.id}/warehouses`);
 
 const columns = computed(() => [
@@ -34,17 +33,23 @@ const columns = computed(() => [
     },
 ]);
 
-const deleteWarehouse = async (row, rows, rowIndex) => {
+const deleteWarehouse = async (row) => {
     try {
         await axios.delete(`${urlPath.value}/${row.id}`);
-        if (rowIndex || rowIndex === 0) rows.splice(rowIndex, 1);
+        fetchWarehouses();
     } catch (error) {
         console.error(error);
     }
 };
 
-const openCreateWarehouseForm = () => {
-    createWarehouseDialogRef.value.show();
+const createZoneWarehouse = async (ZoneWarehouseFormData) => {
+    console.log(ZoneWarehouseFormData);
+    try {
+        await axios.post(urlPath.value, ZoneWarehouseFormData);
+        fetchWarehouses();
+    } catch (error) {
+        console.error(error);
+    }
 };
 
 watch(
@@ -57,6 +62,8 @@ watch(
 );
 
 const fetchWarehouses = () => paginateRef.value.fetch();
+
+const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
 </script>
 
 <template>
@@ -70,7 +77,7 @@ const fetchWarehouses = () => paginateRef.value.fetch();
                 auto-load
             >
                 <template #body="{ rows }">
-                    <QTable :rows="rows" :columns="columns" hide-header>
+                    <QTable :rows="data" :columns="columns" hide-header>
                         <template #body="{ row, rowIndex }">
                             <QTr>
                                 <QTd>
@@ -101,12 +108,12 @@ const fetchWarehouses = () => paginateRef.value.fetch();
                 </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>
-                <QDialog ref="createWarehouseDialogRef">
-                    <ZoneCreateWarehouse @on-submit="fetchWarehouses()" />
-                </QDialog>
             </QBtn>
         </QPageSticky>
     </QPage>

From ce87008c125f2aa5cf3a943544ba59dc82743002 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 18 May 2024 08:50:38 +0200
Subject: [PATCH 47/76] fix: remove console.log

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

diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 87b7ef93e..196333d08 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -43,7 +43,6 @@ const deleteWarehouse = async (row) => {
 };
 
 const createZoneWarehouse = async (ZoneWarehouseFormData) => {
-    console.log(ZoneWarehouseFormData);
     try {
         await axios.post(urlPath.value, ZoneWarehouseFormData);
         fetchWarehouses();

From 632acc13ac77371344c61f0b52f9f4b641c054c5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 18 May 2024 08:53:08 +0200
Subject: [PATCH 48/76] style: reset poc style

---
 src/components/ui/FetchedTags.vue | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue
index a2dbf0c16..709961a7f 100644
--- a/src/components/ui/FetchedTags.vue
+++ b/src/components/ui/FetchedTags.vue
@@ -51,13 +51,11 @@ const tags = computed(() => {
 
 <style lang="scss" scoped>
 .fetchedTags {
-    display: grid;
-    grid-template-columns: repeat(3, 0fr);
-    grid-template-rows: repeat(2, auto);
-
-    max-width: 300px;
+    align-items: center;
     .wrap {
-        display: contents;
+        width: 100%;
+        flex-wrap: wrap;
+        display: flex;
     }
 
     .inline-tag {
@@ -71,12 +69,8 @@ const tags = computed(() => {
         border: 1px solid $color-spacer;
         text-overflow: ellipsis;
         overflow: hidden;
-        min-width: 7rem;
+        min-width: 4rem;
         max-width: 4rem;
     }
-
-    .empty {
-        border: 1px solid $color-spacer-light;
-    }
 }
 </style>

From 7197881cdd3804596906c38d6eb8391be51861ec Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 18 May 2024 08:53:46 +0200
Subject: [PATCH 49/76] style: reset poc style

---
 src/components/ui/FetchedTags.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue
index 709961a7f..795e1ab4e 100644
--- a/src/components/ui/FetchedTags.vue
+++ b/src/components/ui/FetchedTags.vue
@@ -72,5 +72,8 @@ const tags = computed(() => {
         min-width: 4rem;
         max-width: 4rem;
     }
+    .empty {
+        border: 1px solid $color-spacer-light;
+    }
 }
 </style>

From 4199fc0dc58f019604d095011c49643a9e0de762 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 20 May 2024 09:00:54 +0200
Subject: [PATCH 50/76] refs #7396 fix basicData, summary, change
 deleteDepartment

---
 .../Department/Card/DepartmentDescriptor.vue  | 47 +++++++++----------
 src/pages/Worker/Card/WorkerBasicData.vue     | 18 +++----
 src/pages/Worker/Card/WorkerSummary.vue       |  8 ++--
 3 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
index e60a8c91b..70c578fc2 100644
--- a/src/pages/Department/Card/DepartmentDescriptor.vue
+++ b/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>
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 2f69de318..4ff5c9b2f 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -74,11 +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"
@@ -87,7 +87,7 @@ const maritalStatus = [
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Boss')"
                     :options="workersOptions"
@@ -118,7 +118,7 @@ const maritalStatus = [
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Origin country')"
                     :options="countriesOptions"
@@ -137,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"
@@ -146,19 +146,19 @@ const maritalStatus = [
                     clearable
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInputDate :label="t('fiDueDate')" v-model="data.fiDueDate" />
 
                 <VnInput v-model="data.sex" :label="t('sex')" clearable />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInputDate :label="t('seniority')" v-model="data.seniority" />
                 <VnInput v-model="data.fi" :label="t('fi')" />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInputDate :label="t('birth')" v-model="data.birth" />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox
                     size="sm"
                     :label="t('isFreelance')"
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index bcf3fdb16..129e0ce8c 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -128,25 +128,25 @@ const filter = {
                 <VnLv :label="t('worker.summary.fi')" :value="worker.fi" />
                 <VnLv :label="t('worker.summary.birth')" :value="toDate(worker.birth)" />
                 <QCheckbox
-                    style="padding: 0"
+                    class="padding-none"
                     :label="t('worker.summary.isFreelance')"
                     v-model="worker.isFreelance"
                     :disable="true"
                 />
                 <QCheckbox
-                    style="padding: 0"
+                    class="padding-none"
                     :label="t('worker.summary.isSsDiscounted')"
                     v-model="worker.isSsDiscounted"
                     :disable="true"
                 />
                 <QCheckbox
-                    style="padding: 0"
+                    class="padding-none"
                     :label="t('worker.summary.hasMachineryAuthorized')"
                     v-model="worker.hasMachineryAuthorized"
                     :disable="true"
                 />
                 <QCheckbox
-                    style="padding: 0"
+                    class="padding-none"
                     :label="t('worker.summary.isDisable')"
                     v-model="worker.isDisable"
                     :disable="true"

From febc88203d7b50d7c16da7c0dd3078da5f20bad1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 20 May 2024 11:16:05 +0200
Subject: [PATCH 51/76] style: fix color when is empty

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

diff --git a/src/components/ui/FetchedTags.vue b/src/components/ui/FetchedTags.vue
index 795e1ab4e..d05e9c40f 100644
--- a/src/components/ui/FetchedTags.vue
+++ b/src/components/ui/FetchedTags.vue
@@ -73,7 +73,7 @@ const tags = computed(() => {
         max-width: 4rem;
     }
     .empty {
-        border: 1px solid $color-spacer-light;
+        border: 1px solid #2b2b2b;
     }
 }
 </style>

From 9f517eb59d4a8d63469899dc3ee25440ef0619df Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 20 May 2024 12:40:47 +0200
Subject: [PATCH 52/76] refs #6820 fix BasicData Tickets

---
 src/pages/Route/Card/RouteForm.vue | 20 +++++++++++++-------
 src/pages/Route/RouteTickets.vue   |  5 -----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 892a0333c..ea75955ce 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -28,7 +28,7 @@ const defaultInitialData = {
     workerFk: null,
     isOk: false,
 };
-
+const maxDistance = ref(null);
 const workerList = ref([]);
 const agencyList = ref([]);
 const vehicleList = ref([]);
@@ -82,11 +82,6 @@ const onSave = (data, response) => {
 </script>
 <template>
     <VnSubToolbar />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <RouteSearchbar />
-        </Teleport>
-    </template>
     <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"
+        @on-fetch="(data) => (maxDistance = data.kmMax)"
+        auto-load
+        :where="{ id: 1 }"
+    />
     <FormModel
         :url="isNew ? null : `Routes/${route.params?.id}`"
         :url-create="isNew ? 'Routes' : null"
@@ -174,7 +175,12 @@ 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 />
+                    <VnInput
+                        v-model.number="data.kmEnd"
+                        :label="t('Km End')"
+                        max="maxDistance"
+                        clearable
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnInputTime
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index eb2035011..0efcd6e0c 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/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

From 9468e409ea43f3fa5747d89562db56e25400f598 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 21 May 2024 00:34:03 +0200
Subject: [PATCH 53/76] fix: refs #7187 fix reload

---
 src/pages/Worker/Card/WorkerPda.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index fceaaf1d7..06f1e0e80 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -40,6 +40,12 @@ const deallocatePDA = async (deviceProductionFk) => {
     }
     paginate.value.fetch();
 };
+
+function reloadData() {
+    initialData.value.deviceProductionFk = null;
+    initialData.value.simSerialNumber = null;
+    paginate.value.fetch();
+}
 </script>
 
 <template>
@@ -128,7 +134,7 @@ const deallocatePDA = async (deviceProductionFk) => {
                         url-create="DeviceProductionUsers"
                         model="DeviceProductionUser"
                         :form-initial-data="initialData"
-                        @on-data-saved="paginate.fetch()"
+                        @on-data-saved="reloadData()"
                     >
                         <template #form-inputs="{ data }">
                             <VnRow class="row q-gutter-md q-mb-md">

From 45f56078d7939bc793b764d5dae5536fff1be0a4 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 21 May 2024 01:04:52 +0200
Subject: [PATCH 54/76] feat: refs #7187 add vnconfirm on delete

---
 src/pages/Worker/Card/WorkerPda.vue               | 12 +++++++++++-
 test/cypress/integration/worker/workerPda.spec.js |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 06f1e0e80..976469476 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -7,6 +7,7 @@ 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';
@@ -19,6 +20,7 @@ const { notify } = useNotify();
 const paginate = ref();
 const dialog = ref();
 const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
 const routeId = computed(() => route.params.id);
 
 const initialData = computed(() => {
@@ -115,7 +117,13 @@ function reloadData() {
                                 size="sm"
                                 class="cursor-pointer"
                                 color="primary"
-                                @click="deallocatePDA(row.deviceProductionFk)"
+                                @click="
+                                    openConfirmationModal(
+                                        t(`Remove PDA`),
+                                        t('Do you want to remove this PDA?'),
+                                        () => deallocatePDA(row.deviceProductionFk)
+                                    )
+                                "
                             >
                                 <QTooltip>
                                     {{ t('worker.pda.removePDA') }}
@@ -194,6 +202,8 @@ function reloadData() {
 </style>
 <i18n>
 es:
+    Remove PDA: Eliminar PDA
+    Do you want to remove this PDA?: ¿Desea eliminar este PDA?
     PDA deallocated: PDA desasignada
     SIM serial number: Número de serie de la SIM
     Model: Modelo
diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
index 79940232b..9af994a70 100644
--- a/test/cypress/integration/worker/workerPda.spec.js
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -16,6 +16,9 @@ describe('WorkerPda', () => {
 
     it('delete pda', () => {
         cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
+        cy.get(
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+        ).click();
         cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
     });
 });

From a8fef3fa84a1b937f5dd9aa737198194fbc62028 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 21 May 2024 11:30:00 +0200
Subject: [PATCH 55/76] deploy: init version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7be20a842..38a1d06a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.22.0",
+    "version": "24.24.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 99d16d215fc97b028149725b05b6544d30a170ed Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 21 May 2024 11:56:30 +0200
Subject: [PATCH 56/76] refs #6332 colors

---
 src/components/ui/QCalendarMonthWrapper.vue  | 1 -
 src/pages/Worker/Card/WorkerCalendarItem.vue | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue
index 5e3cdadc7..896fb1974 100644
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@@ -50,7 +50,6 @@ const containerClasses = computed(() => {
     // Cambia los colores del día actual del calendario por los de salix
     --calendar-border-current-dark: #84d0e2 2px solid;
     --calendar-border-current: #84d0e2 2px solid;
-    --calendar-current-color-dark: #84d0e2;
     // Colores de fondo del calendario en dark mode
     --calendar-outside-background-dark: #222;
     --calendar-background-dark: #222;
diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 4787c3fd3..65ed8522a 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -238,6 +238,7 @@ watch(_year, (newValue) => {
 
     &.--festive {
         border: 2px solid $negative;
+        color: $negative;
     }
 
     &:hover {

From bacc07a4cac76b2a3a30d26a7eb1eaeca958ce08 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 21 May 2024 12:04:56 +0200
Subject: [PATCH 57/76] remove right

---
 src/pages/Worker/Card/WorkerCalendar.vue    | 17 -----------------
 src/pages/Worker/Card/WorkerTimeControl.vue | 17 -----------------
 2 files changed, 34 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 2e525aa30..cfde97f93 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -170,23 +170,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
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index d0b91e3a7..d9a650d9a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/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>

From 27c86288e1bedfb537959f746e8d543a4d035929 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 21 May 2024 16:14:55 +0200
Subject: [PATCH 58/76] refs #6332 color red button

---
 src/components/ui/QCalendarMonthWrapper.vue  | 8 +++++++-
 src/pages/Worker/Card/WorkerCalendarItem.vue | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue
index 896fb1974..6736d30d8 100644
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@@ -109,7 +109,13 @@ const containerClasses = computed(() => {
             cursor: pointer;
         }
     }
-
+    .q-calendar-month__day--label .q-calendar__button {
+        color: red;
+        &::before {
+            content: '';
+            color: transparent !important;
+        }
+    }
     .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
diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 65ed8522a..e2c9e525c 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -152,7 +152,7 @@ const getEventAttrs = (timestamp) => {
 
     if (isFestive) {
         attrs.class = '--festive';
-        attrs.label = event.absenceId ? timestamp.day : '';
+        attrs.label = timestamp.day;
     }
 
     return attrs;
@@ -237,7 +237,6 @@ watch(_year, (newValue) => {
     }
 
     &.--festive {
-        border: 2px solid $negative;
         color: $negative;
     }
 

From d2d80645d050e4147a044e98375b8be0a27b1112 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 21 May 2024 19:12:40 +0200
Subject: [PATCH 59/76] fix: refs #7187 fix responsive

---
 src/pages/Worker/Card/WorkerPda.vue           | 97 ++++++++-----------
 .../integration/worker/workerPda.spec.js      | 11 ++-
 2 files changed, 49 insertions(+), 59 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 976469476..8e971a02c 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -71,52 +71,36 @@ function reloadData() {
                     bordered
                     :key="row.id"
                     v-for="row of rows"
-                    class="card q-pt-xs q-mb-sm"
+                    class="card q-px-md q-mb-sm"
                 >
-                    <QItem>
-                        <QItemSection side-left>
-                            <VnRow>
-                                <QField
-                                    :label="t('worker.pda.currentPDA')"
-                                    :model-value="row?.deviceProductionFk"
-                                    disable
-                                >
-                                    <template #control>
-                                        <div tabindex="0" style="padding: none">
-                                            <span>Id: </span>
-                                            <span>
-                                                {{ row?.deviceProductionFk }}&nbsp;
-                                            </span>
-                                            <span>{{ t('Model') }}: </span>
-                                            <span>
-                                                {{ row?.deviceProduction?.modelFk }}&nbsp;
-                                            </span>
-                                            <span>{{ t('SIM serial number') }}: </span>
-                                            <span>
-                                                {{
-                                                    row?.deviceProduction?.serialNumber
-                                                }}&nbsp;
-                                            </span>
-                                        </div>
-                                    </template>
-                                </QField>
-                                <QField
-                                    :label="t('Current SIM')"
-                                    :model-value="row?.simSerialNumber"
-                                    disable
-                                >
-                                    <template #control>
-                                        <div tabindex="0">{{ row?.simSerialNumber }}</div>
-                                    </template>
-                                </QField>
-                            </VnRow>
-                        </QItemSection>
-                        <QItemSection side>
+                    <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
+                        />
+
+                        <div class="icon">
                             <QIcon
                                 name="delete"
                                 size="sm"
-                                class="cursor-pointer"
                                 color="primary"
+                                class="cursor-pointer"
                                 @click="
                                     openConfirmationModal(
                                         t(`Remove PDA`),
@@ -129,8 +113,8 @@ function reloadData() {
                                     {{ t('worker.pda.removePDA') }}
                                 </QTooltip>
                             </QIcon>
-                        </QItemSection>
-                    </QItem>
+                        </div>
+                    </VnRow>
                 </QCard>
             </template>
         </VnPaginate>
@@ -187,26 +171,23 @@ function reloadData() {
     </QPage>
 </template>
 <style lang="scss" scoped>
-.centerCard {
-    padding: 5%;
-    width: 100%;
-    max-width: 70%;
-    margin: 0 auto;
-}
-.label {
-    color: red;
-}
-.q-field {
-    height: 65px;
+.icon {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 2%;
+    max-width: 4%;
 }
 </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?
-    PDA deallocated: PDA desasignada
-    SIM serial number: Número de serie de la SIM
-    Model: Modelo
+    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
-    Add new device: Añadir nuevo dispositivo
 </i18n>
diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
index 9af994a70..e27127202 100644
--- a/test/cypress/integration/worker/workerPda.spec.js
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -14,8 +14,17 @@ describe('WorkerPda', () => {
         cy.get('.q-notification__message').should('have.text', 'Data created');
     });
 
+    it('assign more than 1 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(
+            ':nth-child(1) > .q-notification__wrapper > .q-notification__content > .q-notification__message'
+        ).should('have.text', 'You can only have one PDA');
+    });
+
     it('delete pda', () => {
-        cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
+        cy.get('.icon > .q-icon').click();
         cy.get(
             '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
         ).click();

From f3c334b82637d5b7823b3e460de3a6bedce195c2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 22 May 2024 08:02:59 +0200
Subject: [PATCH 60/76] hotFix(VnDmsList): downloadModel default undefined

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

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index e3cb2874a..769ba9959 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -35,7 +35,7 @@ const $props = defineProps({
     downloadModel: {
         type: String,
         required: false,
-        default: null,
+        default: undefined,
     },
     defaultDmsCode: {
         type: String,

From 2094506baf9f9845bf092f1cb021af84906b7166 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 22 May 2024 08:27:09 +0200
Subject: [PATCH 61/76] fix: WorkerCalendarItem

---
 src/pages/Worker/Card/WorkerCalendar.vue     |  1 +
 src/pages/Worker/Card/WorkerCalendarItem.vue | 25 ++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 2e525aa30..432603477 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -82,6 +82,7 @@ const onFetchAbsences = (data) => {
                 type: type.code,
                 absenceId: absence.id,
                 isFestive: false,
+                isHoliday: false,
             });
         });
     }
diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 4787c3fd3..f21d34af0 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/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,37 @@ 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 && type !== 'holiday'
+                ? `background-color: ${color};`
+                : 'background-color:#3d3d3d;',
         label: timestamp.day,
     };
 
     if (isFestive) {
         attrs.class = '--festive';
         attrs.label = event.absenceId ? timestamp.day : '';
+        // attrs.style = 'color: red';
     }
+    // if(type === 'holiday')
+    else attrs.class = `--${type}`;
 
     return attrs;
 };
@@ -203,7 +216,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)
@@ -239,6 +251,11 @@ watch(_year, (newValue) => {
     &.--festive {
         border: 2px solid $negative;
     }
+    &.--holiday {
+        & > span:nth-child(2) .block {
+            color: $negative;
+        }
+    }
 
     &:hover {
         opacity: 0.8;

From 81f7e06143963ccede20a6b310368cefb3fbb084 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 22 May 2024 08:35:01 +0200
Subject: [PATCH 62/76] refs #6332 fix calendar

---
 src/pages/Worker/Card/WorkerCalendarItem.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index a116c93f9..c29dba853 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -163,10 +163,7 @@ const getEventAttrs = (timestamp) => {
     if (isFestive) {
         attrs.class = '--festive';
         attrs.label = event.absenceId ? timestamp.day : '';
-        // attrs.style = 'color: red';
-    }
-    // if(type === 'holiday')
-    else attrs.class = `--${type}`;
+    } else attrs.class = `--${type}`;
 
     return attrs;
 };

From 0e0f649ff9c580f4e0187bf09e586a43bf7f8588 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 22 May 2024 08:54:37 +0200
Subject: [PATCH 63/76] fix: 9-12

---
 src/components/ui/QCalendarMonthWrapper.vue  | 7 -------
 src/pages/Worker/Card/WorkerCalendarItem.vue | 9 +++------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/components/ui/QCalendarMonthWrapper.vue b/src/components/ui/QCalendarMonthWrapper.vue
index 7b604bd0b..05a598a1b 100644
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@@ -110,13 +110,6 @@ const containerClasses = computed(() => {
             cursor: pointer;
         }
     }
-    // .q-calendar-month__day--label .q-calendar__button {
-    //     color: red;
-    //     &::before {
-    //         content: '';
-    //         color: transparent !important;
-    //     }
-    // }
     .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
diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index a116c93f9..9156d7a30 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -162,7 +162,7 @@ const getEventAttrs = (timestamp) => {
 
     if (isFestive) {
         attrs.class = '--festive';
-        attrs.label = event.absenceId ? timestamp.day : '';
+        attrs.label = event.absenceId ?? timestamp.day;
         // attrs.style = 'color: red';
     }
     // if(type === 'holiday')
@@ -250,12 +250,9 @@ watch(_year, (newValue) => {
 
     &.--festive {
         color: $negative;
+        border: 2px solid $negative;
     }
-    &.--holiday {
-        & > span:nth-child(2) .block {
-            color: $negative;
-        }
-    }
+
     &.--holiday {
         & > span:nth-child(2) .block {
             color: $negative;

From eaa0288f25d3ca01f70fb23c05c6c4f33c8100b5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 22 May 2024 09:27:48 +0200
Subject: [PATCH 64/76] update

---
 src/pages/Worker/Card/WorkerCalendarItem.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 0a89b131d..4167a013c 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -153,10 +153,7 @@ const getEventAttrs = (timestamp) => {
 
     const attrs = {
         title: name,
-        style:
-            color && type !== 'holiday'
-                ? `background-color: ${color};`
-                : 'background-color:#3d3d3d;',
+        style: color ? `background-color: ${color};` : '',
         label: timestamp.day,
     };
 
@@ -247,12 +244,12 @@ watch(_year, (newValue) => {
 
     &.--festive {
         color: $negative;
-        border: 2px solid $negative;
+        // border: 2px solid $negative;
     }
 
     &.--holiday {
         & > span:nth-child(2) .block {
-            color: $negative;
+            color: white;
         }
     }
 

From c1bcc0379daf3ea36775446f4c3393112a369644 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 22 May 2024 09:35:56 +0200
Subject: [PATCH 65/76] refs #6332 fix festive

---
 src/pages/Worker/Card/WorkerCalendarItem.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 0a89b131d..c63a775c3 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -153,10 +153,7 @@ const getEventAttrs = (timestamp) => {
 
     const attrs = {
         title: name,
-        style:
-            color && type !== 'holiday'
-                ? `background-color: ${color};`
-                : 'background-color:#3d3d3d;',
+        style: color ? `background-color: ${color};` : ``,
         label: timestamp.day,
     };
 
@@ -247,12 +244,11 @@ watch(_year, (newValue) => {
 
     &.--festive {
         color: $negative;
-        border: 2px solid $negative;
     }
 
     &.--holiday {
         & > span:nth-child(2) .block {
-            color: $negative;
+            color: white;
         }
     }
 

From 2af4df8ded6d1cbaf7d90907f5cf5450fec2e6f4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 22 May 2024 10:07:58 +0200
Subject: [PATCH 66/76] refactor: refs #6652 improved defaulter section

---
 src/filters/dateRange.js                      |  2 +-
 .../Customer/Defaulter/CustomerDefaulter.vue  | 76 +++++++++++++++++--
 .../Defaulter/CustomerDefaulterFilter.vue     | 10 ++-
 3 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/src/filters/dateRange.js b/src/filters/dateRange.js
index 4c0cfe654..7aa2869e5 100644
--- a/src/filters/dateRange.js
+++ b/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];
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index c1e537c0a..5ed6af1a9 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/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
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 26a6743d5..9220bd7c0 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/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>

From f6051472efa1e6499bbbf846e69c241fd11fa403 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 22 May 2024 10:21:06 +0200
Subject: [PATCH 67/76] style: color transparent when is fetive

---
 src/pages/Worker/Card/WorkerCalendarItem.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 4167a013c..5fb0e9f04 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -169,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);
 });
@@ -229,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;
@@ -244,7 +248,6 @@ watch(_year, (newValue) => {
 
     &.--festive {
         color: $negative;
-        // border: 2px solid $negative;
     }
 
     &.--holiday {

From 98449b0c1ec89b166fd3902c28413c9990287206 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 22 May 2024 10:23:10 +0200
Subject: [PATCH 68/76] refs #6111 scroll horizontal

---
 src/pages/Route/RouteList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index b20c72807..7b98cc1cc 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -295,6 +295,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             :visible-columns="visibleColumns"
                             hide-pagination
                             :no-data-label="t('globals.noResults')"
+                            style="max-height: 82vh"
                         >
                             <template #body-cell-worker="{ row }">
                                 <QTd>

From 506b5dd9c289f6fc7af6abb6686988ce9de4a565 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 22 May 2024 12:24:08 +0200
Subject: [PATCH 69/76] refs #6820 fix error front

---
 src/pages/Route/Card/RouteForm.vue | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index ea75955ce..27927a98d 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -81,7 +81,7 @@ const onSave = (data, response) => {
 };
 </script>
 <template>
-    <VnSubToolbar />
+    <VnSubToolbar v-if="isNew" />
     <FetchData
         url="Workers/search"
         :filter="{ fields: ['id', 'nickname'] }"
@@ -107,10 +107,10 @@ const onSave = (data, response) => {
         auto-load
     />
     <FetchData
-        url="RouteConfigs"
-        @on-fetch="(data) => (maxDistance = data.kmMax)"
+        url="RouteConfigs/findOne"
+        @on-fetch="({ kmMax }) => (maxDistance = kmMax)"
         auto-load
-        :where="{ id: 1 }"
+        sort-by="id ASC"
     />
     <FormModel
         :url="isNew ? null : `Routes/${route.params?.id}`"
@@ -175,11 +175,16 @@ 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
+                    <QInput
                         v-model.number="data.kmEnd"
                         :label="t('Km End')"
-                        max="maxDistance"
+                        :rules="[
+                            (val) =>
+                                val < maxDistance ||
+                                t('Distance must be lesser than 4000'),
+                        ]"
                         clearable
+                        type="number"
                     />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
@@ -227,4 +232,5 @@ es:
     Description: Descripción
     Is served: Se ha servido
     Created: Creado
+    Distance must be lesser than 4000: La distancia debe ser inferior a 4000
 </i18n>

From e4ebf4c4db19126872ab228db97a8f9fb9b77b62 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 22 May 2024 13:44:53 +0200
Subject: [PATCH 70/76] refs #6820 fix traduction

---
 src/pages/Route/Card/RouteForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 27927a98d..7c25c6a02 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -28,7 +28,7 @@ const defaultInitialData = {
     workerFk: null,
     isOk: false,
 };
-const maxDistance = ref(null);
+const maxDistance = ref();
 const workerList = ref([]);
 const agencyList = ref([]);
 const vehicleList = ref([]);
@@ -232,5 +232,5 @@ es:
     Description: Descripción
     Is served: Se ha servido
     Created: Creado
-    Distance must be lesser than 4000: La distancia debe ser inferior a 4000
+    Distance must be lesser than {maxDistance}: La distancia debe ser inferior a {maxDistance}
 </i18n>

From 6ea942bf3151194213a8e1008c7b56fb2045fcb7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 23 May 2024 09:24:50 +0200
Subject: [PATCH 71/76] refs #6111 fix merge, fix column

---
 src/pages/Route/RouteList.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 419674e4b..5edb9c7ec 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -355,8 +355,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 </QTd>
                             </template>
                             <template #body-cell-vehicle="{ row }">
-                                <QTd>
-                                    <VnSelectFilter
+                                <QTd class="table-input-cell small-column">
+                                    <VnSelect
                                         :label="t('Vehicle')"
                                         v-model="row.vehicleFk"
                                         :options="vehicleList"
@@ -424,7 +424,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 </QTd>
                             </template>
                             <template #body-cell-isServed="props">
-                                <QTd>
+                                <QTd class="table-input-cell small-column">
                                     <QCheckbox v-model="props.value" disable>
                                         <QTooltip>
                                             {{
@@ -520,6 +520,7 @@ es:
     Description: Descripción
     Hour started: Hora inicio
     Hour finished: Hora fin
+    Served: Servida
     newRoute: Nueva Ruta
     Clone Selected Routes: Clonar rutas seleccionadas
     Select the starting date: Seleccione la fecha de inicio

From 2432a37211abe092117aac1efc33b32434975608 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 23 May 2024 10:26:54 +0200
Subject: [PATCH 72/76] refs #6111 fix sticky

---
 src/pages/Route/RouteList.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 5edb9c7ec..3e7c14dd1 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -505,6 +505,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 .table-actions {
     gap: 12px;
 }
+th:last-child,
+td:last-child {
+    background-color: var(--vn-section-color);
+    position: sticky;
+    right: 0;
+}
 </style>
 <i18n>
 en:

From 8b8033cb3d4e9d1d26a1df9c50a3a178c46beaed Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 23 May 2024 13:21:54 +0200
Subject: [PATCH 73/76] refs #6095 remove limit

---
 src/components/CreateManualInvoiceForm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
index 5af01c6dd..92399c20c 100644
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@@ -52,7 +52,6 @@ const onDataSaved = async (formData, requestResponse) => {
             fields: ['id', 'nickname'],
             where: { refFk: null },
             order: 'shipped DESC',
-            limit: 30,
         }"
         @on-fetch="(data) => (ticketsOptions = data)"
         auto-load

From 410012df5504a8570c24a44230a0479e7717946e Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 23 May 2024 14:24:58 +0200
Subject: [PATCH 74/76] fix: refs #7187 fix div

---
 src/pages/Worker/Card/WorkerPda.vue           | 46 ++++++++-----------
 .../integration/worker/workerPda.spec.js      | 11 +----
 2 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 8e971a02c..513edcf45 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -71,7 +71,7 @@ function reloadData() {
                     bordered
                     :key="row.id"
                     v-for="row of rows"
-                    class="card q-px-md q-mb-sm"
+                    class="card q-px-md q-mb-sm container"
                 >
                     <VnRow>
                         <VnInput
@@ -94,26 +94,23 @@ function reloadData() {
                             :model-value="row?.simSerialNumber"
                             disable
                         />
-
-                        <div class="icon">
-                            <QIcon
-                                name="delete"
-                                size="sm"
-                                color="primary"
-                                class="cursor-pointer"
-                                @click="
-                                    openConfirmationModal(
-                                        t(`Remove PDA`),
-                                        t('Do you want to remove this PDA?'),
-                                        () => deallocatePDA(row.deviceProductionFk)
-                                    )
-                                "
-                            >
-                                <QTooltip>
-                                    {{ t('worker.pda.removePDA') }}
-                                </QTooltip>
-                            </QIcon>
-                        </div>
+                        <QBtn
+                            flat
+                            icon="delete"
+                            color="primary"
+                            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>
+                        </QBtn>
                     </VnRow>
                 </QCard>
             </template>
@@ -171,12 +168,9 @@ function reloadData() {
     </QPage>
 </template>
 <style lang="scss" scoped>
-.icon {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-top: 2%;
+.btn-delete {
     max-width: 4%;
+    margin-top: 30px;
 }
 </style>
 <i18n>
diff --git a/test/cypress/integration/worker/workerPda.spec.js b/test/cypress/integration/worker/workerPda.spec.js
index e27127202..4184735ae 100644
--- a/test/cypress/integration/worker/workerPda.spec.js
+++ b/test/cypress/integration/worker/workerPda.spec.js
@@ -14,17 +14,8 @@ describe('WorkerPda', () => {
         cy.get('.q-notification__message').should('have.text', 'Data created');
     });
 
-    it('assign more than 1 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(
-            ':nth-child(1) > .q-notification__wrapper > .q-notification__content > .q-notification__message'
-        ).should('have.text', 'You can only have one PDA');
-    });
-
     it('delete pda', () => {
-        cy.get('.icon > .q-icon').click();
+        cy.get('.btn-delete').click();
         cy.get(
             '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
         ).click();

From f12c9d5a9e53cdfc2e39de1e4e687a8b84e957fb Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 24 May 2024 07:55:54 +0200
Subject: [PATCH 75/76] refactor: add flat

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

diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index 86d934e7e..be7b12534 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -63,7 +63,7 @@ onMounted(() => weekdayStore.initStore());
                 <span class="header">
                     {{ getHeaderTitle(detail.shipped) }}
                 </span>
-                <QTable :columns="columns" :rows="detail.lines" class="full-width" />
+                <QTable flat :columns="columns" :rows="detail.lines" class="full-width" />
             </div>
         </QCard>
     </QPage>

From ba5407310fce4deee6a853f433615cf6fa85aef1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 24 May 2024 13:40:00 +0200
Subject: [PATCH 76/76] refs #7396 fix summary

---
 src/i18n/locale/en.yml                    | 2 +-
 src/pages/Worker/Card/WorkerBasicData.vue | 2 +-
 src/pages/Worker/Card/WorkerSummary.vue   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 0e6edeab2..ef7fb0ae6 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -866,7 +866,7 @@ worker:
         sex: Sexo
         seniority: Antigüedad
         fi: DNI/NIE/NIF
-        birth: Cumpleaños
+        birth: Fecha de nacimiento
         isFreelance: Autónomo
         isSsDiscounted: Bonificación SS
         hasMachineryAuthorized: Autorizado para llevar maquinaria
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 4ff5c9b2f..62ca9dad9 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -201,6 +201,6 @@ es:
     isDisable: Trabajador desactivado
     fi: DNI/NIE/NIF
     sex: Sexo
-    birth: Cumpleaños
+    birth: Fecha de Nacimiento
     isSsDiscounted: Bonificación SS
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 129e0ce8c..6d6dde97b 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.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" />
@@ -113,7 +113,7 @@ const filter = {
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="workerUrl + `basic-data`"
+                    :url="`#/worker/${entityId}/basic-data`"
                     :text="t('worker.summary.basicData')"
                 />
                 <VnLv