From 3a0204d27bde863207db6d8a621611cd7085dc18 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Jul 2024 14:58:51 +0200
Subject: [PATCH 01/19] feat: vnLocation changes

---
 src/components/common/VnLocation.vue          | 149 +++++++++++-------
 .../Customer/Card/CustomerFiscalData.vue      |   6 +-
 .../Supplier/Card/SupplierFiscalData.vue      |  10 +-
 .../vnComponent/vnLocation.spec.js            |   2 +-
 4 files changed, 98 insertions(+), 69 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 9ed48ca15..fc19e509f 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -1,18 +1,23 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
+import { ref, toRefs, onMounted, nextTick } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-const emit = defineEmits(['update:modelValue', 'update:options']);
+const emit = defineEmits(['update:selected', 'update:options']);
 import { useI18n } from 'vue-i18n';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
 const postcodesOptions = ref([]);
-const postcodesRef = ref(null);
+const postcodesOptionsOriginal = ref([]);
+// const postcodesRef = ref(null);
 
 const $props = defineProps({
-    modelValue: {
-        type: [String, Number, Object],
+    postalCodeKey: {
+        type: String,
+        default: 'postalCode',
+    },
+    location: {
+        type: Object,
         default: null,
     },
     options: {
@@ -41,89 +46,115 @@ const $props = defineProps({
     },
 });
 
-const { options } = toRefs($props);
-const myOptions = ref([]);
-const myOptionsOriginal = ref([]);
-
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        emit(
-            'update:modelValue',
-            postcodesOptions.value.find((p) => p.code === value)
-        );
-    },
+const selectedId = ref(null);
+const mySelect = ref();
+const modelValue = ref($props.location[$props.postalCodeKey]);
+const arrayData = useArrayData('postcodes', {
+    url: 'Postcodes/filter',
+    limit: 1,
 });
 
-onMounted(() => {
-    locationFilter($props.modelValue);
-});
+function sanitizePostcode(data) {
+    return data.map((postcode) => ({
+        ...postcode,
+        original: postcode,
+        id: sanitizeId(postcode),
+        label: sanitizeLabel(postcode),
+    }));
+}
 
+function sanitizeId(postcode) {
+    return `${postcode.code ?? postcode[$props.postalCodeKey]}_${postcode.provinceFk}_${
+        postcode.countryFk
+    }`;
+}
+onMounted(async () => {
+    await retriveOptions();
+    nextTick(() => mySelect.value.showPopup());
+});
+async function retriveOptions() {
+    let options = [];
+    if (modelValue.value) {
+        await locationFilter(modelValue.value, () => {});
+        options = arrayData.store.data;
+    } else {
+        const { data } = await arrayData.fetch({ updateRouter: false, append: true });
+        options = data;
+    }
+    setOptions(options);
+}
+function findOptionById(postcode) {
+    return postcodesOptions.value.find((p) => p.id === postcode);
+}
 function setOptions(data) {
-    myOptions.value = JSON.parse(JSON.stringify(data));
-    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
-}
-setOptions(options.value);
-
-watch(options, (newValue) => {
-    setOptions(newValue);
-});
-
-function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    postcodesOptions.value = sanitizePostcode(data);
+    if (modelValue.value) {
+        const { [$props.postalCodeKey]: code } = $props.location;
+        selectedId.value =
+            findOptionById(sanitizeId({ ...$props.location, code })) ??
+            sanitizePostcode([$props.location])[0];
+    }
+    postcodesOptionsOriginal.value = JSON.parse(JSON.stringify(postcodesOptions.value));
 }
 
-function locationFilter(search = '') {
-    if (
-        search &&
-        (search.includes('undefined') || search.startsWith(`${$props.modelValue} - `))
-    )
+async function handleInput(value) {
+    if (value) emit('update:selected', findOptionById(value));
+    if (modelValue.value) {
+        modelValue.value = value;
+        arrayData.store.userFilter = {};
+        await retriveOptions();
+        mySelect.value.showPopup();
+    } else postcodesOptions.value = postcodesOptionsOriginal.value;
+}
+function sanitizeLabel(postcode) {
+    return `${postcode.code ?? postcode[$props.postalCodeKey]} - ${postcode.town}(${
+        postcode.province
+    }), ${postcode.country}`;
+}
+
+async function locationFilter(search, update) {
+    if (search.length === 0) {
         return;
+    }
     let where = { search };
-    postcodesRef.value.fetch({ filter: { where }, limit: 30 });
+    arrayData.store.userFilter = { filter: { where } };
+    await arrayData.fetch({ append: false, updateRouter: false });
+
+    update(() => {
+        postcodesOptions.value = sanitizePostcode(arrayData.store.data);
+    });
 }
 
-function handleFetch(data) {
-    postcodesOptions.value = data;
-}
 function onDataSaved(newPostcode) {
     postcodesOptions.value.push(newPostcode);
-    value.value = newPostcode.code;
+    selectedId.value = newPostcode.code ?? newPostcode[$props.postalCodeKey];
 }
 </script>
 <template>
-    <FetchData
-        ref="postcodesRef"
-        url="Postcodes/filter"
-        @on-fetch="(data) => handleFetch(data)"
-    />
     <VnSelectDialog
-        v-if="postcodesRef"
-        :option-label="(opt) => showLabel(opt) ?? 'code'"
-        :option-value="(opt) => opt.code"
-        v-model="value"
+        ref="mySelect"
+        option-label="label"
+        option-value="id"
+        v-model="selectedId"
         :options="postcodesOptions"
         :label="t('Location')"
+        @update:model-value="handleInput"
         :placeholder="t('search_by_postalcode')"
-        @input-value="locationFilter"
-        :default-filter="false"
+        @filter="locationFilter"
         :input-debounce="300"
         :class="{ required: $attrs.required }"
         v-bind="$attrs"
         clearable
+        emit-value
     >
         <template #form>
-            <CreateNewPostcode
-                @on-data-saved="onDataSaved"
-            />
+            <CreateNewPostcode @on-data-saved="onDataSaved" />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
                 <QItemSection v-if="opt.code">
                     <QItemLabel>{{ opt.code }}</QItemLabel>
-                    <QItemLabel caption>{{ showLabel(opt) }}</QItemLabel>
+                    <QItemLabel caption>{{ opt.label }}</QItemLabel>
                 </QItemSection>
             </QItem>
         </template>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index a7cdfafc5..d05e4fa01 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -95,9 +95,9 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    :options="postcodesOptions"
-                    v-model="data.postcode"
-                    @update:model-value="(location) => handleLocation(data, location)"
+                    :location="data"
+                    postal-code-key="postcode"
+                    @update:selected="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
             </VnRow>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 179c6f5e6..61077d48e 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -17,11 +17,10 @@ const sageTaxTypesOptions = ref([]);
 const sageWithholdingsOptions = ref([]);
 const sageTransactionTypesOptions = ref([]);
 const supplierActivitiesOptions = ref([]);
-const postcodesOptions = ref([]);
 
 function handleLocation(data, location) {
-    const { town, code, provinceFk, countryFk } = location ?? {};
-    data.postCode = code;
+    const { town, label, provinceFk, countryFk } = location ?? {};
+    data.postCode = label;
     data.city = town;
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
@@ -131,9 +130,8 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    :options="postcodesOptions"
-                    v-model="data.postCode"
-                    @update:model-value="(location) => handleLocation(data, location)"
+                    :location="data"
+                    @update:selected="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
             </VnRow>
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 6719d8391..c465b152c 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -17,7 +17,7 @@ describe('VnLocation', () => {
             cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('al');
-            cy.get(locationOptions).should('have.length.at.least', 3);
+            cy.get(locationOptions).should('have.length.at.least', 4);
         });
         it('input filter location as "ecuador"', function () {
             cy.get(inputLocation).click();

From 92130b4c9c770c6cc49e1253885f7837bcba29cf Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 08:09:27 +0200
Subject: [PATCH 02/19] WIP: 59262019 Merge pull request '#7283 finish item
 card sections' (!588) from 7283-itemSectionsMigration into dev

---
 src/components/common/VnLocation.vue | 103 +++------------------------
 1 file changed, 9 insertions(+), 94 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 4d429a995..8256ec5b0 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -1,124 +1,39 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';
-import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
-const postcodesOptions = ref([]);
-const postcodesRef = ref(null);
-
-const $props = defineProps({
-    modelValue: {
-        type: [String, Number, Object],
-        default: null,
-    },
-    options: {
-        type: Array,
-        default: () => [],
-    },
-    optionLabel: {
-        type: String,
-        default: '',
-    },
-    optionValue: {
-        type: String,
-        default: '',
-    },
-    filterOptions: {
-        type: Array,
-        default: () => [],
-    },
-    isClearable: {
-        type: Boolean,
-        default: true,
-    },
-    defaultFilter: {
-        type: Boolean,
-        default: true,
-    },
-});
-
-const { options } = toRefs($props);
-const myOptions = ref([]);
-const myOptionsOriginal = ref([]);
-
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        emit(
-            'update:modelValue',
-            postcodesOptions.value.find((p) => p.code === value)
-        );
-    },
-});
-
-onMounted(() => {
-    locationFilter($props.modelValue);
-});
-
-function setOptions(data) {
-    myOptions.value = JSON.parse(JSON.stringify(data));
-    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
-}
-setOptions(options.value);
-
-watch(options, (newValue) => {
-    setOptions(newValue);
-});
+const value = defineModel({ type: [String, Number, Object] });
 
 function showLabel(data) {
     return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
-
-function locationFilter(search = '') {
-    if (
-        search &&
-        (search.includes('undefined') || search.startsWith(`${$props.modelValue} - `))
-    )
-        return;
-    let where = { search };
-    postcodesRef.value.fetch({ filter: { where }, limit: 30 });
-}
-
-function handleFetch(data) {
-    postcodesOptions.value = data;
-}
-function onDataSaved(newPostcode) {
-    postcodesOptions.value.push(newPostcode);
-    value.value = newPostcode.code;
-}
 </script>
 <template>
     <VnSelectDialog
-        v-if="postcodesRef"
-        :option-label="(opt) => showLabel(opt) ?? 'code'"
-        :option-value="(opt) => opt.code"
         v-model="value"
-        :options="postcodesOptions"
+        option-value="code"
+        option-filter-value="search"
+        :option-label="(opt) => showLabel(opt)"
+        url="Postcodes/filter"
+        :use-like="false"
         :label="t('Location')"
-        @update:model-value="handleInput"
         :placeholder="t('search_by_postalcode')"
-        @input-value="locationFilter"
-        :default-filter="false"
         :input-debounce="300"
         :class="{ required: $attrs.required }"
         v-bind="$attrs"
         clearable
+        :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="onDataSaved" />
+            <CreateNewPostcode @on-data-saved="(newValue) => (value = newValue)" />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
                 <QItemSection v-if="opt.code">
                     <QItemLabel>{{ opt.code }}</QItemLabel>
-                    <QItemLabel caption>{{ opt.label }}</QItemLabel>
+                    <QItemLabel caption>{{ showLabel(opt) }}</QItemLabel>
                 </QItemSection>
             </QItem>
         </template>

From 55b9cd9ff44f29fb95da4958c29d18ea1ae4207d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 09:18:24 +0200
Subject: [PATCH 03/19] feat: handle same multiple CP

---
 src/components/common/VnLocation.vue          | 24 ++++++++++++-----
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 src/pages/Customer/Card/CustomerAddress.vue   | 26 ++++++-------------
 .../Customer/Card/CustomerFiscalData.vue      |  2 +-
 src/pages/Customer/CustomerCreate.vue         |  1 -
 src/pages/Customer/CustomerList.vue           |  1 -
 .../components/CustomerAddressCreate.vue      |  1 -
 .../components/CustomerAddressEdit.vue        |  7 ++++-
 src/pages/Supplier/Card/SupplierAddresses.vue |  8 +++++-
 .../Supplier/Card/SupplierAddressesCreate.vue | 12 ++++++++-
 .../Supplier/Card/SupplierFiscalData.vue      | 24 ++++++++++++++++-
 src/pages/Worker/WorkerCreate.vue             |  1 -
 src/pages/Worker/WorkerList.vue               |  1 -
 src/router/modules/customer.js                |  2 +-
 15 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 8256ec5b0..778932be3 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -2,20 +2,32 @@
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
-
+import { ref } from 'vue';
 const { t } = useI18n();
-const value = defineModel({ type: [String, Number, Object] });
 
+const props = defineProps({
+    location: {
+        type: Object,
+        default: null,
+    },
+});
+const modelValue = ref(
+    props.location
+        ? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
+        : null
+);
 function showLabel(data) {
     return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 </script>
 <template>
+    {{ modelValue }}
     <VnSelectDialog
-        v-model="value"
-        option-value="code"
+        v-model="modelValue"
         option-filter-value="search"
-        :option-label="(opt) => showLabel(opt)"
+        :option-label="
+            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
+        "
         url="Postcodes/filter"
         :use-like="false"
         :label="t('Location')"
@@ -27,7 +39,7 @@ function showLabel(data) {
         :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="(newValue) => (value = newValue)" />
+            <CreateNewPostcode @on-data-saved="(newValue) => (modelValue = newValue)" />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ee53da80c..f61dda8a4 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -95,6 +95,7 @@ globals:
     to: To
     pageTitles:
         logIn: Login
+        addressEdit: Update address
         summary: Summary
         basicData: Basic data
         log: Logs
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 86963f3dc..4e71a69fb 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -95,6 +95,7 @@ globals:
     to: Hasta
     pageTitles:
         logIn: Inicio de sesión
+        addressEdit: Modificar consignatario
         summary: Resumen
         basicData: Datos básicos
         log: Historial
diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index 6c8279d84..a97b45a50 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -5,15 +5,12 @@ import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
 
-import FetchData from 'components/FetchData.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
 const addresses = ref([]);
 const client = ref(null);
-const provincesLocation = ref([]);
 
 const addressFilter = {
     fields: [
@@ -41,7 +38,13 @@ const addressFilter = {
         {
             relation: 'province',
             scope: {
-                fields: ['id', 'name'],
+                fields: ['id', 'name', 'countryFk'],
+                include: [
+                    {
+                        relation: 'country',
+                        scope: { fields: ['id', 'name'] },
+                    },
+                ],
             },
         },
     ],
@@ -83,13 +86,6 @@ const getClientData = async (id) => {
     }
 };
 
-const setProvince = (provinceFk) => {
-    const result = provincesLocation.value.filter(
-        (province) => province.id === provinceFk
-    );
-    return result[0]?.name || '';
-};
-
 const isDefaultAddress = (address) => {
     return client?.value?.defaultAddressFk === address.id ? 1 : 0;
 };
@@ -128,12 +124,6 @@ const toCustomerAddressEdit = (addressId) => {
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (provincesLocation = data)"
-        auto-load
-        url="Provinces/location"
-    />
-
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg" v-if="addresses.length">
             <QCardSection>
@@ -177,7 +167,7 @@ const toCustomerAddressEdit = (addressId) => {
                         <div>{{ item.street }}</div>
                         <div>
                             {{ item.postalCode }} - {{ item.city }},
-                            {{ setProvince(item.provinceFk) }}
+                            {{ item.province.name }}
                         </div>
                         <div class="flex">
                             <QCheckbox
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 5cc656bb3..54b8adb70 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -94,7 +94,7 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    v-model="data.postcode"
+                    :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
             </VnRow>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 041c92d17..193ed59c9 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -87,7 +87,6 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
                     </VnLocation>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 82ad559ad..1dc0dab43 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -413,7 +413,6 @@ function handleLocation(data, location) {
         <template #more-create-dialog="{ data }">
             <VnLocation
                 :roles-allowed-to-create="['deliveryAssistant']"
-                v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
             <QInput v-model="data.userName" :label="t('Web user')" />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..e37306a94 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -93,7 +93,6 @@ function handleLocation(data, location) {
             <VnLocation
                 :rules="validate('Worker.postcode')"
                 :roles-allowed-to-create="['deliveryAssistant']"
-                v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
 
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..133d2fabc 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -177,7 +177,12 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.postalCode"
+                        :location="{
+                            postcode: data.postalCode,
+                            city: data.city,
+                            province: data.province,
+                            country: data.province.country,
+                        }"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>
                 </div>
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index 735b50625..4b2174d0b 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -26,7 +26,13 @@ const addressesFilter = {
         {
             relation: 'province',
             scope: {
-                fields: ['id', 'name'],
+                fields: ['id', 'name', 'countryFk'],
+                include: [
+                    {
+                        relation: 'country',
+                        scope: { fields: ['id', 'name'] },
+                    },
+                ],
             },
         },
     ],
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index da6549a24..df98b6091 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -21,6 +21,7 @@ const newAddressForm = reactive({
     provinceFk: null,
     phone: null,
     mobile: null,
+    province: null,
 });
 
 const onDataSaved = () => {
@@ -84,7 +85,16 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
+                        :location="
+                            data.postalCode
+                                ? {
+                                      postcode: data.postalCode,
+                                      city: data.city,
+                                      province: data.province,
+                                      country: data.province.country,
+                                  }
+                                : null
+                        "
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
                     </VnLocation>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index c638abbdc..c2cb42c6a 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -51,6 +51,23 @@ function handleLocation(data, location) {
         :url="`Suppliers/${route.params.id}`"
         :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
         model="supplier"
+        :filter="{
+            fields: ['id', 'name', 'city', 'postCode', 'countryFk', 'provinceFk'],
+            include: [
+                {
+                    relation: 'province',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+                {
+                    relation: 'country',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+            ],
+        }"
         auto-load
         :clear-store-on-unmount="false"
     >
@@ -130,7 +147,12 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    v-model="data.postCode"
+                    :location="{
+                        postcode: data.postCode,
+                        city: data.city,
+                        province: data.province,
+                        country: data.country,
+                    }"
                     @update:model-value="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index a1ded2bfd..5f96c136d 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -172,7 +172,6 @@ onBeforeMount(async () => {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                         :disable="formData.isFreelance"
                     >
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 0c2656597..9d4c3acbf 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -223,7 +223,6 @@ function uppercaseStreetModel(data) {
                     <VnLocation
                         :roles-allowed-to-create="['deliveryAssistant']"
                         :options="postcodesOptions"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                         :disable="data.isFreelance"
                     >
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 684b83b0f..f364bd862 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -174,7 +174,7 @@ export default {
                                     path: 'edit',
                                     name: 'CustomerAddressEdit',
                                     meta: {
-                                        title: 'address-edit',
+                                        title: 'addressEdit',
                                     },
                                     component: () =>
                                         import(

From 8acd008f42e02a80f0c491394f41335705dc3b85 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 09:47:27 +0200
Subject: [PATCH 04/19] feat: handle newValue

---
 src/components/common/VnLocation.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 778932be3..2fbe357ba 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -4,6 +4,7 @@ import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
 import { ref } from 'vue';
 const { t } = useI18n();
+const emit = defineEmits(['update:model-value', 'update:options']);
 
 const props = defineProps({
     location: {
@@ -39,7 +40,14 @@ function showLabel(data) {
         :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="(newValue) => (modelValue = newValue)" />
+            <CreateNewPostcode
+                @on-data-saved="
+                    (newValue) => {
+                        modelValue = newValue;
+                        emit('update:model-value', newValue);
+                    }
+                "
+            />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">

From 9eff6b56ea4f78fbc8938dbbf5d22f89a4cd843a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 09:48:59 +0200
Subject: [PATCH 05/19] fix: remove print variable

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

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 2fbe357ba..e95d5a043 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -22,7 +22,6 @@ function showLabel(data) {
 }
 </script>
 <template>
-    {{ modelValue }}
     <VnSelectDialog
         v-model="modelValue"
         option-filter-value="search"

From a131cb559dbbc8f012f650bd6cbdd0130042a6d4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 13:34:40 +0200
Subject: [PATCH 06/19] feat: add max rule

---
 src/components/common/VnInput.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 75d4b8a28..e79a235d5 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -67,9 +67,13 @@ const mixinRules = [
     requiredFieldRule,
     ...($attrs.rules ?? []),
     (val) => {
-        const { min } = vnInputRef.value.$attrs;
+        const { min, max } = vnInputRef.value.$attrs;
         if (!min) return null;
         if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
+        if (!max) return null;
+        if (max > 0) {
+            if (Math.floor(val) > max) return t('inputMax', { value: max });
+        }
     },
 ];
 </script>
@@ -116,6 +120,8 @@ const mixinRules = [
 <i18n>
     en:
         inputMin: Must be more than {value}
+        inputMax: Must be less than {value}
     es:
         inputMin: Debe ser mayor a {value}
+        inputMax: Debe ser menor a {value}
 </i18n>

From 6b79d70551f4bdc981c20816d1b014f6d4162fa7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Sep 2024 09:14:55 +0200
Subject: [PATCH 07/19] refactor: refs #7828 wip

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 50 +++++++++------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index abf60a078..2f66fbcc1 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -271,44 +271,38 @@ const fetchWorkerTimeControlMails = async (filter) => {
 
 const fetchWeekData = async () => {
     try {
-        const filter = {
-            where: {
-                workerFk: route.params.id,
-                year: selectedDate.value ? selectedDate.value?.getFullYear() : null,
-                week: selectedWeekNumber.value,
-            },
-        };
-
-        const data = await fetchWorkerTimeControlMails(filter);
-        if (!data.length) {
-            state.value = null;
-        } else {
+        const data = (
+            await axios.get(`WorkerTimeControlMails/${route.params.id}/getWeeklyMail`, {
+                params: {
+                    workerFk: route.params.id,
+                    year: selectedDate.value.getFullYear(),
+                    week: selectedWeekNumber.value,
+                },
+            })
+        ).data;
+        if (!data.length) state.value = null;
+        else {
             const [mail] = data;
             state.value = mail.state;
             reason.value = mail.reason;
         }
 
-        await canBeResend();
+        canResend.value = !!(
+            await axios.get('WorkerTimeControlMails/count', {
+                filter: {
+                    where: {
+                        year: selectedDate.value.getFullYear(),
+                        week: selectedWeekNumber.value,
+                        limit: 1,
+                    },
+                },
+            })
+        ).data.count;
     } catch (err) {
         console.error('Error fetching week data');
     }
 };
 
-const canBeResend = async () => {
-    canResend.value = false;
-
-    const filter = {
-        where: {
-            year: selectedDate.value.getFullYear(),
-            week: selectedWeekNumber.value,
-        },
-        limit: 1,
-    };
-
-    const data = await fetchWorkerTimeControlMails(filter);
-    if (data.length) canResend.value = true;
-};
-
 const setHours = (data) => {
     for (const weekDay of weekDays.value) {
         if (data) {

From 44fd356d63ee78589a3902ba1891ec41dd5d39ad Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Sep 2024 13:19:31 +0200
Subject: [PATCH 08/19] feat: refs #7828 useAcl & cherry pick mail data worker

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 63 +++++++--------------
 1 file changed, 22 insertions(+), 41 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 2f66fbcc1..3893305a5 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -12,7 +12,6 @@ import WorkerTimeControlCalendar from 'pages/Worker/Card/WorkerTimeControlCalend
 
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
-import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useStateStore } from 'stores/useStateStore';
@@ -63,13 +62,16 @@ const selectedCalendarDates = ref([]);
 const selectedDateFormatted = ref(toDateString(defaultDate.value));
 
 const arrayData = useArrayData('workerData');
-
+const acl = useAcl();
 const worker = computed(() => arrayData.store?.data);
-
-const isHr = computed(() => useRole().hasAny(['hr']));
-
-const canSend = computed(() => useAcl().hasAny('WorkerTimeControl', 'sendMail', 'WRITE'));
-
+const canSend = computed(() =>
+    acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }])
+);
+const canUpdate = computed(() =>
+    acl.hasAny([
+        { model: 'WorkerTimeControl', props: 'updateMailState', accessType: 'WRITE' },
+    ])
+);
 const isHimself = computed(() => user.value.id === Number(route.params.id));
 
 const columns = computed(() => {
@@ -257,46 +259,25 @@ const fetchHours = async () => {
     }
 };
 
-const fetchWorkerTimeControlMails = async (filter) => {
-    try {
-        const { data } = await axios.get('WorkerTimeControlMails', {
-            params: { filter: JSON.stringify(filter) },
-        });
-
-        return data;
-    } catch (err) {
-        console.error('Error fetching worker time control mails');
-    }
-};
-
 const fetchWeekData = async () => {
+    const where = {
+        year: selectedDate.value.getFullYear(),
+        week: selectedWeekNumber.value,
+    };
     try {
-        const data = (
-            await axios.get(`WorkerTimeControlMails/${route.params.id}/getWeeklyMail`, {
-                params: {
-                    workerFk: route.params.id,
-                    year: selectedDate.value.getFullYear(),
-                    week: selectedWeekNumber.value,
-                },
+        const mail = (
+            await axios.get(`Workers/${route.params.id}/mail`, {
+                params: { filter: { where } },
             })
-        ).data;
-        if (!data.length) state.value = null;
+        ).data[0];
+        if (!mail) state.value = null;
         else {
-            const [mail] = data;
             state.value = mail.state;
             reason.value = mail.reason;
         }
 
         canResend.value = !!(
-            await axios.get('WorkerTimeControlMails/count', {
-                filter: {
-                    where: {
-                        year: selectedDate.value.getFullYear(),
-                        week: selectedWeekNumber.value,
-                        limit: 1,
-                    },
-                },
-            })
+            await axios.get('WorkerTimeControlMails/count', { params: { where } })
         ).data.count;
     } catch (err) {
         console.error('Error fetching week data');
@@ -443,7 +424,7 @@ onMounted(async () => {
         <div>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <QBtn
-                    v-if="isHimself && state"
+                    v-if="canUpdate && state"
                     :label="t('Satisfied')"
                     color="primary"
                     type="submit"
@@ -451,7 +432,7 @@ onMounted(async () => {
                     @click="isSatisfied()"
                 />
                 <QBtn
-                    v-if="isHimself && state"
+                    v-if="canUpdate && state"
                     :label="t('Not satisfied')"
                     color="primary"
                     type="submit"
@@ -462,7 +443,7 @@ onMounted(async () => {
             </QBtnGroup>
             <QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
                 <QBtn
-                    v-if="reason && state && (isHimself || isHr)"
+                    v-if="reason && state && canUpdate"
                     :label="t('Reason')"
                     color="primary"
                     type="submit"

From 58be11df046f33259a794effec4bc84b9e0728b0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 10:13:03 +0200
Subject: [PATCH 09/19] chore: refs #7828 fix e2e

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

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 516b0f13d..8192b7c7c 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -5,7 +5,7 @@ describe('Ticket descriptor', () => {
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;
-    const weightValue = ':nth-child(10) > .value > span';
+    const weightValue = '.summaryBody.row :nth-child(1) > :nth-child(9) > .value > span';
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);

From 5796bc9c0a7e0dc27378b1b053eded6c07a53bbb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 10:32:40 +0200
Subject: [PATCH 10/19] fix: emit:updateModelValue

---
 src/components/common/VnLocation.vue          |  4 +++
 .../vnComponent/vnLocation.spec.js            | 32 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index e95d5a043..b6cbfbafd 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -20,6 +20,9 @@ const modelValue = ref(
 function showLabel(data) {
     return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
+const handleModelValue = (data) => {
+    emit('update:model-value', data);
+};
 </script>
 <template>
     <VnSelectDialog
@@ -29,6 +32,7 @@ function showLabel(data) {
             (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
         "
         url="Postcodes/filter"
+        @update:model-value="handleModelValue"
         :use-like="false"
         :label="t('Location')"
         :placeholder="t('search_by_postalcode')"
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 614b93a8a..8c187cc7e 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -33,11 +33,40 @@ describe('VnLocation', () => {
             cy.login('developer');
             cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
             cy.waitForElement('.q-form');
-            cy.get(createLocationButton).click();
         });
+        it('Fin by postalCode', () => {
+            const postCode = '46600';
+            const firstOption = '[role="listbox"] .q-item:nth-child(1)';
+
+            cy.get(inputLocation).click();
+            cy.get(inputLocation).clear();
+            cy.get(inputLocation).type(postCode);
+            cy.get(locationOptions).should('have.length.at.least', 2);
+            cy.get(firstOption).click();
+            cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
+            cy.reload();
+            cy.waitForElement('.q-form');
+            // cy.get('[href="#/supplier/567/basic-data"] > .q-item__section--main').click();
+            // cy.get(
+            //     '[href="#/supplier/567/fiscal-data"] > .q-item__section--main'
+            // ).click();
+            cy.get(inputLocation).should(
+                'have.value',
+                '46600 - Valencia(Province one), España'
+            );
+
+            // cy.get('.q-form > .q-card > .vn-row:nth-child(6)')
+            // .find('input')
+            // .invoke('val')
+            // .then((text) => {
+            //     expect(text).to.contain('46600 - Valencia(Province one), España');
+            // });
+        });
+
         it('Create postCode', () => {
             const postCode = '1234475';
             const province = 'Valencia';
+            cy.get(createLocationButton).click();
             cy.get('.q-card > h1').should('have.text', 'New postcode');
             cy.get(dialogInputs).eq(0).clear();
             cy.get(dialogInputs).eq(0).type(postCode);
@@ -54,6 +83,7 @@ describe('VnLocation', () => {
         it('Create city', () => {
             const postCode = '9011';
             const province = 'Saskatchew';
+            cy.get(createLocationButton).click();
             cy.get(dialogInputs).eq(0).type(postCode);
             // city create button
             cy.get(

From a56dc7aa089c2b46d37bb92aa2c7279316f93b07 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 10:33:08 +0200
Subject: [PATCH 11/19] test: fix test

---
 .../integration/vnComponent/vnLocation.spec.js        | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 8c187cc7e..3533a3c1f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -46,21 +46,10 @@ describe('VnLocation', () => {
             cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
             cy.reload();
             cy.waitForElement('.q-form');
-            // cy.get('[href="#/supplier/567/basic-data"] > .q-item__section--main').click();
-            // cy.get(
-            //     '[href="#/supplier/567/fiscal-data"] > .q-item__section--main'
-            // ).click();
             cy.get(inputLocation).should(
                 'have.value',
                 '46600 - Valencia(Province one), España'
             );
-
-            // cy.get('.q-form > .q-card > .vn-row:nth-child(6)')
-            // .find('input')
-            // .invoke('val')
-            // .then((text) => {
-            //     expect(text).to.contain('46600 - Valencia(Province one), España');
-            // });
         });
 
         it('Create postCode', () => {

From 48a5c15b9d8a466676c4b069a0e67b41f4b5c14c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 10:54:09 +0200
Subject: [PATCH 12/19] feat: refs #7828 create axios instance which no manage
 errors

---
 src/boot/axios.js                           | 8 ++++++--
 src/pages/Worker/Card/WorkerTimeControl.vue | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/boot/axios.js b/src/boot/axios.js
index 9b32275bd..99a163cca 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -5,8 +5,10 @@ import useNotify from 'src/composables/useNotify.js';
 
 const session = useSession();
 const { notify } = useNotify();
+const baseUrl = '/api/';
 
-axios.defaults.baseURL = '/api/';
+axios.defaults.baseURL = baseUrl;
+const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
     const token = session.getToken();
@@ -79,5 +81,7 @@ const onResponseError = (error) => {
 
 axios.interceptors.request.use(onRequest, onRequestError);
 axios.interceptors.response.use(onResponse, onResponseError);
+axiosNoError.interceptors.request.use(onRequest);
+axiosNoError.interceptors.response.use(onResponse);
 
-export { onRequest, onResponseError };
+export { onRequest, onResponseError, axiosNoError };
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 3893305a5..9ae91f8ce 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -2,6 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { onMounted, ref, computed, onBeforeMount, nextTick, reactive } from 'vue';
+import { axiosNoError } from 'src/boot/axios';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerTimeHourChip from 'pages/Worker/Card/WorkerTimeHourChip.vue';
@@ -266,10 +267,11 @@ const fetchWeekData = async () => {
     };
     try {
         const mail = (
-            await axios.get(`Workers/${route.params.id}/mail`, {
+            await axiosNoError.get(`Workers/${route.params.id}/mail`, {
                 params: { filter: { where } },
             })
         ).data[0];
+
         if (!mail) state.value = null;
         else {
             state.value = mail.state;
@@ -277,7 +279,7 @@ const fetchWeekData = async () => {
         }
 
         canResend.value = !!(
-            await axios.get('WorkerTimeControlMails/count', { params: { where } })
+            await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
         ).data.count;
     } catch (err) {
         console.error('Error fetching week data');

From 0f604ea8b5eaf3485a4678326aa5e327f9154a81 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Sep 2024 11:34:45 +0200
Subject: [PATCH 13/19] fix: refs #7500 fixed e2e test

---
 test/cypress/integration/entry/entryDms.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/entry/entryDms.spec.js b/test/cypress/integration/entry/entryDms.spec.js
index ed4a3d79c..47dcdba9e 100644
--- a/test/cypress/integration/entry/entryDms.spec.js
+++ b/test/cypress/integration/entry/entryDms.spec.js
@@ -23,7 +23,7 @@ describe('EntryDms', () => {
             expect(value).to.have.length(newFileTd++);
             const newRowSelector = `tbody > :nth-child(${newFileTd})`;
             cy.waitForElement(newRowSelector);
-            cy.validateRow(newRowSelector, [u, u, u, u, 'ENTRADA ID 1']);
+            cy.validateRow(newRowSelector, [u, u, u, u, u, 'ENTRADA ID 1']);
 
             //Edit new dms
             const newDescription = 'entry id 1 modified';
@@ -38,7 +38,7 @@ describe('EntryDms', () => {
             cy.saveCard();
             cy.reload();
 
-            cy.validateRow(newRowSelector, [u, u, u, u, newDescription]);
+            cy.validateRow(newRowSelector, [u, u, u, u, u, newDescription]);
         });
     });
 });

From 401400bdcfc8b03eab00a4e40dc78ad1ea1fe9e7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 22:52:26 +0200
Subject: [PATCH 14/19] fix: remove FetchData

---
 src/components/common/VnSelect.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 837a3d9f6..e767fb201 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -1,6 +1,7 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
+import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
+import FetchData from 'src/components/FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
 
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
@@ -225,6 +226,16 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 </script>
 
 <template>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => setOptions(data)"
+        :where="where || { [optionValue]: value }"
+        :limit="limit"
+        :sort-by="sortBy"
+        :fields="fields"
+        :params="params"
+    />
     <QSelect
         v-model="value"
         :options="myOptions"

From b6cce74449dfbf28c95ab36832635d41e20011bd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 23:11:18 +0200
Subject: [PATCH 15/19] fix: merge conflicts

---
 src/components/common/VnInputDate.vue | 53 ++++++++++++++-------------
 src/components/common/VnInputTime.vue |  6 ++-
 src/components/common/VnSelect.vue    | 12 +++---
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 96e47d6d7..7113cadf9 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -2,6 +2,7 @@
 import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useAttrs } from 'vue';
 
 const model = defineModel({ type: [String, Date] });
 const $props = defineProps({
@@ -14,29 +15,19 @@ const $props = defineProps({
         default: true,
     },
 });
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
 const hover = ref();
 const mask = ref();
+const $attrs = useAttrs();
 
-onMounted(() => {
-    // fix quasar bug
-    mask.value = '##/##/####';
-});
-
-const styleAttrs = computed(() => {
-    return $props.isOutlined
-        ? {
-              dense: true,
-              outlined: true,
-              rounded: true,
-          }
-        : {};
-});
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
 const formattedDate = computed({
     get() {
@@ -48,15 +39,12 @@ const formattedDate = computed({
         let newDate;
         if (value) {
             // parse input
-            if (value.includes('/')) {
-                if (value.length == 6) value = value + new Date().getFullYear();
-                if (value.length >= 10) {
-                    if (value.at(2) == '/') value = value.split('/').reverse().join('/');
-                    value = date.formatDate(
-                        new Date(value).toISOString(),
-                        'YYYY-MM-DDTHH:mm:ss.SSSZ'
-                    );
-                }
+            if (value.includes('/') && value.length >= 10) {
+                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
+                value = date.formatDate(
+                    new Date(value).toISOString(),
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
+                );
             }
             const [year, month, day] = value.split('-').map((e) => parseInt(e));
             newDate = new Date(year, month - 1, day);
@@ -79,12 +67,25 @@ const formattedDate = computed({
 const popupDate = computed(() =>
     model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
 );
-
+onMounted(() => {
+    // fix quasar bug
+    mask.value = '##/##/####';
+});
 watch(
     () => model.value,
     (val) => (formattedDate.value = val),
     { immediate: true }
 );
+
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
 </script>
 
 <template>
@@ -96,7 +97,7 @@ watch(
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
-            :rules="$attrs.required ? [requiredFieldRule] : null"
+            :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = true"
         >
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index b610dc1e9..27395aa9e 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,8 +1,10 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
-
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
+const $attrs = useAttrs();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index e767fb201..ed842103f 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -3,7 +3,6 @@ import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'src/components/FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
-
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 
 const $props = defineProps({
@@ -84,10 +83,11 @@ const $props = defineProps({
         default: false,
     },
 });
-
+const { validations } = useValidator();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const $attrs = useAttrs();
 const { t } = useI18n();
-const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
-
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
     toRefs($props);
 const myOptions = ref([]);
@@ -100,7 +100,6 @@ const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
-const { validations } = useValidator();
 
 const value = computed({
     get() {
@@ -251,8 +250,9 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
         ref="vnSelectRef"
         lazy-rules
         :class="{ required: $attrs.required }"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
+        :rules="mixinRules"
         virtual-scroll-slice-size="options.length"
+        hide-bottom-space
     >
         <template v-if="isClearable" #append>
             <QIcon

From 93488a5750b2a3de2c49ddff952defa55a3f3386 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 23:19:16 +0200
Subject: [PATCH 16/19] fix: styles

---
 src/components/common/VnInputDate.vue | 1 +
 src/components/common/VnInputTime.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 7113cadf9..fd8993d6f 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -100,6 +100,7 @@ const styleAttrs = computed(() => {
             :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = true"
+            hide-bottom-space
         >
             <template #append>
                 <QIcon
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 27395aa9e..42ec79479 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -79,6 +79,7 @@ function dateToTime(newDate) {
             :rules="mixinRules"
             @click="isPopupOpen = false"
             type="time"
+            hide-bottom-space
         >
             <template #append>
                 <QIcon

From 8c4e4a16af99c429d3abbf0a355184df5a6e9769 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 16 Sep 2024 09:19:08 +0200
Subject: [PATCH 17/19] fix(VnSectionMain): add QPage

---
 src/components/common/VnSectionMain.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnSectionMain.vue
index 0c1641ce1..97a150cf4 100644
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@@ -20,6 +20,8 @@ onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <RouterView></RouterView>
+        <QPage>
+            <RouterView></RouterView>
+        </QPage>
     </QPageContainer>
 </template>

From 4c8238455f9a21da8a59376a249d067352052fd0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 16 Sep 2024 10:03:12 +0200
Subject: [PATCH 18/19] fix(ClaimList): fix summary

---
 src/components/VnTable/VnTable.vue      | 4 ++--
 src/components/common/VnSectionMain.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 899e4d000..6f678d5c1 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -633,7 +633,7 @@ function handleOnDataSaved(_, res) {
             </QTable>
         </template>
     </CrudModel>
-    <QPageSticky :offset="[20, 20]" style="z-index: 2">
+    <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">
         <QBtn
             @click="
                 () =>
@@ -645,7 +645,7 @@ function handleOnDataSaved(_, res) {
             shortcut="+"
         />
         <QTooltip>
-            {{ createForm.title }}
+            {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
     <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnSectionMain.vue
index 97a150cf4..9975b1011 100644
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@@ -21,7 +21,7 @@ onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <RouterView></RouterView>
+            <RouterView />
         </QPage>
     </QPageContainer>
 </template>

From ae76bd0b0e524035a3fe92aa73bd2a819bab1c0c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 16 Sep 2024 12:58:06 +0200
Subject: [PATCH 19/19] refactor: refs #6346 wagons to VnTable

---
 src/pages/Wagon/Type/WagonTypeList.vue | 105 +++++++-------
 src/pages/Wagon/WagonList.vue          | 184 +++++++++++++++++--------
 2 files changed, 186 insertions(+), 103 deletions(-)

diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 7615dea02..2f0d55fbe 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -2,14 +2,13 @@
 import { ref, computed } from 'vue';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import CardList from 'components/ui/CardList.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonTypeList');
@@ -17,7 +16,7 @@ const store = arrayData.store;
 const dialog = ref();
 const { push } = useRouter();
 const { t } = useI18n();
-const paginate = ref();
+const tableRef = ref();
 
 const initialData = computed(() => {
     return {
@@ -25,10 +24,46 @@ const initialData = computed(() => {
     };
 });
 
-function reloadData() {
-    initialData.value.name = null;
-    paginate.value.fetch();
-}
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('ID'),
+        isId: true,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('Name'),
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        name: 'divisible',
+        label: t('Divisible'),
+        cardVisible: true,
+        component: 'checkbox',
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.openCard'),
+                icon: 'arrow_forward',
+                isPrimary: true,
+                action: (row) => navigate(row.id, row.name),
+            },
+            {
+                title: t('wagon.list.remove'),
+                icon: 'delete',
+                isPrimary: true,
+                action: (row) => remove(row),
+            },
+        ],
+    },
+]);
 
 function navigate(id, name) {
     push({ path: `/wagon/type/${id}/edit`, query: { name } });
@@ -41,51 +76,25 @@ async function remove(row) {
         type: 'positive',
     });
     store.data.splice(store.data.indexOf(row), 1);
+    window.location.reload();
 }
 </script>
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                ref="paginate"
-                data-key="WagonTypeList"
-                url="WagonTypes"
-                order="id DESC"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="(row.name || '').toString()"
-                        :id="row.id"
-                        @click="navigate(row.id, row.name)"
-                    >
-                        <template #list-items>
-                            <QCheckbox
-                                :label="t('Divisble')"
-                                :model-value="row.divisible"
-                                disable
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id, row.name)"
-                                outline
-                            />
-                            <QBtn
-                                :label="t('wagon.list.remove')"
-                                @click.stop="remove(row)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
+        <VnTable
+            ref="tableRef"
+            data-key="WagonTypeList"
+            url="WagonTypes"
+            :columns="columns"
+            auto-load
+            order="id DESC"
+            :right-search="false"
+            :column-search="false"
+            :default-mode="'card'"
+            :disable-option="{ table: true }"
+        >
+        </VnTable>
         <QPageSticky :offset="[18, 18]">
             <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
                 <QDialog ref="dialog">
@@ -94,7 +103,7 @@ async function remove(row) {
                         url-create="WagonTypes"
                         model="WagonType"
                         :form-initial-data="initialData"
-                        @on-data-saved="reloadData()"
+                        @on-data-saved="window.location.reload()"
                         auto-load
                     >
                         <template #form-inputs="{ data }">
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index c4824b861..129e803f5 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -1,12 +1,13 @@
 <script setup>
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { computed } from 'vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonList');
@@ -23,14 +24,56 @@ const filter = {
     },
 };
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'label',
+        label: t('Label'),
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        name: 'plate',
+        label: t('wagon.list.plate'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'volume',
+        label: t('wagon.list.volume'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('wagon.list.type'),
+        cardVisible: true,
+        format: (row) => row?.type?.name,
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.openCard'),
+                icon: 'arrow_forward',
+                isPrimary: true,
+                action: (row) => navigate(row.id),
+            },
+            {
+                title: t('wagon.list.remove'),
+                icon: 'delete',
+                isPrimary: true,
+                action: (row) => remove(row),
+            },
+        ],
+    },
+]);
+
 function navigate(id) {
     router.push({ path: `/wagon/${id}/edit` });
 }
 
-function create() {
-    router.push({ path: `/wagon/create` });
-}
-
 async function remove(row) {
     try {
         await axios.delete(`Wagons/${row.id}`).then(async () => {
@@ -39,6 +82,7 @@ async function remove(row) {
                 type: 'positive',
             });
             store.data.splice(store.data.indexOf(row), 1);
+            window.location.reload();
         });
     } catch (error) {
         //
@@ -48,53 +92,83 @@ async function remove(row) {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="WagonList"
-                url="/Wagons"
-                order="id DESC"
-                :filter="filter"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="(row.label || '').toString()"
-                        :id="row.id"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv
-                                :label="t('wagon.list.plate')"
-                                :title-label="t('wagon.list.plate')"
-                                :value="row.plate"
-                            />
-                            <VnLv :label="t('wagon.list.volume')" :value="row?.volume" />
-                            <VnLv
-                                :label="t('wagon.list.type')"
-                                :value="row?.type?.name"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
-                                outline
-                            />
-                            <QBtn
-                                :label="t('wagon.list.remove')"
-                                @click.stop="remove(row)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="create" fab icon="add" color="primary" shortcut="+" />
-        </QPageSticky>
+        <VnTable
+            ref="tableRef"
+            data-key="WagonList"
+            url="Wagons"
+            :filter="filter"
+            :columns="columns"
+            auto-load
+            order="id DESC"
+            :right-search="false"
+            :column-search="false"
+            :default-mode="'card'"
+            :disable-option="{ table: true }"
+            :create="{
+                urlCreate: 'Wagons',
+                title: t('Create new wagon'),
+                onDataSaved: () => {
+                    window.location.reload();
+                },
+                formInitialData: {},
+            }"
+        >
+            <template #more-create-dialog="{ data }">
+                <VnInput
+                    filled
+                    v-model="data.label"
+                    :label="t('wagon.create.label')"
+                    type="number"
+                    min="0"
+                    :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
+                />
+                <VnInput
+                    filled
+                    v-model="data.plate"
+                    :label="t('wagon.create.plate')"
+                    :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
+                />
+                <VnInput
+                    filled
+                    v-model="data.volume"
+                    :label="t('wagon.create.volume')"
+                    type="number"
+                    min="0"
+                    :rules="[(val) => !!val || t('wagon.warnings.volumeNotEmpty')]"
+                />
+                <VnSelect
+                    url="WagonTypes"
+                    filled
+                    v-model="data.typeFk"
+                    use-input
+                    fill-input
+                    hide-selected
+                    input-debounce="0"
+                    option-label="name"
+                    option-value="id"
+                    emit-value
+                    map-options
+                    :label="t('wagon.create.type')"
+                    :options="filteredWagonTypes"
+                    :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
+                    @filter="filterType"
+                >
+                    <template v-if="data.typeFk" #append>
+                        <QIcon
+                            name="cancel"
+                            @click.stop.prevent="data.typeFk = null"
+                            class="cursor-pointer"
+                        />
+                    </template>
+                    <template #no-option>
+                        <QItem>
+                            <QItemSection class="text-grey">
+                                {{ t('wagon.warnings.noData') }}
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </template>
+        </VnTable>
     </QPage>
 </template>