refactor: refs #6683 remove 'only' from Worker pop-ups test suite to include all tests

cypress.config.js

@@ -44,7 +44,6 @@ export default defineConfig({
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
         downloadsFolder: 'test/cypress/downloads',
-        tmpUploadFolder: 'test/cypress/storage/tmp/dms',
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,

package.json

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

src/App.vue

@@ -2,7 +2,6 @@
 import { onMounted } from 'vue';
 import { useQuasar, Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import VnScroll from './components/common/VnScroll.vue';
 
 const quasar = useQuasar();
 const { availableLocales, locale, fallbackLocale } = useI18n();
@@ -39,7 +38,6 @@ quasar.iconMapFn = (iconName) => {
 
 <template>
     <RouterView />
-    <VnScroll/>
 </template>
 
 <style lang="scss">

src/boot/__tests__/axios.spec.js

@@ -67,7 +67,7 @@ describe('Axios boot', () => {
             };
 
             const result = onResponseError(error);
-            await expect(result).rejects.toEqual(expect.objectContaining(error));
+            expect(result).rejects.toEqual(expect.objectContaining(error));
         });
 
         it('should call to the Notify plugin with a message from the response property', async () => {
@@ -83,7 +83,7 @@ describe('Axios boot', () => {
             };
 
             const result = onResponseError(error);
-            await expect(result).rejects.toEqual(expect.objectContaining(error));
+            expect(result).rejects.toEqual(expect.objectContaining(error));
         });
     });
 });

src/boot/vnDate.js

@@ -1,6 +1,4 @@
 import { boot } from 'quasar/wrappers';
-import { date as quasarDate } from 'quasar';
-const { formatDate } = quasarDate;
 
 export default boot(() => {
     Date.vnUTC = () => {
@@ -27,34 +25,4 @@ export default boot(() => {
         const date = new Date(Date.vnUTC());
         return new Date(date.getFullYear(), date.getMonth() + 1, 0);
     };
-
-    Date.getCurrentDateTimeFormatted = (
-        options = {
-            startOfDay: false,
-            endOfDay: true,
-            iso: true,
-            mask: 'DD-MM-YYYY HH:mm',
-        },
-    ) => {
-        const date = Date.vnUTC();
-        if (options.startOfDay) {
-            date.setHours(0, 0, 0);
-        }
-        if (options.endOfDay) {
-            date.setHours(23, 59, 0);
-        }
-        if (options.iso) {
-            return date.toISOString();
-        }
-        return formatDate(date, options.mask);
-    };
-
-    Date.convertToISODateTime = (dateTimeStr) => {
-        const [datePart, timePart] = dateTimeStr.split(' ');
-        const [day, month, year] = datePart.split('-');
-        const [hours, minutes] = timePart.split(':');
-
-        const isoDate = new Date(year, month - 1, day, hours, minutes);
-        return isoDate.toISOString();
-    };
 });

src/components/CreateNewPostcodeForm.vue

@@ -20,6 +20,7 @@ const postcodeFormData = reactive({
     provinceFk: null,
     townFk: null,
 });
+const townFilter = ref({});
 
 const countriesRef = ref(false);
 const provincesOptions = ref([]);
@@ -32,11 +33,11 @@ function onDataSaved(formData) {
     newPostcode.town = town.value.name;
     newPostcode.townFk = town.value.id;
     const provinceObject = provincesOptions.value.find(
-        ({ id }) => id === formData.provinceFk,
+        ({ id }) => id === formData.provinceFk
     );
     newPostcode.province = provinceObject?.name;
     const countryObject = countriesRef.value.opts.find(
-        ({ id }) => id === formData.countryFk,
+        ({ id }) => id === formData.countryFk
     );
     newPostcode.country = countryObject?.name;
     emit('onDataSaved', newPostcode);
@@ -66,11 +67,21 @@ function setTown(newTown, data) {
 }
 async function onCityCreated(newTown, formData) {
     newTown.province = provincesOptions.value.find(
-        (province) => province.id === newTown.provinceFk,
+        (province) => province.id === newTown.provinceFk
     );
     formData.townFk = newTown;
     setTown(newTown, formData);
 }
+
+async function filterTowns(name) {
+    if (name !== '') {
+        townFilter.value.where = {
+            name: {
+                like: `%${name}%`,
+            },
+        };
+    }
+}
 </script>
 
 <template>
@@ -96,6 +107,7 @@ async function onCityCreated(newTown, formData) {
                 <VnSelectDialog
                     :label="t('City')"
                     @update:model-value="(value) => setTown(value, data)"
+                    @filter="filterTowns"
                     :tooltip="t('Create city')"
                     v-model="data.townFk"
                     url="Towns/location"

src/components/CrudModel.vue

@@ -65,7 +65,7 @@ const $props = defineProps({
         default: null,
     },
     beforeSaveFn: {
-        type: [String, Function],
+        type: Function,
         default: null,
     },
     goTo: {

src/components/EditPictureForm.vue

@@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
             img.onerror = () => {
                 notify(
                     t("This photo provider doesn't allow remote downloads"),
-                    'negative',
+                    'negative'
                 );
             };
         }
@@ -219,7 +219,11 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateLeft()"
-                    />
+                    >
+                        <!-- <QTooltip class="no-pointer-events">
+                            {{ t('Rotate left') }}
+                        </QTooltip> -->
+                    </QIcon>
                     <div>
                         <div ref="photoContainerRef" />
                     </div>
@@ -229,7 +233,11 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateRight()"
-                    />
+                    >
+                        <!-- <QTooltip class="no-pointer-events">
+                            {{ t('Rotate right') }}
+                        </QTooltip> -->
+                    </QIcon>
                 </div>
 
                 <div class="column">
@@ -257,6 +265,7 @@ const makeRequest = async () => {
                                     class="cursor-pointer q-mr-sm"
                                     @click="openInputFile()"
                                 >
+                                    <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
                                 </QIcon>
                                 <QIcon name="info" class="cursor-pointer">
                                     <QTooltip>{{

src/components/FormModel.vue

@@ -22,6 +22,7 @@ const { validate, validations } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
+const attrs = useAttrs();
 const $props = defineProps({
     url: {
         type: String,
@@ -98,12 +99,8 @@ const $props = defineProps({
         type: Function,
         default: () => {},
     },
-    preventSubmit: {
-        type: Boolean,
-        default: true,
-    },
 });
-const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
+const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
     () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
 ).value;
@@ -304,7 +301,7 @@ function onBeforeSave(formData, originalData) {
     );
 }
 async function onKeyup(evt) {
-    if (evt.key === 'Enter' && !$props.preventSubmit) {
+    if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
         const input = evt.target;
         if (input.type == 'textarea' && evt.shiftKey) {
             let { selectionStart, selectionEnd } = input;
@@ -333,7 +330,6 @@ defineExpose({
 <template>
     <div class="column items-center full-width">
         <QForm
-            v-on="$attrs"
             ref="myForm"
             v-if="formData"
             @submit.prevent="save"
@@ -410,7 +406,6 @@ defineExpose({
             </QBtnDropdown>
             <QBtn
                 v-else
-                data-cy="saveDefaultBtn"
                 :label="tMobile('globals.save')"
                 color="primary"
                 icon="save"

src/components/LeftMenu.vue

@@ -181,7 +181,7 @@ const searchModule = () => {
 <template>
     <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
-            <template v-if="route?.matched[1]?.name === 'Dashboard'">
+            <template v-if="$route?.matched[1]?.name === 'Dashboard'">
                 <QItem class="q-pb-md">
                     <VnInput
                         v-model="search"
@@ -262,7 +262,7 @@ const searchModule = () => {
             </template>
 
             <template v-for="item in items" :key="item.name">
-                <template v-if="item.name === route?.matched[1]?.name">
+                <template v-if="item.name === $route?.matched[1]?.name">
                     <QItem class="header">
                         <QItemSection avatar v-if="item.icon">
                             <QIcon :name="item.icon" />

src/components/NavBar.vue

@@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
                     'no-visible': !stateQuery.isLoading().value,
                 }"
                 size="sm"
-                data-cy="navBar-spinner"
+                data-cy="loading-spinner"
             />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>

src/components/VnTable/VnOrder.vue

@@ -16,7 +16,7 @@ const $props = defineProps({
         required: true,
     },
     searchUrl: {
-        type: [String, Boolean],
+        type: String,
         default: 'table',
     },
     vertical: {

src/components/VnTable/VnTable.vue

@@ -33,7 +33,6 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 import VnTableFilter from './VnTableFilter.vue';
 import { getColAlign } from 'src/composables/getColAlign';
 import RightMenu from '../common/RightMenu.vue';
-import VnScroll from '../common/VnScroll.vue'
 
 const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
@@ -66,7 +65,7 @@ const $props = defineProps({
         default: null,
     },
     create: {
-        type: [Boolean, Object],
+        type: Object,
         default: null,
     },
     createAsDialog: {
@@ -169,7 +168,6 @@ const params = ref(useFilterParams($attrs['data-key']).params);
 const orders = ref(useFilterParams($attrs['data-key']).orders);
 const app = inject('app');
 const tableHeight = useTableHeight();
-const vnScrollRef = ref(null);
 
 const editingRow = ref(null);
 const editingField = ref(null);
@@ -191,17 +189,6 @@ const tableModes = [
     },
 ];
 
-const onVirtualScroll = ({ to }) => {
-    handleScroll();
-    const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
-    if (virtualScrollContainer) {
-      virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
-      if (vnScrollRef.value) {
-        vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
-      }
-    }
-};
-
 onBeforeMount(() => {
     const urlParams = route.query[$props.searchUrl];
     hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@@ -340,13 +327,16 @@ function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
+
 function handleScroll() {
     if ($props.crudModel.disableInfiniteScroll) return;
+
     const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
     const { scrollHeight, scrollTop, clientHeight } = tMiddle;
     const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
     if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
 }
+
 function handleSelection({ evt, added, rows: selectedRows }, rows) {
     if (evt?.shiftKey && added) {
         const rowIndex = selectedRows[0].$index;
@@ -679,9 +669,9 @@ const rowCtrlClickFunction = computed(() => {
                 ref="tableRef"
                 v-bind="table"
                 :class="[
-                  'vnTable',
+                    'vnTable',
-                  table ? 'selection-cell' : '',
+                    table ? 'selection-cell' : '',
-                  $props.footer ? 'last-row-sticky' : '',
+                    $props.footer ? 'last-row-sticky' : '',
                 ]"
                 wrap-cells
                 :columns="splittedColumns.columns"
@@ -693,7 +683,7 @@ const rowCtrlClickFunction = computed(() => {
                 flat
                 :style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
                 :virtual-scroll="isTableMode"
-                @virtual-scroll="onVirtualScroll"
+                @virtual-scroll="handleScroll"
                 @row-click="(event, row) => handleRowClick(event, row)"
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
@@ -751,7 +741,6 @@ const rowCtrlClickFunction = computed(() => {
                                     withFilters
                                 "
                                 :column="col"
-                                :data-cy="`column-filter-${col.name}`"
                                 :show-title="true"
                                 :data-key="$attrs['data-key']"
                                 v-model="params[columnName(col)]"
@@ -1098,11 +1087,6 @@ const rowCtrlClickFunction = computed(() => {
             </template>
         </FormModelPopup>
     </QDialog>
-    <VnScroll 
-      ref="vnScrollRef"
-      v-if="isTableMode"
-      :scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
-    />
 </template>
 <i18n>
 en:

src/components/VnTable/VnTableFilter.vue

@@ -30,7 +30,6 @@ function columnName(col) {
         v-bind="$attrs"
         :search-button="true"
         :disable-submit-event="true"
-        :data-key="$attrs['data-key']"
         :search-url
     >
         <template #body="{ params, orders, searchFn }">

src/components/VnTable/VnVisibleColumn.vue

@@ -58,7 +58,7 @@ async function getConfig(url, filter) {
     const response = await axios.get(url, {
         params: { filter: filter },
     });
-    return response?.data && response?.data?.length > 0 ? response.data[0] : null;
+    return response.data && response.data.length > 0 ? response.data[0] : null;
 }
 
 async function fetchViewConfigData() {

src/components/VnTable/__tests__/VnTable.spec.js

@@ -11,9 +11,6 @@ describe('VnTable', () => {
             propsData: {
                 columns: [],
             },
-            attrs: {
-                'data-key': 'test',
-            },
         });
         vm = wrapper.vm;
 

src/components/__tests__/CrudModel.spec.js

@@ -11,7 +11,13 @@ describe('CrudModel', () => {
     beforeAll(() => {
         wrapper = createWrapper(CrudModel, {
             global: {
-                stubs: ['vnPaginate', 'vue-i18n'],
+                stubs: [
+                    'vnPaginate',
+                    'useState',
+                    'arrayData',
+                    'useStateStore',
+                    'vue-i18n',
+                ],
                 mocks: {
                     validate: vi.fn(),
                 },
@@ -23,7 +29,7 @@ describe('CrudModel', () => {
                 dataKey: 'crudModelKey',
                 model: 'crudModel',
                 url: 'crudModelUrl',
-                saveFn: vi.fn(),
+                saveFn: '',
             },
         });
         wrapper = wrapper.wrapper;
@@ -225,7 +231,7 @@ describe('CrudModel', () => {
             expect(vm.isLoading).toBe(false);
             expect(vm.hasChanges).toBe(false);
 
-            await wrapper.setProps({ saveFn: null });
+            await wrapper.setProps({ saveFn: '' });
         });
 
         it("should use default url if there's not saveFn", async () => {

src/components/__tests__/Leftmenu.spec.js

@@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
         vm = mount('card').vm;
     });
 
-    it('should get routes for card source', () => {
+    it('should get routes for card source', async () => {
         vm.getRoutes();
     });
 });
@@ -251,6 +251,7 @@ describe('LeftMenu as main', () => {
     });
 
     it('should get routes for main source', () => {
+        vm.props.source = 'main';
         vm.getRoutes();
         expect(navigation.getModules).toHaveBeenCalled();
     });

src/components/common/VnAccountNumber.vue

@@ -8,8 +8,7 @@ const model = defineModel({ prop: 'modelValue' });
     <VnInput
         v-model="model"
         ref="inputRef"
-        @keydown.tab="$refs.inputRef.vnInputRef.blur()"
+        @keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
-        @blur="model = useAccountShortToStandard(model) ?? model"
         @input="model = $event.target.value.replace(/[^\d.]/g, '')"
     />
 </template>

src/components/common/VnDate.vue

@@ -1,5 +1,5 @@
 <script setup>
-const model = defineModel({ type: [String, Number], default: '' });
+const model = defineModel({ type: [String, Number], required: true });
 </script>
 <template>
     <QDate v-model="model" :today-btn="true" :options="$attrs.options" />

src/components/common/VnDms.vue

@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 
-import useNotify from 'src/composables/useNotify.js';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -13,7 +12,6 @@ import FormModelPopup from 'components/FormModelPopup.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-const { notify } = useNotify();
 const emit = defineEmits(['onDataSaved']);
 
 const $props = defineProps({
@@ -63,11 +61,8 @@ function onFileChange(files) {
 
 function mapperDms(data) {
     const formData = new FormData();
-    let files = data.files;
+    const { files } = data;
-    if (files) {
+    if (files) formData.append(files?.name, files);
-        files = Array.isArray(files) ? files : [files];
-        files.forEach((file) => formData.append(file?.name, file));
-    }
 
     const dms = {
         hasFile: !!data.hasFile,
@@ -88,16 +83,11 @@ function getUrl() {
 }
 
 async function save() {
-    try {
+    const body = mapperDms(dms.value);
-        const body = mapperDms(dms.value);
+    const response = await axios.post(getUrl(), body[0], body[1]);
-        const response = await axios.post(getUrl(), body[0], body[1]);
+    emit('onDataSaved', body[1].params, response);
-        emit('onDataSaved', body[1].params, response);
+    delete dms.value.files;
-        notify(t('globals.dataSaved'), 'positive');
+    return response;
-        delete dms.value.files;
-        return response;
-    } catch (e) {
-        throw e;
-    }
 }
 
 function defaultData() {

src/components/common/VnDmsList.vue

@@ -13,12 +13,11 @@ import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useSession } from 'src/composables/useSession';
-import useNotify from 'src/composables/useNotify.js';
+import { toDate } from 'src/filters/index';
 
 const route = useRoute();
 const quasar = useQuasar();
 const { t } = useI18n();
-const { notify } = useNotify();
 const rows = ref([]);
 const dmsRef = ref();
 const formDialog = ref({});
@@ -90,6 +89,7 @@ const dmsFilter = {
             ],
         },
     },
+    where: { [$props.filter]: route.params.id },
 };
 
 const columns = computed(() => [
@@ -119,7 +119,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: 'type',
+        field: 'dmsType',
         label: t('globals.type'),
         name: 'type',
         component: QInput,
@@ -128,6 +128,7 @@ const columns = computed(() => [
             borderless: true,
             'model-value': prop.row.dmsType?.name,
         }),
+        format: (row) => row.name,
     },
     {
         align: 'left',
@@ -173,6 +174,7 @@ const columns = computed(() => [
             name: prop.row.worker?.user?.name.toLowerCase(),
             workerId: prop.row.worker?.id,
         }),
+        format: (row) => row?.user?.name,
     },
     {
         align: 'left',
@@ -184,6 +186,7 @@ const columns = computed(() => [
             disable: true,
             'model-value': prop.row.created,
         }),
+        format: (row) => toDate(row),
     },
     {
         field: 'options',
@@ -259,16 +262,9 @@ function deleteDms(dmsFk) {
             },
         })
         .onOk(async () => {
-            try {
+            await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
-                await axios.post(
+            const index = rows.value.findIndex((row) => row.id == dmsFk);
-                    `${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
+            rows.value.splice(index, 1);
-                );
-                const index = rows.value.findIndex((row) => row.id == dmsFk);
-                rows.value.splice(index, 1);
-                notify(t('globals.dataDeleted'), 'positive');
-            } catch (e) {
-                throw e;
-            }
         });
 }
 
@@ -308,7 +304,6 @@ defineExpose({
         :user-filter="dmsFilter"
         search-url="dmsFilter"
         :order="['dmsFk DESC']"
-        :filter="{ where: { [$props.filter]: route.params.id } }"
         auto-load
         @on-fetch="setData"
     >

src/components/common/VnInputDate.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { nextTick, watch, computed, ref, useAttrs } from 'vue';
+import { onMounted, watch, computed, ref, useAttrs } from 'vue';
-import { date, getCssVar } from 'quasar';
+import { date } from 'quasar';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 
@@ -20,18 +20,61 @@ const $props = defineProps({
 });
 
 const vnInputDateRef = ref(null);
-const errColor = getCssVar('negative');
-const textColor = ref('');
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
 const hover = ref();
+const mask = ref();
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
+const formattedDate = computed({
+    get() {
+        if (!model.value) return model.value;
+        return date.formatDate(new Date(model.value), dateFormat);
+    },
+    set(value) {
+        if (value == model.value) return;
+        let newDate;
+        if (value) {
+            // parse input
+            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);
+            if (model.value) {
+                const orgDate =
+                    model.value instanceof Date ? model.value : new Date(model.value);
+
+                newDate.setHours(
+                    orgDate.getHours(),
+                    orgDate.getMinutes(),
+                    orgDate.getSeconds(),
+                    orgDate.getMilliseconds(),
+                );
+            }
+        }
+        if (!isNaN(newDate)) model.value = newDate.toISOString();
+    },
+});
+
 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
@@ -43,139 +86,28 @@ const styleAttrs = computed(() => {
         : {};
 });
 
-const inputValue = ref('');
-
-const validateAndCleanInput = (value) => {
-    inputValue.value = value.replace(/[^0-9./-]/g, '');
-};
-
 const manageDate = (date) => {
-    inputValue.value = date.split('/').reverse().join('/');
+    formattedDate.value = date;
     isPopupOpen.value = false;
 };
-
-watch(
-    () => model.value,
-    (nVal) => {
-        if (nVal) inputValue.value = date.formatDate(new Date(model.value), dateFormat);
-        else inputValue.value = '';
-    },
-    { immediate: true },
-);
-
-const formatDate = () => {
-    let value = inputValue.value;
-    if (!value || value === model.value) {
-        textColor.value = '';
-        return;
-    } 
-    const regex =
-        /^([0]?[1-9]|[12][0-9]|3[01])([./-])([0]?[1-9]|1[0-2])([./-](\d{1,4}))?$/;
-    if (!regex.test(value)){
-        textColor.value = errColor;
-        return;
-    } 
-
-    value = value.replace(/[.-]/g, '/');
-    const parts = value.split('/');
-    if (parts.length < 2) {
-        textColor.value = errColor;
-         return;
-    }
-
-    let [day, month, year] = parts;
-    if (day.length === 1) day = '0' + day;
-    if (month.length === 1) month = '0' + month;
-
-    const currentYear = Date.vnNew().getFullYear();
-    if (!year) year = currentYear;
-    const millennium = currentYear.toString().slice(0, 1);
-
-    switch (year.length) {
-        case 1:
-            year = `${millennium}00${year}`;
-            break;
-        case 2:
-            year = `${millennium}0${year}`;
-            break;
-        case 3:
-            year = `${millennium}${year}`;
-            break;
-        case 4:
-            break;
-    }
-
-    let isoCandidate = `${year}/${month}/${day}`;
-    isoCandidate = date.formatDate(
-                    new Date(isoCandidate).toISOString(),
-                    'YYYY-MM-DDTHH:mm:ss.SSSZ',
-                );
-    const [isoYear, isoMonth, isoDay] = isoCandidate.split('-').map((e) => parseInt(e));
-    const parsedDate = new Date(isoYear, isoMonth - 1, isoDay);
-
-    const isValidDate = 
-        parsedDate instanceof Date &&
-        !isNaN(parsedDate) &&
-        parsedDate.getFullYear() === parseInt(year) &&
-        parsedDate.getMonth() === parseInt(month) - 1 &&
-        parsedDate.getDate() === parseInt(day);
-
-    if (!isValidDate) {
-        textColor.value = errColor;
-        return;
-    }
-
-    if (model.value) {
-        const original =
-            model.value instanceof Date ? model.value : new Date(model.value);
-        parsedDate.setHours(
-            original.getHours(),
-            original.getMinutes(),
-            original.getSeconds(),
-            original.getMilliseconds(),
-        );
-    }
-
-    model.value = parsedDate.toISOString();
-
-    textColor.value = '';
-};
-
-const handleEnter = (event) => {
-    formatDate();
-
-    nextTick(() => {
-        const newEvent = new KeyboardEvent('keydown', {
-            key: 'Enter',
-            code: 'Enter',
-            bubbles: true,
-            cancelable: true,
-        });
-        vnInputDateRef.value?.$el?.dispatchEvent(newEvent);
-    });
-};
 </script>
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
-        {{ console.log($q) }}
         <QInput
             ref="vnInputDateRef"
-            v-model="inputValue"
+            v-model="formattedDate"
             class="vn-input-date"
+            :mask="mask"
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: isRequired }"
             :rules="mixinRules"
             :clearable="false"
-            :input-style="{color: textColor}"
             @click="isPopupOpen = !isPopupOpen"
             @keydown="isPopupOpen = false"
-            @blur="formatDate"
-            @keydown.enter.prevent="handleEnter"
             hide-bottom-space
             :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
-            @update:model-value="validateAndCleanInput"
         >
             <template #append>
                 <QIcon
@@ -184,12 +116,11 @@ const handleEnter = (event) => {
                     v-if="
                         ($attrs.clearable == undefined || $attrs.clearable) &&
                         hover &&
-                        inputValue &&
+                        model &&
                         !$attrs.disable
                     "
                     @click="
                         vnInputDateRef.focus();
-                        inputValue = null;
                         model = null;
                         isPopupOpen = false;
                     "

src/components/common/VnInputDateTime.vue

@@ -1,79 +0,0 @@
-<script setup>
-import { computed, useAttrs } from 'vue';
-import { date } from 'quasar';
-import VnDate from './VnDate.vue';
-import VnTime from './VnTime.vue';
-
-const $attrs = useAttrs();
-const model = defineModel({ type: [Date, String] });
-
-const $props = defineProps({
-    isOutlined: {
-        type: Boolean,
-        default: false,
-    },
-    showEvent: {
-        type: Boolean,
-        default: true,
-    },
-});
-const styleAttrs = computed(() => {
-    return $props.isOutlined
-        ? {
-              dense: true,
-              outlined: true,
-              rounded: true,
-          }
-        : {};
-});
-const mask = 'DD-MM-YYYY HH:mm';
-const selectedDate = computed({
-    get() {
-        if (!model.value) return JSON.stringify(new Date(model.value));
-        return date.formatDate(new Date(model.value), mask);
-    },
-    set(value) {
-        model.value = Date.convertToISODateTime(value);
-    },
-});
-const manageDate = (date) => {
-    selectedDate.value = date;
-};
-</script>
-
-<template>
-    <div @mouseover="hover = true" @mouseleave="hover = false">
-        <QInput
-            ref="vnInputDateRef"
-            v-model="selectedDate"
-            class="vn-input-date"
-            placeholder="dd/mm/aaaa HH:mm"
-            v-bind="{ ...$attrs, ...styleAttrs }"
-            :clearable="false"
-            @click="isPopupOpen = !isPopupOpen"
-            @keydown="isPopupOpen = false"
-            hide-bottom-space
-            @update:model-value="manageDate"
-            :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
-        >
-            <template #prepend>
-                <QIcon name="today" size="xs">
-                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
-                        <VnDate :mask="mask" v-model="selectedDate" />
-                    </QPopupProxy>
-                </QIcon>
-            </template>
-            <template #append>
-                <QIcon name="access_time" size="xs">
-                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
-                        <VnTime format24h :mask="mask" v-model="selectedDate" />
-                    </QPopupProxy>
-                </QIcon>
-            </template>
-        </QInput>
-    </div>
-</template>
-<i18n>
-    es:
-        Open date: Abrir fecha
-</i18n>

src/components/common/VnScroll.vue

@@ -1,100 +0,0 @@
-<script setup>
-import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
-
-const props = defineProps({
-    scrollTarget: { type: [String, Object], default: 'window' }
-});
-
-const scrollPosition = ref(0);
-const showButton = ref(false);
-let scrollContainer = null;
-
-const onScroll = () => {
-    if (!scrollContainer) return;
-    scrollPosition.value = 
-        typeof props.scrollTarget === 'object' 
-            ? scrollContainer.scrollTop 
-            : window.scrollY;
-};
-
-watch(scrollPosition, (newValue) => {
-    showButton.value = newValue > 0;
-});
-
-const scrollToTop = () => {
-    if (scrollContainer) {
-        scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
-    }
-};
-
-const updateScrollContainer = (container) => {
-  if (container) {
-    if (scrollContainer) {
-      scrollContainer.removeEventListener('scroll', onScroll);
-    }
-    scrollContainer = container;
-    scrollContainer.addEventListener('scroll', onScroll);
-    onScroll();
-  }
-};
-
-defineExpose({
-  updateScrollContainer
-});
-
-const initScrollContainer = async () => {
-    await nextTick();
-
-    if (typeof props.scrollTarget === 'object') {
-        scrollContainer = props.scrollTarget;
-    } else {
-        scrollContainer = window;
-    }
-
-    if (!scrollContainer) return
-        scrollContainer.addEventListener('scroll', onScroll);    
-};
-
-
-onMounted(() => {
-    initScrollContainer();
-});
-
-onUnmounted(() => {
-    if (scrollContainer) {
-        scrollContainer.removeEventListener('scroll', onScroll);
-        scrollContainer = null;
-    }
-});
-</script>
-
-<template>
-    <QIcon
-        v-if="showButton"
-        color="primary"
-        name="keyboard_arrow_up"
-        class="scroll-to-top"
-        @click="scrollToTop"
-    >
-        <QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
-    </QIcon>
-</template>
-
-<style scoped>
-.scroll-to-top {
-  position: fixed;
-  top: 70px;
-  font-size: 65px;
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: 1000;
-  transition: transform 0.2s ease-in-out;
-}
-
-.scroll-to-top:hover {
-  transform: translateX(-50%) scale(1.2);
-  cursor: pointer;
-  filter: brightness(0.8);
-}
-</style>
-

src/components/common/VnSelect.vue

@@ -54,10 +54,6 @@ const $props = defineProps({
         type: [Array],
         default: () => [],
     },
-    filterFn: {
-        type: Function,
-        default: null,
-    },
     exprBuilder: {
         type: Function,
         default: null,
@@ -66,12 +62,16 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    defaultFilter: {
+        type: Boolean,
+        default: true,
+    },
     fields: {
         type: Array,
         default: null,
     },
     include: {
-        type: [Object, Array, String],
+        type: [Object, Array],
         default: null,
     },
     where: {
@@ -79,7 +79,7 @@ const $props = defineProps({
         default: null,
     },
     sortBy: {
-        type: [String, Array],
+        type: String,
         default: null,
     },
     limit: {
@@ -152,22 +152,10 @@ const value = computed({
     },
 });
 
-const arrayDataKey =
-    $props.dataKey ??
-    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
-
-const arrayData = useArrayData(arrayDataKey, {
-    url: $props.url,
-    searchUrl: false,
-    mapKey: $attrs['map-key'],
-});
-
 const computedSortBy = computed(() => {
     return $props.sortBy || $props.optionLabel + ' ASC';
 });
 
-const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
-
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -186,6 +174,16 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
+const arrayDataKey =
+    $props.dataKey ??
+    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
+
+const arrayData = useArrayData(arrayDataKey, {
+    url: $props.url,
+    searchUrl: false,
+    mapKey: $attrs['map-key'],
+});
+
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -254,41 +252,43 @@ async function fetchFilter(val) {
 }
 
 async function filterHandler(val, update) {
+    if (isLoading.value) return update();
+    if (!val && lastVal.value === val) {
+        lastVal.value = val;
+        return update();
+    }
+    lastVal.value = val;
     let newOptions;
 
-    if ($props.filterFn) update($props.filterFn(val));
+    if (!$props.defaultFilter) return update();
-    else if (!val && lastVal.value === val) update();
+    if (
-    else {
+        $props.url &&
-        const makeRequest =
+        ($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
-            ($props.url && $props.limit) ||
+    ) {
-            (!$props.limit && Object.keys(myOptions.value).length === 0);
+        newOptions = await fetchFilter(val);
-        newOptions = makeRequest
+    } else newOptions = filter(val, myOptionsOriginal.value);
-            ? await fetchFilter(val)
+    update(
-            : filter(val, myOptionsOriginal.value);
+        () => {
+            if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
+                newOptions.unshift(noOneOpt.value);
 
-        update(
+            myOptions.value = newOptions;
-            () => {
+        },
-                if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
+        (ref) => {
-                    newOptions.unshift(noOneOpt.value);
+            if (val !== '' && ref.options.length > 0) {
-
+                ref.setOptionIndex(-1);
-                myOptions.value = newOptions;
+                ref.moveOptionSelection(1, true);
-            },
+            }
-            (ref) => {
+        },
-                if (val !== '' && ref.options.length > 0) {
+    );
-                    ref.setOptionIndex(-1);
-                    ref.moveOptionSelection(1, true);
-                }
-            },
-        );
-    }
-
-    lastVal.value = val;
 }
 
 function nullishToTrue(value) {
     return value ?? true;
 }
 
+const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+
 async function onScroll({ to, direction, from, index }) {
     const lastIndex = myOptions.value.length - 1;
 

src/components/common/VnSmsDialog.vue

@@ -232,7 +232,7 @@ fr:
     pt: Portugais
 pt:
     Send SMS: Enviar SMS
-    CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
+    CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
     Language: Linguagem
     Phone: Móvel
     Subject: Assunto

src/components/common/__tests__/VnDiscount.spec.js

@@ -12,9 +12,7 @@ describe('VnDiscount', () => {
                 price: 100,
                 quantity: 2,
                 discount: 10,
-                mana: 10,
+            }
-                promise: vi.fn(),
-            },
         }).vm;
     });
 

src/components/common/__tests__/VnDms.spec.js

@@ -41,12 +41,10 @@ describe('VnDms', () => {
         companyFk: 2,
         dmsTypeFk: 3,
         description: 'This is a test description',
-        files: [
+        files: {
-            {
+            name: 'example.txt',
-                name: 'example.txt',
+            content: new Blob(['file content'], { type: 'text/plain' }),
-                content: new Blob(['file content'], { type: 'text/plain' }),
+        },
-            },
-        ],
     };
 
     const expectedBody = {
@@ -85,7 +83,7 @@ describe('VnDms', () => {
         it('should map DMS data correctly and add file to FormData', () => {
             const [formData, params] = vm.mapperDms(data);
 
-            expect([formData.get('example.txt')]).toStrictEqual(data.files);
+            expect(formData.get('example.txt')).toBe(data.files);
             expect(expectedBody).toEqual(params.params);
         });
 

src/components/common/__tests__/VnInput.spec.js

@@ -2,6 +2,7 @@ import { createWrapper } from 'app/test/vitest/helper';
 import { vi, describe, expect, it } from 'vitest';
 import VnInput from 'src/components/common/VnInput.vue';
 
+
 describe('VnInput', () => {
     let vm;
     let wrapper;
@@ -11,27 +12,25 @@ describe('VnInput', () => {
         wrapper = createWrapper(VnInput, {
             props: {
                 modelValue: value,                
-                isOutlined,
+                isOutlined,  emptyToNull,  insertable,
-                emptyToNull,
+                maxlength: 101
-                insertable,
-                maxlength: 101,
             },
             attrs: {
                 label: 'test',
                 required: true,
                 maxlength: 101,
                 maxLength: 10,
-                'max-length': 20,
+                'max-length':20
             },
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;
         input = wrapper.find('[data-cy="test_input"]');
-    }
+    };
 
     describe('value', () => {
         it('should emit update:modelValue when value changes', async () => {
-            generateWrapper('12345', false, false, true);
+            generateWrapper('12345', false, false, true)
             await input.setValue('123');
             expect(wrapper.emitted('update:modelValue')).toBeTruthy();
             expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
@@ -63,6 +62,7 @@ describe('VnInput', () => {
             expect(wrapper.emitted('update:modelValue')).toBeUndefined();
             const spyhandler = vi.spyOn(vm, 'handleInsertMode');
             expect(spyhandler).not.toHaveBeenCalled();
+            
         });
         
         /*
@@ -71,12 +71,12 @@ describe('VnInput', () => {
         it.skip('handleKeydown respects insertable behavior', async () => {
             const expectedValue = '12345';
             generateWrapper('1234', false, false, true);
-            vm.focus();
+            vm.focus()
             await input.trigger('keydown', { key: '5' });
             await vm.$nextTick();
             expect(wrapper.emitted('update:modelValue')).toBeTruthy();
-            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue]);
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
-            expect(vm.value).toBe(expectedValue);
+            expect(vm.value).toBe( expectedValue);
         });
     });
 

src/components/common/__tests__/VnInputDate.spec.js

@@ -5,71 +5,52 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 let vm;
 let wrapper;
 
-function generateWrapper(outlined = false, required = false) {
+function generateWrapper(date, outlined, required) {
     wrapper = createWrapper(VnInputDate, {
         props: {
-            modelValue: '2000-12-31T23:00:00.000Z',
+            modelValue: date,
-            'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
         },
         attrs: {
             isOutlined: outlined,
-            required: required,
+            required: required
         },
     });
     wrapper = wrapper.wrapper;
     vm = wrapper.vm;
-}
+};
 
 describe('VnInputDate', () => {
+
     describe('formattedDate', () => {     
-        it('validateAndCleanInput should remove non-numeric characters', async () => {
+        it('formats a valid date correctly', async () => {
-            generateWrapper();
+            generateWrapper('2023-12-25', false, false);
-            vm.validateAndCleanInput('10a/1s2/2dd0a23');
             await vm.$nextTick();
-            expect(vm.inputValue).toBe('10/12/2023');
+            expect(vm.formattedDate).toBe('25/12/2023');
         });
 
-        it('manageDate should reverse the date', async () => {
+        it('updates the model value when a new date is set', async () => {
-            generateWrapper();
-            vm.manageDate('10/12/2023');
-            await vm.$nextTick();
-            expect(vm.inputValue).toBe('2023/12/10');
-        });
-
-        it('formatDate should format the date correctly when a valid date is entered with full year', async () => {
             const input = wrapper.find('input');
-            await input.setValue('25.12/2002');
+            await input.setValue('31/12/2023');
-            await vm.$nextTick();
+            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
-            await vm.formatDate();
+            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
-            expect(vm.model).toBe('2002-12-24T23:00:00.000Z');
         });
 
-        it('should format the date correctly when a valid date is entered with short year', async () => {
+        it('should not update the model value when an invalid date is set', async () => {
             const input = wrapper.find('input');
-            await input.setValue('31.12-23');
+            await input.setValue('invalid-date');
-            await vm.$nextTick();
+            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
-            await vm.formatDate();
-            expect(vm.model).toBe('2023-12-30T23:00:00.000Z');
-        });
-
-        it('should format the date correctly when a valid date is entered without year', async () => {
-            const input = wrapper.find('input');
-            await input.setValue('12.03');
-            await vm.$nextTick();
-            await vm.formatDate();
-            expect(vm.model).toBe('2001-03-11T23:00:00.000Z');
         }); 
     });
 
     describe('styleAttrs', () => {
         it('should return empty styleAttrs when isOutlined is false', async () => {
-            generateWrapper();
+            generateWrapper('2023-12-25', false, false);
             await vm.$nextTick();
             expect(vm.styleAttrs).toEqual({}); 
         });
 
         it('should set styleAttrs when isOutlined is true', async () => {        
-            generateWrapper(true, false);
+            generateWrapper('2023-12-25', true, false);
             await vm.$nextTick();
             expect(vm.styleAttrs.outlined).toBe(true);
         });
@@ -77,13 +58,13 @@ describe('VnInputDate', () => {
 
     describe('required', () => {
         it('should not applies required class when isRequired is false', async () => {
-            generateWrapper();
+            generateWrapper('2023-12-25', false, false);
             await vm.$nextTick();
             expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
         });
         
         it('should applies required class when isRequired is true', async () => {
-            generateWrapper(false, true);
+            generateWrapper('2023-12-25', false, true);
             await vm.$nextTick();
             expect(wrapper.find('.vn-input-date').classes()).toContain('required');
         });

src/components/common/__tests__/VnInputDateTime.spec.js

@@ -1,81 +0,0 @@
-import { createWrapper } from 'app/test/vitest/helper.js';
-import { describe, it, expect, beforeAll } from 'vitest';
-import VnInputDateTime from 'components/common/VnInputDateTime.vue';
-import vnDateBoot from 'src/boot/vnDate';
-
-let vm;
-let wrapper;
-
-beforeAll(() => {
-    // Initialize the vnDate boot
-    vnDateBoot();
-});
-function generateWrapper(date, outlined, showEvent) {
-    wrapper = createWrapper(VnInputDateTime, {
-        props: {
-            modelValue: date,
-            isOutlined: outlined,
-            showEvent: showEvent,
-        },
-    });
-    wrapper = wrapper.wrapper;
-    vm = wrapper.vm;
-}
-
-describe('VnInputDateTime', () => {
-    describe('selectedDate', () => {
-        it('formats a valid datetime correctly', async () => {
-            generateWrapper('2023-12-25T10:30:00', false, true);
-            await vm.$nextTick();
-            expect(vm.selectedDate).toBe('25-12-2023 10:30');
-        });
-
-        it('handles null date value', async () => {
-            generateWrapper(null, false, true);
-            await vm.$nextTick();
-            expect(vm.selectedDate).not.toBe(null);
-        });
-
-        it('updates the model value when a new datetime is set', async () => {
-            vm.selectedDate = '31-12-2023 15:45';
-            await vm.$nextTick();
-            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
-        });
-    });
-
-    describe('styleAttrs', () => {
-        it('should return empty styleAttrs when isOutlined is false', async () => {
-            generateWrapper('2023-12-25T10:30:00', false, true);
-            await vm.$nextTick();
-            expect(vm.styleAttrs).toEqual({});
-        });
-
-        it('should set styleAttrs when isOutlined is true', async () => {
-            generateWrapper('2023-12-25T10:30:00', true, true);
-            await vm.$nextTick();
-            expect(vm.styleAttrs).toEqual({
-                dense: true,
-                outlined: true,
-                rounded: true,
-            });
-        });
-    });
-
-    describe('component rendering', () => {
-        it('should render date and time icons', async () => {
-            generateWrapper('2023-12-25T10:30:00', false, true);
-            await vm.$nextTick();
-            const icons = wrapper.findAllComponents({ name: 'QIcon' });
-            expect(icons.length).toBe(2);
-            expect(icons[0].props('name')).toBe('today');
-            expect(icons[1].props('name')).toBe('access_time');
-        });
-
-        it('should render popup proxies for date and time', async () => {
-            generateWrapper('2023-12-25T10:30:00', false, true);
-            await vm.$nextTick();
-            const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
-            expect(popups.length).toBe(2);
-        });
-    });
-});

src/components/common/__tests__/VnLog.spec.js

@@ -90,10 +90,8 @@ describe('VnLog', () => {
 
         vm = createWrapper(VnLog, {
             global: {
-                stubs: ['FetchData', 'vue-i18n'],
+                stubs: [],
-                mocks: {
+                mocks: {},
-                    fetch: vi.fn(),
-                },
             },
             propsData: {
                 model: 'Claim',

src/components/common/__tests__/VnNotes.spec.js

@@ -26,7 +26,7 @@ describe('VnNotes', () => {
     ) {
         vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         wrapper = createWrapper(VnNotes, {
-            propsData: { ...defaultOptions, ...options },
+            propsData: options,
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;

src/components/ui/EntityDescriptor.vue

@@ -44,8 +44,7 @@ onBeforeMount(async () => {
     });
 
     // It enables to load data only once if the module is the same as the dataKey
-    if (!isSameDataKey.value || !route.params.id || $props.id !== route.params.id)
+    if (!isSameDataKey.value || !route.params.id) await getData();
-        await getData();
     watch(
         () => [$props.url, $props.filter],
         async () => {
@@ -59,8 +58,7 @@ async function getData() {
     store.filter = $props.filter ?? {};
     isLoading.value = true;
     try {
-        await arrayData.fetch({ append: false, updateRouter: false });
+        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-        const { data } = store;
         state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {

src/components/ui/VnFilterPanel.vue

@@ -212,7 +212,6 @@ const getLocale = (label) => {
         color="primary"
         style="position: fixed; z-index: 1; right: 0; bottom: 0"
         icon="search"
-        data-cy="vnFilterPanel_search"
         @click="search()"
     >
         <QTooltip bottom anchor="bottom right">
@@ -230,7 +229,6 @@ const getLocale = (label) => {
                 <QItemSection top side>
                     <QBtn
                         @click="clearFilters"
-                        data-cy="clearFilters"
                         color="primary"
                         dense
                         flat
@@ -294,7 +292,6 @@ const getLocale = (label) => {
         </QList>
     </QForm>
     <QInnerLoading
-        data-cy="filterPanel-spinner"
         :label="t('globals.pleaseWait')"
         :showing="isLoading"
         color="primary"

src/components/ui/VnPaginate.vue

@@ -2,9 +2,7 @@
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
-import { useAttrs } from 'vue';
 
-const attrs = useAttrs();
 const { t } = useI18n();
 
 const props = defineProps({
@@ -69,7 +67,7 @@ const props = defineProps({
         default: null,
     },
     searchUrl: {
-        type: [String, Boolean],
+        type: String,
         default: null,
     },
     disableInfiniteScroll: {
@@ -77,7 +75,7 @@ const props = defineProps({
         default: false,
     },
     mapKey: {
-        type: [String, Boolean],
+        type: String,
         default: '',
     },
     keyData: {
@@ -222,7 +220,7 @@ defineExpose({
 </script>
 
 <template>
-    <div class="full-width" v-bind="attrs">
+    <div class="full-width">
         <div
             v-if="!store.data && !store.data?.length && !isLoading"
             class="info-row q-pa-md text-center"

src/components/ui/VnSearchbar.vue

@@ -46,7 +46,7 @@ const props = defineProps({
         default: null,
     },
     order: {
-        type: [String, Array],
+        type: String,
         default: '',
     },
     limit: {

src/components/ui/__tests__/CardSummary.spec.js

@@ -23,15 +23,10 @@ describe('CardSummary', () => {
 
     beforeEach(() => {
         wrapper = createWrapper(CardSummary, {
-            global: {
-                mocks: {
-                    validate: vi.fn(),
-                },
-            },
             propsData: {
                 dataKey: 'cardSummaryKey',
                 url: 'cardSummaryUrl',
-                filter: { key: 'cardFilter' },
+                filter: 'cardFilter',
             },
         });
         vm = wrapper.vm;
@@ -55,7 +50,7 @@ describe('CardSummary', () => {
 
     it('should set correct props to the store', () => {
         expect(vm.store.url).toEqual('cardSummaryUrl');
-        expect(vm.store.filter).toEqual({ key: 'cardFilter' });
+        expect(vm.store.filter).toEqual('cardFilter');
     });
 
     it('should respond to prop changes and refetch data', async () => {

src/components/ui/__tests__/VnSearchbar.spec.js

@@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
     let wrapper;
     let applyFilterSpy;
     const searchText = 'Bolas de madera';
-    const userParams = { staticKey: 'staticValue' };
+    const userParams = {staticKey: 'staticValue'};
 
     beforeEach(async () => {
         wrapper = createWrapper(VnSearchbar, {
@@ -23,9 +23,8 @@ describe('VnSearchbar', () => {
 
         vm.searchText = searchText;
         vm.arrayData.store.userParams = userParams;
-        applyFilterSpy = vi
+        applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
-            .spyOn(vm.arrayData, 'applyFilter')
+        
-            .mockImplementation(() => {});
     });
 
     afterEach(() => {
@@ -33,9 +32,7 @@ describe('VnSearchbar', () => {
     });
 
     it('search resets pagination and applies filter', async () => {
-        const resetPaginationSpy = vi
+        const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
-            .spyOn(vm.arrayData, 'resetPagination')
-            .mockImplementation(() => {});
         await vm.search();
 
         expect(resetPaginationSpy).toHaveBeenCalled();
@@ -51,7 +48,7 @@ describe('VnSearchbar', () => {
 
         expect(applyFilterSpy).toHaveBeenCalledWith({
             params: { staticKey: 'staticValue', search: searchText },
-            filter: { skip: 0 },
+            filter: {skip: 0},
         });
     });
 

src/components/ui/__tests__/VnSms.spec.js

@@ -1,4 +1,5 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import axios from 'axios';
 import { createWrapper } from 'app/test/vitest/helper';
 import VnSms from 'src/components/ui/VnSms.vue';
 
@@ -11,9 +12,6 @@ describe('VnSms', () => {
                 stubs: ['VnPaginate'],
                 mocks: {},
             },
-            propsData: {
-                url: 'SmsUrl',
-            },
         }).vm;
     });
 

src/composables/__tests__/useArrayData.spec.js

@@ -4,8 +4,6 @@ import { useArrayData } from 'composables/useArrayData';
 import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
 import { setActivePinia, createPinia } from 'pinia';
-import { defineComponent, h } from 'vue';
-import { mount } from '@vue/test-utils';
 
 describe('useArrayData', () => {
     const filter = '{"limit":20,"skip":0}';
@@ -45,7 +43,7 @@ describe('useArrayData', () => {
     it('should fetch and replace url with new params', async () => {
         vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
 
-        const arrayData = mountArrayData('ArrayData', {
+        const arrayData = useArrayData('ArrayData', {
             url: 'mockUrl',
             searchUrl: 'params',
         });
@@ -74,7 +72,7 @@ describe('useArrayData', () => {
             data: [{ id: 1 }],
         });
 
-        const arrayData = mountArrayData('ArrayData', {
+        const arrayData = useArrayData('ArrayData', {
             url: 'mockUrl',
             navigate: {},
         });
@@ -96,7 +94,7 @@ describe('useArrayData', () => {
             ],
         });
 
-        const arrayData = mountArrayData('ArrayData', {
+        const arrayData = useArrayData('ArrayData', {
             url: 'mockUrl',
             oneRecord: true,
         });
@@ -109,17 +107,3 @@ describe('useArrayData', () => {
         });
     });
 });
-
-function mountArrayData(...args) {
-    let arrayData;
-
-    const TestComponent = defineComponent({
-        setup() {
-            arrayData = useArrayData(...args);
-            return () => h('div');
-        },
-    });
-
-    const asd = mount(TestComponent);
-    return arrayData;
-}

src/composables/__tests__/useSession.spec.js

@@ -64,84 +64,88 @@ describe('session', () => {
         });
     });
 
-    describe('login', () => {
+    describe(
-        const expectedUser = {
+        'login',
-            id: 999,
+        () => {
-            name: `T'Challa`,
+            const expectedUser = {
-            nickname: 'Black Panther',
+                id: 999,
-            lang: 'en',
+                name: `T'Challa`,
-            userConfig: {
+                nickname: 'Black Panther',
-                darkMode: false,
+                lang: 'en',
-            },
+                userConfig: {
-            worker: { department: { departmentFk: 155 } },
+                    darkMode: false,
-        };
-        const rolesData = [
-            {
-                role: {
-                    name: 'salesPerson',
                 },
-            },
+                worker: { department: { departmentFk: 155 } },
-            {
+            };
-                role: {
+            const rolesData = [
-                    name: 'admin',
+                {
+                    role: {
+                        name: 'salesPerson',
+                    },
                 },
-            },
+                {
-        ];
+                    role: {
-        beforeEach(() => {
+                        name: 'admin',
-            vi.spyOn(axios, 'get').mockImplementation((url) => {
+                    },
-                if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+                },
-                return Promise.resolve({
+            ];
-                    data: { roles: rolesData, user: expectedUser },
+            beforeEach(() => {
+                vi.spyOn(axios, 'get').mockImplementation((url) => {
+                    if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+                    return Promise.resolve({
+                        data: { roles: rolesData, user: expectedUser },
+                    });
                 });
             });
-        });
 
-        it('should fetch the user roles and then set token in the sessionStorage', async () => {
+            it('should fetch the user roles and then set token in the sessionStorage', async () => {
-            const expectedRoles = ['salesPerson', 'admin'];
+                const expectedRoles = ['salesPerson', 'admin'];
-            const expectedToken = 'mySessionToken';
+                const expectedToken = 'mySessionToken';
-            const expectedTokenMultimedia = 'mySessionTokenMultimedia';
+                const expectedTokenMultimedia = 'mySessionTokenMultimedia';
-            const keepLogin = false;
+                const keepLogin = false;
 
-            await session.login({
+                await session.login({
-                token: expectedToken,
+                    token: expectedToken,
-                tokenMultimedia: expectedTokenMultimedia,
+                    tokenMultimedia: expectedTokenMultimedia,
-                keepLogin,
+                    keepLogin,
+                });
+
+                const roles = state.getRoles();
+                const localToken = localStorage.getItem('token');
+                const sessionToken = sessionStorage.getItem('token');
+
+                expect(roles.value).toEqual(expectedRoles);
+                expect(localToken).toBeNull();
+                expect(sessionToken).toEqual(expectedToken);
+
+                await session.destroy(); // this clears token and user for any other test
             });
 
-            const roles = state.getRoles();
+            it('should fetch the user roles and then set token in the localStorage', async () => {
-            const localToken = localStorage.getItem('token');
+                const expectedRoles = ['salesPerson', 'admin'];
-            const sessionToken = sessionStorage.getItem('token');
+                const expectedToken = 'myLocalToken';
+                const expectedTokenMultimedia = 'myLocalTokenMultimedia';
+                const keepLogin = true;
 
-            expect(roles.value).toEqual(expectedRoles);
+                await session.login({
-            expect(localToken).toBeNull();
+                    token: expectedToken,
-            expect(sessionToken).toEqual(expectedToken);
+                    tokenMultimedia: expectedTokenMultimedia,
+                    keepLogin,
+                });
 
-            await session.destroy(); // this clears token and user for any other test
+                const roles = state.getRoles();
-        });
+                const localToken = localStorage.getItem('token');
+                const sessionToken = sessionStorage.getItem('token');
 
-        it('should fetch the user roles and then set token in the localStorage', async () => {
+                expect(roles.value).toEqual(expectedRoles);
-            const expectedRoles = ['salesPerson', 'admin'];
+                expect(localToken).toEqual(expectedToken);
-            const expectedToken = 'myLocalToken';
+                expect(sessionToken).toBeNull();
-            const expectedTokenMultimedia = 'myLocalTokenMultimedia';
-            const keepLogin = true;
 
-            await session.login({
+                await session.destroy(); // this clears token and user for any other test
-                token: expectedToken,
-                tokenMultimedia: expectedTokenMultimedia,
-                keepLogin,
             });
-
+        },
-            const roles = state.getRoles();
+        {},
-            const localToken = localStorage.getItem('token');
+    );
-            const sessionToken = sessionStorage.getItem('token');
-
-            expect(roles.value).toEqual(expectedRoles);
-            expect(localToken).toEqual(expectedToken);
-            expect(sessionToken).toBeNull();
-
-            await session.destroy(); // this clears token and user for any other test
-        });
-    });
 
     describe('RenewToken', () => {
         const expectedToken = 'myToken';

src/i18n/locale/en.yml

@@ -6,7 +6,6 @@ globals:
     quantity: Quantity
     entity: Entity
     preview: Preview
-    scrollToTop: Go up
     user: User
     details: Details
     collapseMenu: Collapse lateral menu
@@ -20,7 +19,6 @@ globals:
     logOut: Log out
     date: Date
     dataSaved: Data saved
-    openDetail: Open detail
     dataDeleted: Data deleted
     delete: Delete
     search: Search
@@ -163,8 +161,8 @@ globals:
     noData: No data available
     vehicle: Vehicle
     selectDocumentId: Select document id
-    document: Document
     import: Import from existing
+    document: Document
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -346,6 +344,7 @@ globals:
         parking: Parking
         vehicleList: Vehicles
         vehicle: Vehicle
+        properties: Properties
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?
@@ -394,6 +393,7 @@ errors:
     updateUserConfig: Error updating user config
     tokenConfig: Error fetching token config
     writeRequest: The requested operation could not be completed
+    documentIdEmpty: The document identifier can't be empty
 login:
     title: Login
     username: Username

src/i18n/locale/es.yml

@@ -6,7 +6,6 @@ globals:
     quantity: Cantidad
     entity: Entidad
     preview: Vista previa
-    scrollToTop: Ir arriba
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral
@@ -21,11 +20,10 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
-    dataCreated: Datos creados
-    openDetail: Ver detalle
     delete: Eliminar
     search: Buscar
     changes: Cambios
+    dataCreated: Datos creados
     add: Añadir
     create: Crear
     edit: Modificar
@@ -166,9 +164,9 @@ globals:
     noData: Datos no disponibles
     department: Departamento
     vehicle: Vehículo
-    selectDocumentId: Seleccione el id de gestión documental
+    selectDocumentId: Introduzca id de gestión documental
-    document: Documento
     import: Importar desde existente
+    document: Documento
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -349,6 +347,7 @@ globals:
         parking: Parking
         vehicleList: Vehículos
         vehicle: Vehículo
+        properties: Propiedades
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?
@@ -390,6 +389,7 @@ errors:
     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
+    documentIdEmpty: El número de documento no puede estar vacío
 login:
     title: Inicio de sesión
     username: Nombre de usuario

src/pages/Claim/Card/ClaimPhoto.vue

@@ -23,7 +23,7 @@ const claimDms = ref([
 ]);
 const client = ref({});
 const inputFile = ref();
-const files = ref([]);
+const files = ref({});
 const spinnerRef = ref();
 const claimDmsRef = ref();
 const dmsType = ref({});
@@ -255,8 +255,9 @@ function onDrag() {
                 icon="add"
                 color="primary"
             >
-                <QFile
+                <QInput
                     ref="inputFile"
+                    type="file"
                     style="display: none"
                     multiple
                     v-model="files"

src/pages/Claim/Card/__tests__/ClaimLines.spec.js

@@ -52,7 +52,7 @@ describe('ClaimLines', () => {
                 expectedData,
                 {
                     signal: canceller.signal,
-                },
+                }
             );
         });
     });
@@ -69,7 +69,7 @@ describe('ClaimLines', () => {
                 expect.objectContaining({
                     message: 'Discount updated',
                     type: 'positive',
-                }),
+                })
             );
         });
     });

src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js

@@ -14,9 +14,6 @@ describe('ClaimLinesImport', () => {
                     fetch: vi.fn(),
                 },
             },
-            propsData: {
-                ticketId: 1,
-            },
         }).vm;
     });
 
@@ -43,7 +40,7 @@ describe('ClaimLinesImport', () => {
                 expect.objectContaining({
                     message: 'Lines added to claim',
                     type: 'positive',
-                }),
+                })
             );
             expect(vm.canceller).toEqual(null);
         });

src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js

@@ -41,10 +41,10 @@ describe('ClaimPhoto', () => {
             await vm.deleteDms({ index: 0 });
 
             expect(axios.post).toHaveBeenCalledWith(
-                `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`,
+                `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`
             );
             expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' }),
+                expect.objectContaining({ type: 'positive' })
             );
         });
     });
@@ -63,7 +63,7 @@ describe('ClaimPhoto', () => {
                         data: { index: 1 },
                         promise: vm.deleteDms,
                     },
-                }),
+                })
             );
         });
     });
@@ -102,10 +102,10 @@ describe('ClaimPhoto', () => {
                 new FormData(),
                 expect.objectContaining({
                     params: expect.objectContaining({ hasFile: false }),
-                }),
+                })
             );
             expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' }),
+                expect.objectContaining({ type: 'positive' })
             );
 
             expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -39,7 +39,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const entityId = computed(() => {
-    return Number($props.id || route.params.id);
+    return $props.id || route.params.id;
 });
 
 const data = ref(useCardDescription());

src/pages/Customer/Card/CustomerDescriptorProxy.vue

@@ -11,7 +11,7 @@ const $props = defineProps({
 </script>
 
 <template>
-    <QPopupProxy data-cy="CustomerDescriptor">
+    <QPopupProxy>
         <CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" />
     </QPopupProxy>
 </template>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -86,7 +86,7 @@ async function acceptPropagate({ isEqualizated }) {
                     :required="true"
                     :rules="validate('client.socialName')"
                     clearable
-                    :uppercase="true"
+                    uppercase="true"
                     v-model="data.socialName"
                 >
                     <template #append>

src/pages/Customer/Card/CustomerSamples.vue

@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { QBtn, useQuasar } from 'quasar';
+
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
 import VnTable from 'src/components/VnTable/VnTable.vue';
@@ -73,11 +74,12 @@ const tableRef = ref();
 <template>
     <VnTable
         ref="tableRef"
-        data-key="CustomerSamples"
+        data-key="ClientSamples"
         auto-load
-        :user-filter="filter"
+        :filter="filter"
         url="ClientSamples"
         :columns="columns"
+        :pagination="{ rowsPerPage: 12 }"
         :disable-option="{ card: true }"
         :right-search="false"
         :rows="rows"

src/pages/Customer/Card/CustomerSummary.vue

@@ -25,7 +25,7 @@ const $props = defineProps({
     },
 });
 
-const entityId = computed(() => Number($props.id || route.params.id));
+const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
 const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);

src/pages/Customer/CustomerFilter.vue

@@ -72,7 +72,7 @@ const exprBuilder = (param, value) => {
                         option-value="id"
                         option-label="name"
                         url="Departments"
-                        :no-one="true"
+                        no-one="true"
                     />
                 </QItemSection>
             </QItem>

src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js

@@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
                 expect.objectContaining({
                     message: 'Payment confirmed',
                     type: 'positive',
-                }),
+                })
             );
         });
     });

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -41,6 +41,7 @@ const sampleType = ref({ hasPreview: false });
 const initialData = reactive({});
 const entityId = computed(() => route.params.id);
 const customer = computed(() => useArrayData('Customer').store?.data);
+const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [
         { relation: 'province', scope: { fields: ['name'] } },
@@ -72,7 +73,7 @@ onBeforeMount(async () => {
 
 const setEmailUser = (data) => {
     optionsEmailUsers.value = data;
-    initialData.replyTo = data[0]?.notificationEmail;
+    initialData.replyTo = data[0]?.email;
 };
 
 const setClientsAddresses = (data) => {
@@ -181,12 +182,10 @@ const toCustomerSamples = () => {
 
 <template>
     <FetchData
-        :filter="{
+        :filter="filterEmailUsers"
-            where: { id: customer.departmentFk },
-        }"
         @on-fetch="setEmailUser"
         auto-load
-        url="Departments"
+        url="EmailUsers"
     />
     <FetchData
         :filter="filterClientsAddresses"

src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue

@@ -5,7 +5,7 @@ import InvoiceInSummary from './InvoiceInSummary.vue';
 const $props = defineProps({
     id: {
         type: Number,
-        default: null,
+        required: true,
     },
 });
 </script>

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -164,7 +164,6 @@ onMounted(async () => {
             unelevated
             filled
             dense
-            data-cy="formSubmitBtn"
         />
         <QBtn
             v-else
@@ -175,7 +174,6 @@ onMounted(async () => {
             filled
             dense
             @click="getStatus = 'stopping'"
-            data-cy="formStopBtn"
         />
     </QForm>
 </template>

src/pages/Item/components/ItemProposal.vue

@@ -6,12 +6,10 @@ import { toCurrency } from 'filters/index';
 import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import axios from 'axios';
-import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
+import notifyResults from 'src/utils/notifyResults';
 import FetchData from 'components/FetchData.vue';
-import { useState } from 'src/composables/useState';
 
 const MATCH = 'match';
-const { notifyResults } = displayResults();
 
 const { t } = useI18n();
 const $props = defineProps({
@@ -20,20 +18,14 @@ const $props = defineProps({
         required: true,
         default: () => {},
     },
-    filter: {
-        type: Object,
-        required: true,
-        default: () => {},
-    },
     replaceAction: {
         type: Boolean,
-        required: true,
+        required: false,
         default: false,
     },
-
     sales: {
         type: Array,
-        required: true,
+        required: false,
         default: () => [],
     },
 });
@@ -44,8 +36,6 @@ const proposalTableRef = ref(null);
 const sale = computed(() => $props.sales[0]);
 const saleFk = computed(() => sale.value.saleFk);
 const filter = computed(() => ({
-    where: $props.filter,
-
     itemFk: $props.itemLack.itemFk,
     sales: saleFk.value,
 }));
@@ -238,15 +228,11 @@ async function handleTicketConfig(data) {
         url="TicketConfigs"
         :filter="{ fields: ['lackAlertPrice'] }"
         @on-fetch="handleTicketConfig"
-    ></FetchData>
+        auto-load
-    <QInnerLoading
-        :showing="isLoading"
-        :label="t && t('globals.pleaseWait')"
-        color="primary"
     />
 
     <VnTable
-        v-if="!isLoading"
+        v-if="ticketConfig"
         auto-load
         data-cy="proposalTable"
         ref="proposalTableRef"

src/pages/Item/components/ItemProposalProxy.vue

@@ -1,17 +1,13 @@
 <script setup>
 import ItemProposal from './ItemProposal.vue';
 import { useDialogPluginComponent } from 'quasar';
+
 const $props = defineProps({
     itemLack: {
         type: Object,
         required: true,
         default: () => {},
     },
-    filter: {
-        type: Object,
-        required: true,
-        default: () => {},
-    },
     replaceAction: {
         type: Boolean,
         required: false,
@@ -35,7 +31,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
     <QDialog ref="dialogRef" transition-show="scale" transition-hide="scale">
         <QCard class="dialog-width">
             <QCardSection class="row items-center q-pb-none">
-                <span class="text-h6 text-grey">{{ $t('itemProposal') }}</span>
+                <span class="text-h6 text-grey">{{ $t('Item proposal') }}</span>
                 <QSpace />
                 <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>

src/pages/Monitor/MonitorClientsActions.vue

@@ -8,14 +8,14 @@ import VnRow from 'src/components/ui/VnRow.vue';
         class="q-pa-md"
         :style="{ 'flex-direction': $q.screen.lt.lg ? 'column' : 'row', gap: '0px' }"
     >
-        <div style="flex: 0.3" data-cy="clientsOnWebsite">
+        <div style="flex: 0.3">
             <span
                 class="q-ml-md text-body1"
                 v-text="$t('salesMonitor.clientsOnWebsite')"
             />
             <SalesClientTable />
         </div>
-        <div style="flex: 0.7" data-cy="recentOrderActions">
+        <div style="flex: 0.7">
             <span
                 class="q-ml-md text-body1"
                 v-text="$t('salesMonitor.recentOrderActions')"

src/pages/Monitor/MonitorOrders.vue

@@ -9,7 +9,6 @@ import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
 import { toCurrency } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
-import VnDateBadge from 'src/components/common/VnDateBadge.vue';
 import useOpenURL from 'src/composables/useOpenURL';
 
 const { t } = useI18n();
@@ -166,7 +165,16 @@ const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
             </div>
         </template>
         <template #column-dateSend="{ row }">
-            <VnDateBadge :date="row.date_send" />
+            <QTd>
+                <QBadge
+                    :color="getBadgeColor(row.date_send)"
+                    text-color="black"
+                    class="q-pa-sm"
+                    style="font-size: 14px"
+                >
+                    {{ toDateFormat(row.date_send) }}
+                </QBadge>
+            </QTd>
         </template>
 
         <template #column-clientFk="{ row }">

src/pages/Monitor/Ticket/MonitorTicketFilter.vue

@@ -9,7 +9,6 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { dateRange } from 'src/filters';
-import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
 defineProps({ dataKey: { type: String, required: true } });
 const { t, te } = useI18n();
@@ -210,7 +209,7 @@ const getLocale = (label) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnCheckbox
+                    <QCheckbox
                         :label="t('params.myTeam')"
                         v-model="params.myTeam"
                         toggle-indeterminate
@@ -219,7 +218,7 @@ const getLocale = (label) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnCheckbox
+                    <QCheckbox
                         :label="t('params.problems')"
                         v-model="params.problems"
                         toggle-indeterminate
@@ -228,7 +227,7 @@ const getLocale = (label) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnCheckbox
+                    <QCheckbox
                         :label="t('params.pending')"
                         v-model="params.pending"
                         toggle-indeterminate

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
+import FetchData from 'components/FetchData.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
@@ -167,11 +168,9 @@ const columns = computed(() => [
             component: 'select',
             name: 'provinceFk',
             attrs: {
-                url: 'Provinces',
+                options: provinceOpts.value,
-                fields: ['id', 'name'],
+                'option-value': 'id',
-                sortBy: ['name ASC'],
+                'option-label': 'name',
-                optionValue: 'id',
-                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -184,11 +183,9 @@ const columns = computed(() => [
             component: 'select',
             name: 'stateFk',
             attrs: {
-                sortBy: ['name ASC'],
+                options: stateOpts.value,
-                url: 'States',
+                'option-value': 'id',
-                fields: ['id', 'name'],
+                'option-label': 'name',
-                optionValue: 'id',
-                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -215,12 +212,9 @@ const columns = computed(() => [
             component: 'select',
             name: 'zoneFk',
             attrs: {
-                url: 'Zones',
+                options: zoneOpts.value,
-                fields: ['id', 'name'],
+                'option-value': 'id',
-                sortBy: ['name ASC'],
+                'option-label': 'name',
-
-                optionValue: 'id',
-                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -231,12 +225,11 @@ const columns = computed(() => [
         align: 'left',
         columnFilter: {
             component: 'select',
+            url: 'PayMethods',
             attrs: {
-                url: 'PayMethods',
+                options: PayMethodOpts.value,
-                fields: ['id', 'name'],
-                sortBy: ['id ASC'],
-                optionLabel: 'name',
                 optionValue: 'id',
+                optionLabel: 'name',
                 dense: true,
             },
         },
@@ -261,9 +254,7 @@ const columns = computed(() => [
         columnFilter: {
             component: 'select',
             attrs: {
-                url: 'Departments',
+                options: DepartmentOpts.value,
-                fields: ['id', 'name'],
-                sortBy: ['id ASC'],
                 dense: true,
             },
         },
@@ -274,12 +265,11 @@ const columns = computed(() => [
         align: 'left',
         columnFilter: {
             component: 'select',
+            url: 'ItemPackingTypes',
             attrs: {
-                url: 'ItemPackingTypes',
+                options: ItemPackingTypeOpts.value,
-                fields: ['code'],
+                'option-value': 'code',
-                sortBy: ['code ASC'],
+                'option-label': 'code',
-                optionValue: 'code',
-                optionCode: 'code',
                 dense: true,
             },
         },
@@ -334,6 +324,60 @@ const totalPriceColor = (ticket) => {
 const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
 </script>
 <template>
+    <FetchData
+        url="Provinces"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'name ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (provinceOpts = data)"
+    />
+    <FetchData
+        url="States"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'name ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (stateOpts = data)"
+    />
+    <FetchData
+        url="Zones"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'name ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (zoneOpts = data)"
+    />
+    <FetchData
+        url="ItemPackingTypes"
+        :filter="{
+            fields: ['code'],
+            order: 'code ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (ItemPackingTypeOpts = data)"
+    />
+    <FetchData
+        url="Departments"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'id ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (DepartmentOpts = data)"
+    />
+    <FetchData
+        url="PayMethods"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'id ASC',
+        }"
+        auto-load
+        @on-fetch="(data) => (PayMethodOpts = data)"
+    />
     <MonitorTicketSearchbar />
     <RightMenu>
         <template #right-panel>

src/pages/Order/Card/OrderCatalog.vue

@@ -120,6 +120,7 @@ watch(
                 :data-key="dataKey"
                 :tag-value="tagValue"
                 :tags="tags"
+                :initial-catalog-params="catalogParams"
                 :arrayData
             />
         </template>

src/pages/Order/Card/OrderDescriptor.vue

@@ -27,7 +27,7 @@ const getTotalRef = ref();
 const total = ref(0);
 
 const entityId = computed(() => {
-    return Number($props.id || route.params.id);
+    return $props.id || route.params.id;
 });
 
 const orderTotal = computed(() => state.get('orderTotal') ?? 0);

src/pages/Property/Card/PropertyBasicData.vue

@@ -0,0 +1,191 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const isNew = Boolean(!route.params.id);
+</script>
+
+<template>
+    <VnSubToolbar v-if="isNew" />
+    <div class="q-pa-md">
+        <FormModel
+            :url-update="`Properties/${route.params.id}`"
+            model="Property"
+            auto-load
+        >
+            <template #form="{ data }">
+                <VnRow>
+                    <VnInput
+                        :label="t('property.name')"
+                        v-model="data.name"
+                        fill-input
+                    />
+                    <VnInput
+                        :label="t('property.cadaster')"
+                        v-model="data.cadaster"
+                        fill-input
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnSelect
+                        url="propertyGroups"
+                        :label="t('property.group')"
+                        v-model="data.propertyGroupFk"
+                        option-value="id"
+                        option-label="description"
+                        hide-selected
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ `${scope.opt.id}: ${scope.opt.description}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        url="Companies"
+                        :label="t('property.owner')"
+                        v-model="data.companyFk"
+                        option-value="id"
+                        option-label="code"
+                        hide-selected
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ `${scope.opt.id}: ${scope.opt.code}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </VnRow>
+                <VnRow>
+                    <VnInput
+                        :label="t('property.map')"
+                        v-model="data.url"
+                        fill-input
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnInputDate
+                        placeholder="dd-mm-aaa"
+                        :label="t('property.purchased')"
+                        v-model="data.purchased"
+                        fill-input
+                    />
+                    <VnInput
+                        :label="t('property.value')"
+                        v-model="data.value"
+                        fill-input
+                    />
+                    <VnInput
+                        :label="t('property.protocol')"
+                        v-model="data.protocol"
+                        fill-input
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnInput
+                        :label="t('property.smallHolding')"
+                        v-model="data.smallHolding"
+                        fill-input
+                    />
+                    <VnInput
+                        :label="t('property.area')"
+                        v-model="data.area"
+                        fill-input
+                    />
+                    <VnInput
+                        :label="t('property.allocation')"
+                        v-model="data.allocation"
+                        fill-input
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnSelect
+                        url="Towns"
+                        :label="t('property.town')"
+                        v-model="data.townFk"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnInput
+                        :label="t('property.m2')"
+                        v-model="data.m2"
+                        fill-input
+                    />
+                    <VnInput
+                        :label="t('property.registry')"
+                        v-model="data.registry"
+                        fill-input
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnInput
+                        :label="t('property.tome')"
+                        v-model="data.tome"
+                        fill-input
+                    />
+                    <VnInput
+                        :label="t('property.book')"
+                        v-model="data.book"
+                        fill-input
+                    />
+                    <VnInput
+                        :label="t('property.page')"
+                        v-model="data.page"
+                        fill-input
+                    />
+                    <VnInput
+                        :label="t('property.farm')"
+                        v-model="data.farm"
+                        fill-input
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnInput
+                        :label="t('property.registration')"
+                        v-model="data.registration"
+                        fill-input
+                    />
+                    <VnInputDate
+                        placeholder="dd-mm-aaa"
+                        :label="t('property.booked')"
+                        v-model="data.booked"
+                        fill-input
+                    />
+                    <VnInput
+                        :label="t('property.volume')"
+                        v-model="data.volume"
+                        fill-input
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
+    </div>
+</template>

src/pages/Property/Card/PropertyCard.vue

@@ -0,0 +1,12 @@
+<script setup>
+import VnCard from 'components/common/VnCard.vue';
+import PropertyDescriptor from 'pages/Property/Card/PropertyDescriptor.vue';
+</script>
+<template>
+    <VnCard
+        data-key="Property"
+        url="Properties"
+        :descriptor="PropertyDescriptor"
+        :filter="{ where: { id: $route.params.id } }"
+    />
+</template>

src/pages/Property/Card/PropertyDescriptor.vue

@@ -0,0 +1,60 @@
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import PropertyCard from './PropertyCard.vue';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const route = useRoute();
+
+const entityId = computed(() => {
+    return Number(props.id || route.params.id);
+});
+
+const props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+});
+</script>
+<template>
+    <CardDescriptor
+        v-bind="$attrs"
+        :id="entityId"
+        :card="PropertyCard"
+        title="name"
+        module="Property"
+    >
+        <template #body="{ entity }">
+            <VnLv :label="$t('property.owner')" :value="entity.company.code" />
+            <VnLv
+                :label="$t('property.group')"
+                :value="entity.propertyGroup.description"
+            />
+            <VnLv :label="$t('property.notary')">
+                <template #value>
+                    <span class="link">
+                        {{ entity?.supplier?.name || '-' }}
+                        <SupplierDescriptorProxy :id="entity?.supplierFk" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="$t('property.protocol')" :value="entity.protocol" copy />
+            <VnLv :label="$t('property.cadaster')" :value="entity.cadaster" copy />
+            <VnLv :label="$t('property.farm')" :value="entity.farm" />
+            <VnLv :label="$t('property.area')" :value="entity.area" />
+        </template>
+    </CardDescriptor>
+</template>

src/pages/Property/Card/PropertyDms.vue

@@ -3,7 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnDmsList from 'src/components/common/VnDmsList.vue';
-import VehicleDmsImportForm from 'src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue';
+import PropertyDmsImportForm from 'src/pages/Property/Card/PropertyDmsImportForm.vue';
 
 const { t } = useI18n();
 
@@ -15,15 +15,15 @@ const onDataSaved = () => dmsListRef.value.dmsRef.fetch();
 <template>
     <VnDmsList
         ref="dmsListRef"
-        model="VehicleDms"
+        model="PropertyDms"
-        update-model="vehicles"
+        update-model="PropertyDms"
-        delete-model="VehicleDms"
+        delete-model="PropertyDms"
         download-model="dms"
-        default-dms-code="vehicles"
+        default-dms-code="property"
-        filter="vehicleFk"
+        filter="propertyFk"
     />
     <QDialog v-model="showImportDialog">
-        <VehicleDmsImportForm @on-data-saved="onDataSaved()" />
+        <PropertyDmsImportForm @on-data-saved="onDataSaved()" />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 90]">
         <QBtn

src/pages/Property/Card/PropertyDmsImportForm.vue

@@ -6,8 +6,8 @@ import { useRoute } from 'vue-router';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 import FetchData from 'components/FetchData.vue';
-import useNotify from 'src/composables/useNotify.js';
 
+import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
 const emit = defineEmits(['onDataSaved']);
@@ -21,14 +21,14 @@ const dmsId = ref(null);
 
 const importDms = async () => {
     try {
-        if (!dmsId.value) throw new Error(t(`vehicle.errors.documentIdEmpty`));
+        if (!dmsId.value) throw new Error(t(`globals.errors.documentIdEmpty`));
 
         const data = {
-            vehicleFk: route.params.id,
+            propertyFk: route.params.id,
             dmsFk: dmsId.value,
         };
 
-        await axios.post('vehicleDms', data);
+        await axios.post('propertyDms', data);
         notify(t('globals.dataSaved'), 'positive');
         dmsId.value = null;
         emit('onDataSaved');

src/pages/Property/Card/PropertyLog.vue

@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Property" url="/PropertyLogs" />
+</template>

src/pages/Property/Card/PropertyNotes.vue

@@ -0,0 +1,33 @@
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useState } from 'src/composables/useState';
+import VnNotes from 'src/components/ui/VnNotes.vue';
+
+const route = useRoute();
+const state = useState();
+const user = state.getUser();
+const propertyId = computed(() => route.params.id);
+
+const noteFilter = computed(() => {
+    return {
+        order: 'created DESC',
+        where: { propertyFk: propertyId.value },
+    };
+});
+
+const body = {
+    propertyFk: propertyId.value,
+    workerFk: user.value.id,
+};
+</script>
+
+<template>
+    <VnNotes
+        url="propertyObservations"
+        :add-note="true"
+        :filter="noteFilter"
+        :body="body"
+        required
+    />
+</template>

src/pages/Property/Card/PropertySummary.vue

@@ -0,0 +1,349 @@
+<script setup>
+import { onMounted, ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
+import VnTitle from 'src/components/common/VnTitle.vue';
+import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnAvatar from 'src/components/ui/VnAvatar.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
+
+const route = useRoute();
+const { notify } = useNotify();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: null,
+    },
+});
+
+const dmsColumns = ref([
+    {
+        align: 'left',
+        label: t('globals.id'),
+        name: 'id',
+        field: ({ id }) => id,
+    },
+    {
+        align: 'left',
+        label: t('globals.type'),
+        name: 'type',
+        field: ({ type }) => type?.name,
+    },
+    {
+        align: 'left',
+        label: t('globals.order'),
+        name: 'order',
+        field: ({ hardCopyNumber }) => dashIfEmpty(hardCopyNumber),
+    },
+    {
+        align: 'left',
+        label: t('globals.reference'),
+        name: 'reference',
+        field: ({ reference }) => dashIfEmpty(reference),
+    },
+    {
+        align: 'left',
+        label: t('globals.description'),
+        name: 'description',
+        field: ({ description }) => dashIfEmpty(description),
+    },
+    {
+        align: 'left',
+        label: t('globals.original'),
+        name: 'hasFile',
+        toolTip: t('The documentation is available in paper form'),
+        component: 'checkbox',
+        field: ({ hasFile }) => hasFile,
+    },
+    {
+        align: 'left',
+        label: t('globals.worker'),
+        name: 'worker',
+        field: ({ worker }) => worker?.name,
+    },
+    {
+        align: 'left',
+        label: t('globals.created'),
+        name: 'created',
+        field: ({ created }) => toDate(created),
+    },
+]);
+
+const entityId = computed(() => $props.id || route.params.id);
+
+const summary = ref();
+const property = computed(() => summary.value?.entity);
+const propertyUrl = ref();
+const propertyDms = ref(null);
+
+const descriptorData = useArrayData('Property');
+
+onMounted(async () => {
+    propertyUrl.value = (await getUrl('property/')) + entityId.value + '/';
+});
+
+function toPropertyUrl(section) {
+    return '#/property/' + entityId.value + '/' + section;
+}
+</script>
+
+<template>
+    <FetchData
+        ref="propertyDms"
+        :url="`Properties/${entityId}/dms`"
+        @on-fetch="
+            (data) => {
+                propertyDms.value = data;
+            }
+        "
+    />
+    <CardSummary
+        ref="summary"
+        :url="`Properties/${entityId}/summary`"
+        data-key="PropertySummary"
+        v-bind="$attrs.width"
+    >
+        <template #header-left>
+            <VnToSummary
+                v-if="route?.name !== 'PropertySummary'"
+                :route-name="'PropertySummary'"
+                :entity-id="entityId"
+                :url="PropertyUrl"
+            />
+        </template>
+        <template #header="{ entity }">
+            <div>Property #{{ entity.id }} - {{ entity.name }}</div>
+        </template>
+        <template #menu="{ entity }">
+            <!-- <PropertyDescriptorMenu :ticket="entity" /> -->
+        </template>
+        <template #body="{ entity }">
+            <QCard class="vn-one">
+                <VnTitle
+                    :url="toPropertyUrl('basic-data')"
+                    :text="t('globals.summary.basicData')"
+                    data-cy="titleBasicDataBlock1"
+                />
+                <div class="vn-card-group">
+                    <div class="vn-card-content">
+                        <VnLv
+                            :label="t('property.owner')"
+                            :value="dashIfEmpty(entity.company.code)"
+                        />
+                        <VnLv
+                            :label="t('property.map')"
+                            :value="dashIfEmpty(entity.url)"
+                            copy
+                        >
+                            <template #value>
+                                <a
+                                    v-if="entity?.url"
+                                    :href="`${entity?.url}`"
+                                    target="_blank"
+                                    class="grafana"
+                                    data-cy="propertyMapLink"
+                                >
+                                    {{ t('property.goToMap') }}
+                                </a>
+                            </template>
+                        </VnLv>
+                        <VnLv
+                            :label="t('property.value')"
+                            :value="toCurrency(entity.value)"
+                        />
+                        <VnLv :label="$t('property.notary')">
+                            <template #value>
+                                <span class="link">
+                                    {{ entity?.supplier?.name || '-' }}
+                                    <SupplierDescriptorProxy :id="entity?.supplierFk" />
+                                </span>
+                            </template>
+                        </VnLv>
+                        <VnLv
+                            :label="t('property.protocol')"
+                            :value="dashIfEmpty(entity.protocol)"
+                            copy
+                        />
+                        <VnLv
+                            :label="t('property.purchased')"
+                            :value="toDate(entity.purchased)"
+                        />
+                        <VnLv
+                            :label="t('property.booked')"
+                            :value="toDate(entity.booked)"
+                        />
+                    </div>
+                </div>
+            </QCard>
+            <QCard class="vn-one">
+                <VnTitle
+                    :url="toPropertyUrl('basic-data')"
+                    :text="t('globals.summary.basicData')"
+                    data-cy="titleBasicDataBlock2"
+                />
+                <div class="vn-card-content">
+                    <VnLv
+                        :label="t('property.cadaster')"
+                        :value="dashIfEmpty(entity.cadaster)"
+                        copy
+                    />
+                    <VnLv
+                        :label="t('property.smallHolding')"
+                        :value="dashIfEmpty(entity.smallHolding)"
+                    />
+                    <VnLv :label="t('property.area')" :value="dashIfEmpty(entity.area)" />
+                    <VnLv
+                        :label="t('property.allocation')"
+                        :value="dashIfEmpty(entity.allocation)"
+                    />
+                    <VnLv
+                        :label="t('property.town')"
+                        :value="dashIfEmpty(entity.town.name)"
+                    />
+                    <VnLv :label="t('property.m2')" :value="dashIfEmpty(entity.m2)" />
+                </div>
+            </QCard>
+            <QCard class="vn-one">
+                <VnTitle
+                    :url="toPropertyUrl('basic-data')"
+                    :text="t('globals.summary.basicData')"
+                    data-cy="titleBasicDataBlock3"
+                />
+                <div class="vn-card-content">
+                    <VnLv
+                        :label="t('property.registry')"
+                        :value="dashIfEmpty(entity.registry)"
+                    />
+                    <VnLv :label="t('property.tome')" :value="dashIfEmpty(entity.tome)" />
+                    <VnLv :label="t('property.book')" :value="dashIfEmpty(entity.book)" />
+                    <VnLv :label="t('property.page')" :value="dashIfEmpty(entity.page)" />
+                    <VnLv :label="t('property.farm')" :value="dashIfEmpty(entity.farm)" />
+                    <VnLv
+                        :label="t('property.registration')"
+                        :value="dashIfEmpty(entity.registration)"
+                    />
+                </div>
+            </QCard>
+            <QCard v-if="entity?.propertyDms.length > 0" class="vn-max">
+                <VnTitle
+                    :url="toPropertyUrl('dms')"
+                    :text="t('globals.pageTitles.dms')"
+                    data-cy="titleDmsBlock"
+                />
+                <QTable :columns="dmsColumns" :rows="entity?.propertyDms" flat>
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh auto-width class="text-left">{{ t('globals.id') }}</QTh>
+                            <QTh auto-width class="text-left">{{
+                                t('globals.type')
+                            }}</QTh>
+                            <QTh auto-width class="text-left">{{
+                                t('globals.order')
+                            }}</QTh>
+                            <QTh auto-width class="text-left">{{
+                                t('globals.reference')
+                            }}</QTh>
+                            <QTh auto-width class="text-left">{{
+                                t('globals.description')
+                            }}</QTh>
+                            <QTh auto-width class="text-center">{{
+                                t('globals.original')
+                            }}</QTh>
+                            <QTh auto-width class="text-left">{{
+                                t('globals.worker')
+                            }}</QTh>
+                            <QTh auto-width class="text-center">{{
+                                t('globals.created')
+                            }}</QTh>
+                        </QTr>
+                    </template>
+                    <template #body="props">
+                        <QTr :props="props">
+                            <QTd class="text-left">{{ props.row.dms.id }}</QTd>
+                            <QTd class="text-left">{{ props.row.dms.dmsType.name }}</QTd>
+                            <QTd class="text-left">{{
+                                props.row.dms.hardCopyNumber
+                            }}</QTd>
+                            <QTd class="text-left">{{ props.row.dms.reference }}</QTd>
+                            <QTd class="text-left">{{ props.row.dms.description }}</QTd>
+                            <QTd class="text-center"
+                                ><VnCheckbox
+                                    :disable="true"
+                                    v-model="props.row.dms.hasFile"
+                            /></QTd>
+                            <QTd class="text-left"
+                                ><span class="link" @click.stop
+                                    >{{ props.row.dms.worker.firstName
+                                    }}<WorkerDescriptorProxy
+                                        :id="props.row.dms.worker.id" /></span
+                            ></QTd>
+                            <QTd class="text-center">{{
+                                toDate(props.row.dms.created)
+                            }}</QTd>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
+            <QCard v-if="entity?.notes.length > 0" class="vn-max">
+                <VnTitle
+                    :url="toPropertyUrl('notes')"
+                    :text="t('globals.notes')"
+                    data-cy="titleNotesBlock"
+                />
+                <QCardSection
+                    v-if="entity?.notes"
+                    v-for="note in entity?.notes"
+                    horizontal
+                    class="q-pb-sm"
+                >
+                    <VnAvatar
+                        :descriptor="false"
+                        :worker-id="note.workerFk"
+                        size="md"
+                        :title="note.worker?.user.nickname"
+                        class="q-pr-xs"
+                    />
+                    <VnUserLink
+                        :name="`${note.worker.user.name}`"
+                        :worker-id="note.worker.id"
+                    />
+                    <span class="q-pr-xs">{{ ':' }}</span>
+                    <span class="no-margin">
+                        {{ note.text }}
+                    </span>
+                </QCardSection>
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
+<style lang="scss" scoped>
+.q-card.q-card--dark.q-dark.vn-one {
+    & > .bodyCard {
+        padding: 1%;
+    }
+}
+
+.q-table {
+    tr,
+    th,
+    .q-td {
+        border-bottom: 1px solid black;
+    }
+}
+
+.grafana {
+    color: $primary-light;
+}
+</style>

src/pages/Property/PropertyFilter.vue

@@ -0,0 +1,182 @@
+<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 VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`property.params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.id"
+                        :label="t('property.id')"
+                        dense
+                        filled
+                        data-cy="idInput"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.name"
+                        :label="t('property.name')"
+                        dense
+                        filled
+                        data-cy="nameInput"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        url="PropertyGroups"
+                        :label="t('property.group')"
+                        v-model="params.propertyGroupFk"
+                        option-value="id"
+                        option-label="description"
+                        dense
+                        filled
+                        data-cy="propertyGroupSelect"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        url="Suppliers"
+                        :label="t('property.notary')"
+                        v-model="params.supplierFk"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        filled
+                        data-cy="notarySelect"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.protocol"
+                        :label="t('property.protocol')"
+                        dense
+                        filled
+                        data-cy="protocolInput"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.cadaster"
+                        :label="t('property.cadaster')"
+                        filled
+                        dense
+                        data-cy="cadasterInput"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        url="Companies"
+                        :label="t('property.owner')"
+                        v-model="params.companyFk"
+                        option-value="id"
+                        option-label="code"
+                        dense
+                        filled
+                        data-cy="ownerSelect"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.purchased"
+                        :label="t('property.purchased')"
+                        dense
+                        filled
+                        data-cy="purchasedDateInput"
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.booked"
+                        :label="t('property.booked')"
+                        dense
+                        filled
+                        data-cy="bookedDateInput"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnCheckbox
+                        v-model="params.hasFormalization"
+                        :label="t('property.hasFormalization')"
+                        dense
+                        filled
+                        data-cy="hasFormalizationCheckbox"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnCheckbox
+                        v-model="params.hasSimpleCopy"
+                        :label="t('property.hasSimpleCopy')"
+                        dense
+                        filled
+                        data-cy="hasSimpleCopyCheckbox"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnCheckbox
+                        v-model="params.hasOriginalPropertyDeed"
+                        :label="t('property.hasOriginalPropertyDeed')"
+                        dense
+                        filled
+                        data-cy="hasOriginalPropertyDeedCheckbox"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnCheckbox
+                        v-model="params.hasFundProvision"
+                        :label="t('property.hasFundProvision')"
+                        dense
+                        filled
+                        data-cy="hasFundProvisionCheckbox"
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>

src/pages/Property/PropertyList.vue

@@ -0,0 +1,307 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { toDate } from 'src/filters/index';
+import { useI18n } from 'vue-i18n';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnSection from 'src/components/common/VnSection.vue';
+import PropertyFilter from './PropertyFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import SupplierDescriptorProxy from '../Supplier/Card/SupplierDescriptorProxy.vue';
+
+const { t } = useI18n();
+const tableRef = ref();
+
+const dataKey = 'PropertyList';
+
+const columns = computed(() => [
+    {
+        align: 'right',
+        name: 'id',
+        label: t('property.id'),
+        width: '35px',
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('property.name'),
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        name: 'propertyGroupFk',
+        label: t('property.group'),
+        component: 'select',
+        attrs: {
+            url: 'propertyGroups',
+            fields: ['id', 'description'],
+            optionValue: 'id',
+            optionLabel: 'description',
+            hideSelected: true,
+        },
+        format: ({ propertyGroup }) => propertyGroup,
+    },
+    {
+        label: t('property.group'),
+        name: 'propertyGroup',
+        cardVisible: true,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'notary',
+        label: t('property.notary'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'protocol',
+        label: t('property.protocol'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'cadaster',
+        label: t('property.cadaster'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'companyFk',
+        label: t('property.owner'),
+        component: 'select',
+        attrs: {
+            url: 'Companies',
+            fields: ['id', 'code'],
+            optionValue: 'id',
+            optionLabel: 'code',
+            hideSelected: true,
+        },
+        format: ({ companyCode }) => companyCode,
+    },
+    {
+        label: t('property.owner'),
+        name: 'companyCode',
+        cardVisible: true,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'purchased',
+        label: t('property.purchased'),
+        component: 'date',
+        format: ({ purchased }) => toDate(purchased),
+    },
+    {
+        label: t('property.purchased'),
+        name: 'purchased',
+        format: ({ purchased }) => toDate(purchased),
+        cardVisible: true,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'booked',
+        label: t('property.booked'),
+        component: 'date',
+        format: ({ booked }) => toDate(booked),
+    },
+    {
+        label: t('property.booked'),
+        name: 'booked',
+        format: ({ booked }) => toDate(booked),
+        cardVisible: true,
+        visible: false,
+    },
+    {
+        labelAbbreviation: 'Fo',
+        label: t('property.hasFormalization'),
+        toolTip: t('property.hasFormalization'),
+        name: 'hasFormalization',
+        component: 'checkbox',
+        width: '35px',
+        cardVisible: true,
+    },
+    {
+        labelAbbreviation: 'SC',
+        label: t('property.hasSimpleCopy'),
+        toolTip: t('property.hasSimpleCopy'),
+        name: 'hasSimpleCopy',
+        component: 'checkbox',
+        width: '35px',
+        cardVisible: true,
+    },
+    {
+        labelAbbreviation: 'OP',
+        label: t('property.hasOriginalPropertyDeed'),
+        toolTip: t('property.hasOriginalPropertyDeed'),
+        name: 'hasOriginalPropertyDeed',
+        component: 'checkbox',
+        width: '35px',
+        cardVisible: true,
+    },
+    {
+        labelAbbreviation: 'FP',
+        label: t('property.hasFundProvision'),
+        toolTip: t('property.hasFundProvision'),
+        name: 'hasFundProvision',
+        component: 'checkbox',
+        width: '35px',
+        cardVisible: true,
+    },
+]);
+</script>
+
+<template>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="property"
+        :array-data-props="{
+            url: 'Properties/filter',
+        }"
+    >
+        <template #advanced-menu>
+            <PropertyFilter :data-key="dataKey" />
+        </template>
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :columns="columns"
+                redirect="property"
+                search-url="PropertyList"
+                :create="{
+                    urlCreate: 'Properties',
+                    title: t('property.createProperty'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: {},
+                }"
+                :with-filters="false"
+                :right-search="false"
+            >
+                <template #column-name="{ row }">
+                    <span>
+                        {{ row.name }}
+                        <QTooltip>
+                            {{ row.name }}
+                        </QTooltip>
+                    </span>
+                </template>
+                <template #column-notary="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.notary }}
+                        <SupplierDescriptorProxy :id="row.supplierFk" />
+                    </span>
+                </template>
+                <template #more-create-dialog="{ data }">
+                    <div class="col-span-2">
+                        <VnRow>
+                            <VnInput v-model="data.name" :label="$t('property.name')" />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                url="Suppliers"
+                                v-model="data.supplierFk"
+                                :label="$t('property.notary')"
+                                :fields="['id', 'name']"
+                                hide-selected
+                            />
+                            <VnInput
+                                v-model="data.protocol"
+                                :label="$t('property.protocol')"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                url="Companies"
+                                :fields="['id', 'code']"
+                                v-model="data.companyFk"
+                                :label="$t('property.owner')"
+                                option-value="id"
+                                option-label="code"
+                                hide-selected
+                            />
+                            <VnSelect
+                                url="PropertyGroups"
+                                :fields="['id', 'description']"
+                                v-model="data.propertyGroupFk"
+                                :label="$t('property.group')"
+                                option-value="id"
+                                option-label="description"
+                                hide-selected
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput v-model="data.url" :label="$t('property.map')" />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput v-model="data.value" :label="$t('property.value')" />
+                            <VnInputDate
+                                placeholder="dd-mm-aaa"
+                                :label="$t('property.purchased')"
+                                v-model="data.purchased"
+                            />
+                            <VnInputDate
+                                placeholder="dd-mm-aaa"
+                                :label="$t('property.booked')"
+                                v-model="data.booked"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput
+                                v-model="data.cadaster"
+                                :label="$t('property.cadaster')"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput
+                                v-model="data.smallHolding"
+                                :label="$t('property.smallHolding')"
+                            />
+                            <VnInput v-model="data.area" :label="$t('property.area')" />
+                            <VnInput
+                                v-model="data.allocation"
+                                :label="$t('property.allocation')"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnSelect
+                                url="Towns"
+                                v-model="data.townFk"
+                                :label="$t('property.town')"
+                                :fields="['id', 'name']"
+                                :options="towns"
+                                option-value="id"
+                                option-label="name"
+                                hide-selected
+                            />
+                            <VnInput v-model="data.m2" :label="$t('property.m2')" />
+                            <VnInput
+                                v-model="data.registry"
+                                :label="$t('property.registry')"
+                            />
+                        </VnRow>
+                        <VnRow>
+                            <VnInput v-model="data.tome" :label="$t('property.tome')" />
+                            <VnInput v-model="data.book" :label="$t('property.book')" />
+                            <VnInput v-model="data.page" :label="$t('property.page')" />
+                            <VnInput v-model="data.farm" :label="$t('property.farm')" />
+                        </VnRow>
+                        <VnInput
+                            v-model="data.registration"
+                            :label="$t('property.registration')"
+                        />
+                    </div>
+                </template>
+            </VnTable>
+        </template>
+    </VnSection>
+</template>

src/pages/Property/locale/en.yml

@@ -0,0 +1,47 @@
+property:
+    search: Search property
+    searchInfo: Search property by id or name
+    id: Id
+    name: Name
+    cadaster: Cadaster
+    smallHolding: Small holding
+    area: Area
+    town: Town
+    registry: Registry
+    volume: Volume
+    book: Book
+    page: Page
+    farm: Farm
+    registration: Registration
+    value: Value
+    group: Group
+    m2: m2
+    owner: Owner
+    allocation: Allocation
+    tome: Tome
+    map: Map
+    notary: Notary
+    protocol: Notarial protocol
+    purchased: Purchased date
+    booked: Booked date
+    createProperty: Create property
+    goToMap: Link to map
+    hasFormalization: Formalization
+    hasSimpleCopy: Simple copy
+    hasOriginalPropertyDeed: Original property deed
+    hasFundProvision: Fund provision
+    params:
+        search: General search
+        id: Id
+        name: Name
+        supplierFk: Notary
+        propertyGroupFk: Group
+        protocol: Notarial protocol
+        companyFk: Owner
+        purchased: Purchased date
+        booked: Booked date
+        cadaster: Cadaster
+        hasFormalization: Formalization
+        hasSimpleCopy: Simple copy
+        hasOriginalPropertyDeed: Original property deed
+        hasFundProvision: Fund provision

src/pages/Property/locale/es.yml

@@ -0,0 +1,47 @@
+property:
+    search: Buscar propiedad
+    searchInfo: Buscar propiedad por id o nombre
+    id: Id
+    name: Nombre
+    cadaster: Ref. catastral
+    smallHolding: Parcela
+    area: Polígono
+    town: Municipio
+    registry: Registro urbanístico
+    volume: Volumen
+    book: Libro
+    page: Folio
+    farm: Finca
+    registration: Inscripción
+    value: Valor
+    group: Grupo
+    m2: m2
+    owner: Propietario
+    allocation: Partida
+    tome: Volumen
+    map: Mapa
+    notary: Notario
+    protocol: Prot. notarial
+    purchased: F. compra
+    booked: F. finalización
+    createProperty: Nueva propiedad
+    goToMap: Ir al mapa
+    hasFormalization: Formalización
+    hasSimpleCopy: Copia simple
+    hasOriginalPropertyDeed: Escritura original
+    hasFundProvision: Provisión de fondos
+    params:
+        search: Búsqueda general
+        id: Id
+        name: Nombre
+        supplierFk: Notario
+        propertyGroupFk: Grupo
+        protocol: Prot. notarial
+        companyFk: Propietario
+        purchased: F. compra
+        booked: F. finalización
+        cadaster: Ref. catastral
+        hasFormalization: Formalización
+        hasSimpleCopy: Copia simple
+        hasOriginalPropertyDeed: Escritura original
+        hasFundProvision: Provisión de fondos

src/pages/Route/Card/RouteSummary.vue

@@ -233,10 +233,10 @@ const ticketColumns = ref([
                                 </span>
                             </QTd>
                         </template>
-                        <template #body-cell-client="{ row }">
+                        <template #body-cell-client="{ value, row }">
-                            <QTd>
+                            <QTd auto-width>
                                 <span class="link">
-                                    {{ row.clientFk }}
+                                    {{ value }}
                                     <CustomerDescriptorProxy :id="row?.clientFk" />
                                 </span>
                             </QTd>

src/pages/Route/Vehicle/Card/VehicleNotes.vue

@@ -28,7 +28,6 @@ const body = {
         :add-note="true"
         :filter="noteFilter"
         :body="body"
-        style="overflow-y: auto"
         required
         deletable
     />

src/pages/Route/Vehicle/locale/en.yml

@@ -18,5 +18,3 @@ vehicle:
     params:
         vehicleTypeFk: Type
         vehicleStateFk: State
-    errors:
-        documentIdEmpty: The document identifier can't be empty

src/pages/Route/Vehicle/locale/es.yml

@@ -18,5 +18,3 @@ vehicle:
     params:
         vehicleTypeFk: Tipo
         vehicleStateFk: Estado
-    errors:
-        documentIdEmpty: El número de documento no puede estar vacío

src/pages/Shelving/Parking/ParkingList.vue

@@ -80,7 +80,7 @@ const columns = computed(() => [
             <VnTable
                 :data-key="dataKey"
                 :columns="columns"
-                :is-editable="false"
+                is-editable="false"
                 :right-search="false"
                 :use-model="true"
                 :disable-option="{ table: true }"

src/pages/Shelving/ShelvingList.vue

@@ -90,7 +90,7 @@ const onDataSaved = ({ id }) => {
             <VnTable
                 :data-key="dataKey"
                 :columns="columns"
-                :is-editable="false"
+                is-editable="false"
                 :right-search="false"
                 :use-model="true"
                 :disable-option="{ table: true }"

src/pages/Supplier/Card/SupplierAccounts.vue

@@ -65,13 +65,15 @@ function findBankFk(value, row) {
     if (bankEntityFk) row.bankEntityFk = bankEntityFk.id;
 }
 
-function bankEntityFilter(val) {
+function bankEntityFilter(val, update) {
-    const needle = val.toLowerCase();
+    update(() => {
-    filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
+        const needle = val.toLowerCase();
-        (bank) =>
+        filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
-            bank.bic.toLowerCase().startsWith(needle) ||
+            (bank) =>
-            bank.name.toLowerCase().includes(needle),
+                bank.bic.toLowerCase().startsWith(needle) ||
-    );
+                bank.name.toLowerCase().includes(needle),
+        );
+    });
 }
 </script>
 <template>
@@ -80,8 +82,7 @@ function bankEntityFilter(val) {
         url="BankEntities"
         @on-fetch="
             (data) => {
-                bankEntitiesOptions = data;
+                (bankEntitiesOptions = data), (filteredBankEntitiesOptions = data);
-                filteredBankEntitiesOptions = data;
             }
         "
         auto-load
@@ -134,8 +135,10 @@ function bankEntityFilter(val) {
                         :label="t('worker.create.bankEntity')"
                         v-model="row.bankEntityFk"
                         :options="filteredBankEntitiesOptions"
-                        :filter-fn="bankEntityFilter"
+                        :default-filter="false"
+                        @filter="(val, update) => bankEntityFilter(val, update)"
                         option-label="bic"
+                        option-value="id"
                         hide-selected
                         :required="true"
                         :roles-allowed-to-create="['financial']"

src/pages/Supplier/Card/SupplierDescriptorProxy.vue

@@ -5,7 +5,7 @@ import SupplierSummary from './SupplierSummary.vue';
 const $props = defineProps({
     id: {
         type: Number,
-        default: null,
+        required: true,
     },
 });
 </script>

src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue

@@ -101,7 +101,7 @@ const onNextStep = async () => {
                 t('basicData.negativesConfirmMessage'),
                 submitWithNegatives,
             );
-        else await submit();
+        else submit();
     }
 };
 </script>

src/pages/Ticket/Card/TicketDescriptorMenu.vue

@@ -28,7 +28,6 @@ const props = defineProps({
 
 onMounted(() => {
     restoreTicket();
-    hasDocuware();
 });
 
 watch(

src/pages/Ticket/Card/TicketDescriptorProxy.vue

@@ -1,6 +1,7 @@
 <script setup>
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketSummary from './TicketSummary.vue';
+
 const $props = defineProps({
     id: {
         type: Number,
@@ -9,7 +10,7 @@ const $props = defineProps({
 });
 </script>
 <template>
-    <QPopupProxy data-cy="TicketDescriptor">
+    <QPopupProxy>
         <TicketDescriptor v-if="$props.id" :id="$props.id" :summary="TicketSummary" />
     </QPopupProxy>
 </template>

src/pages/Ticket/Card/TicketDms.vue

@@ -35,13 +35,8 @@ const onDataSaved = () => dmsListRef.value.dmsRef.fetch();
             class="fill-icon"
         >
             <QTooltip>
-                {{ t('Import from existing') }}
+                {{ t('globals.import') }}
             </QTooltip>
         </QBtn>
     </QPageSticky>
 </template>
-
-<i18n>
-es:
-    Import from existing: Importar desde existente
-</i18n>

src/pages/Ticket/Card/TicketDmsImportForm.vue

@@ -22,7 +22,7 @@ const dmsId = ref(null);
 
 const importDms = async () => {
     try {
-        if (!dmsId.value) throw new Error(t(`The document identifier can't be empty`));
+        if (!dmsId.value) throw new Error(t(`globals.errors.documentIdEmpty`));
 
         const data = {
             ticketFk: route.params.id,
@@ -56,7 +56,7 @@ const importDms = async () => {
         <template #form-inputs>
             <VnRow>
                 <VnSelect
-                    :label="t('Document')"
+                    :label="t('globals.document')"
                     :options="dmsOptions"
                     hide-selected
                     option-label="id"
@@ -67,9 +67,3 @@ const importDms = async () => {
         </template>
     </FormModelPopup>
 </template>
-
-<i18n>
-es:
-    Document: Documento
-    The document indentifier can't be empty: El número de documento no puede estar vacío
-</i18n>

src/pages/Ticket/Card/TicketSale.vue

@@ -773,7 +773,6 @@ watch(
                 v-model="row.itemFk"
                 :use-like="false"
                 @update:model-value="changeItem(row)"
-                autofocus
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">

src/pages/Ticket/Card/TicketSplit.vue

@@ -3,9 +3,7 @@ import { ref } from 'vue';
 
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import split from './components/split';
-import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
+const emit = defineEmits(['ticketTransfered']);
-const { notifyResults } = displayResults();
-const emit = defineEmits(['ticketTransferred']);
 
 const $props = defineProps({
     ticket: {
@@ -18,20 +16,13 @@ const splitDate = ref(Date.vnNew());
 
 const splitSelectedRows = async () => {
     const tickets = Array.isArray($props.ticket) ? $props.ticket : [$props.ticket];
-    const results = await split(tickets, splitDate.value);
+    await split(tickets, splitDate.value);
-    notifyResults(results, 'ticketFk');
+    emit('ticketTransfered', tickets);
-    emit('ticketTransferred', tickets);
 };
 </script>
 
 <template>
-    <VnInputDate
+    <VnInputDate class="q-mr-sm" :label="$t('New date')" v-model="splitDate" clearable />
-        class="q-mr-sm"
-        :label="$t('New date')"
-        v-model="splitDate"
-        clearable
-        autofocus
-    />
     <QBtn class="q-mr-sm" color="primary" label="Split" @click="splitSelectedRows"></QBtn>
 </template>
 <style lang="scss">

src/pages/Ticket/Card/TicketTransfer.vue

@@ -5,7 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
-const emit = defineEmits(['ticketTransferred']);
+const emit = defineEmits(['ticketTransfered']);
 
 const $props = defineProps({
     mana: {

src/pages/Ticket/Card/TicketTransferProxy.vue

@@ -1,8 +1,8 @@
 <script setup>
 import { ref } from 'vue';
 import TicketTransfer from './TicketTransfer.vue';
-import TicketSplit from './TicketSplit.vue';
+import Split from './TicketSplit.vue';
-const emit = defineEmits(['ticketTransferred']);
+const emit = defineEmits(['ticketTransfered']);
 
 const $props = defineProps({
     mana: {
@@ -35,7 +35,7 @@ const transferRef = ref(null);
 <template>
     <QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
         <div class="flex row items-center q-ma-lg" v-if="$props.split">
-            <TicketSplit
+            <Split
                 ref="splitRef"
                 @splitSelectedRows="splitSelectedRows"
                 :ticket="$props.ticket"

src/pages/Ticket/Card/components/split.js

@@ -1,11 +1,13 @@
 import axios from 'axios';
+import notifyResults from 'src/utils/notifyResults';
+
 export default async function (data, date) {
     const reducedData = data.reduce((acc, item) => {
         const existing = acc.find(({ ticketFk }) => ticketFk === item.id);
         if (existing) {
             existing.sales.push(item.saleFk);
         } else {
-            acc.push({ ticketFk: item.ticketFk, sales: [item.saleFk], date });
+            acc.push({ ticketFk: item.id, sales: [item.saleFk], date });
         }
         return acc;
     }, []);
@@ -14,5 +16,7 @@ export default async function (data, date) {
 
     const results = await Promise.allSettled(promises);
 
+    notifyResults(results, 'ticketFk');
+
     return results;
 }

src/pages/Ticket/Negative/TicketLackDetail.vue

@@ -23,6 +23,7 @@ const tableRef = ref();
 const changeItemDialogRef = ref(null);
 const changeStateDialogRef = ref(null);
 const changeQuantityDialogRef = ref(null);
+const showProposalDialog = ref(false);
 const showChangeQuantityDialog = ref(false);
 const selectedRows = ref([]);
 const route = useRoute();
@@ -62,7 +63,6 @@ const showItemProposal = () => {
         .dialog({
             component: ItemProposalProxy,
             componentProps: {
-                filter: filter.value,
                 itemLack: tableRef.value.itemLack,
                 replaceAction: true,
                 sales: selectedRows.value,
@@ -117,17 +117,21 @@ const showItemProposal = () => {
                                 sales: selectedRows,
                                 lastActiveTickets: selectedRows.map((row) => row.id),
                             }"
-                            @ticket-transferred="reload"
+                            @ticket-transfered="reload"
                         ></TicketTransferProxy>
                     </template>
                 </QBtn>
                 <QBtn
                     color="primary"
-                    @click="showItemProposal"
+                    @click="showProposalDialog = true"
-                    :disable="!(selectedRows.length === 1)"
+                    :disable="selectedRows.length < 1"
                     data-cy="itemProposal"
                 >
-                    <QIcon name="import_export" class="rotate-90" />
+                    <QIcon
+                        name="import_export"
+                        class="rotate-90"
+                        @click="showItemProposal"
+                    ></QIcon>
                     <QTooltip bottom anchor="bottom right">
                         {{ t('itemProposal') }}
                     </QTooltip>
@@ -135,7 +139,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeItem"
                     icon="sync"
-                    :disable="!(selectedRows.length === 1)"
+                    :disable="selectedRows.length < 1"
                     :tooltip="t('negative.detail.modal.changeItem.title')"
                 >
                     <template #extraIcon> <QIcon name="vn:item" /> </template>
@@ -149,7 +153,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeState"
                     icon="sync"
-                    :disable="!(selectedRows.length === 1)"
+                    :disable="selectedRows.length < 1"
                     :tooltip="t('negative.detail.modal.changeState.title')"
                 >
                     <template #extraIcon> <QIcon name="vn:eye" /> </template>
@@ -163,7 +167,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeQuantity"
                     icon="sync"
-                    :disable="!(selectedRows.length === 1)"
+                    :disable="selectedRows.length < 1"
                     :tooltip="t('negative.detail.modal.changeQuantity.title')"
                     @click="showChangeQuantityDialog = true"
                 >

src/pages/Ticket/Negative/TicketLackFilter.vue

@@ -6,7 +6,6 @@ import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputDateTime from 'src/components/common/VnInputDateTime.vue';
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
@@ -67,7 +66,6 @@ const setUserParams = (params) => {
         :data-key="props.dataKey"
         :search-button="true"
         @set-user-params="setUserParams"
-        :unremovable-params="['warehouseFk']"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -79,11 +77,12 @@ const setUserParams = (params) => {
             <QList dense class="q-gutter-y-sm q-mt-sm">
                 <QItem>
                     <QItemSection>
-                        <VnInputDateTime
+                        <VnInput
-                            v-model="params.availabled"
+                            v-model="params.days"
-                            :label="t('negative.availabled')"
+                            :label="t('negative.days')"
                             dense
                             filled
+                            type="number"
                             @update:model-value="
                                 (value) => {
                                     setUserParams(params);

src/pages/Ticket/Negative/TicketLackList.vue

@@ -21,13 +21,14 @@ const selectedRows = ref([]);
 const tableRef = ref();
 const filterParams = ref({});
 const negativeParams = reactive({
+    days: useRole().likeAny('buyer') ? 2 : 0,
     warehouseFk: useState().getUser().value.warehouseFk,
-    availabled: Date.getCurrentDateTimeFormatted(),
 });
 const redirectToCreateView = ({ itemFk }) => {
     router.push({
         name: 'NegativeDetail',
         params: { id: itemFk },
+        query: { days: filterParams.value.days ?? negativeParams.days },
     });
 };
 const columns = computed(() => [
@@ -64,19 +65,15 @@ const columns = computed(() => [
         columnFilter: {
             component: 'input',
             type: 'number',
-            inWhere: false,
+            columnClass: 'shrink',
         },
     },
     {
         name: 'longName',
-        align: 'left',
+        align: 'center',
         label: t('negative.longName'),
         field: ({ longName }) => longName,
-        columnFilter: {
+
-            component: 'input',
-            inWhere: false,
-            useLike: true,
-        },
         sortable: true,
         headerStyle: 'width: 350px',
         cardVisible: true,
@@ -97,11 +94,6 @@ const columns = computed(() => [
         field: ({ inkFk }) => inkFk,
         sortable: true,
         cardVisible: true,
-        columnFilter: {
-            component: 'input',
-            columnClass: 'shrink',
-            inWhere: false,
-        },
     },
     {
         name: 'size',
@@ -163,6 +155,7 @@ const setUserParams = (params) => {
             <TicketLackFilter data-key="NegativeList" @set-user-params="setUserParams" />
         </template>
     </RightMenu>
+    {{ filterRef }}
     <VnTable
         ref="tableRef"
         data-key="NegativeList"