Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx

src/components/CreateBankEntityForm.vue

@@ -21,7 +21,7 @@ const customer = computed(() => state.get('customer'));
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: customer.value.countryFk,
+    countryFk: customer.value?.countryFk,
     id: null,
 });
 

src/components/CreateNewCityForm.vue

@@ -1,35 +1,42 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectProvince from 'components/VnSelectProvince.vue';
 import VnInput from 'components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const { t } = useI18n();
 
-const cityFormData = reactive({
+const cityFormData = ref({
     name: null,
     provinceFk: null,
 });
-
-const provincesOptions = ref([]);
-
+onMounted(() => {
+    cityFormData.value.provinceFk = $props.provinceSelected;
+});
 const onDataSaved = (...args) => {
     emit('onDataSaved', ...args);
 };
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (provincesOptions = data)"
-        auto-load
-        url="Provinces"
-    />
     <FormModelPopup
         :title="t('New city')"
         :subtitle="t('Please, ensure you put the correct data!')"
@@ -41,11 +48,16 @@ const onDataSaved = (...args) => {
         <template #form-inputs="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('Name')"
+                    :label="t('Names')"
                     v-model="data.name"
                     :rules="validate('city.name')"
                 />
-                <VnSelectProvince v-model="data.provinceFk" />
+                <VnSelectProvince
+                    :province-selected="$props.provinceSelected"
+                    :country-fk="$props.countryFk"
+                    v-model="data.provinceFk"
+                    :provinces="$props.provinces"
+                />
             </VnRow>
         </template>
     </FormModelPopup>

src/components/CreateNewPostcodeForm.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { reactive, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
@@ -22,9 +22,11 @@ const postcodeFormData = reactive({
     townFk: null,
 });
 
+const townsFetchDataRef = ref(null);
 const provincesFetchDataRef = ref(null);
 const countriesOptions = ref([]);
 const provincesOptions = ref([]);
+const townsOptions = ref([]);
 const town = ref({});
 
 function onDataSaved(formData) {
@@ -61,26 +63,78 @@ function setTown(newTown, data) {
 }
 
 async function setProvince(id, data) {
-    await provincesFetchDataRef.value.fetch();
     const newProvince = provincesOptions.value.find((province) => province.id == id);
     if (!newProvince) return;
 
     data.countryFk = newProvince.countryFk;
 }
+
+async function onProvinceCreated(data) {
+    await provincesFetchDataRef.value.fetch({
+        where: { countryFk: postcodeFormData.countryFk },
+    });
+    postcodeFormData.provinceFk.value = data.id;
+}
+
+watch(
+    () => [postcodeFormData.countryFk],
+    async (newCountryFk, oldValueFk) => {
+        if (!!oldValueFk[0] && newCountryFk[0] !== oldValueFk[0]) {
+            postcodeFormData.provinceFk = null;
+            postcodeFormData.townFk = null;
+        }
+        if ((newCountryFk, newCountryFk !== postcodeFormData.countryFk)) {
+            await provincesFetchDataRef.value.fetch({
+                where: {
+                    countryFk: newCountryFk[0],
+                },
+            });
+            await townsFetchDataRef.value.fetch({
+                where: {
+                    provinceFk: {
+                        inq: provincesOptions.value.map(({ id }) => id),
+                    },
+                },
+            });
+        }
+    }
+);
+
+watch(
+    () => postcodeFormData.provinceFk,
+    async (newProvinceFk) => {
+        if (newProvinceFk[0] && newProvinceFk[0] !== postcodeFormData.provinceFk) {
+            await townsFetchDataRef.value.fetch({
+                where: { provinceFk: newProvinceFk[0] },
+            });
+        }
+    }
+);
+async function handleProvinces(data) {
+    provincesOptions.value = data;
+}
+async function handleTowns(data) {
+    townsOptions.value = data;
+}
+async function handleCountries(data) {
+    countriesOptions.value = data;
+}
 </script>
 
 <template>
     <FetchData
         ref="provincesFetchDataRef"
-        @on-fetch="(data) => (provincesOptions = data)"
+        @on-fetch="handleProvinces"
         auto-load
         url="Provinces/location"
     />
     <FetchData
-        @on-fetch="(data) => (countriesOptions = data)"
+        ref="townsFetchDataRef"
+        @on-fetch="handleTowns"
         auto-load
-        url="Countries"
+        url="Towns/location"
     />
+    <FetchData @on-fetch="handleCountries" auto-load url="Countries" />
     <FormModelPopup
         url-create="postcodes"
         model="postcode"
@@ -96,18 +150,20 @@ async function setProvince(id, data) {
                     :label="t('Postcode')"
                     v-model="data.code"
                     :rules="validate('postcode.code')"
+                    clearable
                 />
                 <VnSelectDialog
                     :label="t('City')"
-                    url="Towns/location"
                     @update:model-value="(value) => setTown(value, data)"
+                    :tooltip="t('Create city')"
                     v-model="data.townFk"
+                    :options="townsOptions"
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
-                    clearable
+                    :clearable="true"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -122,6 +178,9 @@ async function setProvince(id, data) {
                     </template>
                     <template #form>
                         <CreateNewCityForm
+                            :country-fk="data.countryFk"
+                            :province-selected="data.provinceFk"
+                            :provinces="provincesOptions"
                             @on-data-saved="
                                 (_, requestResponse) =>
                                     onCityCreated(requestResponse, data)
@@ -132,8 +191,13 @@ async function setProvince(id, data) {
             </VnRow>
             <VnRow>
                 <VnSelectProvince
+                    :country-fk="data.countryFk"
+                    :province-selected="data.provinceFk"
                     @update:model-value="(value) => setProvince(value, data)"
                     v-model="data.provinceFk"
+                    :clearable="true"
+                    :provinces="provincesOptions"
+                    @on-province-created="onProvinceCreated"
                 />
                 <VnSelect
                     :label="t('Country')"
@@ -152,6 +216,7 @@ async function setProvince(id, data) {
 <i18n>
 es:
     New postcode: Nuevo código postal
+    Create city: Crear población
     Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
     City: Población
     Province: Provincia

src/components/CreateNewProvinceForm.vue

@@ -16,7 +16,16 @@ const provinceFormData = reactive({
     name: null,
     autonomyFk: null,
 });
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const autonomiesOptions = ref([]);
 
 const onDataSaved = (dataSaved, requestResponse) => {
@@ -31,6 +40,11 @@ const onDataSaved = (dataSaved, requestResponse) => {
     <FetchData
         @on-fetch="(data) => (autonomiesOptions = data)"
         auto-load
+        :filter="{
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
         url="Autonomies/location"
     />
     <FormModelPopup

src/components/CreateThermographForm.vue

@@ -50,7 +50,7 @@ const onDataSaved = (dataSaved) => {
         model="thermograph"
         :title="t('New thermograph')"
         :form-initial-data="thermographFormData"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="(_, response) => onDataSaved(response)"
     >
         <template #form-inputs="{ data, validate }">
             <VnRow>

src/components/LeftMenuItem.vue

@@ -44,7 +44,6 @@ const itemComputed = computed(() => {
         </QItemSection>
     </QItem>
 </template>
-
 <style lang="scss" scoped>
 .q-item {
     min-height: 5vh;

src/components/RefundInvoiceForm.vue

@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

src/components/UserPanel.vue

@@ -13,12 +13,14 @@ import FetchData from 'components/FetchData.vue';
 import { useClipboard } from 'src/composables/useClipboard';
 import { useRole } from 'src/composables/useRole';
 import VnAvatar from './ui/VnAvatar.vue';
+import useNotify from 'src/composables/useNotify';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
 const { copyText } = useClipboard();
+const { notify } = useNotify();
 
 const userLocale = computed({
     get() {
@@ -53,6 +55,7 @@ const user = state.getUser();
 const warehousesData = ref();
 const companiesData = ref();
 const accountBankData = ref();
+const isEmployee = computed(() => useRole().isEmployee());
 
 onMounted(async () => {
     updatePreferences();
@@ -70,18 +73,28 @@ function updatePreferences() {
 
 async function saveDarkMode(value) {
     const query = `/UserConfigs/${user.value.id}`;
-    await axios.patch(query, {
-        darkMode: value,
-    });
-    user.value.darkMode = value;
+    try {
+        await axios.patch(query, {
+            darkMode: value,
+        });
+        user.value.darkMode = value;
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
 }
 
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
-    await axios.patch(query, {
-        lang: value,
-    });
-    user.value.lang = value;
+    try {
+        await axios.patch(query, {
+            lang: value,
+        });
+        user.value.lang = value;
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
 }
 
 function logout() {
@@ -97,11 +110,23 @@ function localUserData() {
     state.setUser(user.value);
 }
 
-function saveUserData(param, value) {
-    axios.post('UserConfigs/setUserConfig', { [param]: value });
-    localUserData();
+async function saveUserData(param, value) {
+    try {
+        await axios.post('UserConfigs/setUserConfig', { [param]: value });
+        localUserData();
+        onDataSaved();
+    } catch (error) {
+        onDataError();
+    }
 }
-const isEmployee = computed(() => useRole().isEmployee());
+
+const onDataSaved = () => {
+    notify('globals.dataSaved', 'positive');
+};
+
+const onDataError = () => {
+    notify('errors.updateUserConfig', 'negative');
+};
 </script>
 
 <template>

src/components/VnSelectProvince.vue

@@ -8,33 +8,55 @@ import FetchData from 'components/FetchData.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 
 const emit = defineEmits(['onProvinceCreated']);
-const provinceFk = defineModel({ type: Number });
-watch(provinceFk, async () => await provincesFetchDataRef.value.fetch());
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
+const provinceFk = defineModel({ type: Number, default: null });
 
 const { validate } = useValidator();
 const { t } = useI18n();
 
-const provincesOptions = ref();
+const provincesOptions = ref($props.provinces);
+provinceFk.value = $props.provinceSelected;
 const provincesFetchDataRef = ref();
 
 async function onProvinceCreated(_, data) {
-    await provincesFetchDataRef.value.fetch();
+    await provincesFetchDataRef.value.fetch({ where: { countryFk: $props.countryFk } });
     provinceFk.value = data.id;
     emit('onProvinceCreated', data);
 }
+async function handleProvinces(data) {
+    provincesOptions.value = data;
+}
 </script>
 
 <template>
     <FetchData
         ref="provincesFetchDataRef"
-        :filter="{ include: { relation: 'country' } }"
-        @on-fetch="(data) => (provincesOptions = data)"
-        auto-load
+        :filter="{
+            include: { relation: 'country' },
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
+        @on-fetch="handleProvinces"
         url="Provinces"
     />
     <VnSelectDialog
         :label="t('Province')"
-        :options="provincesOptions"
+        :options="$props.provinces"
+        :tooltip="t('Create province')"
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
@@ -49,11 +71,15 @@ async function onProvinceCreated(_, data) {
             </QItem>
         </template>
         <template #form>
-            <CreateNewProvinceForm @on-data-saved="onProvinceCreated" />
+            <CreateNewProvinceForm
+                :country-fk="$props.countryFk"
+                @on-data-saved="onProvinceCreated"
+            />
         </template>
     </VnSelectDialog>
 </template>
 <i18n>
     es:
         Province: Provincia
+        Create province: Crear provincia
 </i18n>

src/components/VnTable/VnFilter.vue

@@ -10,8 +10,6 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 
-defineExpose({ addFilter });
-
 const $props = defineProps({
     column: {
         type: Object,
@@ -30,6 +28,9 @@ const $props = defineProps({
         default: 'params',
     },
 });
+
+defineExpose({ addFilter, props: $props });
+
 const model = defineModel(undefined, { required: true });
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
 const columnFilter = computed(() => $props.column?.columnFilter);
@@ -115,11 +116,11 @@ const components = {
     rawSelect: selectComponent,
 };
 
-async function addFilter(value) {
+async function addFilter(value, name) {
     value ??= undefined;
     if (value && typeof value === 'object') value = model.value;
     value = value === '' ? undefined : value;
-    let field = columnFilter.value?.name ?? $props.column.name;
+    let field = columnFilter.value?.name ?? $props.column.name ?? name;
 
     if (columnFilter.value?.inWhere) {
         if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;

src/components/VnTable/VnTable.vue

@@ -10,7 +10,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
 
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
-import VnTableFilter from 'components/VnTable/VnFilter.vue';
+import VnFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
@@ -73,7 +73,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-
     hasSubToolbar: {
         type: Boolean,
         default: null,
@@ -102,6 +101,10 @@ const $props = defineProps({
         type: String,
         default: '90vh',
     },
+    chipLocale: {
+        type: String,
+        default: null,
+    },
     footer: {
         type: Boolean,
         default: false,
@@ -130,6 +133,7 @@ const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
+const tableFilterRef = ref([]);
 
 const tableModes = [
     {
@@ -232,7 +236,7 @@ function splitColumns(columns) {
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
         if ($props.useModel && col.columnFilter != false)
-            col.columnFilter = { ...col.columnFilter, inWhere: true };
+            col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
     // Status column
@@ -313,8 +317,8 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved(this);
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
 </script>
@@ -334,6 +338,13 @@ function handleOnDataSaved(_) {
                 :search-url="searchUrl"
                 :redirect="!!redirect"
                 @set-user-params="setUserParams"
+                :disable-submit-event="true"
+                @remove="
+                    (key) =>
+                        tableFilterRef
+                            .find((f) => f.props?.column.name == key)
+                            ?.addFilter()
+                "
             >
                 <template #body>
                     <div
@@ -343,7 +354,8 @@ function handleOnDataSaved(_) {
                         )"
                         :key="col.id"
                     >
-                        <VnTableFilter
+                        <VnFilter
+                            ref="tableFilterRef"
                             :column="col"
                             :data-key="$attrs['data-key']"
                             v-model="params[columnName(col)]"
@@ -367,10 +379,15 @@ function handleOnDataSaved(_) {
                         :columns="splittedColumns.columns"
                     />
                 </template>
+                <template #tags="{ tag, formatFn }" v-if="chipLocale">
+                    <div class="q-gutter-x-xs">
+                        <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
+                        <span>{{ formatFn(tag.value) }}</span>
+                    </div>
+                </template>
             </VnFilterPanel>
         </QScrollArea>
     </QDrawer>
-    <!-- class in div to fix warn-->
     <CrudModel
         v-bind="$attrs"
         :class="$attrs['class'] ?? 'q-px-md'"
@@ -450,7 +467,7 @@ function handleOnDataSaved(_) {
                                     :search-url="searchUrl"
                                 />
                             </div>
-                            <VnTableFilter
+                            <VnFilter
                                 v-if="$props.columnSearch"
                                 :column="col"
                                 :show-title="true"
@@ -667,17 +684,15 @@ function handleOnDataSaved(_) {
                         </QCard>
                     </component>
                 </template>
-                <template #bottom-row="{ cols }" v-if="footer">
-                    <QTr v-if="rows.length" class="bg-header" style="height: 30px">
+                <template #bottom-row="{ cols }" v-if="$props.footer">
+                    <QTr v-if="rows.length" style="height: 30px">
                         <QTh
                             v-for="col of cols.filter((cols) => cols.visible ?? true)"
                             :key="col?.id"
                             class="text-center"
+                            :class="getColAlign(col)"
                         >
-                            <slot
-                                :name="`column-footer-${col.name}`"
-                                :class="getColAlign(col)"
-                            />
+                            <slot :name="`column-footer-${col.name}`" />
                         </QTh>
                     </QTr>
                 </template>
@@ -756,16 +771,6 @@ es:
     color: var(--vn-text-color);
 }
 
-.q-table--dark .q-table__bottom,
-.q-table--dark thead,
-.q-table--dark tr {
-    border-color: var(--vn-section-color);
-}
-
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
@@ -839,6 +844,15 @@ es:
         background-color: var(--vn-section-color);
         z-index: 1;
     }
+    table tbody th {
+        position: relative;
+    }
+    tbody:nth-last-child(1) {
+        @extend .bg-header;
+        position: sticky;
+        z-index: 2;
+        bottom: 0;
+    }
 }
 
 .vn-label-value {
@@ -885,12 +899,11 @@ es:
     user-select: all;
 }
 
-.full-width-slot {
-    width: 100%;
-    display: flex;
-    text-align: center;
-    color: var(--vn-text-color);
-    margin-bottom: -1%;
-    background-color: var(--vn-header-color);
+.q-table__container {
+    background-color: transparent;
+}
+
+.q-table__middle.q-virtual-scroll.q-virtual-scroll--vertical.scroll {
+    background-color: var(--vn-section-color);
 }
 </style>

src/components/common/VnInput.vue

@@ -130,4 +130,24 @@ const mixinRules = [
 .q-field__append {
     padding-inline: 0;
 }
+
+.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: 20px;
+}
+.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: auto;
+}
+.q-field__control {
+    height: unset;
+}
+
+.q-field--labeled {
+    .q-field__native,
+    .q-field__prefix,
+    .q-field__suffix,
+    .q-field__input {
+        padding-bottom: 0;
+        min-height: 15px;
+    }
+}
 </style>

src/components/common/VnLocation.vue

@@ -12,14 +12,46 @@ const props = defineProps({
         default: null,
     },
 });
+
+const locationProperties = [
+    'postcode',
+    (obj) =>
+        obj.city
+            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
+            : null,
+    (obj) => obj.country?.name,
+];
+
+const formatLocation = (obj, properties) => {
+    const parts = properties.map((prop) => {
+        if (typeof prop === 'string') {
+            return obj[prop];
+        } else if (typeof prop === 'function') {
+            return prop(obj);
+        }
+        return null;
+    });
+
+    const filteredParts = parts.filter(
+        (part) => part !== null && part !== undefined && part !== ''
+    );
+
+    return filteredParts.join(', ');
+};
+
 const modelValue = ref(
-    props.location
-        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
-        : null
+    props.location ? formatLocation(props.location, locationProperties) : null
 );
+
 function showLabel(data) {
-    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
+    const dataProperties = [
+        'code',
+        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
+        'country',
+    ];
+    return formatLocation(data, dataProperties);
 }
+
 const handleModelValue = (data) => {
     emit('update:model-value', data);
 };
@@ -41,6 +73,7 @@ const handleModelValue = (data) => {
         v-bind="$attrs"
         clearable
         :emit-value="false"
+        :tooltip="t('Create new location')"
     >
         <template #form>
             <CreateNewPostcode
@@ -73,7 +106,9 @@ const handleModelValue = (data) => {
 <i18n>
 en:
     search_by_postalcode: Search by postalcode, town, province or country
+    Create new location: Create new location
 es:
     Location: Ubicación
+    Create new location: Crear nueva ubicación
     search_by_postalcode: Buscar por código postal, ciudad o país
 </i18n>

src/components/common/VnLog.vue

@@ -406,6 +406,7 @@ watch(
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        search-url="logs"
     >
         <template #body>
             <div

src/components/common/VnSelect.vue

@@ -283,4 +283,15 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field--outlined {
     max-width: 100%;
 }
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+
+        display: flex;
+        align-items: flex-end;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}
 </style>

src/components/common/VnSelectDialog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 

src/components/ui/VnFilterPanel.vue

@@ -3,7 +3,6 @@ import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
-import { date } from 'quasar';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
@@ -59,7 +58,6 @@ const $props = defineProps({
 });
 
 defineExpose({ search, sanitizer });
-
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
@@ -187,7 +185,6 @@ async function remove(key) {
 }
 
 function formatValue(value) {
-    if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY');
     if (typeof value === 'boolean') return value ? t('Yes') : t('No');
     if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 
@@ -214,7 +211,7 @@ function sanitizer(params) {
         icon="search"
         @click="search()"
     ></QBtn>
-    <QForm @submit="search" id="filterPanelForm">
+    <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>

src/components/ui/VnPaginate.vue

@@ -119,10 +119,9 @@ watch(
 );
 
 watch(
-    () => [props.url, props.filter, props.userParams],
-    ([url, filter, userParams]) => mounted.value && fetch({ url, filter, userParams })
+    () => [props.url, props.filter],
+    ([url, filter]) => mounted.value && fetch({ url, filter })
 );
-
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
 };

src/components/ui/VnRow.vue

@@ -9,6 +9,7 @@ defineProps({ wrap: { type: Boolean, default: false } });
 <style lang="scss" scoped>
 .vn-row {
     display: flex;
+    align-items: flex-end;
     > :deep(*) {
         flex: 1;
     }

src/components/ui/VnSearchbar.vue

@@ -108,6 +108,7 @@ async function search() {
             ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
+        ...{ filter: props.filter },
     };
 
     if (props.whereFilter) {

src/composables/useArrayData.js

@@ -26,7 +26,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             const params = JSON.parse(query[searchUrl]);
             const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
             delete params.filter;
-            store.userParams = { ...params, ...store.userParams };
+
+            store.userParams = { ...store.userParams, ...params };
             store.userFilter = { ...filter, ...store.userFilter };
             if (filter?.order) store.order = filter.order;
         }

src/css/app.scss

@@ -288,3 +288,14 @@ input::-webkit-inner-spin-button {
         color: $info;
     }
 }
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+        display: flex;
+        align-items: flex-end;
+        padding-bottom: 2px;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}

src/filters/toHour.js

@@ -4,7 +4,7 @@ export default function toHour(date) {
     if (!isValidDate(date)) {
         return '--:--';
     }
-    return (new Date(date || '')).toLocaleTimeString([], {
+    return new Date(date || '').toLocaleTimeString([], {
         hour: '2-digit',
         minute: '2-digit',
     });

src/i18n/locale/en.yml

@@ -50,6 +50,7 @@ globals:
     summary:
         basicData: Basic data
     daysOnward: Days onward
+    daysAgo: Days ago
     today: Today
     yesterday: Yesterday
     dateFormat: en-GB
@@ -111,7 +112,7 @@ globals:
         basicData: Basic data
         log: Logs
         parkingList: Parkings list
-        agencyList: Agencies list
+        agencyList: Agencies
         agency: Agency
         workCenters: Work centers
         modes: Modes
@@ -135,7 +136,7 @@ globals:
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
-        'address-create': New address
+        address-create: New address
         notes: Notes
         credits: Credits
         greuges: Greuges
@@ -207,7 +208,7 @@ globals:
         roadmap: Roadmap
         stops: Stops
         routes: Routes
-        cmrsList: CMRs list
+        cmrsList: CMRs
         RouteList: List
         routeCreate: New route
         RouteRoadmap: Roadmaps
@@ -273,6 +274,7 @@ globals:
         clientsActionsMonitor: Clients and actions
         serial: Serial
         medical: Mutual
+        RouteExtendedList: Router
     supplier: Supplier
     created: Created
     worker: Worker
@@ -288,6 +290,8 @@ globals:
     createInvoiceIn: Create invoice in
     myAccount: My account
     noOne: No one
+    maxTemperature: Max
+    minTemperature: Min
     params:
         clientFk: Client id
         salesPersonFk: Sales person
@@ -302,6 +306,7 @@ errors:
     statusBadGateway: It seems that the server has fall down
     statusGatewayTimeout: Could not contact the server
     userConfig: Error fetching user config
+    updateUserConfig: Error updating user config
     tokenConfig: Error fetching token config
     writeRequest: The requested operation could not be completed
 login:
@@ -879,6 +884,7 @@ route:
         tickets: Tickets
         log: Log
         autonomous: Autonomous
+        RouteExtendedList: Router
     cmr:
         list:
             results: results
@@ -1007,6 +1013,7 @@ travel:
             warehouseOut: Warehouse out
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
+            daysOnward: Landed days onwards
     summary:
         confirmed: Confirmed
         entryId: Entry Id

src/i18n/locale/es.yml

@@ -49,6 +49,7 @@ globals:
     summary:
         basicData: Datos básicos
     daysOnward: Días adelante
+    daysAgo: Días atras
     today: Hoy
     yesterday: Ayer
     dateFormat: es-ES
@@ -113,7 +114,7 @@ globals:
         basicData: Datos básicos
         log: Historial
         parkingList: Listado de parkings
-        agencyList: Listado de agencias
+        agencyList: Agencias
         agency: Agencia
         workCenters: Centros de trabajo
         modes: Modos
@@ -211,12 +212,13 @@ globals:
         roadmap: Troncales
         stops: Paradas
         routes: Rutas
-        cmrsList: Listado de CMRs
+        cmrsList: CMRs
         RouteList: Listado
         routeCreate: Nueva ruta
         RouteRoadmap: Troncales
         RouteRoadmapCreate: Crear troncal
         autonomous: Autónomos
+        RouteExtendedList: Enrutador
         suppliers: Proveedores
         supplier: Proveedor
         supplierCreate: Nuevo proveedor
@@ -292,6 +294,8 @@ globals:
     createInvoiceIn: Crear factura recibida
     myAccount: Mi cuenta
     noOne: Nadie
+    maxTemperature: Máx
+    minTemperature: Mín
     params:
         clientFk: Id cliente
         salesPersonFk: Comercial
@@ -306,6 +310,7 @@ errors:
     statusBadGateway: Parece ser que el servidor ha caído
     statusGatewayTimeout: No se ha podido contactar con el servidor
     userConfig: Error al obtener configuración de usuario
+    updateUserConfig: Error al actualizar la configuración de usuario
     tokenConfig: Error al obtener configuración de token
     writeRequest: No se pudo completar la operación solicitada
 login:
@@ -992,6 +997,7 @@ travel:
             warehouseOut: Alm.entrada
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
+            daysOnward: Días de llegada en adelante
     summary:
         confirmed: Confirmado
         entryId: Id entrada

src/pages/Account/AccountList.vue

@@ -9,7 +9,9 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
-
+const filter = {
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};
 const columns = computed(() => [
     {
         align: 'left',
@@ -29,7 +31,22 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'username',
+        name: 'roleFk',
+        label: t('role'),
+        columnFilter: {
+            component: 'select',
+            name: 'roleFk',
+            attrs: {
+                url: 'VnRoles',
+                optionValue: 'id',
+                optionLabel: 'name',
+            },
+        },
+        format: ({ role }, dashIfEmpty) => dashIfEmpty(role?.name),
+    },
+    {
+        align: 'left',
+        name: 'nickname',
         label: t('Nickname'),
         isTitle: true,
         component: 'input',
@@ -104,12 +121,13 @@ const exprBuilder = (param, value) => {
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
+        :filter="filter"
     />
-
     <VnTable
         ref="tableRef"
         data-key="AccountUsers"
         url="VnUsers/preview"
+        :filter="filter"
         order="id DESC"
         :columns="columns"
         default-mode="table"

src/pages/Account/Card/AccountCard.vue

@@ -11,6 +11,9 @@ const { t } = useI18n();
         data-key="Account"
         :descriptor="AccountDescriptor"
         search-data-key="AccountUsers"
+        :filter="{
+            include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+        }"
         :searchbar-props="{
             url: 'VnUsers/preview',
             label: t('account.search'),

src/pages/Customer/Card/CustomerBasicData.vue

@@ -18,6 +18,7 @@ const contactChannels = ref([]);
 const title = ref();
 const handleSalesModelValue = (val) => ({
     or: [
+        { id: val },
         { name: val },
         { nickname: { like: '%' + val + '%' } },
         { code: { like: `${val}%` } },

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -93,6 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"

src/pages/Customer/Card/CustomerSummary.vue

@@ -13,6 +13,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 const $props = defineProps({
     id: {

src/pages/Customer/CustomerList.vue

@@ -429,10 +429,9 @@ function handleLocation(data, location) {
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
-                option-label="nickname"
-                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
+                :use-like="false"
                 emit-value
                 auto-load
             >

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
@@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />

src/pages/Entry/EntryStockBought.vue

@@ -47,7 +47,7 @@ const columns = [
         },
     },
     {
-        align: 'left',
+        align: 'center',
         label: t('Reserve'),
         name: 'reserve',
         columnFilter: false,
@@ -76,7 +76,7 @@ const columns = [
         name: 'tableActions',
         actions: [
             {
-                title: t('More'),
+                title: t('View more details'),
                 icon: 'search',
                 isPrimary: true,
                 action: (row) => {
@@ -141,6 +141,10 @@ function setFooter(data) {
     });
     tableRef.value.footer = footer;
 }
+
+function round(value) {
+    return Math.round(value * 100) / 100;
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -152,7 +156,9 @@ function setFooter(data) {
                 :filter="filter"
                 @on-fetch="
                     (data) => {
-                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
+                        travel = data.find(
+                            (data) => data.warehouseIn.code.toLowerCase() === 'vnh'
+                        );
                     }
                 "
             />
@@ -206,7 +212,7 @@ function setFooter(data) {
         </template>
     </RightMenu>
     <div class="table-container">
-        <QPage class="column items-center q-pa-md">
+        <div class="column items-center">
             <VnTable
                 ref="tableRef"
                 data-key="StockBoughts"
@@ -228,6 +234,7 @@ function setFooter(data) {
                 :columns="columns"
                 :user-params="userParams"
                 :footer="true"
+                table-height="80vh"
                 auto-load
             >
                 <template #column-workerFk="{ row }">
@@ -243,7 +250,7 @@ function setFooter(data) {
                 </template>
                 <template #column-footer-reserve>
                     <span>
-                        {{ tableRef.footer.reserve }}
+                        {{ round(tableRef.footer.reserve) }}
                     </span>
                 </template>
                 <template #column-footer-bought>
@@ -253,11 +260,11 @@ function setFooter(data) {
                                 tableRef.footer.reserve < tableRef.footer.bought,
                         }"
                     >
-                        {{ tableRef.footer.bought }}
+                        {{ round(tableRef.footer.bought) }}
                     </span>
                 </template>
             </VnTable>
-        </QPage>
+        </div>
     </div>
 </template>
 <style lang="scss" scoped>
@@ -272,7 +279,6 @@ function setFooter(data) {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 40%;
 }
 .text-negative {
     color: $negative !important;
@@ -286,8 +292,8 @@ function setFooter(data) {
         Buyer: Comprador
         Reserve: Reservado
         Bought: Comprado
-        More: Más
         Date: Fecha
+        View more details: Ver más detalles
         Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
+        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha 
 </i18n>

src/pages/Entry/EntryStockBoughtDetail.vue

@@ -77,18 +77,10 @@ const columns = [
                 :columns="columns"
                 :right-search="false"
                 :disable-infinite-scroll="true"
+                :disable-option="{ card: true }"
                 :limit="0"
                 auto-load
             >
-                <template #top-left>
-                    <QBtn
-                        flat
-                        icon="Close"
-                        color="primary"
-                        class="bg-vn-section-color q-pa-xs"
-                        v-close-popup
-                    />
-                </template>
                 <template #column-entryFk="{ row }">
                     <span class="link">
                         {{ row?.entryFk }}
@@ -112,6 +104,11 @@ const columns = [
     justify-content: center;
     align-items: center;
     margin: auto;
+    background-color: var(--vn-section-color);
+    padding: 4px;
+}
+.container > div > div > .q-table__top.relative-position.row.items-center {
+    background-color: red !important;
 }
 </style>
 <i18n>

src/pages/Entry/MyEntries.vue

@@ -9,22 +9,27 @@ import VnTable from 'components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
+const params = {
+    daysOnward: 7,
+    daysAgo: 3,
+};
+
 const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
-        label: t('customer.extendedList.tableVisibleColumns.id'),
+        label: t('myEntries.id'),
         columnFilter: false,
         isTitle: true,
     },
     {
         visible: false,
         align: 'right',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: {
             name: 'fromShipped',
-            label: t('fromShipped'),
+            label: t('myEntries.fromShipped'),
             component: 'date',
         },
         format: ({ shipped }) => toDate(shipped),
@@ -32,11 +37,11 @@ const columns = computed(() => [
     {
         visible: false,
         align: 'left',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: {
             name: 'toShipped',
-            label: t('toShipped'),
+            label: t('myEntries.toShipped'),
             component: 'date',
         },
         format: ({ shipped }) => toDate(shipped),
@@ -44,14 +49,14 @@ const columns = computed(() => [
     },
     {
         align: 'right',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: false,
         format: ({ shipped }) => toDate(shipped),
     },
     {
         align: 'right',
-        label: t('landed'),
+        label: t('myEntries.landed'),
         name: 'landed',
         columnFilter: false,
         format: ({ landed }) => toDate(landed),
@@ -59,26 +64,36 @@ const columns = computed(() => [
 
     {
         align: 'right',
-        label: t('globals.wareHouseIn'),
+        label: t('myEntries.wareHouseIn'),
         name: 'warehouseInFk',
-        format: (row) => row.warehouseInName,
+        format: (row) => {
+            row.warehouseInName;
+        },
         cardVisible: true,
         columnFilter: {
+            name: 'warehouseInFk',
+            label: t('myEntries.warehouseInFk'),
             component: 'select',
             attrs: {
                 url: 'warehouses',
                 fields: ['id', 'name'],
                 optionLabel: 'name',
                 optionValue: 'id',
+                alias: 't',
             },
-            alias: 't',
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('globals.daysOnward'),
-        name: 'days',
+        label: t('myEntries.daysOnward'),
+        name: 'daysOnward',
+        visible: false,
+    },
+    {
+        align: 'left',
+        label: t('myEntries.daysAgo'),
+        name: 'daysAgo',
         visible: false,
     },
     {
@@ -88,6 +103,7 @@ const columns = computed(() => [
             {
                 title: t('printLabels'),
                 icon: 'print',
+                isPrimary: true,
                 action: (row) => printBuys(row.id),
             },
         ],
@@ -114,9 +130,11 @@ const printBuys = (rowId) => {
         data-key="myEntriesList"
         url="Entries/filter"
         :columns="columns"
+        :user-params="params"
         default-mode="card"
         order="shipped DESC"
         auto-load
+        chip-locale="myEntries"
     />
 </template>
 

src/pages/Entry/locale/en.yml

@@ -6,9 +6,15 @@ entryFilter:
     filter:
         search: General search
         reference: Reference
-landed: Landed
-shipped: Shipped
-fromShipped: Shipped(from)
-toShipped: Shipped(to)
-printLabels: Print stickers
-viewLabel: View sticker
+myEntries:
+    id: ID
+    landed: Landed
+    shipped: Shipped
+    fromShipped: Shipped(from)
+    toShipped: Shipped(to)
+    printLabels: Print stickers
+    viewLabel: View sticker
+    wareHouseIn: Warehouse in
+    warehouseInFk: Warehouse in
+    daysOnward: Days onward
+    daysAgo: Days ago

src/pages/Entry/locale/es.yml

@@ -9,10 +9,15 @@ entryFilter:
     filter:
         search: Búsqueda general
         reference: Referencia
-
-landed: F. llegada
-shipped: F. salida
-fromShipped: F. salida(desde)
-toShipped: F. salida(hasta)
-printLabels: Imprimir etiquetas
-viewLabel: Ver etiqueta
+myEntries:
+    id: ID
+    landed: F. llegada
+    shipped: F. salida
+    fromShipped: F. salida(desde)
+    toShipped: F. salida(hasta)
+    printLabels: Imprimir etiquetas
+    viewLabel: Ver etiqueta
+    wareHouseIn: Alm. entrada
+    warehouseInFk: Alm. entrada
+    daysOnward: Días adelante
+    daysAgo: Días atras

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -27,13 +27,16 @@ const { openReport } = usePrintService();
 
 const columns = computed(() => [
     {
-        align: 'left',
+        align: 'center',
         name: 'id',
         label: t('invoiceOutList.tableVisibleColumns.id'),
         chip: {
             condition: () => true,
         },
         isId: true,
+        columnFilter: {
+            name: 'search',
+        },
     },
     {
         align: 'left',

src/pages/InvoiceOut/InvoiceOutNegativeBases.vue

@@ -9,6 +9,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from '../Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -64,7 +65,8 @@ const columns = computed(() => [
         cardVisible: true,
         attrs: {
             url: 'Clients',
-            fields: ['id', 'name'],
+            optionLabel: 'socialName',
+            optionValue: 'socialName',
         },
         columnField: {
             component: null,
@@ -192,10 +194,33 @@ const downloadCSV = async () => {
                 <WorkerDescriptorProxy :id="row.comercialId" />
             </span>
         </template>
+        <template #moreFilterPanel="{ params }">
+            <VnInputDate
+                :label="t('params.from')"
+                v-model="params.from"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+            <VnInputDate
+                :label="t('params.to')"
+                v-model="params.to"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+        </template>
     </VnTable>
 </template>
 
 <i18n>
 es:
     Download as CSV: Descargar como CSV
+    params:
+        from: Desde
+        to: Hasta
+en:
+    params:
+        from: From
+        to: To
 </i18n>

src/pages/Item/ItemFixedPrice.vue

@@ -514,7 +514,7 @@ function handleOnDataSave({ CrudModelRef }) {
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row">
+                    <div class="row" style="align-items: center">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -600,11 +600,14 @@ function handleOnDataSave({ CrudModelRef }) {
 .q-table th,
 .q-table td {
     padding-inline: 5px !important;
-    // text-align: -webkit-right;
+}
+.q-table tr td {
+    font-size: 10pt;
+    border-top: none;
+    border-collapse: collapse;
 }
 .q-table tbody td {
     max-width: none;
-
     .q-td.col {
         & .vnInputDate {
             min-width: 90px;

src/pages/Route/Agency/AgencyList.vue

@@ -27,12 +27,15 @@ const columns = computed(() => [
             condition: () => true,
         },
         isId: true,
+        columnFilter: false,
     },
     {
         align: 'left',
         label: t('globals.name'),
         name: 'name',
         isTitle: true,
+        columnFilter: false,
+        columnClass: 'expand',
     },
     {
         align: 'left',
@@ -70,18 +73,33 @@ const columns = computed(() => [
         data-key="AgencyList"
         :expr-builder="exprBuilder"
     />
-    <VnTable
-        ref="tableRef"
-        data-key="AgencyList"
-        url="Agencies"
-        order="name"
-        :columns="columns"
-        :right-search="false"
-        :use-model="true"
-        redirect="agency"
-        default-mode="card"
-    />
+    <div class="list-container">
+        <div class="list">
+            <VnTable
+                data-key="AgencyList"
+                url="Agencies"
+                order="name"
+                :columns="columns"
+                :right-search="false"
+                :use-model="true"
+                redirect="agency"
+                default-mode="card"
+            />
+        </div>
+    </div>
 </template>
+<style lang="scss" scoped>
+.list {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 55%;
+}
+.list-container {
+    display: flex;
+    justify-content: center;
+}
+</style>
 <i18n>
     es:
         isOwn: Tiene propietario

src/pages/Route/Card/RouteListTicketsDialog.vue

@@ -167,8 +167,8 @@ const setTicketsRoute = async () => {
                         <QTd :props="props">
                             <span class="link">
                                 {{ props.value }}
-                                <TicketDescriptorProxy :id="props?.row?.id" />
                             </span>
+                            <TicketDescriptorProxy :id="props?.row?.id" />
                         </QTd>
                     </template>
                     <template #body-cell-client="props">

src/pages/Route/RouteExtendedList.vue

@@ -0,0 +1,360 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useQuasar } from 'quasar';
+import { toDate } from 'src/filters';
+import { useRouter } from 'vue-router';
+import { usePrintService } from 'src/composables/usePrintService';
+
+import axios from 'axios';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
+import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+
+const { openReport } = usePrintService();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const quasar = useQuasar();
+const selectedRows = ref([]);
+const tableRef = ref([]);
+const confirmationDialog = ref(false);
+const startingDate = ref(null);
+const router = useRouter();
+const routeFilter = {
+    include: [
+        {
+            relation: 'workers',
+            scope: {
+                fields: ['id', 'firstName'],
+            },
+        },
+    ],
+};
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: 'Id',
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'workerFk',
+        label: t('route.Worker'),
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            useLike: false,
+            optionFilter: 'firstName',
+            find: {
+                value: 'workerFk',
+                label: 'workerUserName',
+            },
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        useLike: false,
+        cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
+    },
+    {
+        align: 'left',
+        name: 'agencyModeFk',
+        label: t('route.Agency'),
+        isTitle: true,
+        cardVisible: true,
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'agencyModes',
+            fields: ['id', 'name'],
+            find: {
+                value: 'agencyModeFk',
+                label: 'agencyName',
+            },
+        },
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'vehicleFk',
+        label: t('route.Vehicle'),
+        cardVisible: true,
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'vehicles',
+            fields: ['id', 'numberPlate'],
+            optionLabel: 'numberPlate',
+            optionFilterValue: 'numberPlate',
+            find: {
+                value: 'vehicleFk',
+                label: 'vehiclePlateNumber',
+            },
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('route.Date'),
+        columnFilter: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'left',
+        name: 'from',
+        label: t('route.From'),
+        visible: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'left',
+        name: 'to',
+        label: t('route.To'),
+        visible: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'center',
+        name: 'm3',
+        label: 'm3',
+        cardVisible: true,
+        columnClass: 'shrink',
+    },
+    {
+        align: 'left',
+        name: 'started',
+        label: t('route.hourStarted'),
+        component: 'time',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'finished',
+        label: t('route.hourFinished'),
+        component: 'time',
+        columnFilter: false,
+    },
+    {
+        align: 'center',
+        name: 'kmStart',
+        label: t('route.KmStart'),
+        columnClass: 'shrink',
+        create: true,
+        visible: false,
+    },
+    {
+        align: 'center',
+        name: 'kmEnd',
+        label: t('route.KmEnd'),
+        columnClass: 'shrink',
+        create: true,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'description',
+        label: t('route.Description'),
+        isTitle: true,
+        create: true,
+        component: 'input',
+        field: 'description',
+    },
+    {
+        align: 'left',
+        name: 'isOk',
+        label: t('route.Served'),
+        component: 'checkbox',
+        columnFilter: false,
+        columnClass: 'shrink',
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('route.Add tickets'),
+                icon: 'vn:ticketAdd',
+                action: (row) => openTicketsDialog(row?.id),
+                isPrimary: true,
+            },
+            {
+                title: t('route.components.smartCard.viewSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row?.id, RouteSummary),
+                isPrimary: true,
+            },
+            {
+                title: t('route.Route summary'),
+                icon: 'arrow_forward',
+                action: (row) => navigate(row?.id),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
+
+function navigate(id) {
+    router.push({ path: `/route/${id}` });
+}
+
+const cloneRoutes = () => {
+    if (!selectedRows.value.length || !startingDate.value) return;
+    axios.post('Routes/clone', {
+        created: startingDate.value,
+        ids: selectedRows.value.map((row) => row?.id),
+    });
+    startingDate.value = null;
+    tableRef.value.reload();
+};
+
+const showRouteReport = () => {
+    const ids = selectedRows.value.map((row) => row?.id);
+    const idString = ids.join(',');
+    let url = `Routes/${idString}/driver-route-pdf`;
+    let params = {};
+    if (selectedRows.value.length >= 1) {
+        params = {
+            id: idString,
+        };
+        url = `Routes/downloadZip`;
+    }
+    openReport(url, params, '_blank');
+};
+
+function markAsServed() {
+    selectedRows.value.forEach(async (row) => {
+        await axios.patch(`Routes/${row?.id}`, { isOk: true });
+    });
+    tableRef.value.reload();
+    startingDate.value = null;
+}
+
+const openTicketsDialog = (id) => {
+    quasar
+        .dialog({
+            component: RouteListTicketsDialog,
+            componentProps: {
+                id,
+            },
+        })
+        .onOk(() => tableRef.value.reload());
+};
+</script>
+
+<template>
+    <RouteSearchbar />
+    <QDialog v-model="confirmationDialog">
+        <QCard style="min-width: 350px">
+            <QCardSection>
+                <p class="text-h6 q-ma-none">{{ t('route.Select the starting date') }}</p>
+            </QCardSection>
+
+            <QCardSection class="q-pt-none">
+                <VnInputDate
+                    :label="t('route.Stating date')"
+                    v-model="startingDate"
+                    autofocus
+                />
+            </QCardSection>
+            <QCardActions align="right">
+                <QBtn
+                    flat
+                    :label="t('route.Cancel')"
+                    v-close-popup
+                    class="text-primary"
+                />
+                <QBtn color="primary" v-close-popup @click="cloneRoutes">
+                    {{ t('globals.clone') }}
+                </QBtn>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+    <VnSubToolbar />
+    <RightMenu>
+        <template #right-panel>
+            <RouteFilter data-key="RouteList" />
+        </template>
+    </RightMenu>
+    <VnTable
+        class="route-list"
+        ref="tableRef"
+        data-key="RouteList"
+        url="Routes/filter"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="true"
+        :filter="routeFilter"
+        redirect="route"
+        :row-click="false"
+        :create="{
+            urlCreate: 'Routes',
+            title: t('route.createRoute'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
+        }"
+        save-url="Routes/crud"
+        :disable-option="{ card: true }"
+        table-height="85vh"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+    >
+        <template #moreBeforeActions>
+            <QBtn
+                icon="vn:clone"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="confirmationDialog = true"
+            >
+                <QTooltip>{{ t('route.Clone Selected Routes') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                icon="cloud_download"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="showRouteReport"
+            >
+                <QTooltip>{{ t('route.Download selected routes as PDF') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                icon="check"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="markAsServed()"
+            >
+                <QTooltip>{{ t('route.Mark as served') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnTable>
+</template>

src/pages/Route/RouteList.vue

@@ -1,34 +1,19 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useQuasar } from 'quasar';
-import { toDate } from 'src/filters';
-import { useRouter } from 'vue-router';
+import { toHour } from 'src/filters';
 
-import axios from 'axios';
 import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
-
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { usePrintService } from 'src/composables/usePrintService';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
-const { openReport } = usePrintService();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const quasar = useQuasar();
-const session = useSession();
-const selectedRows = ref([]);
 const tableRef = ref([]);
-const confirmationDialog = ref(false);
-const startingDate = ref(null);
-const router = useRouter();
 const routeFilter = {
     include: [
         {
@@ -42,156 +27,70 @@ const routeFilter = {
 const columns = computed(() => [
     {
         align: 'left',
+        isId: true,
         name: 'id',
         label: 'Id',
         chip: {
             condition: () => true,
         },
-        isId: true,
         columnFilter: false,
     },
     {
         align: 'left',
         name: 'workerFk',
-        label: t('Worker'),
+        label: t('route.Worker'),
         create: true,
-        component: 'select',
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            useLike: false,
-            optionFilter: 'firstName',
-            find: {
-                value: 'workerFk',
-                label: 'workerUserName',
-            },
-        },
-        columnFilter: {
-            inWhere: true,
-        },
-        useLike: false,
         cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
-    },
-    {
-        align: 'left',
-        name: 'agencyModeFk',
-        label: t('Agency'),
-        isTitle: true,
-        cardVisible: true,
-        create: true,
-        component: 'select',
-        attrs: {
-            url: 'agencyModes',
-            fields: ['id', 'name'],
-            find: {
-                value: 'agencyModeFk',
-                label: 'agencyName',
-            },
-        },
-        columnClass: 'expand',
-    },
-    {
-        align: 'left',
-        name: 'vehicleFk',
-        label: t('Vehicle'),
-        cardVisible: true,
-        create: true,
-        component: 'select',
-        attrs: {
-            url: 'vehicles',
-            fields: ['id', 'numberPlate'],
-            optionLabel: 'numberPlate',
-            optionFilterValue: 'numberPlate',
-            find: {
-                value: 'vehicleFk',
-                label: 'vehiclePlateNumber',
-            },
-        },
-        columnFilter: {
-            inWhere: true,
-        },
-    },
-    {
-        align: 'left',
-        name: 'created',
-        label: t('Date'),
         columnFilter: false,
-        cardVisible: true,
-        create: true,
-        component: 'date',
-        format: ({ date }) => toDate(date),
     },
     {
         align: 'left',
-        name: 'from',
-        label: t('From'),
-        visible: false,
+        name: 'agencyName',
+        label: t('route.Agency'),
         cardVisible: true,
         create: true,
-        component: 'date',
-        format: ({ date }) => toDate(date),
+        columnClass: 'expand',
+        columnFilter: false,
     },
     {
         align: 'left',
-        name: 'to',
-        label: t('To'),
-        visible: false,
+        name: 'vehiclePlateNumber',
+        label: t('route.Vehicle'),
         cardVisible: true,
         create: true,
-        component: 'date',
-        format: ({ date }) => toDate(date),
-    },
-    {
-        align: 'center',
-        name: 'm3',
-        label: t('Volume'),
-        cardVisible: true,
-        columnClass: 'shrink',
+        columnFilter: false,
     },
     {
         align: 'left',
         name: 'started',
-        label: t('hourStarted'),
-        component: 'time',
+        label: t('route.hourStarted'),
+        cardVisible: true,
         columnFilter: false,
+        format: (row) => toHour(row.started),
     },
     {
         align: 'left',
         name: 'finished',
-        label: t('hourFinished'),
-        component: 'time',
+        label: t('route.hourFinished'),
+        cardVisible: true,
         columnFilter: false,
-    },
-    {
-        align: 'center',
-        name: 'kmStart',
-        label: t('KmStart'),
-        columnClass: 'shrink',
-        create: true,
-        visible: false,
-    },
-    {
-        align: 'center',
-        name: 'kmEnd',
-        label: t('KmEnd'),
-        columnClass: 'shrink',
-        create: true,
-        visible: false,
+        format: (row) => toHour(row.started),
     },
     {
         align: 'left',
         name: 'description',
-        label: t('Description'),
+        label: t('route.Description'),
+        cardVisible: true,
         isTitle: true,
         create: true,
-        component: 'input',
         field: 'description',
+        columnFilter: false,
     },
     {
         align: 'left',
         name: 'isOk',
-        label: t('Served'),
+        label: t('route.Served'),
         component: 'checkbox',
         columnFilter: false,
         columnClass: 'shrink',
@@ -200,212 +99,43 @@ const columns = computed(() => [
         align: 'right',
         name: 'tableActions',
         actions: [
-            {
-                title: t('Add tickets'),
-                icon: 'vn:ticketAdd',
-                action: (row) => openTicketsDialog(row?.id),
-            },
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row?.id, RouteSummary),
-            },
-            {
-                title: t('Route summary'),
-                icon: 'arrow_forward',
                 isPrimary: true,
-                action: (row) => navigate(row?.id),
             },
         ],
     },
 ]);
-
-function navigate(id) {
-    router.push({ path: `/route/${id}` });
-}
-
-const cloneRoutes = () => {
-    if (!selectedRows.value.length || !startingDate.value) return;
-    axios.post('Routes/clone', {
-        created: startingDate.value,
-        ids: selectedRows.value.map((row) => row?.id),
-    });
-    startingDate.value = null;
-    tableRef.value.reload();
-};
-
-const showRouteReport = () => {
-    const ids = selectedRows.value.map((row) => row?.id);
-    const idString = ids.join(',');
-    let url = `Routes/${idString}/driver-route-pdf`;
-    let params = {};
-    if (selectedRows.value.length >= 1) {
-        params = {
-            id: idString,
-        };
-        url = `Routes/downloadZip`;
-    }
-    openReport(url, params, '_blank');
-};
-
-function markAsServed() {
-    selectedRows.value.forEach(async (row) => {
-        await axios.patch(`Routes/${row?.id}`, { isOk: true });
-    });
-    tableRef.value.reload();
-    startingDate.value = null;
-}
-
-const openTicketsDialog = (id) => {
-    quasar
-        .dialog({
-            component: RouteListTicketsDialog,
-            componentProps: {
-                id,
-            },
-        })
-        .onOk(() => tableRef.value.reload());
-};
 </script>
-
 <template>
     <RouteSearchbar />
-    <QDialog v-model="confirmationDialog">
-        <QCard style="min-width: 350px">
-            <QCardSection>
-                <p class="text-h6 q-ma-none">{{ t('Select the starting date') }}</p>
-            </QCardSection>
-
-            <QCardSection class="q-pt-none">
-                <VnInputDate
-                    :label="t('Stating date')"
-                    v-model="startingDate"
-                    autofocus
-                />
-            </QCardSection>
-            <QCardActions align="right">
-                <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
-                <QBtn color="primary" v-close-popup @click="cloneRoutes">
-                    {{ t('globals.clone') }}
-                </QBtn>
-            </QCardActions>
-        </QCard>
-    </QDialog>
-    <VnSubToolbar />
     <RightMenu>
         <template #right-panel>
             <RouteFilter data-key="RouteList" />
         </template>
     </RightMenu>
     <VnTable
-        class="route-list"
-        ref="tableRef"
         data-key="RouteList"
         url="Routes/filter"
         :columns="columns"
         :right-search="false"
-        :is-editable="true"
         :filter="routeFilter"
         redirect="route"
-        :row-click="false"
         :create="{
             urlCreate: 'Routes',
-            title: t('Create route'),
+            title: t('route.createRoute'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {},
         }"
-        save-url="Routes/crud"
-        :disable-option="{ card: true }"
         table-height="85vh"
-        v-model:selected="selectedRows"
-        :table="{
-            'row-key': 'id',
-            selection: 'multiple',
-        }"
     >
-        <template #moreBeforeActions>
-            <QBtn
-                icon="vn:clone"
-                color="primary"
-                class="q-mr-sm"
-                :disable="!selectedRows?.length"
-                @click="confirmationDialog = true"
-            >
-                <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                icon="cloud_download"
-                color="primary"
-                class="q-mr-sm"
-                :disable="!selectedRows?.length"
-                @click="showRouteReport"
-            >
-                <QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                icon="check"
-                color="primary"
-                class="q-mr-sm"
-                :disable="!selectedRows?.length"
-                @click="markAsServed()"
-            >
-                <QTooltip>{{ t('Mark as served') }}</QTooltip>
-            </QBtn>
+        <template #column-workerFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row?.workerUserName }}
+                <WorkerDescriptorProxy :id="row?.workerFk" v-if="row?.workerFk" />
+            </span>
         </template>
     </VnTable>
 </template>
-
-<style lang="scss" scoped>
-.table-input-cell {
-    max-width: 143px;
-}
-
-.route-list {
-    width: 100%;
-    max-height: 100%;
-}
-
-.table-actions {
-    gap: 12px;
-}
-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:
-    From: Desde
-    To: Hasta
-    Worker: Trabajador
-    Agency: Agencia
-    Vehicle: Vehículo
-    Volume: Volumen
-    Date: Fecha
-    Description: Descripción
-    Hour started: Hora inicio
-    Hour finished: Hora fin
-    KmStart: Km inicio
-    KmEnd: Km fin
-    Served: Servida
-    newRoute: Nueva Ruta
-    Clone Selected Routes: Clonar rutas seleccionadas
-    Select the starting date: Seleccione la fecha de inicio
-    Stating date: Fecha de inicio
-    Cancel: Cancelar
-    Mark as served: Marcar como servidas
-    Download selected routes as PDF: Descargar rutas seleccionadas como PDF
-    Add ticket: Añadir tickets
-    Preview: Vista previa
-    Summary: Resumen
-    Route is closed: La ruta está cerrada
-    Route is not served: La ruta no está servida
-    hourStarted: Hora de inicio
-    hourFinished: Hora de fin
-</i18n>

src/pages/Route/RouteRoadmap.vue

@@ -87,7 +87,7 @@ const columns = computed(() => [
         actions: [
             {
                 title: t('Ver cmr'),
-                icon: 'visibility',
+                icon: 'preview',
                 isPrimary: true,
                 action: (row) => viewSummary(row?.id, RoadmapSummary),
             },

src/pages/Route/RouteTickets.vue

@@ -342,10 +342,7 @@ const openSmsDialog = async () => {
                             </template>
                             <template #body-cell-city="{ value, row }">
                                 <QTd auto-width>
-                                    <span
-                                        class="text-primary cursor-pointer"
-                                        @click="goToBuscaman(row)"
-                                    >
+                                    <span class="link" @click="goToBuscaman(row)">
                                         {{ value }}
                                         <QTooltip>{{ t('Open buscaman') }}</QTooltip>
                                     </span>
@@ -353,7 +350,7 @@ const openSmsDialog = async () => {
                             </template>
                             <template #body-cell-client="{ value, row }">
                                 <QTd auto-width>
-                                    <span class="text-primary cursor-pointer">
+                                    <span class="link">
                                         {{ value }}
                                         <CustomerDescriptorProxy :id="row?.clientFk" />
                                     </span>
@@ -361,7 +358,7 @@ const openSmsDialog = async () => {
                             </template>
                             <template #body-cell-ticket="{ value, row }">
                                 <QTd auto-width class="text-center">
-                                    <span class="text-primary cursor-pointer">
+                                    <span class="link">
                                         {{ value }}
                                         <TicketDescriptorProxy :id="row?.id" />
                                     </span>

src/pages/Route/locale/en.yml

@@ -0,0 +1,25 @@
+route:
+    Worker: Worker
+    Agency: Agency
+    Vehicle: Vehicle
+    Description: Description
+    hourStarted: H.Start
+    hourFinished: H.End
+    createRoute: Create route
+    From: From
+    To: To
+    Date: Date
+    KmStart: Km start
+    KmEnd: Km end
+    Served: Served
+    Clone Selected Routes: Clone selected routes
+    Select the starting date: Select the starting date
+    Stating date: Starting date
+    Cancel: Cancel
+    Mark as served: Mark as served
+    Download selected routes as PDF: Download selected routes as PDF
+    Add ticket: Add ticket
+    Preview: Preview
+    Summary: Summary
+    Route is closed: Route is closed
+    Route is not served: Route is not served

src/pages/Route/locale/es.yml

@@ -0,0 +1,25 @@
+route:
+    Worker: Trabajador
+    Agency: Agencia
+    Vehicle: Vehículo
+    Description: Descripción
+    hourStarted: H.Inicio
+    hourFinished: H.Fin
+    createRoute: Crear ruta
+    From: Desde
+    To: Hasta
+    Date: Fecha
+    KmStart: Km inicio
+    KmEnd: Km fin
+    Served: Servida
+    Clone Selected Routes: Clonar rutas seleccionadas
+    Select the starting date: Seleccione la fecha de inicio
+    Stating date: Fecha de inicio
+    Cancel: Cancelar
+    Mark as served: Marcar como servidas
+    Download selected routes as PDF: Descargar rutas seleccionadas como PDF
+    Add ticket: Añadir tickets
+    Preview: Vista previa
+    Summary: Resumen
+    Route is closed: La ruta está cerrada
+    Route is not served: La ruta no está servida

src/pages/Supplier/Card/SupplierAccounts.vue

@@ -113,6 +113,7 @@ const setWireTransfer = async () => {
                         option-label="bic"
                         option-value="id"
                         hide-selected
+                        :roles-allowed-to-create="['financial']"
                     >
                         <template #form>
                             <CreateBankEntityForm

src/pages/Supplier/Card/SupplierAddressesCreate.vue

@@ -84,6 +84,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :location="
                             data.postalCode

src/pages/Supplier/Card/SupplierFiscalData.vue

@@ -52,7 +52,22 @@ function handleLocation(data, location) {
         :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
         model="supplier"
         :filter="{
-            fields: ['id', 'name', 'city', 'postCode', 'countryFk', 'provinceFk'],
+            fields: [
+                'id',
+                'nif',
+                'city',
+                'name',
+                'account',
+                'postCode',
+                'countryFk',
+                'provinceFk',
+                'sageTaxTypeFk',
+                'sageWithholdingFk',
+                'sageTransactionTypeFk',
+                'supplierActivityFk',
+                'healthRegister',
+                'street',
+            ],
             include: [
                 {
                     relation: 'province',
@@ -146,6 +161,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="{
                         postcode: data.postCode,

src/pages/Ticket/Card/TicketDescriptorMenu.vue

@@ -277,13 +277,14 @@ async function createRefund(withWarehouse) {
     const params = {
         ticketsIds: [parseInt(ticketId)],
         withWarehouse: withWarehouse,
+        negative: true,
     };
-    const { data } = await axios.post(`Tickets/refund`, params);
+    const { data } = await axios.post(`Tickets/cloneAll`, params);
 
     if (data) {
-        const refundTicket = data;
-
-        push({ name: 'TicketSale', params: { id: refundTicket[0].id } });
+        const [refundTicket] = data;
+        notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
+        push({ name: 'TicketSale', params: { id: refundTicket.id } });
     }
 }
 

src/pages/Ticket/Card/TicketSale.vue

@@ -53,7 +53,7 @@ const tableRef = ref([]);
 
 watch(
     () => route.params.id,
-    async () => await getSales()
+    () => tableRef.value.reload()
 );
 
 const columns = computed(() => [
@@ -161,15 +161,6 @@ const onSalesFetched = (salesData) => {
     for (let sale of salesData) sale.amount = getSaleTotal(sale);
 };
 
-const getSales = async () => {
-    try {
-        const { data } = await axios.get(`Tickets/${route.params.id}/getSales`);
-        onSalesFetched(data);
-    } catch (err) {
-        console.error('Error fetching sales', err);
-    }
-};
-
 const getSaleTotal = (sale) => {
     if (sale.quantity == null || sale.price == null) return null;
 
@@ -181,7 +172,7 @@ const getSaleTotal = (sale) => {
 
 const resetChanges = async () => {
     arrayData.fetch({ append: false });
-    getSales();
+    tableRef.value.reload();
 };
 
 const updateQuantity = async (sale) => {
@@ -434,8 +425,6 @@ const setTransferParams = async () => {
 onMounted(async () => {
     stateStore.rightDrawer = true;
     getConfig();
-    getSales();
-    getItems();
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -443,11 +432,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 const items = ref([]);
 const newRow = ref({});
 
-async function getItems() {
-    const { data } = await axios.get(`Items/withName`);
-    items.value = data;
-}
-
 const updateItem = (row) => {
     const selectedItem = items.value.find((item) => item.id === row.itemFk);
     if (selectedItem) {
@@ -623,6 +607,7 @@ watch(
         :column-search="false"
         :disable-option="{ card: true }"
         auto-load
+        @on-fetch="onSalesFetched"
         :create="{
             onDataSaved: handleOnDataSave,
         }"

src/pages/Ticket/Card/TicketSaleMoreActions.vue

@@ -44,7 +44,7 @@ const props = defineProps({
     },
 });
 
-const router = useRouter();
+const { push } = useRouter();
 const { t } = useI18n();
 const { dialog } = useQuasar();
 const { notify } = useNotify();
@@ -142,7 +142,7 @@ const onCreateClaimAccepted = async () => {
     try {
         const params = { ticketId: ticket.value.id, sales: props.sales };
         const { data } = await axios.post(`Claims/createFromSales`, params);
-        router.push({ name: 'ClaimBasicData', params: { id: data.id } });
+        push({ name: 'ClaimBasicData', params: { id: data.id } });
     } catch (error) {
         console.error('Error creating claim: ', error);
     }
@@ -169,7 +169,7 @@ const createRefund = async (withWarehouse) => {
         const { data } = await axios.post('Tickets/cloneAll', params);
         const [refundTicket] = data;
         notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
-        router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
+        push({ name: 'TicketSale', params: { id: refundTicket.id } });
     } catch (error) {
         console.error(error);
     }

src/pages/Ticket/Card/TicketSummary.vue

@@ -1,7 +1,7 @@
 <script setup>
 import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import { onMounted, ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
@@ -12,6 +12,8 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
@@ -19,8 +21,7 @@ import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
-const router = useRouter();
-
+const { notify } = useNotify();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -38,6 +39,8 @@ const ticket = computed(() => summaryRef.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
+const stateBtnDropdownRef = ref();
+const descriptorData = useArrayData('ticketData');
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -64,15 +67,19 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    if (!ticket.value.id) return;
-
-    const formData = {
-        ticketFk: ticket.value.id,
-        code: value,
-    };
-
-    await axios.post(`Tickets/state`, formData);
-    router.go(route.fullPath);
+    try {
+        stateBtnDropdownRef.value.hide();
+        const formData = {
+            ticketFk: entityId.value,
+            code: value,
+        };
+        await axios.post(`Tickets/state`, formData);
+        notify('globals.dataSaved', 'positive');
+        summaryRef.value?.fetch();
+        descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }
 
 function getNoteValue(description) {
@@ -125,6 +132,7 @@ function toTicketUrl(section) {
         </template>
         <template #header-right>
             <QBtnDropdown
+                ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
@@ -137,7 +145,7 @@ function toTicketUrl(section) {
                     option-value="code"
                     hide-dropdown-icon
                     focus-on-mount
-                    @update:model-value="changeState(item.code)"
+                    @update:model-value="changeState"
                 />
             </QBtnDropdown>
         </template>

src/pages/Travel/Card/TravelSummary.vue

@@ -121,6 +121,20 @@ const thermographsTableColumns = computed(() => {
             name: 'temperatureFk',
             align: 'left',
         },
+        {
+            label: t('globals.maxTemperature'),
+            field: 'maxTemperature',
+            name: 'maxTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
+        {
+            label: t('globals.minTemperature'),
+            field: 'minTemperature',
+            name: 'minTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
         {
             label: t('travel.thermographs.state'),
             field: 'result',
@@ -133,7 +147,7 @@ const thermographsTableColumns = computed(() => {
             name: 'destination',
             align: 'left',
             format: (val) =>
-                warehouses.value.find((warehouse) => warehouse.id === val).name,
+                warehouses.value.find((warehouse) => warehouse.id === val)?.name,
         },
         {
             label: t('travel.thermographs.created'),
@@ -319,7 +333,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     </template>
                     <template #body-cell-id="{ col, value }">
                         <QTd>
-                            <QBtn v-if="col.name === 'id'" flat color="blue">
+                            <QBtn v-if="col.name === 'id'" flat class="link">
                                 {{ value }}
                                 <EntryDescriptorProxy :id="value" />
                             </QBtn>

src/pages/Travel/Card/TravelThermographs.vue

@@ -47,6 +47,20 @@ const TableColumns = computed(() => {
             name: 'temperatureFk',
             align: 'left',
         },
+        {
+            label: t('globals.maxTemperature'),
+            field: 'maxTemperature',
+            name: 'maxTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
+        {
+            label: t('globals.minTemperature'),
+            field: 'minTemperature',
+            name: 'minTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
         {
             label: t('travel.thermographs.state'),
             field: 'result',
@@ -92,11 +106,7 @@ const openRemoveDialog = async (id) => {
             },
         })
         .onOk(async () => {
-            try {
-                await removeThermograph(id);
-            } catch (err) {
-                console.error('Error removing thermograph');
-            }
+            await removeThermograph(id);
         });
 };
 
@@ -106,9 +116,7 @@ const redirectToThermographForm = (action, id) => {
     };
 
     if (action === 'edit' && id) {
-        const params = {};
-        params.thermographId = id;
-        routeDetails.params = params;
+        routeDetails.query = { travelThermographFk: id };
     }
     router.push(routeDetails);
 };

src/pages/Travel/Card/TravelThermographsForm.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { reactive, ref, onBeforeMount } from 'vue';
+import { ref, onBeforeMount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
@@ -14,6 +14,7 @@ import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const props = defineProps({
     viewAction: {
@@ -28,24 +29,17 @@ const route = useRoute();
 const router = useRouter();
 const state = useState();
 const { notify } = useNotify();
+
+const fetchTravelThermographsRef = ref(null);
 const allowedContentTypes = ref('');
 const user = state.getUser();
 const dmsTypesOptions = ref([]);
 const companiesOptions = ref([]);
 const warehousesOptions = ref([]);
+const temperaturesOptions = ref([]);
+const thermographForm = ref({});
 const inputFileRef = ref(null);
 
-const thermographForm = reactive({
-    thermographId: null,
-    state: null,
-    reference: null,
-    dmsTypeId: null,
-    companyId: null,
-    warehouseId: null,
-    files: [],
-    description: null,
-});
-
 onBeforeMount(async () => {
     if (props.viewAction === 'create') {
         setCreateDefaultParams();
@@ -65,7 +59,7 @@ const fetchDmsTypes = async () => {
     try {
         const params = {
             filter: {
-                where: { code: 'miscellaneous' },
+                where: { code: 'thermograph' },
             },
         };
         const { data } = await axios.get('DmsTypes/findOne', { params });
@@ -77,88 +71,67 @@ const fetchDmsTypes = async () => {
 
 const setCreateDefaultParams = async () => {
     const dataResponse = await fetchDmsTypes();
-    thermographForm.companyId = user.value.companyFk;
-    thermographForm.warehouseId = user.value.warehouseFk;
-    thermographForm.reference = route.params.id;
-    thermographForm.dmsTypeId = dataResponse.id;
-    thermographForm.state = 'Ok';
-    thermographForm.description = t('travel.thermographs.travelFileDescription', {
+    thermographForm.value.companyId = user.value.companyFk;
+    thermographForm.value.warehouseId = user.value.warehouseFk;
+    thermographForm.value.reference = route.params.id;
+    thermographForm.value.dmsTypeId = dataResponse.id;
+    thermographForm.value.state = 'Ok';
+    thermographForm.value.description = t('travel.thermographs.travelFileDescription', {
         travelId: route.params.id,
     }).toUpperCase();
 };
 
 const setEditDefaultParams = async () => {
-    try {
-        const filterObj = { include: { relation: 'dms' } };
-        const filter = encodeURIComponent(JSON.stringify(filterObj));
-        const { data } = await axios.get(
-            `TravelThermographs/${route.params.thermographId}?filter=${filter}`
-        );
+    const filterObj = { include: { relation: 'dms' } };
+    const filter = encodeURIComponent(JSON.stringify(filterObj));
+    const { data } = await axios.get(
+        `TravelThermographs/${route.query.travelThermographFk}?filter=${filter}`
+    );
 
-        if (data) {
-            thermographForm.thermographId = data.thermographFk;
-            thermographForm.state = data.result;
-            thermographForm.reference = data.dms?.reference;
-            thermographForm.warehouseId = data.dms?.warehouseFk;
-            thermographForm.companyId = data.dms?.companyFk;
-            thermographForm.dmsTypeId = data.dms?.dmsTypeFk;
-            thermographForm.description = data.dms?.description || '';
-            thermographForm.hasFile = data.dms?.hasFile;
-            thermographForm.hasFileAttached = false;
-        }
-    } catch (err) {
-        console.error('Error fetching termograph');
+    if (data) {
+        thermographForm.value.thermographFk = data.thermographFk;
+        thermographForm.value.state = data.result;
+        thermographForm.value.reference = data.dms?.reference;
+        thermographForm.value.warehouseId = data.warehouseFk;
+        thermographForm.value.companyId = data.dms?.companyFk;
+        thermographForm.value.dmsTypeId = data.dms?.dmsTypeFk;
+        thermographForm.value.description = data.dms?.description || '';
+        thermographForm.value.hasFile = data.dms?.hasFile;
+        thermographForm.value.hasFileAttached = false;
+        thermographForm.value.maxTemperature = data.maxTemperature;
+        thermographForm.value.minTemperature = data.minTemperature;
+        thermographForm.value.temperatureFk = data.temperatureFk;
+        thermographForm.value.travelThermographFk = data.id;
     }
 };
 
-const onSubmit = () => {
-    props.viewAction === 'create' ? createThermograph() : updateThermograph();
-};
-
-const createThermograph = async () => {
+const onSubmit = async () => {
     const formData = new FormData();
-
-    thermographForm.files.forEach((file) => {
-        formData.append(file.name, file);
-    });
-
-    try {
-        await axios.post(`/travels/${route.params.id}/createThermograph`, formData, {
-            params: thermographForm,
-            headers: {
-                'Content-Type': 'multipart/form-data',
-            },
+    if (Array.isArray(thermographForm.value.files)) {
+        thermographForm.value.hasFileAttached = true;
+        thermographForm.value.files.forEach((file) => {
+            formData.append(file.name, file);
         });
-        router.push({ name: 'TravelThermographsIndex' });
-        notify(t('Thermograph created'), 'positive');
-    } catch (error) {
-        console.error('Error creating thermograph');
     }
-};
-
-const updateThermograph = async () => {
-    const formData = new FormData();
-
-    thermographForm.files.forEach((file) => {
-        formData.append(file.name, file);
+    delete thermographForm.value.files;
+    await axios.post(`/travels/${route.params.id}/saveThermograph`, formData, {
+        params: thermographForm.value,
+        headers: {
+            'Content-Type': 'multipart/form-data',
+        },
     });
-
-    try {
-        await axios.post(`travels/${route.params.id}/updateThermograph`, formData, {
-            params: thermographForm,
-            headers: {
-                'Content-Type': 'multipart/form-data',
-            },
-        });
-        router.push({ name: 'TravelThermographsIndex' });
-        notify(t('Thermograph created'), 'positive');
-    } catch (error) {
-        console.error('Error creating thermograph');
-    }
+    router.push({ name: 'TravelThermographsIndex' });
+    notify(t('Thermograph created'), 'positive');
 };
 
 const onThermographCreated = async (data) => {
-    thermographForm.thermographId = data.id;
+    await fetchTravelThermographsRef.value.fetch();
+    thermographForm.value = {
+        ...thermographForm.value,
+        ...data,
+        travelThermographFk: data.id,
+        warehouseId: data.warehouseFk,
+    };
 };
 </script>
 <template>
@@ -185,6 +158,11 @@ const onThermographCreated = async (data) => {
         :filter="{ order: 'name' }"
         auto-load
     />
+    <FetchData
+        @on-fetch="(data) => (temperaturesOptions = data)"
+        auto-load
+        url="Temperatures"
+    />
     <QPage class="column items-center full-width">
         <QForm
             model="travel"
@@ -219,21 +197,20 @@ const onThermographCreated = async (data) => {
                 <VnRow>
                     <VnSelectDialog
                         :label="t('travel.thermographs.thermograph')"
-                        v-model="thermographForm.thermographId"
+                        v-model="thermographForm.travelThermographFk"
                         url="TravelThermographs"
-                        option-value="thermographFk"
-                        option-label="thermographFk"
-                        :fields="['thermographFk']"
-                        :where="{ travelFk: null }"
+                        :fields="['id', 'thermographFk']"
+                        :where="{
+                            or: [{ travelFk: null }, { travelFk: $route.params.id }],
+                        }"
                         sort-by="thermographFk ASC"
+                        option-label="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
                     >
                         <template #form>
                             <CreateThermographForm
-                                @on-data-saved="
-                                    (data) => (thermographForm.thermographId = data.id)
-                                "
+                                @on-data-saved="onThermographCreated"
                             />
                         </template>
                     </VnSelectDialog>
@@ -271,6 +248,26 @@ const onThermographCreated = async (data) => {
                         option-label="name"
                     />
                 </VnRow>
+                <VnRow>
+                    <VnSelect
+                        :label="t('travel.thermographs.temperature')"
+                        :options="temperaturesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        v-model="thermographForm.temperatureFk"
+                        :required="true"
+                    />
+                    <VnInputNumber
+                        v-model="thermographForm.maxTemperature"
+                        :label="t('globals.maxTemperature')"
+                    />
+                    <VnInputNumber
+                        v-model="thermographForm.minTemperature"
+                        :label="t('globals.minTemperature')"
+                    />
+                </VnRow>
+
                 <VnRow v-if="viewAction === 'edit'" class="row q-gutter-md q-mb-md">
                     <QInput
                         :label="t('globals.description')"
@@ -310,8 +307,8 @@ const onThermographCreated = async (data) => {
     </QPage>
 </template>
 <i18n>
-es:
-    Select files: Selecciona ficheros
-    Thermograph created: Termógrafo creado
-    New thermograph: Nuevo termógrafo
+    es:
+        Select files: Selecciona ficheros
+        Thermograph created: Termógrafo creado
+        New thermograph: Nuevo termógrafo
 </i18n>

src/pages/Travel/TravelFilter.vue

@@ -0,0 +1,157 @@
+<script setup>
+import { ref } 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 VnInputTime from 'src/components/common/VnInputTime.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const states = ref([]);
+
+defineExpose({ states });
+</script>
+
+<template>
+    <FetchData url="warehouses" @on-fetch="(data) => (states = data)" auto-load />
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <div class="q-pa-sm q-gutter-y-sm">
+                <VnInput
+                    :label="t('travel.Id')"
+                    v-model="params.id"
+                    lazy-rules
+                    is-outlined
+                >
+                    <template #prepend> <QIcon name="badge" size="xs" /></template>
+                </VnInput>
+                <VnInput
+                    :label="t('travel.ref')"
+                    v-model="params.ref"
+                    lazy-rules
+                    is-outlined
+                />
+                <VnSelect
+                    :label="t('travel.agency')"
+                    v-model="params.agencyModeFk"
+                    @update:model-value="searchFn()"
+                    url="agencyModes"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnSelect
+                    :label="t('travel.warehouseInFk')"
+                    v-model="params.warehouseInFk"
+                    @update:model-value="searchFn()"
+                    url="warehouses"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputDate
+                    :label="t('travel.shipped')"
+                    v-model="params.shipped"
+                    @update:model-value="searchFn()"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputTime
+                    v-model="params.shipmentHour"
+                    @update:model-value="searchFn()"
+                    :label="t('travel.shipmentHour')"
+                    outlined
+                    rounded
+                    dense
+                />
+                <VnSelect
+                    :label="t('travel.warehouseOut')"
+                    v-model="params.warehouseOut"
+                    @update:model-value="searchFn()"
+                    url="warehouses"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputDate
+                    :label="t('travel.landed')"
+                    v-model="params.landed"
+                    @update:model-value="searchFn()"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputTime
+                    v-model="params.landingHour"
+                    @update:model-value="searchFn()"
+                    :label="t('travel.landingHour')"
+                    outlined
+                    rounded
+                    dense
+                />
+                <VnInput
+                    :label="t('travel.totalEntries')"
+                    v-model="params.totalEntries"
+                    lazy-rules
+                    is-outlined
+                />
+            </div>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    travel:
+        Id: Contains
+        ref: Reference
+        agency: Agency
+        warehouseInFk: W. In
+        shipped: Shipped
+        shipmentHour: Shipment Hour
+        warehouseOut: W. Out
+        landed: Landed
+        landingHour: Landing Hour
+        totalEntries: Σ
+es:
+    travel:
+        Id: Id
+        ref: Referencia
+        agency: Agencia
+        warehouseInFk: Alm.Salida
+        shipped: F.Envío
+        shipmentHour: Hora de envío
+        warehouseOut: Alm.Entrada
+        landed: F.Entrega
+        landingHour: Hora de entrega
+        totalEntries: Σ
+</i18n>

src/pages/Travel/TravelList.vue

@@ -1,18 +1,16 @@
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useRoute } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { computed } from 'vue';
 import TravelSummary from './Card/TravelSummary.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
-import { dateRange } from 'src/filters';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import TravelFilter from './TravelFilter.vue';
 
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
@@ -28,9 +26,9 @@ const $props = defineProps({
 });
 const entityId = computed(() => $props.id || route.params.id);
 
+const travelFilterRef = ref();
 onMounted(async () => {
     stateStore.rightDrawer = true;
-    handleScopeDays();
 });
 
 const cloneTravel = (travelData) => {
@@ -38,16 +36,6 @@ const cloneTravel = (travelData) => {
     redirectToCreateView(stringifiedTravelData);
 };
 
-function handleScopeDays(days = 7) {
-    days = +days;
-    tableRef.value.params.scopeDays = days;
-    const [landedFrom, landedTo] = dateRange(Date.vnNew());
-    landedTo.setDate(landedTo.getDate() + days);
-
-    tableRef.value.params.landedFrom = landedFrom;
-    tableRef.value.params.landedTo = landedTo;
-}
-
 const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
 };
@@ -173,6 +161,15 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'left',
+        name: 'daysOnward',
+        label: t('travel.travelList.tableVisibleColumns.daysOnward'),
+        visible: false,
+        columnFilter: {
+            inWhere: false,
+        },
+    },
     {
         align: 'right',
         label: '',
@@ -207,6 +204,11 @@ const columns = computed(() => [
         :label="t('Search travel')"
         data-key="TravelList"
     />
+    <RightMenu>
+        <template #right-panel>
+            <TravelFilter data-key="TravelList" ref="travelFilterRef" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="TravelList"
@@ -219,6 +221,8 @@ const columns = computed(() => [
                 editorFk: entityId,
             },
         }"
+        :right-search="false"
+        :user-params="{ daysOnward: 7 }"
         order="landed DESC"
         :columns="columns"
         auto-load

src/pages/Worker/WorkerList.vue

@@ -214,6 +214,7 @@ async function autofillBic(worker) {
                     <VnInput v-model="data.name" :label="t('worker.create.webUser')" />
                     <VnInput
                         v-model="data.email"
+                        type="email"
                         :label="t('worker.create.personalEmail')"
                     />
                 </VnRow>
@@ -262,6 +263,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnLocation
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
                         @update:model-value="(location) => handleLocation(data, location)"

src/pages/Zone/Card/ZoneEventExclusionForm.vue

@@ -154,7 +154,7 @@ onMounted(() => {
             </div>
             <div
                 v-if="excludeType === 'specificLocations'"
-                style="min-height: 60vh; overflow-y: scroll"
+                style="max-height: 60vh; overflow-y: scroll"
             >
                 <ZoneLocationsTree
                     :root-label="t('eventsExclusionForm.rootTreeLabel')"

src/pages/Zone/Card/ZoneEvents.vue

@@ -44,23 +44,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="dock_to_left"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <ZoneEventsPanel

src/pages/Zone/Card/ZoneLocationsTree.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
 import { useRoute } from 'vue-router';
-
+import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
@@ -144,7 +144,8 @@ watch(storeData, async (val) => {
 });
 
 const reFetch = async () => {
-    await arrayData.fetch({ append: false });
+    const { data } = await arrayData.fetch({ append: false });
+    nodes.value = data;
 };
 
 onMounted(async () => {
@@ -182,6 +183,16 @@ onUnmounted(() => {
 </script>
 
 <template>
+    <VnInput
+        v-if="showSearchBar"
+        v-model="store.userParams.search"
+        :placeholder="$t('globals.search')"
+        @update:model-value="reFetch()"
+    >
+        <template #prepend>
+            <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
+        </template>
+    </VnInput>
     <QTree
         ref="treeRef"
         :nodes="nodes"

src/pages/Zone/locale/es.yml

@@ -87,7 +87,7 @@ eventsPanel:
     travelingDays: Días de viaje
     price: Precio
     bonus: Bonificación
-    m3Max: Meidida máxima
+    m3Max: Medida máxima
     everyday: Todos los días
     delete: Eliminar
     deleteTitle: Este elemento será eliminado

src/router/modules/route.js

@@ -11,7 +11,14 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'AgencyList'],
+        main: [
+            'RouteList',
+            'RouteExtendedList',
+            'RouteAutonomous',
+            'RouteRoadmap',
+            'CmrList',
+            'AgencyList',
+        ],
         card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
     },
     children: [
@@ -19,9 +26,6 @@ export default {
             path: '/route',
             name: 'RouteMain',
             component: () => import('src/components/common/VnSectionMain.vue'),
-            props: {
-                leftDrawer: false,
-            },
             redirect: { name: 'RouteList' },
             children: [
                 {
@@ -33,6 +37,15 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteList.vue'),
                 },
+                {
+                    path: 'extended-list',
+                    name: 'RouteExtendedList',
+                    meta: {
+                        title: 'RouteExtendedList',
+                        icon: 'format_list_bulleted',
+                    },
+                    component: () => import('src/pages/Route/RouteExtendedList.vue'),
+                },
                 {
                     path: 'create',
                     name: 'RouteCreate',
@@ -78,7 +91,7 @@ export default {
                             name: 'AgencyList',
                             meta: {
                                 title: 'agencyList',
-                                icon: 'view_list',
+                                icon: 'list',
                             },
                             component: () =>
                                 import('src/pages/Route/Agency/AgencyList.vue'),

test/cypress/integration/vnComponent/UserPanel.spec.js

@@ -0,0 +1,58 @@
+/// <reference types="cypress" />
+describe('UserPanel', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit(`/#dashboard`);
+        cy.waitForElement('.q-page', 6000);
+    });
+
+    it('should notify when update user warehouse', () => {
+        const userWarehouse =
+            '.q-menu .q-gutter-xs > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native> .q-field__input';
+
+        // Abro el panel
+        cy.openUserPanel();
+
+        // Compruebo la opcion inicial
+        cy.get(userWarehouse).should('have.value', 'VNL').click();
+
+        // Actualizo la opción
+        getOption(3);
+
+        //Compruebo la notificación
+        cy.get('.q-notification').should('be.visible');
+        cy.get(userWarehouse).should('have.value', 'VNH');
+
+        //Restauro el valor
+        cy.get(userWarehouse).click();
+        getOption(2);
+    });
+    it('should notify when update user company', () => {
+        const userCompany =
+            '.q-menu .q-gutter-xs > :nth-child(2)  >  .q-field--float > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native> .q-field__input';
+
+        // Abro el panel
+        cy.openUserPanel();
+
+        // Compruebo la opcion inicial
+        cy.get(userCompany).should('have.value', 'Warehouse One').click();
+
+        //Actualizo la opción
+        getOption(2);
+
+        //Compruebo la notificación
+        cy.get('.q-notification').should('be.visible');
+        cy.get(userCompany).should('have.value', 'Warehouse Two');
+
+        //Restauro el valor
+        cy.get(userCompany).click();
+        getOption(1);
+    });
+});
+
+function getOption(index) {
+    cy.waitForElement('[role="listbox"]');
+    const option = `[role="listbox"] .q-item:nth-child(${index})`;
+    cy.get(option).click();
+}

test/cypress/integration/vnComponent/vnLocation.spec.js

@@ -3,25 +3,90 @@ describe('VnLocation', () => {
     const dialogInputs = '.q-dialog label input';
     const createLocationButton = '.q-form > .q-card > .vn-row:nth-child(6) .--add-icon';
     const inputLocation = '.q-form input[aria-label="Location"]';
+    const createForm = {
+        prefix: '.q-dialog__inner > .column > #formModel > .q-card',
+        sufix: ' .q-field__inner > .q-field__control',
+    };
+    describe('CreateFormDialog ', () => {
+        beforeEach(() => {
+            cy.viewport(1280, 720);
+            cy.login('developer');
+            cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
+            cy.waitForElement('.q-card');
+            cy.get(createLocationButton).click();
+        });
+        it('should filter provinces based on selected country', () => {
+            // Select a country
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
+                'Ecuador'
+            );
+            // Verify that provinces are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+
+            // Verify that towns are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+        });
+
+        it('should filter towns based on selected province', () => {
+            // Select a country
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
+                'Ecuador'
+            );
+            // Verify that provinces are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+
+            // Verify that towns are filtered
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
+            ).should('have.length', 1);
+        });
+        it('should pass selected country', () => {
+            // Select a country
+            const country = 'Ecuador';
+            const province = 'Province five';
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
+                country
+            );
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
+                province
+            );
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) > .q-icon`
+            ).click();
+            cy.get(
+                `#q-portal--dialog--4 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
+            ).should('have.value', province);
+        });
+    });
     describe('Worker Create', () => {
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
             cy.visit('/#/worker/create', { timeout: 5000 });
             cy.waitForElement('.q-card');
+            cy.get(inputLocation).click();
         });
         it('Show all options', function () {
-            cy.get(inputLocation).click();
             cy.get(locationOptions).should('have.length.at.least', 5);
         });
         it('input filter location as "al"', function () {
-            cy.get(inputLocation).click();
+            // cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('al');
             cy.get(locationOptions).should('have.length.at.least', 4);
         });
         it('input filter location as "ecuador"', function () {
-            cy.get(inputLocation).click();
+            // cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('ecuador');
             cy.get(locationOptions).should('have.length.at.least', 1);
@@ -63,13 +128,11 @@ describe('VnLocation', () => {
             cy.get(dialogInputs).eq(0).clear();
             cy.get(dialogInputs).eq(0).type(postCode);
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > .q-select > .q-field__inner > .q-field__control ',
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
                 province
             );
             cy.get('.q-mt-lg > .q-btn--standard').click();
-            cy.get('.q-dialog__inner > .column > #formModel > .q-card').should(
-                'not.exist'
-            );
+            cy.get(`${createForm.prefix}`).should('not.exist');
             checkVnLocation(postCode, province);
         });
         it('Create city', () => {
@@ -79,7 +142,7 @@ describe('VnLocation', () => {
             cy.get(dialogInputs).eq(0).type(postCode);
             // city create button
             cy.get(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > .q-select > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon'
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
             ).click();
             cy.selectOption('#q-portal--dialog--2 .q-select', 'one');
             cy.get('#q-portal--dialog--2 .q-input').type(province);
@@ -89,9 +152,7 @@ describe('VnLocation', () => {
         });
 
         function checkVnLocation(postCode, province) {
-            cy.get('.q-dialog__inner > .column > #formModel > .q-card').should(
-                'not.exist'
-            );
+            cy.get(`${createForm.prefix}`).should('not.exist');
             cy.get('.q-form > .q-card > .vn-row:nth-child(6)')
                 .find('input')
                 .invoke('val')

test/cypress/support/commands.js

@@ -248,3 +248,9 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
 Cypress.Commands.add('openActionsDescriptor', () => {
     cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
 });
+
+Cypress.Commands.add('openUserPanel', () => {
+    cy.get(
+        '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image'
+    ).click();
+});