Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation

Jenkinsfile

@@ -54,7 +54,6 @@ pipeline {
     }
     environment {
         PROJECT_NAME = 'lilium'
-        STACK_NAME   = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
         stage('Install') {
@@ -104,15 +103,18 @@ pipeline {
             when {
                 expression { PROTECTED_BRANCH }
             }
-            environment {
-                DOCKER_HOST = "${env.SWARM_HOST}"
-            }
             steps {
                 script {
                     def packageJson = readJSON file: 'package.json'
                     env.VERSION = packageJson.version
                 }
-                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
+                withKubeConfig([
+                    serverUrl: "$KUBERNETES_API",
+                    credentialsId: 'kubernetes',
+                    namespace: 'lilium'
+                ]) {
+                    sh 'kubectl set image deployment/lilium-$BRANCH_NAME lilium-$BRANCH_NAME=$REGISTRY/salix-frontend:$VERSION'
+                }
             }
         }
     }

docker-compose.yml

@@ -1,17 +1,7 @@
 version: '3.7'
 services:
   main:
-    image: registry.verdnatura.es/salix-frontend:${BRANCH_NAME:?}
+    image: registry.verdnatura.es/salix-frontend:${VERSION:?}
     build:
       context: .
       dockerfile: ./Dockerfile
-    ports:
-      - 4000
-    deploy:
-      replicas: ${FRONT_REPLICAS:?}
-      placement:
-        constraints:
-          - node.role == worker
-      resources:
-        limits:
-          memory: 1G

package.json

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

src/components/CreateManualInvoiceForm.vue

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

src/components/VnTable/VnColumn.vue

@@ -53,7 +53,9 @@ const defaultComponents = {
     date: {
         component: markRaw(VnInputDate),
         attrs: {
+            readonly: true,
             disable: !$props.isEditable,
+            style: 'min-width: 125px',
         },
     },
     checkbox: {

src/components/VnTable/VnFilter.vue

@@ -40,6 +40,7 @@ const components = {
             class: 'q-px-sm q-pb-xs q-pt-none',
             dense: true,
             filled: !$props.showTitle,
+            clearable: true,
         },
         forceAttrs: {
             label: $props.showTitle ? '' : $props.column.label,
@@ -50,7 +51,12 @@ const components = {
         event: enterEvent,
         attrs: {
             dense: true,
-            class: 'q-px-md q-pb-xs q-pt-none',
+            class: 'q-px-sm q-pb-xs q-pt-none',
+            clearable: true,
+            filled: !$props.showTitle,
+        },
+        forceAttrs: {
+            label: $props.showTitle ? '' : $props.column.label,
         },
     },
     date: {
@@ -58,7 +64,12 @@ const components = {
         event: updateEvent,
         attrs: {
             dense: true,
-            class: 'q-px-md q-pb-xs q-pt-none',
+            class: 'q-px-sm q-pb-xs q-pt-none',
+            filled: !$props.showTitle,
+            style: 'min-width: 150px',
+        },
+        forceAttrs: {
+            label: $props.showTitle ? '' : $props.column.label,
         },
     },
     checkbox: {
@@ -94,8 +105,8 @@ async function addFilter(value) {
 
     let params = { [field]: value };
     if (columnFilter.value?.inWhere) {
-        if (columnFilter.value.prefix) field = columnFilter.value.prefix + '.' + field;
-        params = { filter: { where: params } };
+        if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;
+        return await arrayData.addFilterWhere(params);
     }
     await arrayData.addFilter({ params });
 }

src/components/VnTable/VnTable.vue

@@ -130,6 +130,13 @@ function reload() {
     VnPaginateRef.value.fetch();
 }
 
+function columnName(col) {
+    const column = Object.assign({}, col, col.columnFilter);
+    let name = column.name;
+    if (column.alias) name = column.alias + '.' + name;
+    return name;
+}
+
 defineExpose({
     reload,
     redirect: redirectFn,
@@ -156,7 +163,7 @@ defineExpose({
                         :data-key="$attrs['data-key']"
                         v-for="col of splittedColumns.columns"
                         :key="col.id"
-                        v-model="params[col.columnFilter?.name ?? col.name]"
+                        v-model="params[columnName(col)]"
                     />
                 </template>
                 <slot
@@ -225,7 +232,7 @@ defineExpose({
                             :column="col"
                             :show-title="true"
                             :data-key="$attrs['data-key']"
-                            v-model="params[col.columnFilter?.name ?? col.name]"
+                            v-model="params[columnName(col)]"
                         />
                     </QTh>
                 </template>
@@ -243,7 +250,11 @@ defineExpose({
                 </template>
                 <template #body-cell="{ col, row }">
                     <!-- Columns -->
-                    <QTd class="no-margin" :class="`text-${col.align ?? 'left'}`">
+                    <QTd
+                        auto-width
+                        class="no-margin q-px-xs"
+                        :class="`text-${col.align ?? 'left'}`"
+                    >
                         <VnTableColumn
                             :column="col"
                             :row="row"
@@ -328,7 +339,11 @@ defineExpose({
                                                 <span
                                                     @click="stopEventPropagation($event)"
                                                 >
-                                                    <VnTableColumn :column="col" :row />
+                                                    <VnTableColumn
+                                                        :column="col"
+                                                        :row
+                                                        component-prop="columnField"
+                                                    />
                                                 </span>
                                             </template>
                                         </VnLv>

src/components/common/VnInputDate.vue

@@ -97,7 +97,7 @@ const styleAttrs = computed(() => {
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value"
+                    v-if="hover && value && !readonly"
                     @click="onDateUpdate(null)"
                 ></QIcon>
                 <QIcon name="event" class="cursor-pointer">

src/components/common/VnInputTime.vue

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

src/components/ui/CardSummary.vue

@@ -56,11 +56,20 @@ async function fetch() {
 }
 
 const showRedirectToSummaryIcon = computed(() => {
-    const routeExists = route.matched.some(
-        (route) => route.name === `${route.meta.moduleName}Summary`
-    );
-    return !isSummary.value && route.meta.moduleName && routeExists;
+    const exist = existSummary(route.matched);
+    return !isSummary.value && route.meta.moduleName && exist;
 });
+
+function existSummary(routes) {
+    const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`);
+    if (hasSummary) return hasSummary;
+    for (const current of routes) {
+        if (current.path != '/' && current.children) {
+            const exist = existSummary(current.children);
+            if (exist) return exist;
+        }
+    }
+}
 </script>
 
 <template>

src/components/ui/FetchedTags.vue

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

src/components/ui/QCalendarMonthWrapper.vue

@@ -59,12 +59,10 @@ const containerClasses = computed(() => {
 // Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
 .q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
     background-color: $primary !important;
-    color: white !important;
 }
 
 .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
     background-color: $primary !important;
-    color: white !important;
 }
 
 .q-calendar-month__head--weekday {
@@ -112,7 +110,6 @@ const containerClasses = computed(() => {
             cursor: pointer;
         }
     }
-
     .q-calendar-month__week--days > div:nth-child(6),
     .q-calendar-month__week--days > div:nth-child(7) {
         // Cambia el color de los días sábado y domingo
@@ -150,7 +147,7 @@ const containerClasses = computed(() => {
     .q-calendar-month__head--workweek,
     .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
         text-transform: capitalize;
-        color: #777;
+        color: var(---color-font-secondary);
         font-weight: bold;
         font-size: 0.8rem;
         text-align: center;

src/composables/useArrayData.js

@@ -150,6 +150,13 @@ export function useArrayData(key, userOptions) {
         return { filter, params };
     }
 
+    async function addFilterWhere(where) {
+        const storedFilter = { ...store.userFilter };
+        if (!storedFilter?.where) storedFilter.where = {};
+        where = { ...storedFilter.where, ...where };
+        await addFilter({ filter: { where } });
+    }
+
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
@@ -188,7 +195,12 @@ export function useArrayData(key, userOptions) {
         if (store.limit) query.limit = store.limit;
         if (store.skip) query.skip = store.skip;
         if (store.userParams && Object.keys(store.userParams).length !== 0)
-            query.params = JSON.stringify(store.userParams);
+            query.params = store.userParams;
+        if (store.userFilter && Object.keys(store.userFilter).length !== 0) {
+            if (!query.params) query.params = {};
+            query.params.filter = store.userFilter;
+        }
+        if (query.params) query.params = JSON.stringify(query.params);
 
         router.replace({
             path: route.path,
@@ -203,6 +215,7 @@ export function useArrayData(key, userOptions) {
         fetch,
         applyFilter,
         addFilter,
+        addFilterWhere,
         refresh,
         destroy,
         loadMore,

src/css/app.scss

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

src/css/quasar.variables.scss

@@ -32,7 +32,7 @@ $primary-light: #f5b351;
 $dark-shadow-color: black;
 $layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
 $spacing-md: 16px;
-
+$color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }

src/filters/dateRange.js

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

src/i18n/locale/en.yml

@@ -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

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"
@@ -259,13 +320,13 @@ function exprBuilder(param, value) {
                     <QTable
                         :columns="columns"
                         :rows="rows"
-                        class="full-width q-mt-md"
+                        class="full-width"
                         row-key="clientFk"
                         selection="multiple"
                         v-model:selected="selected"
                     >
                         <template #header="props">
-                            <QTr :props="props" class="bg">
+                            <QTr :props="props" class="bg" style="min-height: 200px">
                                 <QTh>
                                     <QCheckbox v-model="props.selected" />
                                 </QTh>
@@ -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'
@@ -311,8 +372,9 @@ function exprBuilder(param, value) {
                                                 <VnInput
                                                     type="textarea"
                                                     v-model="props.value"
-                                                    autogrow
-                                                    :disable="true"
+                                                    readonly
+                                                    dense
+                                                    rows="2"
                                                 />
                                             </div>
                                             <div v-else>{{ props.value }}</div>
@@ -354,6 +416,7 @@ es:
     Client: Cliente
     Is worker: Es trabajador
     Salesperson: Comercial
+    Department: Departamento
     Country: País
     P. Method: F. Pago
     Pay method: Forma de pago

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

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

src/pages/Customer/ExtendedList/CustomerExtendedList.vue

@@ -75,6 +75,7 @@ const columns = computed(() => [
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.credit'),
         name: 'credit',
+        component: 'number',
         columnFilter: {
             inWhere: true,
         },
@@ -83,6 +84,7 @@ const columns = computed(() => [
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
         name: 'creditInsurance',
+        component: 'number',
         columnFilter: {
             inWhere: true,
         },
@@ -98,6 +100,10 @@ const columns = computed(() => [
                 'phone-number': prop.phone,
             }),
         },
+        component: 'number',
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
@@ -105,6 +111,7 @@ const columns = computed(() => [
         name: 'mobile',
         cardVisible: true,
         columnFilter: {
+            component: 'number',
             inWhere: true,
         },
     },
@@ -113,6 +120,9 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.street'),
         name: 'street',
         create: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -121,7 +131,7 @@ const columns = computed(() => [
         columnFilter: {
             component: 'select',
             inWhere: true,
-            prefix: 'c',
+            alias: 'c',
             attrs: {
                 url: 'Countries',
             },
@@ -162,6 +172,11 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.created'),
         name: 'created',
         format: ({ created }) => toDate(created),
+        component: 'date',
+        columnFilter: {
+            alias: 'c',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -183,16 +198,44 @@ const columns = computed(() => [
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
         name: 'payMethodFk',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'PayMethods',
+            },
+            inWhere: true,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.payMethod),
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
         name: 'sageTaxTypeFk',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                optionLabel: 'vat',
+                url: 'SageTaxTypes',
+            },
+            alias: 'sti',
+            inWhere: true,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.sageTaxType),
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
         name: 'sageTransactionTypeFk',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                optionLabel: 'transaction',
+                url: 'SageTransactionTypes',
+            },
+            alias: 'stt',
+            inWhere: true,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.sageTransactionType),
     },
     {
         align: 'left',
@@ -203,22 +246,34 @@ const columns = computed(() => [
             condition: (value) => !value,
             icon: 'vn:disabled',
         },
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.isVies'),
         name: 'isVies',
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
         name: 'isTaxDataChecked',
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
         name: 'isEqualizated',
         created: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -229,36 +284,57 @@ const columns = computed(() => [
             condition: (value) => value,
             icon: 'vn:frozen',
         },
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
         name: 'hasToInvoice',
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
         name: 'hasToInvoiceByAddress',
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
         name: 'isToBeMailed',
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
         name: 'hasLcr',
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
         name: 'hasCoreVnl',
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
         name: 'hasSepaVnl',
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'right',

src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue

@@ -1,60 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import CustomerSummary from '../Card/CustomerSummary.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
-const { t } = useI18n();
-const router = useRouter();
-const { viewSummary } = useSummaryDialog();
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: true,
-    },
-});
-
-const redirectToCreateView = () => {
-    router.push({
-        name: 'TicketList',
-        query: {
-            params: JSON.stringify({
-                clientFk: $props.id,
-            }),
-        },
-    });
-};
-</script>
-
-<template>
-    <div>
-        <QIcon
-            @click.stop="redirectToCreateView"
-            color="primary"
-            name="vn:ticket"
-            size="sm"
-        >
-            <QTooltip>
-                {{ t('Client ticket list') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            @click.stop="viewSummary($props.id, CustomerSummary)"
-            class="q-ml-md"
-            color="primary"
-            name="preview"
-            size="sm"
-        >
-            <QTooltip>
-                {{ t('Preview') }}
-            </QTooltip>
-        </QIcon>
-    </div>
-</template>
-
-<i18n>
-es:
-    Client ticket list: Listado de tickets del cliente
-    Preview: Vista previa
-</i18n>

src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue

@@ -1,571 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import { dateRange } from 'src/filters';
-
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-    visibleColumns: {
-        type: Array,
-        required: true,
-    },
-});
-
-const { t } = useI18n();
-
-const clients = ref();
-const workers = ref();
-const countriesOptions = ref([]);
-const provincesOptions = ref([]);
-const paymethodsOptions = ref([]);
-const businessTypesOptions = ref([]);
-const sageTaxTypesOptions = ref([]);
-const sageTransactionTypesOptions = ref([]);
-
-const visibleColumnsSet = computed(() => new Set(props.visibleColumns));
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'created':
-            return {
-                'c.created': {
-                    between: dateRange(value),
-                },
-            };
-        case 'id':
-        case 'name':
-        case 'socialName':
-        case 'fi':
-        case 'credit':
-        case 'creditInsurance':
-        case 'phone':
-        case 'mobile':
-        case 'street':
-        case 'city':
-        case 'postcode':
-        case 'email':
-        case 'isActive':
-        case 'isVies':
-        case 'isTaxDataChecked':
-        case 'isEqualizated':
-        case 'isFreezed':
-        case 'hasToInvoice':
-        case 'hasToInvoiceByAddress':
-        case 'isToBeMailed':
-        case 'hasSepaVnl':
-        case 'hasLcr':
-        case 'hasCoreVnl':
-        case 'countryFk':
-        case 'provinceFk':
-        case 'salesPersonFk':
-        case 'businessTypeFk':
-        case 'payMethodFk':
-        case 'sageTaxTypeFk':
-        case 'sageTransactionTypeFk':
-            return { [`c.${param}`]: value };
-    }
-};
-
-const shouldRenderColumn = (colName) => {
-    return visibleColumnsSet.value.has(colName);
-};
-</script>
-
-<template>
-    <FetchData
-        url="Clients"
-        :filter="{ where: { role: 'socialName' } }"
-        @on-fetch="(data) => (clients = data)"
-        auto-load
-    />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <FetchData
-        url="Countries"
-        :filter="{ fields: ['id', 'country'], order: 'country ASC' }"
-        @on-fetch="(data) => (countriesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        ref="provincesFetchDataRef"
-        @on-fetch="(data) => (provincesOptions = data)"
-        auto-load
-        url="Provinces"
-    />
-    <FetchData
-        url="Paymethods"
-        @on-fetch="(data) => (paymethodsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="BusinessTypes"
-        @on-fetch="(data) => (businessTypesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="SageTaxTypes"
-        auto-load
-        @on-fetch="(data) => (sageTaxTypesOptions = data)"
-    />
-    <FetchData
-        url="sageTransactionTypes"
-        auto-load
-        @on-fetch="(data) => (sageTransactionTypesOptions = data)"
-    />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        :expr-builder="exprBuilder"
-    >
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong
-                    >{{ t(`customer.extendedList.tableVisibleColumns.${tag.label}`) }}:
-                </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params, searchFn }">
-            <QItem v-if="shouldRenderColumn('id')">
-                <QItemSection>
-                    <VnInput
-                        :label="t('customer.extendedList.tableVisibleColumns.id')"
-                        v-model="params.id"
-                        is-outlined
-                        clearable
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('name')">
-                <QItemSection>
-                    <VnInput
-                        :label="t('customer.extendedList.tableVisibleColumns.name')"
-                        v-model="params.name"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <!-- <QItem class="q-mb-sm">
-                    <QItemSection v-if="!clients">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="clients">
-                        <VnSelect
-                            :label="t('Social name')"
-                            v-model="params.socialName"
-                            @update:model-value="searchFn()"
-                            :options="clients"
-                            option-value="socialName"
-                            option-label="socialName"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem> -->
-            <QItem v-if="shouldRenderColumn('fi')">
-                <QItemSection>
-                    <VnInput
-                        :label="t('customer.extendedList.tableVisibleColumns.fi')"
-                        v-model="params.fi"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('salesPersonFk')">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <VnSelect
-                        :label="
-                            t('customer.extendedList.tableVisibleColumns.salesPersonFk')
-                        "
-                        v-model="params.salesPersonFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('credit')">
-                <QItemSection>
-                    <VnInput
-                        :label="t('customer.extendedList.tableVisibleColumns.credit')"
-                        v-model="params.credit"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('creditInsurance')">
-                <QItemSection>
-                    <VnInput
-                        :label="
-                            t('customer.extendedList.tableVisibleColumns.creditInsurance')
-                        "
-                        v-model="params.creditInsurance"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('phone')">
-                <QItemSection>
-                    <VnInput
-                        :label="t('customer.extendedList.tableVisibleColumns.phone')"
-                        v-model="params.phone"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('mobile')">
-                <QItemSection>
-                    <VnInput
-                        :label="t('customer.extendedList.tableVisibleColumns.mobile')"
-                        v-model="params.mobile"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('street')">
-                <QItemSection>
-                    <VnInput
-                        :label="t('customer.extendedList.tableVisibleColumns.street')"
-                        v-model="params.street"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('countryFk')">
-                <QItemSection>
-                    <VnSelect
-                        :label="t('customer.extendedList.tableVisibleColumns.countryFk')"
-                        v-model="params.countryFk"
-                        @update:model-value="searchFn()"
-                        :options="countriesOptions"
-                        option-value="id"
-                        option-label="country"
-                        map-options
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('provinceFk')">
-                <QItemSection>
-                    <VnSelect
-                        :label="t('customer.extendedList.tableVisibleColumns.provinceFk')"
-                        v-model="params.provinceFk"
-                        @update:model-value="searchFn()"
-                        :options="provincesOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('city')">
-                <QItemSection>
-                    <VnInput
-                        :label="t('customer.extendedList.tableVisibleColumns.city')"
-                        v-model="params.city"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('postcode')">
-                <QItemSection>
-                    <VnInput
-                        :label="t('customer.extendedList.tableVisibleColumns.postcode')"
-                        v-model="params.postcode"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('email')">
-                <QItemSection>
-                    <VnInput
-                        :label="t('customer.extendedList.tableVisibleColumns.email')"
-                        v-model="params.email"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QItem v-if="shouldRenderColumn('created')">
-                <QItemSection>
-                    <VnInputDate
-                        v-model="params.created"
-                        :label="t('customer.extendedList.tableVisibleColumns.created')"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('businessTypeFk')">
-                <QItemSection>
-                    <VnSelect
-                        :label="
-                            t('customer.extendedList.tableVisibleColumns.businessTypeFk')
-                        "
-                        v-model="params.businessTypeFk"
-                        :options="businessTypesOptions"
-                        @update:model-value="searchFn()"
-                        option-value="code"
-                        option-label="description"
-                        map-options
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('payMethodFk')">
-                <QItemSection>
-                    <VnSelect
-                        :label="
-                            t('customer.extendedList.tableVisibleColumns.payMethodFk')
-                        "
-                        v-model="params.payMethodFk"
-                        :options="paymethodsOptions"
-                        @update:model-value="searchFn()"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('sageTaxTypeFk')">
-                <QItemSection>
-                    <VnSelect
-                        :label="
-                            t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk')
-                        "
-                        v-model="params.sageTaxTypeFk"
-                        @update:model-value="searchFn()"
-                        :options="sageTaxTypesOptions"
-                        option-value="id"
-                        option-label="vat"
-                        map-options
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('sageTransactionTypeFk')">
-                <QItemSection>
-                    <VnSelect
-                        :label="
-                            t(
-                                'customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'
-                            )
-                        "
-                        v-model="params.sageTransactionTypeFk"
-                        @update:model-value="searchFn()"
-                        :options="sageTransactionTypesOptions"
-                        option-value="id"
-                        option-label="transaction"
-                        map-options
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('isActive') || shouldRenderColumn('isVies')">
-                <QItemSection v-if="shouldRenderColumn('isActive')">
-                    <QCheckbox
-                        v-model="params.isActive"
-                        @update:model-value="searchFn()"
-                        :label="t('customer.extendedList.tableVisibleColumns.isActive')"
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-                <QItemSection v-if="shouldRenderColumn('isVies')">
-                    <QCheckbox
-                        v-model="params.isVies"
-                        @update:model-value="searchFn()"
-                        :label="t('customer.extendedList.tableVisibleColumns.isVies')"
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-if="
-                    shouldRenderColumn('isEqualizated') ||
-                    shouldRenderColumn('isTaxDataChecked')
-                "
-            >
-                <QItemSection v-if="shouldRenderColumn('isTaxDataChecked')">
-                    <QCheckbox
-                        v-model="params.isTaxDataChecked"
-                        @update:model-value="searchFn()"
-                        :label="
-                            t(
-                                'customer.extendedList.tableVisibleColumns.isTaxDataChecked'
-                            )
-                        "
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-                <QItemSection v-if="shouldRenderColumn('isEqualizated')">
-                    <QCheckbox
-                        v-model="params.isEqualizated"
-                        @update:model-value="searchFn()"
-                        :label="
-                            t('customer.extendedList.tableVisibleColumns.isEqualizated')
-                        "
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-if="
-                    shouldRenderColumn('hasToInvoice') || shouldRenderColumn('isFreezed')
-                "
-            >
-                <QItemSection v-if="shouldRenderColumn('isFreezed')">
-                    <QCheckbox
-                        v-model="params.isFreezed"
-                        @update:model-value="searchFn()"
-                        :label="t('customer.extendedList.tableVisibleColumns.isFreezed')"
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-                <QItemSection v-if="shouldRenderColumn('hasToInvoice')">
-                    <QCheckbox
-                        v-model="params.hasToInvoice"
-                        @update:model-value="searchFn()"
-                        :label="
-                            t('customer.extendedList.tableVisibleColumns.hasToInvoice')
-                        "
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-if="
-                    shouldRenderColumn('isToBeMailed') ||
-                    shouldRenderColumn('hasToInvoiceByAddress')
-                "
-            >
-                <QItemSection v-if="shouldRenderColumn('hasToInvoiceByAddress')">
-                    <QCheckbox
-                        v-model="params.hasToInvoiceByAddress"
-                        @update:model-value="searchFn()"
-                        :label="
-                            t(
-                                'customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'
-                            )
-                        "
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-                <QItemSection v-if="shouldRenderColumn('isToBeMailed')">
-                    <QCheckbox
-                        v-model="params.isToBeMailed"
-                        @update:model-value="searchFn()"
-                        :label="
-                            t('customer.extendedList.tableVisibleColumns.isToBeMailed')
-                        "
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-if="shouldRenderColumn('hasLcr') || shouldRenderColumn('hasCoreVnl')"
-            >
-                <QItemSection v-if="shouldRenderColumn('hasLcr')">
-                    <QCheckbox
-                        v-model="params.hasLcr"
-                        @update:model-value="searchFn()"
-                        :label="t('customer.extendedList.tableVisibleColumns.hasLcr')"
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-                <QItemSection v-if="shouldRenderColumn('hasCoreVnl')">
-                    <QCheckbox
-                        v-model="params.hasCoreVnl"
-                        @update:model-value="searchFn()"
-                        :label="t('customer.extendedList.tableVisibleColumns.hasCoreVnl')"
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem v-if="shouldRenderColumn('hasSepaVnl')">
-                <QItemSection>
-                    <QCheckbox
-                        v-model="params.hasSepaVnl"
-                        @update:model-value="searchFn()"
-                        :label="t('customer.extendedList.tableVisibleColumns.hasSepaVnl')"
-                        toggle-indeterminate
-                        :false-value="undefined"
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QSeparator />
-        </template>
-    </VnFilterPanel>
-</template>
-
-<i18n>
-es:
-    Social name: Razón social
-</i18n>

src/pages/Entry/Card/EntryBuys.vue

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

src/pages/Entry/Card/EntrySummary.vue

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

src/pages/Entry/EntryLatestBuys.vue

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

src/pages/Item/ItemFixedPrice.vue

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

src/pages/Item/ItemList.vue

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

src/pages/Item/locale/en.yml

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

src/pages/Item/locale/es.yml

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

src/pages/Order/Card/OrderSummary.vue

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

src/pages/Order/OrderLines.vue

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

src/pages/Order/OrderVolume.vue

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

src/pages/Route/Card/RouteForm.vue

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

src/pages/Route/RouteList.vue

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

src/pages/Route/RouteMain.vue

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

src/pages/Route/RouteTickets.vue

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

src/pages/Supplier/Card/SupplierConsumption.vue

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

src/pages/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>

src/pages/Worker/Card/WorkerCalendar.vue

@@ -82,6 +82,7 @@ const onFetchAbsences = (data) => {
                 type: type.code,
                 absenceId: absence.id,
                 isFestive: false,
+                isHoliday: false,
             });
         });
     }

src/pages/Worker/Card/WorkerCalendarItem.vue

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

src/pages/Worker/Card/WorkerPda.vue

@@ -71,66 +71,47 @@ 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 container"
                 >
-                    <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>
-                            <QIcon
-                                name="delete"
-                                size="sm"
-                                class="cursor-pointer"
-                                color="primary"
-                                @click="
-                                    openConfirmationModal(
-                                        t(`Remove PDA`),
-                                        t('Do you want to remove this PDA?'),
-                                        () => deallocatePDA(row.deviceProductionFk)
-                                    )
-                                "
-                            >
-                                <QTooltip>
-                                    {{ t('worker.pda.removePDA') }}
-                                </QTooltip>
-                            </QIcon>
-                        </QItemSection>
-                    </QItem>
+                    <VnRow>
+                        <VnInput
+                            :label="t('worker.pda.currentPDA')"
+                            :model-value="row?.deviceProductionFk"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Model')"
+                            :model-value="row?.deviceProduction?.modelFk"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Serial number')"
+                            :model-value="row?.deviceProduction?.serialNumber"
+                            disable
+                        />
+                        <VnInput
+                            :label="t('Current SIM')"
+                            :model-value="row?.simSerialNumber"
+                            disable
+                        />
+                        <QBtn
+                            flat
+                            icon="delete"
+                            color="primary"
+                            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>
         </VnPaginate>
@@ -187,26 +168,20 @@ 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;
+.btn-delete {
+    max-width: 4%;
+    margin-top: 30px;
 }
 </style>
 <i18n>
 es:
+    Model: Modelo
+    Serial number: Número de serie
+    Current SIM: SIM actual
+    Add new device: Añadir nuevo dispositivo
+    PDA deallocated: PDA desasignada
     Remove PDA: Eliminar PDA
     Do you want to remove this PDA?: ¿Desea eliminar este PDA?
-    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>

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

src/pages/Zone/Card/ZoneCard.vue

@@ -35,7 +35,7 @@ const searchBarDataKeys = {
         base-url="Zones"
         :descriptor="ZoneDescriptor"
         searchbar-data-key="ZoneList"
-        searchbar-url="Zones/filter"
+        searchbar-url="Zones"
         searchbar-label="Search zones"
         searchbar-info="You can search by zone reference"
     />

src/pages/Zone/ZoneList.vue

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

src/pages/Zone/ZoneMain.vue

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

src/pages/Zone/ZoneUpcoming.vue

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

src/pages/Zone/locale/en.yml

@@ -5,7 +5,7 @@ zone:
         zoneCreate: Create zone
         locations: Locations
         deliveryDays: Delivery days
-        upcomingList: Upcoming deliveries
+        upcomingDeliveries: Upcoming deliveries
         warehouses: Warehouses
 list:
     clone: Clone
@@ -64,3 +64,7 @@ warehouses:
     deleteSubtitle: Are you sure you want to continue?
     warehouse: Warehouse
     add: Add
+upcomingDeliveries:
+    province: Province
+    closing: Closing
+    id: Id

src/pages/Zone/locale/es.yml

@@ -5,7 +5,7 @@ zone:
         zoneCreate: Nueva zona
         locations: Localizaciones
         deliveryDays: Días de entrega
-        upcomingList: Próximos repartos
+        upcomingDeliveries: Próximos repartos
         warehouses: Almacenes
 list:
     clone: Clonar
@@ -66,3 +66,7 @@ warehouses:
     deleteSubtitle: ¿Seguro que quieres continuar?
     warehouse: Almacén
     add: Añadir
+upcomingDeliveries:
+    province: Provincia
+    closing: Cierre
+    id: Id

src/router/modules/zone.js

@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ZoneMain' },
     menus: {
-        main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingList'],
+        main: ['ZoneList', 'ZoneDeliveryDays', 'ZoneUpcomingDeliveries'],
         card: ['ZoneBasicData', 'ZoneWarehouses', 'ZoneHistory', 'ZoneLocations'],
     },
     children: [
@@ -57,6 +57,24 @@ 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'),
+                // },
+                {
+                    name: 'ZoneUpcomingDeliveries',
+                    path: 'upcoming-deliveries',
+                    meta: {
+                        title: 'upcomingDeliveries',
+                        icon: 'vn:calendar',
+                    },
+                    component: () => import('src/pages/Zone/ZoneUpcoming.vue'),
+                },
             ],
         },
         {

test/cypress/integration/VnLocation.spec.js

@@ -39,7 +39,7 @@ describe('VnLocation', () => {
         });
         it('Create postCode', function () {
             cy.get(
-                ':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+                ':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon'
             ).click();
             cy.get('.q-card > h1').should('have.text', 'New postcode');
             cy.get(dialogInputs).eq(0).clear('12');

test/cypress/integration/claim/claimPhoto.spec.js

@@ -21,8 +21,7 @@ describe('ClaimPhoto', () => {
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
 
-    /* it.skip('should open first image dialog change to second and close', () => {
-        skiped fix on https://redmine.verdnatura.es/issues/7113
+    it('should open first image dialog change to second and close', () => {
         cy.get(
             ':nth-child(1) > .q-card > .q-img > .q-img__container > .q-img__image'
         ).click();
@@ -38,19 +37,23 @@ describe('ClaimPhoto', () => {
         cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
             'not.be.visible'
         );
-    }); */
+    });
 
     it('should remove third and fourth file', () => {
         cy.get(
             '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+        cy.get(
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+        ).click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
 
         cy.get(
             '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
+        cy.get(
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+        ).click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
     });
 });

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

@@ -20,6 +20,6 @@ describe('WorkerList', () => {
             .eq(0)
             .invoke('text')
             .should('include', 'Basic data');
-        cy.get('.summary .header-link').eq(1).should('have.text', 'User data ');
+        cy.get('.summary .header-link').eq(2).should('have.text', 'User data ');
     });
 });

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

@@ -15,7 +15,7 @@ describe('WorkerPda', () => {
     });
 
     it('delete pda', () => {
-        cy.get('.q-card > .q-item > .q-item__section--side > .q-icon').click();
+        cy.get('.btn-delete').click();
         cy.get(
             '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
         ).click();