CHANGELOG.md

@@ -1,3 +1,41 @@
+# Version 25.08 - 2025-03-04
+
+### Added 🆕
+
+- feat: add order for table (origin/8681_ticketAdvance_updates) by:Javier Segarra
+- feat: detect when is descriptor proxy by:Javier Segarra
+- feat: refs #7356 update CrudModel by:Javier Segarra
+- feat: refs #8242 remove teleport by:Javier Segarra
+- feat: refs #8242 use stateStore by:Javier Segarra
+- fix: fixed negative bases style by:Jon
+- fix: fixed style when clicking on icons by:Jon
+- refactor: refs #6897 remove debug logs and unused style (origin/6897-fixSomeCaus) by:pablone
+- style: refs #7356 eslint format by:Javier Segarra
+
+### Changed 📦
+
+- perf: refs #7356 minor changes (origin/7356_ticketService) by:Javier Segarra
+- refactor: refs #6897 remove debug logs and unused style (origin/6897-fixSomeCaus) by:pablone
+- refactor: refs #6897 update component props and attributes for consistency and improved functionality (origin/6897-fixMinorIssues) by:pablone
+- refactor: refs #6897 update component props and improve UI handling in Entry pages by:pablone
+- refactor: refs #6897 update VnTable components for improved value handling and UI adjustments (origin/6897-minorFixes) by:pablone
+- refactor: refs #8697 simplify date handling in ItemDiary component by:pablone
+
+### Fixed 🛠️
+
+- fix: add datakey by:Javier Segarra
+- fix: fixed account descriptor menu and created e2e by:Jon
+- fix: fixed negative bases style by:Jon
+- fix: fixed style when clicking on icons by:Jon
+- fix: refs #6553 workerBusiness (origin/6553-fixWorkerBusinessV2) by:carlossa
+- fix: refs #6553 workerBusiness v3 by:carlossa
+- fix: refs #6897 prevent default event behavior in autocompleteExpense function by:pablone
+- fix: refs #7356 chaining params by:Javier Segarra
+- fix: refs #7356 ticketService by:Javier Segarra
+- fix: refs #8242 workerDepartmentTree bug (origin/8242_leftMenu_responsive) by:Javier Segarra
+- fix: workerBasicData by:carlossa
+- Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" (origin/fix_revert_revert, fix_revert_revert) by:alexm
+
 # Version 25.06 - 2025-02-18
 
 ### Added 🆕

Jenkinsfile

@@ -12,20 +12,21 @@ def BRANCH_ENV = [
 node {
     stage('Setup') {
         env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'
-
         PROTECTED_BRANCH = [
             'dev',
             'test',
             'master',
             'main',
             'beta'
-        ].contains(env.BRANCH_NAME)
+        ]
 
+        IS_PROTECTED_BRANCH = PROTECTED_BRANCH.contains(env.BRANCH_NAME)
         IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME)
 
-        // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
+       // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
         echo "NODE_NAME: ${env.NODE_NAME}"
         echo "WORKSPACE: ${env.WORKSPACE}"
+        echo "CHANGE_TARGET: ${env.CHANGE_TARGET}"
 
         configFileProvider([
             configFile(fileId: 'salix-front.properties',
@@ -36,7 +37,7 @@ node {
             props.each {key, value -> echo "${key}: ${value}" }
         }
 
-        if (PROTECTED_BRANCH) {
+        if (IS_PROTECTED_BRANCH) {
             configFileProvider([
                 configFile(fileId: "salix-front.branch.${env.BRANCH_NAME}",
                 variable: 'BRANCH_PROPS_FILE')
@@ -63,7 +64,7 @@ pipeline {
     stages {
         stage('Version') {
             when {
-                expression { PROTECTED_BRANCH }
+                expression { IS_PROTECTED_BRANCH }
             }
             steps {
                 script {
@@ -84,7 +85,7 @@ pipeline {
         }
         stage('Test') {
             when {
-                expression { !PROTECTED_BRANCH }
+                expression { !IS_PROTECTED_BRANCH }
             }
             environment {
                 NODE_ENV = ''
@@ -94,7 +95,7 @@ pipeline {
             parallel {
                 stage('Unit') {
                     steps {
-                        sh 'pnpm run test:unit:ci'
+                        sh 'pnpm run test:front:ci'
                     }
                     post {
                         always {
@@ -107,24 +108,27 @@ pipeline {
                 }
                 stage('E2E') {
                     environment {
-                        CREDENTIALS = credentials('docker-registry')
                         COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
                         COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
                     }
                     steps {
                         script {
+                            sh 'rm junit/e2e-*.xml || true'
+                            env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
+                            withDockerRegistry([credentialsId: 'docker-registry', url: "https://${env.REGISTRY}" ]) {
+                                sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
+                            }
                             def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
-                            sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
-                                sh 'cypress run --browser chromium'
+                                sh 'cypress run --browser chromium || true'
                             }
                         }
                     }
                     post {
                         always {
-                            sh "docker-compose ${env.COMPOSE_PARAMS} down"
+                            sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
                             junit(
-                                testResults: 'junit/e2e.xml',
+                                testResults: 'junit/e2e-*.xml',
                                 allowEmptyResults: true
                             )
                         }
@@ -134,10 +138,9 @@ pipeline {
         }
         stage('Build') {
             when {
-                expression { PROTECTED_BRANCH }
+                expression { IS_PROTECTED_BRANCH }
             }
             environment {
-                CREDENTIALS = credentials('docker-registry')
                 VERSION = readFile 'VERSION.txt'
             }
             steps {
@@ -156,7 +159,7 @@ pipeline {
         }
         stage('Deploy') {
             when {
-                expression { PROTECTED_BRANCH }
+                expression { IS_PROTECTED_BRANCH }
             }
             environment {
                 VERSION = readFile 'VERSION.txt'

README.md

@@ -23,7 +23,7 @@ quasar dev
 ### Run unit tests
 
 ```bash
-pnpm run test:unit
+pnpm run test:front
 ```
 
 ### Run e2e tests

cypress.config.js

@@ -6,7 +6,7 @@ if (process.env.CI) {
     urlHost = 'front';
     reporter = 'junit';
     reporterOptions = {
-        mochaFile: 'junit/e2e.xml',
+        mochaFile: 'junit/e2e-[hash].xml',
         toConsole: false,
     };
 } else {
@@ -31,6 +31,7 @@ export default defineConfig({
         requestTimeout: 10000,
         responseTimeout: 30000,
         pageLoadTimeout: 60000,
+        defaultBrowser: 'chromium',
         fixturesFolder: 'test/cypress/fixtures',
         screenshotsFolder: 'test/cypress/screenshots',
         supportFile: 'test/cypress/support/index.js',
@@ -38,17 +39,10 @@ export default defineConfig({
         downloadsFolder: 'test/cypress/downloads',
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
-        experimentalRunAllSpecs: false,
-        watchForFileChanges: false,
-        reporter: 'cypress-mochawesome-reporter',
-        reporterOptions: {
-            charts: true,
-            reportPageTitle: 'Cypress Inline Reporter',
-            reportFilename: '[status]_[datetime]-report',
-            embeddedScreenshots: true,
-            reportDir: 'test/cypress/reports',
-            inlineAssets: true,
-        },
+        experimentalRunAllSpecs: true,
+        watchForFileChanges: true,
+        reporter,
+        reporterOptions,
         component: {
             componentFolder: 'src',
             testFiles: '**/*.spec.js',

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.10.0",
+    "version": "25.12.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -14,8 +14,8 @@
         "test:e2e": "cypress open",
         "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-        "test:unit": "vitest",
-        "test:unit:ci": "vitest run",
+        "test:front": "vitest",
+        "test:front:ci": "vitest run",
         "commitlint": "commitlint --edit",
         "prepare": "npx husky install",
         "addReferenceTag": "node .husky/addReferenceTag.js",
@@ -71,4 +71,4 @@
         "vite": "^6.0.11",
         "vitest": "^0.31.1"
     }
-}
+}

src/components/CrudModel.vue

@@ -184,8 +184,11 @@ async function saveChanges(data) {
     if ($props.beforeSaveFn) {
         changes = await $props.beforeSaveFn(changes, getChanges);
     }
-
     try {
+        if (changes?.creates?.length === 0 && changes?.updates?.length === 0) {
+            return;
+        }
+
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
     } finally {
         isLoading.value = false;

src/components/FilterTravelForm.vue

@@ -124,7 +124,7 @@ const selectTravel = ({ id }) => {
     <FetchData
         url="AgencyModes"
         @on-fetch="(data) => (agenciesOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         auto-load
     />
     <FetchData

src/components/FormModel.vue

@@ -96,6 +96,10 @@ const $props = defineProps({
         type: [String, Boolean],
         default: '800px',
     },
+    onDataSaved: {
+        type: Function,
+        default: () => {},
+    },
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(

src/components/TicketProblems.vue

@@ -12,20 +12,31 @@ defineProps({ row: { type: Object, required: true } });
         >
             <QIcon name="vn:claims" size="xs">
                 <QTooltip>
-                    {{ t('ticketSale.claim') }}:
+                    {{ $t('ticketSale.claim') }}:
                     {{ row.claim?.claimFk }}
                 </QTooltip>
             </QIcon>
         </router-link>
         <QIcon
-            v-if="row?.risk"
+            v-if="row?.reserved"
+            color="primary"
+            name="vn:reserva"
+            size="xs"
+            data-cy="ticketSaleReservedIcon"
+        >
+            <QTooltip>
+                {{ t('ticketSale.reserved') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasRisk"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
         >
             <QTooltip>
                 {{ $t('salesTicketsTable.risk') }}:
-                {{ toCurrency(row.risk - row.credit) }}
+                {{ toCurrency(row.risk - (row.credit ?? 0)) }}
             </QTooltip>
         </QIcon>
         <QIcon
@@ -67,12 +78,7 @@ defineProps({ row: { type: Object, required: true } });
         >
             <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
         </QIcon>
-        <QIcon
-            v-if="row?.isTaxDataChecked !== 0"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
+        <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
         </QIcon>
         <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">

src/components/VnTable/VnFilter.vue

@@ -91,7 +91,6 @@ const components = {
         event: updateEvent,
         attrs: {
             ...defaultAttrs,
-            style: 'min-width: 150px',
         },
         forceAttrs,
     },

src/components/VnTable/VnTable.vue

@@ -31,6 +31,7 @@ import VnLv from 'components/ui/VnLv.vue';
 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';
 
 const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
@@ -50,14 +51,14 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    rightSearchIcon: {
-        type: Boolean,
-        default: true,
-    },
     rowClick: {
         type: [Function, Boolean],
         default: null,
     },
+    rowCtrlClick: {
+        type: [Function, Boolean],
+        default: null,
+    },
     redirect: {
         type: String,
         default: null,
@@ -137,6 +138,10 @@ const $props = defineProps({
     createComplement: {
         type: Object,
     },
+    dataCy: {
+        type: String,
+        default: 'vn-table',
+    },
 });
 
 const { t } = useI18n();
@@ -165,7 +170,6 @@ const app = inject('app');
 const editingRow = ref(null);
 const editingField = ref(null);
 const isTableMode = computed(() => mode.value == TABLE_MODE);
-const showRightIcon = computed(() => $props.rightSearch || $props.rightSearchIcon);
 const selectRegex = /select/;
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 const tableModes = [
@@ -253,7 +257,9 @@ function splitColumns(columns) {
             col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
-    // Status column
+
+    splittedColumns.value.create = createOrderSort(splittedColumns.value.create);
+
     if (splittedColumns.value.chips.length) {
         splittedColumns.value.columnChips = splittedColumns.value.chips.filter(
             (c) => !c.isId,
@@ -269,6 +275,24 @@ function splitColumns(columns) {
     }
 }
 
+function createOrderSort(columns) {
+    const orderedColumn = columns
+        .map((column, index) =>
+            column.createOrder !== undefined ? { ...column, originalIndex: index } : null,
+        )
+        .filter((item) => item !== null);
+
+    orderedColumn.sort((a, b) => a.createOrder - b.createOrder);
+
+    const filteredColumns = columns.filter((col) => col.createOrder === undefined);
+
+    orderedColumn.forEach((col) => {
+        filteredColumns.splice(col.createOrder, 0, col);
+    });
+
+    return filteredColumns;
+}
+
 const rowClickFunction = computed(() => {
     if ($props.rowClick != undefined) return $props.rowClick;
     if ($props.redirect) return ({ id }) => redirectFn(id);
@@ -314,8 +338,14 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
     if (evt?.shiftKey && added) {
         const rowIndex = selectedRows[0].$index;
         const selectedIndexes = new Set(selected.value.map((row) => row.$index));
-        for (const row of rows) {
-            if (row.$index == rowIndex) break;
+        const minIndex = selectedIndexes.size
+            ? Math.min(...selectedIndexes, rowIndex)
+            : 0;
+        const maxIndex = Math.max(...selectedIndexes, rowIndex);
+
+        for (let i = minIndex; i <= maxIndex; i++) {
+            const row = rows[i];
+            if (row.$index == rowIndex) continue;
             if (!selectedIndexes.has(row.$index)) {
                 selected.value.push(row);
                 selectedIndexes.add(row.$index);
@@ -338,12 +368,11 @@ function hasEditableFormat(column) {
 
 const clickHandler = async (event) => {
     const clickedElement = event.target.closest('td');
-
     const isDateElement = event.target.closest('.q-date');
     const isTimeElement = event.target.closest('.q-time');
-    const isQselectDropDown = event.target.closest('.q-select__dropdown-icon');
+    const isQSelectDropDown = event.target.closest('.q-select__dropdown-icon');
 
-    if (isDateElement || isTimeElement || isQselectDropDown) return;
+    if (isDateElement || isTimeElement || isQSelectDropDown) return;
 
     if (clickedElement === null) {
         await destroyInput(editingRow.value, editingField.value);
@@ -414,20 +443,13 @@ async function renderInput(rowId, field, clickedElement) {
         eventHandlers: {
             'update:modelValue': async (value) => {
                 if (isSelect && value) {
-                    row[column.name] = value[column.attrs?.optionValue ?? 'id'];
-                    row[column?.name + 'TextValue'] =
-                        value[column.attrs?.optionLabel ?? 'name'];
-                    await column?.cellEvent?.['update:modelValue']?.(
-                        value,
-                        oldValue,
-                        row,
-                    );
+                    await updateSelectValue(value, column, row, oldValue);
                 } else row[column.name] = value;
                 await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
             },
             keyup: async (event) => {
                 if (event.key === 'Enter')
-                    await destroyInput(rowIndex, field, clickedElement);
+                    await destroyInput(rowId, field, clickedElement);
             },
             keydown: async (event) => {
                 switch (event.key) {
@@ -458,6 +480,17 @@ async function renderInput(rowId, field, clickedElement) {
         node.el?.querySelector('span > div > div').focus();
 }
 
+async function updateSelectValue(value, column, row, oldValue) {
+    row[column.name] = value[column.attrs?.optionValue ?? 'id'];
+
+    row[column?.name + 'VnTableTextValue'] = value[column.attrs?.optionLabel ?? 'name'];
+
+    if (column?.attrs?.find?.label)
+        row[column?.attrs?.find?.label] = value[column.attrs?.optionLabel ?? 'name'];
+
+    await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
+}
+
 async function destroyInput(rowIndex, field, clickedElement) {
     if (!clickedElement)
         clickedElement = document.querySelector(
@@ -520,9 +553,9 @@ function getToggleIcon(value) {
 }
 
 function formatColumnValue(col, row, dashIfEmpty) {
-    if (col?.format || row[col?.name + 'TextValue']) {
-        if (selectRegex.test(col?.component) && row[col?.name + 'TextValue']) {
-            return dashIfEmpty(row[col?.name + 'TextValue']);
+    if (col?.format || row[col?.name + 'VnTableTextValue']) {
+        if (selectRegex.test(col?.component) && row[col?.name + 'VnTableTextValue']) {
+            return dashIfEmpty(row[col?.name + 'VnTableTextValue']);
         } else {
             return col.format(row, dashIfEmpty);
         }
@@ -555,19 +588,48 @@ function formatColumnValue(col, row, dashIfEmpty) {
     }
     return dashIfEmpty(row[col?.name]);
 }
+
 function cardClick(_, row) {
     if ($props.redirect) router.push({ path: `/${$props.redirect}/${row.id}` });
 }
+
+function removeTextValue(data, getChanges) {
+    let changes = data.updates;
+    if (!changes) return data;
+
+    for (const change of changes) {
+        for (const key in change.data) {
+            if (key.endsWith('VnTableTextValue')) {
+                delete change.data[key];
+            }
+        }
+    }
+
+    data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
+
+    if ($attrs?.beforeSaveFn) data = $attrs.beforeSaveFn(data, getChanges);
+
+    return data;
+}
+
+function handleRowClick(event, row) {
+    if (event.ctrlKey) return rowCtrlClickFunction.value(event, row);
+    if (rowClickFunction.value) rowClickFunction.value(row);
+}
+
+const rowCtrlClickFunction = computed(() => {
+    if ($props.rowCtrlClick != undefined) return $props.rowCtrlClick;
+    if ($props.redirect)
+        return (evt, { id }) => {
+            stopEventPropagation(evt);
+            window.open(`/#/${$props.redirect}/${id}`, '_blank');
+        };
+    return () => {};
+});
 </script>
 <template>
-    <QDrawer
-        v-if="$props.rightSearch"
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        :overlay="$props.overlay"
-    >
-        <QScrollArea class="fit">
+    <RightMenu v-if="$props.rightSearch" :overlay="overlay">
+        <template #right-panel>
             <VnTableFilter
                 :data-key="$attrs['data-key']"
                 :columns="columns"
@@ -581,8 +643,8 @@ function cardClick(_, row) {
                     <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
                 </template>
             </VnTableFilter>
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <CrudModel
         v-bind="$attrs"
         :class="$attrs['class'] ?? 'q-px-md'"
@@ -591,6 +653,7 @@ function cardClick(_, row) {
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
         :disable-infinite-scroll="isTableMode"
+        :before-save-fn="removeTextValue"
         @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
@@ -618,10 +681,11 @@ function cardClick(_, row) {
                 :style="isTableMode && `max-height: ${tableHeight}`"
                 :virtual-scroll="isTableMode"
                 @virtual-scroll="handleScroll"
-                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
+                @row-click="(event, row) => handleRowClick(event, row)"
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
                 :hide-selected-banner="true"
+                :data-cy="$props.dataCy ?? 'vnTable'"
             >
                 <template #top-left v-if="!$props.withoutHeader">
                     <slot name="top-left"> </slot>
@@ -635,6 +699,7 @@ function cardClick(_, row) {
                         :skip="columnsVisibilitySkipped"
                     />
                     <QBtnToggle
+                        v-if="!tableModes.some((mode) => mode.disable)"
                         v-model="mode"
                         toggle-color="primary"
                         class="bg-vn-section-color"
@@ -964,7 +1029,10 @@ function cardClick(_, row) {
         >
             <template #form-inputs="{ data }">
                 <div :style="createComplement?.containerStyle">
-                    <div>
+                    <div
+                        :style="createComplement?.previousStyle"
+                        v-if="!quasar.screen.xs"
+                    >
                         <slot name="previous-create-dialog" :data="data" />
                     </div>
                     <div class="grid-create" :style="createComplement?.columnGridStyle">
@@ -977,7 +1045,10 @@ function cardClick(_, row) {
                             :label="column.label"
                         >
                             <VnColumn
-                                :column="column"
+                                :column="{
+                                    ...column,
+                                    ...{ disable: column?.createDisable ?? false },
+                                }"
                                 :row="{}"
                                 default="input"
                                 v-model="data[column.name]"

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

@@ -27,30 +27,58 @@ describe('VnTable', () => {
     beforeEach(() => (vm.selected = []));
 
     describe('handleSelection()', () => {
-        const rows = [{ $index: 0 }, { $index: 1 }, { $index: 2 }];
-        const selectedRows = [{ $index: 1 }];
-        it('should add rows to selected when shift key is pressed and rows are added except last one', () => {
+        const rows = [
+            { $index: 0 },
+            { $index: 1 },
+            { $index: 2 },
+            { $index: 3 },
+            { $index: 4 },
+        ];
+
+        it('should add rows to selected when shift key is pressed and rows are added in ascending order', () => {
+            const selectedRows = [{ $index: 1 }];
             vm.handleSelection(
                 { evt: { shiftKey: true }, added: true, rows: selectedRows },
-                rows
+                rows,
             );
             expect(vm.selected).toEqual([{ $index: 0 }]);
         });
 
+        it('should add rows to selected when shift key is pressed and rows are added in descending order', () => {
+            const selectedRows = [{ $index: 3 }];
+            vm.handleSelection(
+                { evt: { shiftKey: true }, added: true, rows: selectedRows },
+                rows,
+            );
+            expect(vm.selected).toEqual([{ $index: 0 }, { $index: 1 }, { $index: 2 }]);
+        });
+
         it('should not add rows to selected when shift key is not pressed', () => {
+            const selectedRows = [{ $index: 1 }];
             vm.handleSelection(
                 { evt: { shiftKey: false }, added: true, rows: selectedRows },
-                rows
+                rows,
             );
             expect(vm.selected).toEqual([]);
         });
 
         it('should not add rows to selected when rows are not added', () => {
+            const selectedRows = [{ $index: 1 }];
             vm.handleSelection(
                 { evt: { shiftKey: true }, added: false, rows: selectedRows },
-                rows
+                rows,
             );
             expect(vm.selected).toEqual([]);
         });
+
+        it('should add all rows between the smallest and largest selected indexes', () => {
+            vm.selected = [{ $index: 1 }, { $index: 3 }];
+            const selectedRows = [{ $index: 4 }];
+            vm.handleSelection(
+                { evt: { shiftKey: true }, added: true, rows: selectedRows },
+                rows,
+            );
+            expect(vm.selected).toEqual([{ $index: 1 }, { $index: 3 }, { $index: 2 }]);
+        });
     });
 });

src/components/__tests__/CrudModel.spec.js

@@ -30,8 +30,8 @@ describe('CrudModel', () => {
                 saveFn: '',
             },
         });
-        wrapper=wrapper.wrapper;
-        vm=wrapper.vm;
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
     });
 
     beforeEach(() => {
@@ -143,14 +143,14 @@ describe('CrudModel', () => {
         });
 
         it('should return true if object is empty', async () => {
-            dummyObj ={};
-            result = vm.isEmpty(dummyObj);    
+            dummyObj = {};
+            result = vm.isEmpty(dummyObj);
 
             expect(result).toBe(true);
         });
 
         it('should return false if object is not empty', async () => {
-            dummyObj = {a:1, b:2, c:3};
+            dummyObj = { a: 1, b: 2, c: 3 };
             result = vm.isEmpty(dummyObj);
 
             expect(result).toBe(false);
@@ -158,29 +158,31 @@ describe('CrudModel', () => {
 
         it('should return true if array is empty', async () => {
             dummyArray = [];
-            result = vm.isEmpty(dummyArray); 
+            result = vm.isEmpty(dummyArray);
 
             expect(result).toBe(true);
         });
-        
+
         it('should return false if array is not empty', async () => {
-            dummyArray = [1,2,3];
+            dummyArray = [1, 2, 3];
             result = vm.isEmpty(dummyArray);
 
             expect(result).toBe(false);
-        })
+        });
     });
 
     describe('resetData()', () => {
         it('should add $index to elements in data[] and sets originalData and formData with data', async () => {
-            data = [{
-                name: 'Tony',
-                lastName: 'Stark',
-                age: 42,
-            }];
+            data = [
+                {
+                    name: 'Tony',
+                    lastName: 'Stark',
+                    age: 42,
+                },
+            ];
 
             vm.resetData(data);
-            
+
             expect(vm.originalData).toEqual(data);
             expect(vm.originalData[0].$index).toEqual(0);
             expect(vm.formData).toEqual(data);
@@ -200,7 +202,7 @@ describe('CrudModel', () => {
                 lastName: 'Stark',
                 age: 42,
             };
-            
+
             vm.resetData(data);
 
             expect(vm.originalData).toEqual(data);
@@ -210,17 +212,19 @@ describe('CrudModel', () => {
     });
 
     describe('saveChanges()', () => {
-        data = [{
-            name: 'Tony',
-            lastName: 'Stark',
-            age: 42,
-        }];
+        data = [
+            {
+                name: 'Tony',
+                lastName: 'Stark',
+                age: 42,
+            },
+        ];
 
         it('should call saveFn if exists', async () => {
             await wrapper.setProps({ saveFn: vi.fn() });
 
             vm.saveChanges(data);
-            
+
             expect(vm.saveFn).toHaveBeenCalledOnce();
             expect(vm.isLoading).toBe(false);
             expect(vm.hasChanges).toBe(false);
@@ -229,13 +233,15 @@ describe('CrudModel', () => {
         });
 
         it("should use default url if there's not saveFn", async () => {
-            const postMock =vi.spyOn(axios, 'post');
-            
-            vm.formData = [{
-                name: 'Bruce',
-                lastName: 'Wayne',
-                age: 45,
-            }]
+            const postMock = vi.spyOn(axios, 'post');
+
+            vm.formData = [
+                {
+                    name: 'Bruce',
+                    lastName: 'Wayne',
+                    age: 45,
+                },
+            ];
 
             await vm.saveChanges(data);
 

src/components/common/RightMenu.vue

@@ -11,6 +11,13 @@ const stateStore = useStateStore();
 const slots = useSlots();
 const hasContent = useHasContent('#right-panel');
 
+defineProps({
+    overlay: {
+        type: Boolean,
+        default: false,
+    },
+});
+
 onMounted(() => {
     if ((!slots['right-panel'] && !hasContent.value) || quasar.platform.is.mobile)
         stateStore.rightDrawer = false;
@@ -34,7 +41,12 @@ onMounted(() => {
             </QBtn>
         </div>
     </Teleport>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256">
+    <QDrawer
+        v-model="stateStore.rightDrawer"
+        side="right"
+        :width="256"
+        :overlay="overlay"
+    >
         <QScrollArea class="fit">
             <div id="right-panel"></div>
             <slot v-if="!hasContent" name="right-panel" />

src/components/common/VnAccountNumber.vue

@@ -1,12 +1,9 @@
 <script setup>
-import { nextTick, ref, watch } from 'vue';
-import { QInput } from 'quasar';
+import { nextTick, ref } from 'vue';
+import VnInput from './VnInput.vue';
+import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
 
 const $props = defineProps({
-    modelValue: {
-        type: String,
-        default: '',
-    },
     insertable: {
         type: Boolean,
         default: false,
@@ -14,70 +11,25 @@ const $props = defineProps({
 });
 
 const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
+const model = defineModel({ prop: 'modelValue' });
+const inputRef = ref(false);
 
-let internalValue = ref($props.modelValue);
-
-watch(
-    () => $props.modelValue,
-    (newVal) => {
-        internalValue.value = newVal;
-    }
-);
-
-watch(
-    () => internalValue.value,
-    (newVal) => {
-        emit('update:modelValue', newVal);
-        accountShortToStandard();
-    }
-);
-
-const handleKeydown = (e) => {
-    if (e.key === 'Backspace') return;
-    if (e.key === '.') {
-        accountShortToStandard();
-        // TODO: Fix this setTimeout, with nextTick doesn't work
-        setTimeout(() => {
-            setCursorPosition(0, e.target);
-        }, 1);
-        return;
-    }
-
-    if ($props.insertable && e.key.match(/[0-9]/)) {
-        handleInsertMode(e);
-    }
-};
-function setCursorPosition(pos, el = vnInputRef.value) {
-    el.focus();
-    el.setSelectionRange(pos, pos);
+function setCursorPosition(pos) {
+    const input = inputRef.value.vnInputRef.$el.querySelector('input');
+    input.focus();
+    input.setSelectionRange(pos, pos);
 }
-const vnInputRef = ref(false);
-const handleInsertMode = (e) => {
-    e.preventDefault();
-    const input = e.target;
-    const cursorPos = input.selectionStart;
-    const { maxlength } = vnInputRef.value;
-    let currentValue = internalValue.value;
-    if (!currentValue) currentValue = e.key;
-    const newValue = e.key;
-    if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
-        internalValue.value =
-            currentValue.substring(0, cursorPos) +
-            newValue +
-            currentValue.substring(cursorPos + 1);
-    }
-    nextTick(() => {
-        input.setSelectionRange(cursorPos + 1, cursorPos + 1);
-    });
-};
-function accountShortToStandard() {
-    internalValue.value = internalValue.value?.replace(
-        '.',
-        '0'.repeat(11 - internalValue.value.length)
-    );
+
+async function handleUpdateModel(val) {
+    model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
+    await nextTick(() => setCursorPosition(0));
 }
 </script>
-
 <template>
-    <QInput @keydown="handleKeydown" ref="vnInputRef" v-model="internalValue" />
+    <VnInput
+        v-model="model"
+        ref="inputRef"
+        :insertable
+        @update:model-value="handleUpdateModel"
+    />
 </template>

src/components/common/VnCardBeta.vue

@@ -1,10 +1,9 @@
 <script setup>
 import { onBeforeMount } from 'vue';
-import { useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
-import LeftMenu from 'components/LeftMenu.vue';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
 
 const props = defineProps({
@@ -27,7 +26,13 @@ const arrayData = useArrayData(props.dataKey, {
     oneRecord: true,
 });
 
+onBeforeRouteLeave(() => {
+    stateStore.cardDescriptorChangeValue(null);
+});
+
 onBeforeMount(async () => {
+    stateStore.cardDescriptorChangeValue(props.descriptor);
+
     const route = router.currentRoute.value;
     try {
         await fetch(route.params.id);
@@ -62,11 +67,6 @@ function hasRouteParam(params, valueToCheck = ':addressId') {
 }
 </script>
 <template>
-    <Teleport to="#left-panel" v-if="stateStore.isHeaderMounted()">
-        <component :is="descriptor" />
-        <QSeparator />
-        <LeftMenu source="card" />
-    </Teleport>
     <VnSubToolbar />
     <div :class="[useCardSize(), $attrs.class]">
         <RouterView :key="$route.path" />

src/components/common/VnCheckbox.vue

@@ -27,7 +27,7 @@ const checkboxModel = computed({
 </script>
 <template>
     <div>
-        <QCheckbox v-bind="$attrs" v-on="$attrs" v-model="checkboxModel" />
+        <QCheckbox v-bind="$attrs" v-model="checkboxModel" />
         <QIcon
             v-if="info"
             v-bind="$attrs"

src/components/common/VnInput.vue

@@ -83,7 +83,7 @@ const mixinRules = [
     requiredFieldRule,
     ...($attrs.rules ?? []),
     (val) => {
-        const { maxlength } = vnInputRef.value;
+        const maxlength = $props.maxlength;
         if (maxlength && +val.length > maxlength)
             return t(`maxLength`, { value: maxlength });
         const { min, max } = vnInputRef.value.$attrs;
@@ -108,7 +108,7 @@ const handleInsertMode = (e) => {
     e.preventDefault();
     const input = e.target;
     const cursorPos = input.selectionStart;
-    const { maxlength } = vnInputRef.value;
+    const maxlength = $props.maxlength;
     let currentValue = value.value;
     if (!currentValue) currentValue = e.key;
     const newValue = e.key;
@@ -143,7 +143,7 @@ const handleUppercase = () => {
             :rules="mixinRules"
             :lazy-rules="true"
             hide-bottom-space
-            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
+            :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_input'"
         >
             <template #prepend v-if="$slots.prepend">
                 <slot name="prepend" />

src/components/common/VnLog.vue

@@ -641,15 +641,7 @@ watch(
                                                     >
                                                         {{ prop.nameI18n }}:
                                                     </span>
-                                                    <VnJsonValue :value="prop.val.val" />
-                                                    <span
-                                                        v-if="prop.val.id"
-                                                        class="id-value"
-                                                    >
-                                                        #{{ prop.val.id }}
-                                                    </span>
                                                     <span v-if="log.action == 'update'">
-                                                        ←
                                                         <VnJsonValue
                                                             :value="prop.old.val"
                                                         />
@@ -659,6 +651,26 @@ watch(
                                                         >
                                                             #{{ prop.old.id }}
                                                         </span>
+                                                        →
+                                                        <VnJsonValue
+                                                            :value="prop.val.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.val.id"
+                                                            class="id-value"
+                                                        >
+                                                            #{{ prop.val.id }}
+                                                        </span>
+                                                    </span>
+                                                    <span v-else="prop.old.val">
+                                                        <VnJsonValue
+                                                            :value="prop.val.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.old.id"
+                                                            class="id-value"
+                                                            >#{{ prop.old.id }}</span
+                                                        >
                                                     </span>
                                                 </div>
                                             </span>

src/components/common/VnModule.vue

@@ -12,7 +12,7 @@ const $props = defineProps({
     },
 });
 onMounted(
-    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false),
 );
 
 const teleportRef = ref({});
@@ -35,8 +35,14 @@ onMounted(() => {
 <template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
-            <div id="left-panel" ref="teleportRef"></div>
-            <LeftMenu v-if="!hasContent" />
+            <div id="left-panel" ref="teleportRef">
+                <template v-if="stateStore.cardDescriptor">
+                    <component :is="stateStore.cardDescriptor" />
+                    <QSeparator />
+                    <LeftMenu source="card" />
+                </template>
+                <template v-else> <LeftMenu /></template>
+            </div>
         </QScrollArea>
     </QDrawer>
     <QPageContainer>

src/components/ui/CardDescriptor.vue

@@ -76,6 +76,15 @@ onBeforeMount(async () => {
     );
 });
 
+const routeName = computed(() => {
+    const DESCRIPTOR_PROXY = 'DescriptorProxy';
+
+    let name = $props.dataKey;
+    if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
+        name = name.split(DESCRIPTOR_PROXY)[0];
+    }
+    return `${name}Summary`;
+});
 async function getData() {
     store.url = $props.url;
     store.filter = $props.filter ?? {};
@@ -154,9 +163,7 @@ const toModule = computed(() =>
                         {{ t('components.smartCard.openSummary') }}
                     </QTooltip>
                 </QBtn>
-                <RouterLink
-                    :to="{ name: `${dataKey}Summary`, params: { id: entity.id } }"
-                >
+                <RouterLink :to="{ name: routeName, params: { id: entity.id } }">
                     <QBtn
                         class="link"
                         color="white"
@@ -218,7 +225,7 @@ const toModule = computed(() =>
             <div class="icons">
                 <slot name="icons" :entity="entity" />
             </div>
-            <div class="actions justify-center">
+            <div class="actions justify-center" data-cy="descriptor_actions">
                 <slot name="actions" :entity="entity" />
             </div>
             <slot name="after" />

src/components/ui/CatalogItem.vue

@@ -132,7 +132,8 @@ const card = toRef(props, 'item');
     display: flex;
     flex-direction: column;
     gap: 4px;
-
+    white-space: nowrap;
+    width: 192px;
     p {
         margin-bottom: 0;
     }

src/components/ui/VnNotes.vue

@@ -18,20 +18,16 @@ import VnInput from 'components/common/VnInput.vue';
 
 const emit = defineEmits(['onFetch']);
 
-const originalAttrs = useAttrs();
-
-const $attrs = computed(() => {
-    const { style, ...rest } = originalAttrs;
-    return rest;
-});
+const $attrs = useAttrs();
 
 const isRequired = computed(() => {
-    return Object.keys($attrs).includes('required')
+    return Object.keys($attrs).includes('required');
 });
 
 const $props = defineProps({
     url: { type: String, default: null },
-    saveUrl: {type: String, default: null},
+    saveUrl: { type: String, default: null },
+    userFilter: { type: Object, default: () => {} },
     filter: { type: Object, default: () => {} },
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
@@ -65,7 +61,7 @@ async function insert() {
 }
 
 function confirmAndUpdate() {
-    if(!newNote.text && originalText)
+    if (!newNote.text && originalText)
         quasar
             .dialog({
                 component: VnConfirm,
@@ -88,11 +84,17 @@ async function update() {
         ...body,
         ...{ notes: newNote.text },
     };
-    await axios.patch(`${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`, newBody);
+    await axios.patch(
+        `${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`,
+        newBody,
+    );
 }
 
 onBeforeRouteLeave((to, from, next) => {
-    if ((newNote.text && !$props.justInput) || (newNote.text !== originalText) && $props.justInput)
+    if (
+        (newNote.text && !$props.justInput) ||
+        (newNote.text !== originalText && $props.justInput)
+    )
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
@@ -104,12 +106,11 @@ onBeforeRouteLeave((to, from, next) => {
     else next();
 });
 
-function fetchData([ data ]) {
+function fetchData([data]) {
     newNote.text = data?.notes;
     originalText = data?.notes;
     emit('onFetch', data);
 }
-
 </script>
 <template>
     <FetchData
@@ -126,8 +127,8 @@ function fetchData([ data ]) {
         @on-fetch="fetchData"
         auto-load
     />
-    <QCard 
-        class="q-pa-xs q-mb-lg full-width" 
+    <QCard
+        class="q-pa-xs q-mb-lg full-width"
         :class="{ 'just-input': $props.justInput }"
         v-if="$props.addNote || $props.justInput"
     >
@@ -179,7 +180,8 @@ function fetchData([ data ]) {
         :url="$props.url"
         order="created DESC"
         :limit="0"
-        :user-filter="$props.filter"
+        :user-filter="userFilter"
+        :filter="filter"
         auto-load
         ref="vnPaginateRef"
         class="show"
@@ -218,7 +220,7 @@ function fetchData([ data ]) {
                                 >
                                     {{
                                         observationTypes.find(
-                                            (ot) => ot.id === note.observationTypeFk
+                                            (ot) => ot.id === note.observationTypeFk,
                                         )?.description
                                     }}
                                 </QBadge>

src/components/ui/VnSearchbar.vue

@@ -204,8 +204,9 @@ async function search() {
 }
 
 :deep(.q-field--focused) {
-    .q-icon {
-        color: black;
+    .q-icon,
+    .q-placeholder {
+        color: var(--vn-black-text-color);
     }
 }
 

src/composables/checkEntryLock.js

@@ -29,7 +29,6 @@ export async function checkEntryLock(entryFk, userFk) {
                 .dialog({
                     component: VnConfirm,
                     componentProps: {
-                        'data-cy': 'entry-lock-confirm',
                         title: t('entry.lock.title'),
                         message: t('entry.lock.message', {
                             userName: data?.user?.nickname,

src/i18n/locale/en.yml

@@ -153,6 +153,7 @@ globals:
     maxTemperature: Max
     minTemperature: Min
     changePass: Change password
+    setPass: Set password
     deleteConfirmTitle: Delete selected elements
     changeState: Change state
     raid: 'Raid {daysInForward} days'
@@ -368,6 +369,7 @@ globals:
         countryFk: Country
         countryCodeFk: Country
         companyFk: Company
+        nickname: Alias
     model: Model
     fuel: Fuel
     active: Active
@@ -693,8 +695,10 @@ worker:
         machine: Machine
     business:
         tableVisibleColumns:
+            id: ID
             started: Start Date
             ended: End Date
+            hourlyLabor: Time sheet
             company: Company
             reasonEnd: Reason for Termination
             department: Department
@@ -702,6 +706,7 @@ worker:
             calendarType: Work Calendar
             workCenter: Work Center
             payrollCategories: Contract Category
+            workerBusinessAgreementName: Agreement
             occupationCode: Contribution Code
             rate: Rate
             businessType: Contract Type

src/i18n/locale/es.yml

@@ -157,6 +157,7 @@ globals:
     maxTemperature: Máx
     minTemperature: Mín
     changePass: Cambiar contraseña
+    setPass: Establecer contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
     changeState: Cambiar estado
     raid: 'Redada {daysInForward} días'
@@ -369,6 +370,7 @@ globals:
         countryFk: País
         countryCodeFk: País
         companyFk: Empresa
+        nickname: Alias
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -769,8 +771,10 @@ worker:
             concept: Concepto
     business:
         tableVisibleColumns:
+            id: Id
             started: Fecha inicio
             ended: Fecha fin
+            hourlyLabor: Ficha
             company: Empresa
             reasonEnd: Motivo finalización
             department: Departamento
@@ -781,12 +785,13 @@ worker:
             occupationCode: Cotización
             rate: Tarifa
             businessType: Contrato
+            workerBusinessAgreementName: Convenio
             amount: Salario
             basicSalary: Salario transportistas
             notes: Notas
     operator:
         numberOfWagons: Número de vagones
-        train: tren
+        train: Tren
         itemPackingType: Tipo de embalaje
         warehouse: Almacén
         sector: Sector

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -25,12 +25,13 @@ const $props = defineProps({
 const { t } = useI18n();
 const { hasAccount } = toRefs($props);
 const { openConfirmationModal } = useVnConfirm();
+const arrayData = useArrayData('Account');
 const route = useRoute();
 const router = useRouter();
 const state = useState();
 const user = state.getUser();
 const { notify } = useQuasar();
-const account = computed(() => useArrayData('Account').store.data[0]);
+const account = computed(() => arrayData.store.data);
 account.value.hasAccount = hasAccount.value;
 const entityId = computed(() => +route.params.id);
 const hasitManagementAccess = ref();
@@ -39,7 +40,7 @@ const isHimself = computed(() => user.value.id === account.value.id);
 const url = computed(() =>
     isHimself.value
         ? 'Accounts/change-password'
-        : `Accounts/${entityId.value}/setPassword`
+        : `Accounts/${entityId.value}/setPassword`,
 );
 
 async function updateStatusAccount(active) {
@@ -153,6 +154,7 @@ onMounted(() => {
                 t('account.card.actions.disableAccount.title'),
                 t('account.card.actions.disableAccount.subtitle'),
                 () => deleteAccount(),
+                () => deleteAccount(),
             )
         "
     >
@@ -172,6 +174,7 @@ onMounted(() => {
                 t('account.card.actions.enableAccount.title'),
                 t('account.card.actions.enableAccount.subtitle'),
                 () => updateStatusAccount(true),
+                () => updateStatusAccount(true),
             )
         "
     >
@@ -186,6 +189,7 @@ onMounted(() => {
                 t('account.card.actions.disableAccount.title'),
                 t('account.card.actions.disableAccount.subtitle'),
                 () => updateStatusAccount(false),
+                () => updateStatusAccount(false),
             )
         "
     >
@@ -201,6 +205,7 @@ onMounted(() => {
                 t('account.card.actions.activateUser.title'),
                 t('account.card.actions.activateUser.title'),
                 () => updateStatusUser(true),
+                () => updateStatusUser(true),
             )
         "
     >
@@ -215,6 +220,7 @@ onMounted(() => {
                 t('account.card.actions.deactivateUser.title'),
                 t('account.card.actions.deactivateUser.title'),
                 () => updateStatusUser(false),
+                () => updateStatusUser(false),
             )
         "
     >

src/pages/Claim/Card/ClaimNotes.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, useAttrs } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useState } from 'src/composables/useState';
 import VnNotes from 'src/components/ui/VnNotes.vue';
@@ -7,7 +7,6 @@ import VnNotes from 'src/components/ui/VnNotes.vue';
 const route = useRoute();
 const state = useState();
 const user = state.getUser();
-const $attrs = useAttrs();
 
 const $props = defineProps({
     id: { type: [Number, String], default: null },
@@ -15,24 +14,21 @@ const $props = defineProps({
 });
 const claimId = computed(() => $props.id || route.params.id);
 
-const claimFilter = computed(() => {
-    return {
-        where: { claimFk: claimId.value },
-        fields: ['id', 'created', 'workerFk', 'text'],
-        include: {
-            relation: 'worker',
-            scope: {
-                fields: ['id', 'firstName', 'lastName'],
-                include: {
-                    relation: 'user',
-                    scope: {
-                        fields: ['id', 'nickname', 'name'],
-                    },
+const claimFilter = {
+    fields: ['id', 'created', 'workerFk', 'text'],
+    include: {
+        relation: 'worker',
+        scope: {
+            fields: ['id', 'firstName', 'lastName'],
+            include: {
+                relation: 'user',
+                scope: {
+                    fields: ['id', 'nickname', 'name'],
                 },
             },
         },
-    };
-});
+    },
+};
 
 const body = {
     claimFk: claimId.value,
@@ -43,7 +39,8 @@ const body = {
     <VnNotes
         url="claimObservations"
         :add-note="$props.addNote"
-        :filter="claimFilter"
+        :user-filter="claimFilter"
+        :filter="{ where: { claimFk: claimId } }"
         :body="body"
         v-bind="$attrs"
         style="overflow-y: auto"

src/pages/Claim/Card/ClaimPhoto.vue

@@ -210,6 +210,7 @@ function onDrag() {
                     class="all-pointer-events absolute delete-button zindex"
                     @click.stop="viewDeleteDms(index)"
                     round
+                    :data-cy="`delete-button-${index+1}`"
                 />
                 <QIcon
                     name="play_circle"
@@ -227,6 +228,7 @@ function onDrag() {
                         class="rounded-borders cursor-pointer fit"
                         @click="openDialog(media.dmsFk)"
                         v-if="!media.isVideo"
+                        :data-cy="`file-${index+1}`"
                     >
                     </QImg>
                     <video
@@ -235,6 +237,7 @@ function onDrag() {
                         muted="muted"
                         v-if="media.isVideo"
                         @click="openDialog(media.dmsFk)"
+                        :data-cy="`file-${index+1}`"
                     />
                 </QCard>
             </div>

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -118,14 +118,6 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('Allowed substitution') }}</QTooltip>
                 </QIcon>
-                <QIcon
-                    v-if="customer?.isFreezed"
-                    name="vn:frozen"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
-                </QIcon>
                 <QIcon
                     v-if="!entity.account?.active"
                     color="primary"
@@ -150,6 +142,14 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
+                <QIcon
+                    v-if="entity?.isFreezed"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
+                </QIcon>
                 <QBtn
                     v-if="entity.unpaid"
                     flat
@@ -163,13 +163,13 @@ const debtWarning = computed(() => {
                         <br />
                         {{
                             t('unpaidDated', {
-                                dated: toDate(customer.unpaid?.dated),
+                                dated: toDate(entity.unpaid?.dated),
                             })
                         }}
                         <br />
                         {{
                             t('unpaidAmount', {
-                                amount: toCurrency(customer.unpaid?.amount),
+                                amount: toCurrency(entity.unpaid?.amount),
                             })
                         }}
                     </QTooltip>

src/pages/Customer/Card/CustomerNotes.vue

@@ -1,28 +1,15 @@
 <script setup>
-import { computed } from 'vue';
-import { useRoute } from 'vue-router';
 import VnNotes from 'src/components/ui/VnNotes.vue';
-
-const route = useRoute();
-
-const noteFilter = computed(() => {
-    return {
-        order: 'created DESC',
-        where: {
-            clientFk: `${route.params.id}`,
-        },
-    };
-});
 </script>
-
 <template>
     <VnNotes
         url="clientObservations"
         :add-note="true"
-        :filter="noteFilter"
-        :body="{ clientFk: route.params.id }"
+        :filter="{ where: { clientFk: $route.params.id } }"
+        :body="{ clientFk: $route.params.id }"
         style="overflow-y: auto"
         :select-type="true"
         required
+        order="created DESC"
     />
 </template>

src/pages/Customer/Card/CustomerSummary.vue

@@ -325,7 +325,7 @@ const sumRisk = ({ clientRisks }) => {
             </QCard>
             <QCard class="vn-max">
                 <VnTitle :text="t('Latest tickets')" />
-                <CustomerSummaryTable />
+                <CustomerSummaryTable :id="entityId" />
             </QCard>
         </template>
     </CardSummary>

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -20,7 +20,12 @@ const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 const { viewSummary } = useSummaryDialog();
-
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: null,
+    },
+});
 const filter = {
     include: [
         {
@@ -43,7 +48,7 @@ const filter = {
             },
         },
     ],
-    where: { clientFk: route.params.id },
+    where: { clientFk: $props.id ?? route.params.id },
     order: ['shipped DESC', 'id'],
     limit: 30,
 };

src/pages/Customer/composables/__tests__/getAddresses.spec.js

@@ -17,9 +17,9 @@ describe('getAddresses', () => {
         expect(axios.get).toHaveBeenCalledWith(`Clients/${clientId}/addresses`, {
             params: {
                 filter: JSON.stringify({
-                    fields: ['nickname', 'street', 'city', 'id'],
+                    fields: ['nickname', 'street', 'city', 'id', 'isActive'],
                     where: { isActive: true },
-                    order: 'nickname ASC',
+                    order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
                 }),
             },
         });
@@ -30,4 +30,4 @@ describe('getAddresses', () => {
 
         expect(axios.get).not.toHaveBeenCalled();
     });
-});
+});

src/pages/Customer/composables/getAddresses.js

@@ -1,15 +1,15 @@
 import axios from 'axios';
 
-export async function getAddresses(clientId, _filter = {}) {   
+export async function getAddresses(clientId, _filter = {}) {
     if (!clientId) return;
     const filter = {
         ..._filter,
-        fields: ['nickname', 'street', 'city', 'id'],
+        fields: ['nickname', 'street', 'city', 'id', 'isActive'],
         where: { isActive: true },
-        order: 'nickname ASC',
+        order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
     };
     const params = { filter: JSON.stringify(filter) };
     return await axios.get(`Clients/${clientId}/addresses`, {
         params,
     });
-};
+}

src/pages/Entry/Card/EntryBuys.vue

@@ -54,6 +54,7 @@ const columns = [
             toggleIndeterminate: false,
         },
         create: true,
+        createOrder: 12,
         width: '25px',
     },
     {
@@ -61,9 +62,10 @@ const columns = [
         name: 'workerFk',
         component: 'select',
         attrs: {
-            url: 'Workers/search',
+            url: 'TicketRequests/getItemTypeWorker',
             fields: ['id', 'nickname'],
             optionLabel: 'nickname',
+            sortBy: 'nickname ASC',
             optionValue: 'id',
         },
         visible: false,
@@ -87,15 +89,6 @@ const columns = [
         isEditable: false,
         columnFilter: false,
     },
-    {
-        name: 'entryFk',
-        isId: true,
-        visible: false,
-        isEditable: false,
-        disable: true,
-        create: true,
-        columnFilter: false,
-    },
     {
         align: 'center',
         label: 'Id',
@@ -137,6 +130,7 @@ const columns = [
         name: 'itemFk',
         visible: false,
         create: true,
+        createOrder: 0,
         columnFilter: false,
     },
     {
@@ -160,6 +154,8 @@ const columns = [
         name: 'stickers',
         component: 'input',
         create: true,
+
+        createOrder: 1,
         attrs: {
             positive: false,
         },
@@ -271,6 +267,7 @@ const columns = [
         },
         width: '45px',
         create: true,
+        createOrder: 3,
         style: getQuantityStyle,
     },
     {
@@ -280,6 +277,7 @@ const columns = [
         toolTip: t('Buying value'),
         name: 'buyingValue',
         create: true,
+        createOrder: 2,
         component: 'number',
         attrs: {
             positive: false,
@@ -312,6 +310,7 @@ const columns = [
         toolTip: t('Package'),
         name: 'price2',
         component: 'number',
+        createDisable: true,
         width: '35px',
         create: true,
         format: (row) => parseFloat(row['price2']).toFixed(2),
@@ -321,6 +320,7 @@ const columns = [
         label: t('Box'),
         name: 'price3',
         component: 'number',
+        createDisable: true,
         cellEvent: {
             'update:modelValue': async (value, oldValue, row) => {
                 row['price2'] = row['price2'] * (value / oldValue);
@@ -508,13 +508,14 @@ async function setBuyUltimate(itemFk, data) {
         },
     });
     const buyUltimateData = buyUltimate.data[0];
+    if (!buyUltimateData) return;
 
     const allowedKeys = columns
         .filter((col) => col.create === true)
         .map((col) => col.name);
 
     allowedKeys.forEach((key) => {
-        if (buyUltimateData.hasOwnProperty(key) && key !== 'entryFk') {
+        if (buyUltimateData?.hasOwnProperty(key) && key !== 'entryFk') {
             if (!['stickers', 'quantity'].includes(key)) data[key] = buyUltimateData[key];
         }
     });
@@ -607,6 +608,7 @@ onMounted(() => {
         ref="entryBuysRef"
         data-key="EntryBuys"
         :url="`Entries/${entityId}/getBuyList`"
+        search-url="EntryBuys"
         save-url="Buys/crud"
         :disable-option="{ card: true }"
         v-model:selected="selectedRows"
@@ -636,22 +638,24 @@ onMounted(() => {
             isFullWidth: true,
             containerStyle: {
                 display: 'flex',
-                'flex-wrap': 'wrap',
                 gap: '16px',
                 position: 'relative',
-                height: '450px',
             },
             columnGridStyle: {
                 'max-width': '50%',
-                flex: 1,
                 'margin-right': '30px',
+                flex: 1,
             },
+            previousStyle: {
+                'max-width': '30%',
+                height: '500px',
+            },
+            displayPrevious: true,
         }"
         :is-editable="editableMode"
         :without-header="!editableMode"
         :with-filters="editableMode"
-        :right-search="true"
-        :right-search-icon="true"
+        :right-search="editableMode"
         :row-click="false"
         :columns="columns"
         :beforeSaveFn="beforeSave"
@@ -660,6 +664,7 @@ onMounted(() => {
         auto-load
         footer
         data-cy="entry-buys"
+        overlay
     >
         <template #column-hex="{ row }">
             <VnColor :colors="row?.hexJson" style="height: 100%; min-width: 2000px" />

src/pages/Entry/EntryBuysTableDialog.vue

@@ -65,7 +65,7 @@ const entriesTableColumns = computed(() => [
 ]);
 
 function downloadCSV(rows) {
-    const headers = ['id', 'itemFk', 'name', 'stickers', 'packing', 'comment'];
+    const headers = ['id', 'itemFk', 'name', 'stickers', 'packing', 'grouping', 'comment'];
 
     const csvRows = rows.map((row) => {
         const buy = row;
@@ -77,6 +77,7 @@ function downloadCSV(rows) {
             item.name || '',
             buy.stickers,
             buy.packing,
+            buy.grouping,
             item.comment || '',
         ].join(',');
     });

src/pages/Entry/EntryFilter.vue

@@ -145,6 +145,7 @@ const entryFilterPanel = ref();
                         v-model="params.agencyModeId"
                         @update:model-value="searchFn()"
                         url="AgencyModes"
+                        sort-by="name ASC"
                         :fields="['id', 'name']"
                         hide-selected
                         dense
@@ -248,7 +249,7 @@ const entryFilterPanel = ref();
 <i18n>
 en:
     params:
-        isExcludedFromAvailable: Inventory
+        isExcludedFromAvailable: Is excluded
         isOrdered: Ordered
         isReceived: Received
         isConfirmed: Confirmed

src/pages/Entry/EntryList.vue

@@ -11,6 +11,8 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import VnSelectTravelExtended from 'src/components/common/VnSelectTravelExtended.vue';
 import { toDate } from 'src/filters';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import EntrySummary from './Card/EntrySummary.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -18,6 +20,7 @@ const defaultEntry = ref({});
 const state = useState();
 const user = state.getUser();
 const dataKey = 'EntryList';
+const { viewSummary } = useSummaryDialog();
 
 const entryQueryFilter = {
     include: [
@@ -222,6 +225,19 @@ const columns = computed(() => [
         visible: false,
         create: true,
     },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                isPrimary: true,
+                action: (row) => viewSummary(row.id, EntrySummary, 'xlg-width'),
+            },
+        ],
+    },
 ]);
 function getBadgeAttrs(row) {
     const date = row.landed;
@@ -267,16 +283,7 @@ onBeforeMount(async () => {
 </script>
 
 <template>
-    <VnSection
-        :data-key="dataKey"
-        prefix="entry"
-        url="Entries/filter"
-        :array-data-props="{
-            url: 'Entries/filter',
-            order: 'landed DESC',
-            userFilter: EntryFilter,
-        }"
-    >
+    <VnSection :data-key="dataKey" prefix="entry">
         <template #advanced-menu>
             <EntryFilter :data-key="dataKey" />
         </template>
@@ -285,6 +292,7 @@ onBeforeMount(async () => {
                 v-if="defaultEntry.defaultSupplierFk"
                 ref="tableRef"
                 :data-key="dataKey"
+                search-url="EntryList"
                 url="Entries/filter"
                 :filter="entryQueryFilter"
                 order="landed DESC"

src/pages/Entry/EntryStockBought.vue

@@ -19,6 +19,7 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
+const footer = ref({ bought: 0, reserve: 0 });
 const columns = computed(() => [
     {
         align: 'left',
@@ -38,16 +39,14 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
         attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name', 'nickname'],
-            where: { role: 'buyer' },
-            optionFilter: 'firstName',
+            url: 'TicketRequests/getItemTypeWorker',
+            fields: ['id', 'nickname'],
             optionLabel: 'nickname',
+            sortBy: 'nickname ASC',
             optionValue: 'id',
-            useLike: false,
         },
         columnFilter: false,
-        width: '70px',
+        width: '50px',
     },
     {
         align: 'center',
@@ -58,6 +57,7 @@ const columns = computed(() => [
         component: 'number',
         summation: true,
         width: '50px',
+        format: ({ reserve }, dashIfEmpty) => dashIfEmpty(round(reserve)),
     },
     {
         align: 'center',
@@ -65,6 +65,7 @@ const columns = computed(() => [
         name: 'bought',
         summation: true,
         cardVisible: true,
+        style: ({ reserve, bought }) => boughtStyle(bought, reserve),
         columnFilter: false,
     },
     {
@@ -95,7 +96,6 @@ const columns = computed(() => [
                 },
             },
         ],
-        'data-cy': 'table-actions',
     },
 ]);
 
@@ -137,20 +137,20 @@ function openDialog() {
 }
 
 function setFooter(data) {
-    const footer = {
-        bought: 0,
-        reserve: 0,
-    };
+    footer.value = { bought: 0, reserve: 0 };
     data.forEach((row) => {
-        footer.bought += row?.bought;
-        footer.reserve += row?.reserve;
+        footer.value.bought += row?.bought;
+        footer.value.reserve += row?.reserve;
     });
-    tableRef.value.footer = footer;
 }
 
 function round(value) {
     return Math.round(value * 100) / 100;
 }
+
+function boughtStyle(bought, reserve) {
+    return reserve < bought ? { color: 'var(--q-negative)' } : '';
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -253,24 +253,14 @@ function round(value) {
                         <WorkerDescriptorProxy :id="row?.workerFk" />
                     </span>
                 </template>
-                <template #column-bought="{ row }">
-                    <span :class="{ 'text-negative': row.reserve < row.bought }">
-                        {{ row?.bought }}
-                    </span>
-                </template>
                 <template #column-footer-reserve>
                     <span>
-                        {{ round(tableRef.footer.reserve) }}
+                        {{ round(footer.reserve) }}
                     </span>
                 </template>
                 <template #column-footer-bought>
-                    <span
-                        :class="{
-                            'text-negative':
-                                tableRef.footer.reserve < tableRef.footer.bought,
-                        }"
-                    >
-                        {{ round(tableRef.footer.bought) }}
+                    <span :style="boughtStyle(footer?.bought, footer?.reserve)">
+                        {{ round(footer.bought) }}
                     </span>
                 </template>
             </VnTable>
@@ -286,7 +276,7 @@ function round(value) {
     justify-content: center;
 }
 .column {
-    min-width: 40%;
+    min-width: 35%;
     margin-top: 5%;
     display: flex;
     flex-direction: column;

src/pages/Entry/EntryStockBoughtDetail.vue

@@ -14,7 +14,7 @@ const $props = defineProps({
         required: true,
     },
     dated: {
-        type: Date,
+        type: [Date, String],
         required: true,
     },
 });

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -185,6 +185,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
         data-key="InvoiceInSummary"
         :url="`InvoiceIns/${entityId}/summary`"
         @on-fetch="(data) => init(data)"
+        module-name="InvoiceIn"
     >
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.supplier?.name }}</div>

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -202,7 +202,7 @@ function setCursor(ref) {
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'name']"
                             :tooltip="t('Create a new expense')"
-                            @keydown.tab="
+                            @keydown.tab.prevent="
                                 autocompleteExpense(
                                     $event,
                                     row,

src/pages/InvoiceOut/locale/en.yml

@@ -2,6 +2,7 @@ invoiceOut:
     search: Search invoice
     searchInfo: You can search by invoice reference
     params:
+        id: ID
         company: Company
         country: Country
         clientId: Client

src/pages/InvoiceOut/locale/es.yml

@@ -2,6 +2,7 @@ invoiceOut:
     search: Buscar factura emitida
     searchInfo: Puedes buscar por referencia de la factura
     params:
+        id: ID
         company: Empresa
         country: País
         clientId: Cliente

src/pages/Item/Card/ItemDescriptor.vue

@@ -120,22 +120,9 @@ const updateStock = async () => {
                 </template>
             </VnLv>
             <VnLv :label="t('globals.producer')" :value="dashIfEmpty(entity.subName)" />
-            <VnLv
-                v-if="entity.value5"
-                :label="t('item.descriptor.color')"
-                :value="entity.value5"
-            >
-            </VnLv>
-            <VnLv
-                v-if="entity.value6"
-                :label="t('item.descriptor.category')"
-                :value="entity.value6"
-            />
-            <VnLv
-                v-if="entity.value7"
-                :label="t('item.list.stems')"
-                :value="entity.value7"
-            />
+            <VnLv v-if="entity?.value5" :label="entity?.tag5" :value="entity.value5" />
+            <VnLv v-if="entity?.value6" :label="entity?.tag6" :value="entity.value6" />
+            <VnLv v-if="entity?.value7" :label="entity?.tag7" :value="entity.value7" />
         </template>
         <template #icons="{ entity }">
             <QCardActions v-if="entity" class="q-gutter-x-md">

src/pages/Item/Card/ItemDiary.vue

@@ -12,7 +12,7 @@ import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
-import { toDateFormat } from 'src/filters/date.js';
+import { toDateTimeFormat } from 'src/filters/date.js';
 import { dashIfEmpty } from 'src/filters';
 import { date } from 'quasar';
 import { useState } from 'src/composables/useState';
@@ -143,7 +143,12 @@ onMounted(async () => {
 const fetchItemBalances = async () => await arrayDataItemBalances.fetch({});
 
 const getBadgeAttrs = (_date) => {
-    const isSameDate = date.isSameDate(today, _date);
+    let today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+    let timeTicket = new Date(_date);
+    timeTicket.setHours(0, 0, 0, 0);
+
+    const isSameDate = date.isSameDate(today, timeTicket);
     const attrs = {
         'text-color': isSameDate ? 'black' : 'white',
         color: isSameDate ? 'warning' : 'transparent',
@@ -153,15 +158,10 @@ const getBadgeAttrs = (_date) => {
 
 const scrollToToday = async () => {
     await nextTick();
-    const todayCell = document.querySelector(`td[data-date="${today.toISOString()}"]`);
-    if (todayCell) {
-        todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' });
-    }
-};
-
-const formatDateForAttribute = (dateValue) => {
-    if (dateValue instanceof Date) return date.formatDate(dateValue, 'YYYY-MM-DD');
-    return dateValue;
+    const todayCell = document.querySelector(
+        `td[data-date="${date.formatDate(today, 'YYYY-MM-DD')}"]`,
+    );
+    if (todayCell) todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' });
 };
 
 async function updateWarehouse(warehouseFk) {
@@ -237,14 +237,14 @@ async function updateWarehouse(warehouseFk) {
                 </QTd>
             </template>
             <template #body-cell-date="{ row }">
-                <QTd @click.stop :data-date="formatDateForAttribute(row.shipped)">
+                <QTd @click.stop :data-date="row?.shipped.substring(0, 10)">
                     <QBadge
                         v-bind="getBadgeAttrs(row.shipped)"
                         class="q-ma-none"
                         dense
                         style="font-size: 14px"
                     >
-                        {{ toDateFormat(row.shipped) }}
+                        {{ toDateTimeFormat(row.shipped) }}
                     </QBadge>
                 </QTd>
             </template>

src/pages/Item/Card/ItemLastEntries.vue

@@ -11,7 +11,6 @@ import { toCurrency } from 'filters/index';
 import { useArrayData } from 'composables/useArrayData';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 const from = ref();
@@ -41,7 +40,7 @@ const itemLastEntries = ref([]);
 
 const columns = computed(() => [
     {
-        label: 'Nv',
+        label: 'NV',
         name: 'ig',
         align: 'center',
     },
@@ -70,6 +69,7 @@ const columns = computed(() => [
         field: 'reference',
         align: 'center',
         format: (_, row) => toCurrency(row.price2) + ' / ' + toCurrency(row.price3),
+        style: (row) => highlightedRow(row),
     },
     {
         label: t('lastEntries.printedStickers'),
@@ -84,6 +84,7 @@ const columns = computed(() => [
         field: 'stickers',
         align: 'center',
         format: (val) => dashIfEmpty(val),
+        style: (row) => highlightedRow(row),
     },
     {
         label: 'Packing',
@@ -102,12 +103,14 @@ const columns = computed(() => [
         name: 'stems',
         field: 'stems',
         align: 'center',
+        style: (row) => highlightedRow(row),
     },
     {
         label: t('lastEntries.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'center',
+        style: (row) => highlightedRow(row),
     },
     {
         label: t('lastEntries.cost'),
@@ -120,12 +123,14 @@ const columns = computed(() => [
         name: 'weight',
         field: 'weight',
         align: 'center',
+        style: (row) => highlightedRow(row),
     },
     {
         label: t('lastEntries.cube'),
         name: 'cube',
         field: 'packagingFk',
         align: 'center',
+        style: (row) => highlightedRow(row),
     },
     {
         label: t('lastEntries.supplier'),
@@ -208,6 +213,14 @@ onMounted(async () => {
 function getBadgeClass(groupingMode, expectedGrouping) {
     return groupingMode === expectedGrouping ? 'accent-badge' : 'simple-badge';
 }
+
+function highlightedRow(row) {
+    return row?.isInventorySupplier
+        ? {
+              'background-color': 'var(--vn-section-hover-color)',
+          }
+        : '';
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -236,7 +249,7 @@ function getBadgeClass(groupingMode, expectedGrouping) {
             :no-data-label="t('globals.noResults')"
         >
             <template #body-cell-ig="{ row }">
-                <QTd class="text-center">
+                <QTd class="text-center" :style="highlightedRow(row)">
                     <QIcon
                         :name="row.isIgnored ? 'check_box' : 'check_box_outline_blank'"
                         style="color: var(--vn-label-color)"
@@ -245,38 +258,38 @@ function getBadgeClass(groupingMode, expectedGrouping) {
                 </QTd>
             </template>
             <template #body-cell-warehouse="{ row }">
-                <QTd>
+                <QTd :style="highlightedRow(row)">
                     <span>{{ row.warehouse }}</span>
                 </QTd>
             </template>
             <template #body-cell-date="{ row }">
-                <QTd class="text-center">
+                <QTd class="text-center" :style="highlightedRow(row)">
                     <VnDateBadge :date="row.landed" />
                 </QTd>
             </template>
             <template #body-cell-entry="{ row }">
-                <QTd @click.stop>
+                <QTd @click.stop :style="highlightedRow(row)">
                     <div class="full-width flex justify-center">
                         <EntryDescriptorProxy :id="row.entryFk" class="q-ma-none" dense />
                         <span class="link">{{ row.entryFk }}</span>
                     </div>
                 </QTd>
             </template>
-            <template #body-cell-pvp="{ value }">
-                <QTd @click.stop class="text-center">
+            <template #body-cell-pvp="{ row, value }">
+                <QTd @click.stop class="text-center" :style="highlightedRow(row)">
                     <span> {{ value }}</span>
-                    <QTooltip> {{ t('lastEntries.grouping') }}/Packing </QTooltip></QTd
-                >
+                    <QTooltip> {{ t('lastEntries.grouping') }}/Packing </QTooltip>
+                </QTd>
             </template>
             <template #body-cell-printedStickers="{ row }">
-                <QTd @click.stop class="text-center">
+                <QTd @click.stop class="text-center" :style="highlightedRow(row)">
                     <span style="color: var(--vn-label-color)">
                         {{ row.printedStickers }}</span
                     >
                 </QTd>
             </template>
             <template #body-cell-packing="{ row }">
-                <QTd @click.stop>
+                <QTd @click.stop :style="highlightedRow(row)">
                     <QBadge
                         class="center-content"
                         :class="getBadgeClass(row.groupingMode, 'packing')"
@@ -288,7 +301,7 @@ function getBadgeClass(groupingMode, expectedGrouping) {
                 </QTd>
             </template>
             <template #body-cell-grouping="{ row }">
-                <QTd @click.stop>
+                <QTd @click.stop :style="highlightedRow(row)">
                     <QBadge
                         class="center-content"
                         :class="getBadgeClass(row.groupingMode, 'grouping')"
@@ -300,7 +313,7 @@ function getBadgeClass(groupingMode, expectedGrouping) {
                 </QTd>
             </template>
             <template #body-cell-cost="{ row }">
-                <QTd @click.stop class="text-center">
+                <QTd @click.stop class="text-center" :style="highlightedRow(row)">
                     <span>
                         {{ toCurrency(row.cost, 'EUR', 3) }}
                         <QTooltip>
@@ -319,7 +332,7 @@ function getBadgeClass(groupingMode, expectedGrouping) {
                 </QTd>
             </template>
             <template #body-cell-supplier="{ row }">
-                <QTd @click.stop>
+                <QTd @click.stop :style="highlightedRow(row)">
                     <div class="full-width flex justify-left">
                         <QBadge
                             :class="
@@ -354,7 +367,6 @@ function getBadgeClass(groupingMode, expectedGrouping) {
 .th :first-child {
     .td {
         text-align: center;
-        background-color: red;
     }
 }
 .accent-badge {

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -17,6 +17,7 @@ import MonitorTicketFilter from './MonitorTicketFilter.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
 import VnDateBadge from 'src/components/common/VnDateBadge.vue';
 import { useStateStore } from 'src/stores/useStateStore';
+import useOpenURL from 'src/composables/useOpenURL';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000;
 const { t } = useI18n();
@@ -321,8 +322,7 @@ const totalPriceColor = (ticket) => {
     if (total > 0 && total < 50) return 'warning';
 };
 
-const openTab = (id) =>
-    window.open(`#/ticket/${id}/sale`, '_blank', 'noopener, noreferrer');
+const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
 </script>
 <template>
     <FetchData
@@ -397,6 +397,7 @@ const openTab = (id) =>
         default-mode="table"
         auto-load
         :row-click="({ id }) => openTab(id)"
+        :row-ctrl-click="(_, { id }) => openTab(id)"
         :disable-option="{ card: true }"
         :user-params="{ from, to, scopeDays: 0 }"
     >

src/pages/Monitor/locale/en.yml

@@ -22,7 +22,7 @@ salesTicketsTable:
     notVisible: Not visible
     purchaseRequest: Purchase request
     clientFrozen: Client frozen
-    risk: Risk
+    risk: Excess risk
     componentLack: Component lack
     tooLittle: Ticket too little
     identifier: Identifier

src/pages/Monitor/locale/es.yml

@@ -22,7 +22,7 @@ salesTicketsTable:
     notVisible: No visible
     purchaseRequest: Petición de compra
     clientFrozen: Cliente congelado
-    risk: Riesgo
+    risk: Exceso de riesgo
     componentLack: Faltan componentes
     tooLittle: Ticket demasiado pequeño
     identifier: Identificador

src/pages/Order/Card/OrderCatalog.vue

@@ -10,6 +10,7 @@ import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import { onUnmounted } from 'vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -23,16 +24,40 @@ const catalogParams = {
 const arrayData = useArrayData(dataKey, {
     url: 'Orders/CatalogFilter',
     userParams: catalogParams,
+    exprBuilder,
+    searchUrl: 'table',
 });
 const store = arrayData.store;
 const tags = ref([]);
 const itemRefs = ref({});
 
-onMounted(() => {
+onMounted(async () => {
     stateStore.rightDrawer = true;
     checkOrderConfirmation();
+
+    if (
+        arrayData.store.userParams &&
+        Object.keys(arrayData.store.userParams).some((key) => !key.startsWith('order'))
+    ) {
+        await arrayData.fetch({});
+    }
 });
 
+onUnmounted(() => {
+    arrayData.destroy();
+});
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'categoryFk':
+        case 'typeFk':
+            return { [param]: value };
+        case 'search':
+            if (/^\d+$/.test(value)) return { 'i.id': value };
+            else return { 'i.name': { like: `%${value}%` } };
+    }
+}
+
 async function checkOrderConfirmation() {
     const response = await axios.get(`Orders/${route.params.id}`);
     if (response.data.isConfirmed === 1) {
@@ -96,6 +121,7 @@ watch(
                 :tag-value="tagValue"
                 :tags="tags"
                 :initial-catalog-params="catalogParams"
+                :arrayData
             />
         </template>
     </RightMenu>

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -24,6 +24,10 @@ const props = defineProps({
         type: Array,
         required: true,
     },
+    arrayData: {
+        type: Object,
+        required: true,
+    },
 });
 
 const { t } = useI18n();
@@ -74,17 +78,6 @@ const loadTypes = async (id) => {
     typeList.value = data;
 };
 
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'categoryFk':
-        case 'typeFk':
-            return { [param]: value };
-        case 'search':
-            if (/^\d+$/.test(value)) return { 'i.id': value };
-            else return { 'i.name': { like: `%${value}%` } };
-    }
-}
-
 const applyTags = (tagInfo, params, search) => {
     if (!tagInfo || !tagInfo.values.length) {
         params.tagGroups = null;
@@ -152,9 +145,8 @@ function addOrder(value, field, params) {
         :data-key="props.dataKey"
         :hidden-tags="['filter', 'orderFk', 'orderBy']"
         :unremovable-params="['orderFk', 'orderBy']"
-        :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
-        :redirect="false"
+        :arrayData
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'typeFk' && typeList">

src/pages/Order/OrderList.vue

@@ -155,11 +155,23 @@ onMounted(() => {
 });
 
 async function fetchClientAddress(id, formData = {}) {
-    const { data } = await axios.get(
-        `Clients/${id}/addresses?filter[order]=isActive DESC`
-    );
+    const { data } = await axios.get(`Clients/${id}/addresses`, {
+        params: {
+            filter: JSON.stringify({
+                include: [
+                    {
+                        relation: 'client',
+                        scope: {
+                            fields: ['defaultAddressFk'],
+                        },
+                    },
+                ],
+                order: ['isActive DESC'],
+            }),
+        },
+    });
     addressOptions.value = data;
-    formData.addressId = data.defaultAddressFk;
+    formData.addressId = data[0].client.defaultAddressFk;
     fetchAgencies(formData);
 }
 
@@ -167,7 +179,13 @@ async function fetchAgencies({ landed, addressId }) {
     if (!landed || !addressId) return (agencyList.value = []);
 
     const { data } = await axios.get('Agencies/landsThatDay', {
-        params: { addressFk: addressId, landed },
+        params: {
+            filter: JSON.stringify({
+                order: ['agencyMode DESC', 'agencyModeFk ASC'],
+            }),
+            addressFk: addressId,
+            landed,
+        },
     });
     agencyList.value = data;
 }
@@ -258,6 +276,7 @@ const getDateColor = (date) => {
                         </template>
                     </VnSelect>
                     <VnSelect
+                        :disable="!data.clientFk"
                         v-model="data.addressId"
                         :options="addressOptions"
                         :label="t('module.address')"
@@ -284,6 +303,9 @@ const getDateColor = (date) => {
                                         {{ scope.opt?.street }},
                                         {{ scope.opt?.city }}
                                     </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>

src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js

@@ -27,14 +27,17 @@ describe('getAgencies', () => {
             landed: 'true',
         };
         const filter = {
-            fields: ['nickname', 'street', 'city', 'id'],
+            fields: ['name', 'street', 'city', 'id'],
             where: { isActive: true },
-            order: 'nickname ASC',
+            order: ['name ASC'],
         };
 
         await getAgencies(formData, null, filter);
 
-        expect(axios.get).toHaveBeenCalledWith('Agencies/getAgenciesWithWarehouse', generateParams(formData, filter));
+        expect(axios.get).toHaveBeenCalledWith(
+            'Agencies/getAgenciesWithWarehouse',
+            generateParams(formData, filter),
+        );
     });
 
     it('should not call API when formData is missing required landed field', async () => {
@@ -64,19 +67,19 @@ describe('getAgencies', () => {
     it('should return options and agency when default agency is found', async () => {
         const formData = { warehouseId: '123', addressId: '456', landed: 'true' };
         const client = { defaultAddress: { agencyModeFk: 'Agency1' } };
-        
+
         const { options, agency } = await getAgencies(formData, client);
-        
+
         expect(options).toEqual(response.data);
         expect(agency).toEqual(response.data[0]);
-      });
+    });
 
-      it('should return options and agency when client is not provided', async () => {
+    it('should return options and agency when client is not provided', async () => {
         const formData = { warehouseId: '123', addressId: '456', landed: 'true' };
-        
+
         const { options, agency } = await getAgencies(formData);
-        
+
         expect(options).toEqual(response.data);
         expect(agency).toBeNull();
-      });
+    });
 });

src/pages/Route/Agency/composables/getAgencies.js

@@ -1,14 +1,14 @@
 import axios from 'axios';
-import agency from 'src/router/modules/agency';
 
 export async function getAgencies(formData, client, _filter = {}) {
     if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
-    
+
     const filter = {
-        ..._filter
+        ..._filter,
+        order: ['name ASC'],
     };
 
-    let defaultAgency = null;
+    let agency = null;
     let params = {
         filter: JSON.stringify(filter),
         warehouseFk: formData.warehouseId,
@@ -16,11 +16,15 @@ export async function getAgencies(formData, client, _filter = {}) {
         landed: formData.landed,
     };
 
-    const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
+    const { data: options } = await axios.get('Agencies/getAgenciesWithWarehouse', {
+        params,
+    });
 
-    if(data && client) {
-        defaultAgency = data.find((agency) => agency.agencyModeFk === client.defaultAddress.agencyModeFk );
-    };
-    
-    return {options: data, agency: defaultAgency}
+    if (options && client) {
+        agency = options.find(
+            ({ agencyModeFk }) => agencyModeFk === client.defaultAddress.agencyModeFk,
+        );
+    }
+
+    return { options, agency };
 }

src/pages/Route/Card/RouteAutonomousFilter.vue

@@ -44,8 +44,7 @@ const exprBuilder = (param, value) => {
 <template>
     <FetchData
         url="AgencyModes"
-        :filter="{ fields: ['id', 'name'] }"
-        sort-by="name ASC"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agencyList = data)"
         auto-load
     />

src/pages/Route/RouteAutonomous.vue

@@ -180,6 +180,7 @@ const onDmsSaved = async (dms, response) => {
             rows: dmsDialog.value.rowsToCreateInvoiceIn,
             dms: response.data,
         });
+        notify(t('Data saved'), 'positive');
     }
     dmsDialog.value.show = false;
     dmsDialog.value.initialForm = null;
@@ -243,7 +244,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </template>
         <template #column-invoiceInFk="{ row }">
             <span class="link" @click.stop>
-                {{ row.invoiceInFk }}
+                {{ row.supplierRef }}
                 <InvoiceInDescriptorProxy v-if="row.invoiceInFk" :id="row.invoiceInFk" />
             </span>
         </template>

src/pages/Route/RouteExtendedList.vue

@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useQuasar } from 'quasar';
-import { dashIfEmpty, toDate, toHour } from 'src/filters';
+import { toDate, toHour } from 'src/filters';
 import { useRouter } from 'vue-router';
 import { usePrintService } from 'src/composables/usePrintService';
 import { useNavigate } from 'src/composables/useNavigate';

src/pages/Route/RouteList.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toHour } from 'src/filters';
@@ -8,6 +8,7 @@ import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -38,17 +39,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'workerFk',
         label: t('route.Worker'),
-        component: 'select',
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            useLike: false,
-            optionFilter: 'firstName',
-            find: {
-                value: 'workerFk',
-                label: 'workerUserName',
-            },
-        },
+        component: markRaw(VnSelectWorker),
         create: true,
         cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
@@ -59,6 +50,10 @@ const columns = computed(() => [
         name: 'agencyName',
         label: t('route.Agency'),
         cardVisible: true,
+    },
+    {
+        label: t('route.Agency'),
+        name: 'agencyModeFk',
         component: 'select',
         attrs: {
             url: 'agencyModes',
@@ -69,14 +64,19 @@ const columns = computed(() => [
             },
         },
         create: true,
-        columnClass: 'expand',
         columnFilter: false,
+        visible: false,
     },
     {
         align: 'left',
         name: 'vehiclePlateNumber',
         label: t('route.Vehicle'),
         cardVisible: true,
+    },
+    {
+        name: 'vehicleFk',
+        label: t('route.Vehicle'),
+        cardVisible: true,
         component: 'select',
         attrs: {
             url: 'vehicles',
@@ -90,6 +90,7 @@ const columns = computed(() => [
         },
         create: true,
         columnFilter: false,
+        visible: false,
     },
     {
         align: 'left',
@@ -156,6 +157,7 @@ const columns = computed(() => [
             <VnTable
                 :data-key
                 :columns="columns"
+                ref="tableRef"
                 :right-search="false"
                 redirect="route"
                 :create="{

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

@@ -22,7 +22,12 @@ const links = {
 };
 </script>
 <template>
-    <CardSummary data-key="Vehicle" :url="`Vehicles/${entityId}`" :filter="VehicleFilter">
+    <CardSummary
+        data-key="Vehicle"
+        :url="`Vehicles/${entityId}`"
+        module-name="Vehicle"
+        :filter="VehicleFilter"
+    >
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.numberPlate }}</div>
         </template>

src/pages/Shelving/Parking/Card/ParkingSummary.vue

@@ -45,8 +45,6 @@ const filter = {
                         :label="t('parking.sector')"
                         :value="entity.sector?.description"
                     />
-                    <VnLv :label="t('parking.row')" :value="entity.row" />
-                    <VnLv :label="t('parking.column')" :value="entity.column" />
                 </QCard>
             </template>
         </CardSummary>

src/pages/Shelving/Parking/ParkingList.vue

@@ -1,19 +1,15 @@
 <script setup>
-import { onMounted, onUnmounted } from 'vue';
-import { useRouter } from 'vue-router';
+import { computed, onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import ParkingFilter from './ParkingFilter.vue';
-import ParkingSummary from './Card/ParkingSummary.vue';
-import exprBuilder from './ParkingExprBuilder.js';
+import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import ParkingFilter from './ParkingFilter.vue';
+import exprBuilder from './ParkingExprBuilder.js';
+import ParkingSummary from './Card/ParkingSummary.vue';
 
 const stateStore = useStateStore();
-const { push } = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const dataKey = 'ParkingList';
@@ -24,7 +20,48 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
 };
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'code',
+        label: t('globals.code'),
+        isId: true,
+        isTitle: true,
+        columnFilter: false,
+        sortable: true,
+    },
+    {
+        align: 'left',
+        name: 'sector',
+        label: t('parking.sector'),
+        format: (val) => val.sector.description ?? '',
+        sortable: true,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'pickingOrder',
+        label: t('parking.pickingOrder'),
+        sortable: true,
+        cardVisible: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ParkingSummary),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
 </script>
+
 <template>
     <VnSection
         :data-key="dataKey"
@@ -40,41 +77,24 @@ const filter = {
             <ParkingFilter data-key="ParkingList" />
         </template>
         <template #body>
-            <QPage class="column items-center q-pa-md">
-                <div class="vn-card-list">
-                    <VnPaginate :data-key="dataKey">
-                        <template #body="{ rows }">
-                            <CardList
-                                v-for="row of rows"
-                                :key="row.id"
-                                :id="row.id"
-                                :title="row.code"
-                                @click="
-                                    push({ path: `/shelving/parking/${row.id}/summary` })
-                                "
-                            >
-                                <template #list-items>
-                                    <VnLv
-                                        label="Sector"
-                                        :value="row.sector?.description"
-                                    />
-                                    <VnLv
-                                        :label="t('parking.pickingOrder')"
-                                        :value="row.pickingOrder"
-                                    />
-                                </template>
-                                <template #actions>
-                                    <QBtn
-                                        :label="t('components.smartCard.openSummary')"
-                                        @click.stop="viewSummary(row.id, ParkingSummary)"
-                                        color="primary"
-                                    />
-                                </template>
-                            </CardList>
-                        </template>
-                    </VnPaginate>
-                </div>
-            </QPage>
+            <VnTable
+                :data-key="dataKey"
+                :columns="columns"
+                is-editable="false"
+                :right-search="false"
+                :use-model="true"
+                :disable-option="{ table: true }"
+                redirect="shelving/parking"
+                default-mode="card"
+            >
+                <template #actions="{ row }">
+                    <QBtn
+                        :label="t('components.smartCard.openSummary')"
+                        @click.stop="viewSummary(row.id, ParkingSummary)"
+                        color="primary"
+                    />
+                </template>
+            </VnTable>
         </template>
     </VnSection>
 </template>

src/pages/Shelving/ShelvingList.vue

@@ -1,13 +1,17 @@
 <script setup>
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
-import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { computed } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
+import ShelvingSummary from './Card/ShelvingSummary.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import exprBuilder from './ShelvingExprBuilder.js';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
+const { t } = useI18n();
 const router = useRouter();
 const { viewSummary } = useSummaryDialog();
 const dataKey = 'ShelvingList';
@@ -16,9 +20,56 @@ const filter = {
     include: [{ relation: 'parking' }],
 };
 
-function navigate(id) {
-    router.push({ path: `/shelving/${id}` });
-}
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'code',
+        label: t('globals.code'),
+        isId: true,
+        isTitle: true,
+        columnFilter: false,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'parking',
+        label: t('shelving.list.parking'),
+        sortable: true,
+        format: (val) => val?.code ?? '',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'priority',
+        label: t('shelving.list.priority'),
+        sortable: true,
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'isRecyclable',
+        label: t('shelving.summary.recyclable'),
+        sortable: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ShelvingSummary),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
+
+const onDataSaved = ({ id }) => {
+    router.push({ name: 'ShelvingBasicData', params: { id } });
+};
 </script>
 
 <template>
@@ -36,48 +87,75 @@ function navigate(id) {
             <ShelvingFilter data-key="ShelvingList" />
         </template>
         <template #body>
-            <QPage class="column items-center q-pa-md">
-                <div class="vn-card-list">
-                    <VnPaginate :data-key="dataKey">
-                        <template #body="{ rows }">
-                            <CardList
-                                v-for="row of rows"
-                                :key="row.id"
-                                :id="row.id"
-                                :title="row.code"
-                                @click="navigate(row.id)"
-                            >
-                                <template #list-items>
-                                    <VnLv
-                                        :label="$t('shelving.list.parking')"
-                                        :title-label="$t('shelving.list.parking')"
-                                        :value="row.parking?.code"
-                                    />
-                                    <VnLv
-                                        :label="$t('shelving.list.priority')"
-                                        :value="row?.priority"
-                                    />
-                                </template>
-                                <template #actions>
-                                    <QBtn
-                                        :label="$t('components.smartCard.openSummary')"
-                                        @click.stop="viewSummary(row.id, ShelvingSummary)"
-                                        color="primary"
-                                    />
-                                </template>
-                            </CardList>
-                        </template>
-                    </VnPaginate>
-                </div>
-                <QPageSticky :offset="[20, 20]">
-                    <RouterLink :to="{ name: 'ShelvingCreate' }">
-                        <QBtn fab icon="add" color="primary" v-shortcut="'+'" />
-                        <QTooltip>
-                            {{ $t('shelving.list.newShelving') }}
-                        </QTooltip>
-                    </RouterLink>
-                </QPageSticky>
-            </QPage>
+            <VnTable
+                :data-key="dataKey"
+                :columns="columns"
+                is-editable="false"
+                :right-search="false"
+                :use-model="true"
+                :disable-option="{ table: true }"
+                redirect="shelving"
+                default-mode="card"
+                :create="{
+                    urlCreate: 'Shelvings',
+                    title: t('globals.pageTitles.shelvingCreate'),
+                    onDataSaved,
+                    formInitialData: {
+                        parkingFk: null,
+                        priority: null,
+                        code: '',
+                        isRecyclable: false,
+                    },
+                }"
+            >
+                <template #more-create-dialog="{ data }">
+                    <VnSelect
+                        v-model="data.parkingFk"
+                        url="Parkings"
+                        option-value="id"
+                        option-label="code"
+                        :label="t('shelving.list.parking')"
+                        :filter-options="['id', 'code']"
+                        :fields="['id', 'code']"
+                    />
+                    <VnCheckbox
+                        v-model="data.isRecyclable"
+                        :label="t('shelving.summary.recyclable')"
+                    />
+                </template>
+            </VnTable>
         </template>
     </VnSection>
 </template>
+
+<style lang="scss" scoped>
+.list {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 55%;
+}
+.list-container {
+    display: flex;
+    justify-content: center;
+}
+</style>
+
+<i18n>
+    es:
+        shelving:
+            list:
+                parking: Estacionamiento
+                priority: Prioridad
+        
+            summary:
+                recyclable: Reciclable
+    en:
+        shelving:
+            list:
+                parking: Parking
+                priority: Priority
+        
+            summary:
+                recyclable: Recyclable
+</i18n>

src/pages/Supplier/Card/SupplierFilter.js

@@ -11,6 +11,11 @@ export default {
         'isSerious',
         'isTrucker',
         'account',
+        'workerFk',
+        'note',
+        'isReal',
+        'isPayMethodChecked',
+        'companySize',
     ],
     include: [
         {

src/pages/Supplier/Card/SupplierFiscalData.vue

@@ -108,7 +108,6 @@ function handleLocation(data, location) {
                 <VnAccountNumber
                     v-model="data.account"
                     :label="t('supplier.fiscalData.account')"
-                    clearable
                     data-cy="supplierFiscalDataAccount"
                     insertable
                     :maxlength="10"
@@ -185,8 +184,8 @@ function handleLocation(data, location) {
                     />
                     <VnCheckbox
                         v-model="data.isVies"
-                        :label="t('globals.isVies')" 
-                        :info="t('whenActivatingIt')" 
+                        :label="t('globals.isVies')"
+                        :info="t('whenActivatingIt')"
                     />
                 </div>
             </VnRow>

src/pages/Supplier/SupplierList.vue

@@ -4,9 +4,11 @@ import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.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 { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import SupplierSummary from './Card/SupplierSummary.vue';
 
+const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 const tableRef = ref();
 const dataKey = 'SupplierList';
@@ -50,7 +52,7 @@ const columns = computed(() => [
         label: t('globals.alias'),
         name: 'alias',
         columnFilter: {
-            name: 'search',
+            name: 'nickname',
         },
         cardVisible: true,
     },
@@ -103,7 +105,35 @@ const columns = computed(() => [
             },
         },
     },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                isPrimary: true,
+                action: (row) => viewSummary(row.id, SupplierSummary, 'md-width'),
+            },
+        ],
+    },
 ]);
+
+const filterColumns = computed(() => {
+    const copy = [...columns.value];
+    copy.splice(copy.length - 1, 0, {
+        align: 'left',
+        label: t('globals.params.provinceFk'),
+        name: 'provinceFk',
+        options: provincesOptions.value,
+        columnFilter: {
+            component: 'select',
+        },
+    });
+
+    return copy;
+});
 </script>
 <template>
     <FetchData
@@ -114,7 +144,7 @@ const columns = computed(() => [
     />
     <VnSection
         :data-key="dataKey"
-        :columns="columns"
+        :columns="filterColumns"
         prefix="supplier"
         :array-data-props="{
             url: 'Suppliers/filter',
@@ -149,17 +179,6 @@ const columns = computed(() => [
                 </template>
             </VnTable>
         </template>
-        <template #moreFilterPanel="{ params, searchFn }">
-            <VnSelect
-                :label="t('globals.params.provinceFk')"
-                v-model="params.provinceFk"
-                @update:model-value="searchFn()"
-                :options="provincesOptions"
-                filled
-                dense
-                class="q-px-sm q-pr-lg"
-            />
-        </template>
     </VnSection>
 </template>
 

src/pages/Ticket/Card/TicketDescriptor.vue

@@ -93,9 +93,9 @@ function ticketFilter(ticket) {
             <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
             <VnLv :label="t('globals.alias')" :value="entity.nickname" />
         </template>
-        <template #icons>
+        <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-xs">
-                <TicketProblems :row="problems" />
+                <TicketProblems :row="{ ...entity?.client, ...problems }" />
             </QCardActions>
         </template>
         <template #actions="{ entity }">

src/pages/Ticket/Card/TicketExpedition.vue

@@ -37,7 +37,6 @@ const expeditionStateTypes = ref([]);
 
 const expeditionsFilter = computed(() => ({
     where: { ticketFk: route.params.id },
-    order: ['created DESC'],
 }));
 
 const ticketArrayData = useArrayData('Ticket');
@@ -105,6 +104,9 @@ const columns = computed(() => [
         name: 'created',
         align: 'left',
         cardVisible: true,
+        columnFilter: {
+            component: 'date',
+        },
         format: (row) => toDateTimeFormat(row.created),
     },
     {
@@ -201,7 +203,7 @@ const getExpeditionState = async (expedition) => {
 
 const openGrafana = (expeditionFk) => {
     useOpenURL(
-        `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`
+        `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`,
     );
 };
 
@@ -287,7 +289,7 @@ onMounted(async () => {
                         openConfirmationModal(
                             '',
                             t('expedition.removeExpeditionSubtitle'),
-                            deleteExpedition
+                            deleteExpedition,
                         )
                     "
                 >
@@ -302,7 +304,6 @@ onMounted(async () => {
         url="Expeditions/filter"
         search-url="expeditions"
         :columns="columns"
-        :filter="expeditionsFilter"
         v-model:selected="selectedRows"
         :table="{
             'row-key': 'id',
@@ -316,11 +317,14 @@ onMounted(async () => {
                         return { id: value };
                     case 'packageItemName':
                         return { packagingItemFk: value };
+                    case 'created':
+                        return { 'e.created': { gte: value } };
                 }
             }
         "
         :redirect="false"
         order="created DESC"
+        :filter="expeditionsFilter"
     >
         <template #column-freightItemName="{ row }">
             <span class="link" @click.stop>

src/pages/Ticket/Card/TicketSale.vue

@@ -203,7 +203,7 @@ const updateQuantity = async (sale) => {
         sale.isNew = false;
         await axios.post(`Sales/${id}/updateQuantity`, { quantity });
         notify('globals.dataSaved', 'positive');
-        tableRef.value.reload();
+        resetChanges();
     } catch (e) {
         const { quantity } = tableRef.value.CrudModelRef.originalData.find(
             (s) => s.id === sale.id,
@@ -247,7 +247,7 @@ const updateConcept = async (sale) => {
     const data = { newConcept: sale.concept };
     await axios.post(`Sales/${sale.id}/updateConcept`, data);
     notify('globals.dataSaved', 'positive');
-    tableRef.value.reload();
+    resetChanges();
 };
 
 const DEFAULT_EDIT = {
@@ -298,7 +298,7 @@ const updatePrice = async (sale, newPrice) => {
     sale.price = newPrice;
     edit.value = { ...DEFAULT_EDIT };
     notify('globals.dataSaved', 'positive');
-    tableRef.value.reload();
+    resetChanges();
 };
 
 const changeDiscount = async (sale) => {
@@ -330,7 +330,7 @@ const updateDiscount = async (sales, newDiscount = null) => {
     };
     await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
     notify('globals.dataSaved', 'positive');
-    tableRef.value.reload();
+    resetChanges();
 };
 
 const getNewPrice = computed(() => {
@@ -398,7 +398,7 @@ const removeSales = async () => {
     await axios.post('Sales/deleteSales', params);
     removeSelectedSales();
     notify('globals.dataSaved', 'positive');
-    window.location.reload();
+    resetChanges();
 };
 
 const setTransferParams = async () => {
@@ -681,6 +681,17 @@ watch(
         :disabled-attr="isTicketEditable"
     >
         <template #column-statusIcons="{ row }">
+            <QIcon
+                v-if="row.saleGroupFk"
+                name="inventory_2"
+                size="xs"
+                color="primary"
+                class="cursor-pointer"
+            >
+                <QTooltip class="no-pointer-events">
+                    {{ `saleGroup: ${row.saleGroupFk}` }}
+                </QTooltip>
+            </QIcon>
             <TicketProblems :row="row" />
         </template>
         <template #body-cell-picture="{ row }">

src/pages/Ticket/Card/TicketService.vue

@@ -121,6 +121,50 @@ async function handleSave() {
         isSaving.value = false;
     }
 }
+function validateFields(item) {
+    // Only validate fields that are being updated
+    const shouldExist = (field) => !isUpdate || field in item;
+
+    if (!shouldExist('ticketServiceTypeFk') && !item.ticketServiceTypeFk) {
+        notify('Description is required', 'negative');
+        return false;
+    }
+
+    if (!shouldExist('quantity') && (!item.quantity || item.quantity <= 0)) {
+        notify('Quantity must be greater than 0', 'negative');
+        return false;
+    }
+
+    if (!shouldExist('price') && (!item.price || item.price < 0)) {
+        notify('Price must be valid', 'negative');
+        return false;
+    }
+
+    return true;
+}
+
+function beforeSave(data) {
+    const { creates = [], updates = [] } = data;
+    const validData = { creates: [], updates: [] };
+
+    // Validate creates
+    if (creates.length) {
+        for (const create of creates) {
+            create.ticketFk = route.params.id;
+            if (validateFields(create)) {
+                validData.creates.push(create);
+            }
+        }
+    }
+
+    // Validate updates
+    if (updates.length) {
+        for (const update of updates) {
+            validData.updates.push(update);
+        }
+    }
+    return validData;
+}
 </script>
 
 <template>
@@ -141,6 +185,7 @@ async function handleSave() {
         v-model:selected="selected"
         :order="['description ASC']"
         :default-remove="false"
+        :beforeSaveFn="beforeSave"
     >
         <template #moreBeforeActions>
             <QBtn
@@ -170,6 +215,7 @@ async function handleSave() {
                             option-value="id"
                             hide-selected
                             sort-by="name ASC"
+                            :required="true"
                         >
                             <template #form>
                                 <TicketCreateServiceType
@@ -185,6 +231,7 @@ async function handleSave() {
                             :label="col.label"
                             v-model.number="row.quantity"
                             type="number"
+                            :required="true"
                             min="0"
                             :info="t('service.quantityInfo')"
                         />
@@ -196,6 +243,7 @@ async function handleSave() {
                             :label="col.label"
                             v-model.number="row.price"
                             type="number"
+                            :required="true"
                             min="0"
                             @keyup.enter="handleSave"
                         />

src/pages/Ticket/Card/TicketTransferProxy.vue

@@ -42,7 +42,7 @@ const transferRef = ref(null);
             />
         </div>
 
-        <div v-else>
+        <div style="display: flex; flex-direction: row" v-else>
             <TicketTransfer
                 ref="transferRef"
                 :ticket="$props.ticket"

src/pages/Ticket/Card/TicketVolume.vue

@@ -142,7 +142,7 @@ onMounted(() => (stateStore.rightDrawer = true));
         <template #column-concept="{ row }">
             <span>{{ row.item.name }}</span>
             <span class="color-vn-label q-pl-md">{{ row.item.subName }}</span>
-            <FetchedTags :item="row.item" />
+            <FetchedTags :item="row.item" :columns="6" />
         </template>
         <template #column-volume="{ rowIndex }">
             <span>{{ packingTypeVolume?.[rowIndex]?.volume }}</span>

src/pages/Ticket/TicketAdvance.vue

@@ -456,6 +456,7 @@ watch(
             :pagination="{ rowsPerPage: 0 }"
             :no-data-label="t('globals.noResults')"
             :right-search="false"
+            :order="['futureTotalWithVat ASC']"            
             auto-load
             :disable-option="{ card: true }"
         >

src/pages/Ticket/TicketFilter.vue

@@ -46,7 +46,12 @@ const getGroupedStates = (data) => {
         "
         auto-load
     />
-    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData
+        url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
+        @on-fetch="(data) => (agencies = data)"
+        auto-load
+    />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
@@ -74,10 +79,20 @@ const getGroupedStates = (data) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('From')"
+                        is-outlined
+                        data-cy="From_date"
+                    />
                 </QItemSection>
                 <QItemSection>
-                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('To')"
+                        is-outlined
+                        data-cy="To_date"
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -241,8 +256,6 @@ const getGroupedStates = (data) => {
                         v-model="params.agencyModeFk"
                         @update:model-value="searchFn()"
                         :options="agencies"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input

src/pages/Ticket/TicketList.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, onBeforeMount } from 'vue';
+import { computed, ref, onBeforeMount, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
@@ -69,6 +69,8 @@ const companiesOptions = ref([]);
 const accountingOptions = ref([]);
 const amountToReturn = ref();
 const dataKey = 'TicketList';
+const filterPanelRef = ref(null);
+const formInitialData = ref({});
 
 const columns = computed(() => [
     {
@@ -119,12 +121,16 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'shipped',
+        component: 'time',
+        columnFilter: false,
         label: t('ticketList.hour'),
         format: (row) => toTimeFormat(row.shipped),
     },
     {
         align: 'left',
         name: 'zoneLanding',
+        component: 'time',
+        columnFilter: false,
         label: t('ticketList.closure'),
         format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
     },
@@ -144,9 +150,16 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'province',
+        name: 'provinceFk',
         label: t('ticketList.province'),
-        columnClass: 'expand',
+        component: 'select',
+        attrs: {
+            url: 'Provinces',
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.province),
     },
     {
         align: 'left',
@@ -180,9 +193,19 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'warehouse',
-        label: t('ticketList.warehouse'),
-        columnClass: 'expand',
+        name: 'warehouseFk',
+        label: t('globals.warehouse'),
+        component: 'select',
+        attrs: {
+            url: 'warehouses',
+            fields: ['id', 'name'],
+        },
+        format: (row) => row.warehouse,
+        columnField: {
+            component: null,
+        },
+        cardVisible: false,
+        create: false,
     },
     {
         align: 'left',
@@ -214,6 +237,7 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row, evt) => {
                     if (evt && evt.ctrlKey) {
                         const url = router.resolve({
@@ -251,7 +275,7 @@ const fetchAvailableAgencies = async (formData) => {
 
     const { options, agency } = response;
     if (options) agenciesOptions.value = options;
-    if (agency) formData.agencyModeId = agency;
+    if (agency) formData.agencyModeId = agency.agencyModeFk;
 };
 
 const fetchClient = async (formData) => {
@@ -421,6 +445,22 @@ function setReference(data) {
 
     dialogData.value.value.description = newDescription;
 }
+
+watch(
+    () => route.query.table,
+    (newValue) => {
+        if (newValue) {
+            const clientId = +JSON.parse(newValue)?.clientFk;
+            if (!clientId) return;
+            formInitialData.value = {
+                clientId,
+            };
+            if (tableRef.value) tableRef.value.create.formInitialData = { clientId };
+            onClientSelected({ clientId });
+        }
+    },
+    { immediate: true },
+);
 </script>
 
 <template>
@@ -455,7 +495,7 @@ function setReference(data) {
                     urlCreate: 'Tickets/new',
                     title: t('ticketList.createTicket'),
                     onDataSaved: ({ id }) => tableRef.redirect(id),
-                    formInitialData: { clientId: null },
+                    formInitialData,
                 }"
                 default-mode="table"
                 :columns="columns"
@@ -537,11 +577,9 @@ function setReference(data) {
                             :label="t('ticketList.client')"
                             v-model="data.clientId"
                             :options="clientsOptions"
-                            option-value="id"
-                            option-label="name"
                             hide-selected
                             required
-                            @update:model-value="(client) => onClientSelected(data)"
+                            @update:model-value="() => onClientSelected(data)"
                             :sort-by="'id ASC'"
                         >
                             <template #option="scope">
@@ -563,7 +601,6 @@ function setReference(data) {
                             :label="t('basicData.address')"
                             v-model="data.addressId"
                             :options="addressesOptions"
-                            option-value="id"
                             option-label="nickname"
                             hide-selected
                             map-options
@@ -609,6 +646,9 @@ function setReference(data) {
                                                 {{ scope.opt?.city }}
                                             </span>
                                         </QItemLabel>
+                                        <QItemLabel caption>
+                                            {{ `#${scope.opt?.id}` }}
+                                        </QItemLabel>
                                     </QItemSection>
                                 </QItem>
                             </template>
@@ -632,8 +672,6 @@ function setReference(data) {
                                 :label="t('globals.warehouse')"
                                 v-model="data.warehouseId"
                                 :options="warehousesOptions"
-                                option-value="id"
-                                option-label="name"
                                 hide-selected
                                 required
                                 @update:model-value="() => fetchAvailableAgencies(data)"
@@ -693,7 +731,6 @@ function setReference(data) {
                         :label="t('ticketList.company')"
                         v-model="dialogData.companyFk"
                         :options="companiesOptions"
-                        option-value="id"
                         option-label="code"
                         hide-selected
                     >
@@ -704,7 +741,6 @@ function setReference(data) {
                         :label="t('ticketList.bank')"
                         v-model="dialogData.bankFk"
                         :options="accountingOptions"
-                        option-value="id"
                         option-label="bank"
                         hide-selected
                         @update:model-value="setReference"

src/pages/Travel/ExtraCommunityFilter.vue

@@ -73,6 +73,7 @@ warehouses();
     />
     <FetchData
         url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />

src/pages/Travel/TravelCreate.vue

@@ -39,6 +39,7 @@ const redirectToTravelBasicData = (_, { id }) => {
 <template>
     <FetchData
         url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />

src/pages/Travel/TravelFilter.vue

@@ -52,9 +52,8 @@ defineExpose({ states });
                     v-model="params.agencyModeFk"
                     @update:model-value="searchFn()"
                     url="agencyModes"
+                    sort-by="name ASC"
                     :use-like="false"
-                    option-value="id"
-                    option-label="name"
                     option-filter="name"
                     dense
                     outlined

src/pages/Worker/Card/WorkerBasicData.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -17,6 +17,12 @@ const maritalStatus = [
     { code: 'M', name: t('Married') },
     { code: 'S', name: t('Single') },
 ];
+async function setAdvancedSummary(data) {
+    const advanced = (await useAdvancedSummary('Workers', data.id)) ?? {};
+    Object.assign(form.value.formData, advanced);
+    await nextTick();
+    if (form.value) form.value.hasChanges = false;
+}
 </script>
 <template>
     <FetchData
@@ -36,18 +42,22 @@ const maritalStatus = [
         :url-update="`Workers/${$route.params.id}`"
         auto-load
         model="Worker"
-        @on-fetch="
-            async (data) => {
-                Object.assign(data, (await useAdvancedSummary('Workers', data.id)) ?? {});
-                await $nextTick();
-                if (form) form.hasChanges = false;
-            }
-        "
+        @on-fetch="setAdvancedSummary"
     >
         <template #form="{ data }">
             <VnRow>
-                <VnInput :label="t('Name')" clearable v-model="data.firstName" />
-                <VnInput :label="t('Last name')" clearable v-model="data.lastName" />
+                <VnInput
+                    :label="t('Name')"
+                    clearable
+                    v-model="data.firstName"
+                    :required="true"
+                />
+                <VnInput
+                    :label="t('Last name')"
+                    clearable
+                    v-model="data.lastName"
+                    :required="true"
+                />
             </VnRow>
             <VnRow>
                 <VnInput v-model="data.phone" :label="t('Business phone')" clearable />

src/pages/Worker/Card/WorkerBusiness.vue

@@ -35,6 +35,22 @@ async function reactivateWorker() {
     }
 }
 const columns = computed(() => [
+    {
+        name: 'id',
+        label: t('Id'),
+        align: 'left',
+        isId: true,
+        cardVisible: true,
+        width: '40px',
+    },
+    {
+        name: 'isHourlyLabor',
+        label: t('worker.business.tableVisibleColumns.hourlyLabor'),
+        align: 'left',
+        component: 'checkbox',
+        cardVisible: true,
+        width: '60px',
+    },
     {
         name: 'started',
         label: t('worker.business.tableVisibleColumns.started'),
@@ -194,6 +210,20 @@ const columns = computed(() => [
         format: ({ workerBusinessTypeName }, dashIfEmpty) =>
             dashIfEmpty(workerBusinessTypeName),
     },
+    {
+        align: 'left',
+        name: 'workerBusinessAgreementFk',
+        label: t('worker.business.tableVisibleColumns.workerBusinessAgreementName'),
+        component: 'select',
+        attrs: {
+            url: 'WorkerBusinessAgreements',
+            fields: ['id', 'name'],
+        },
+        cardVisible: true,
+        create: true,
+        format: ({ workerBusinessAgreementName }, dashIfEmpty) =>
+            dashIfEmpty(workerBusinessAgreementName),
+    },
     {
         align: 'left',
         label: t('worker.business.tableVisibleColumns.amount'),
@@ -230,7 +260,7 @@ const columns = computed(() => [
         save-url="/Businesses/crud"
         :create="{
             urlCreate: `Workers/${entityId}/Business`,
-            title: 'Create business',
+            title: t('Create business'),
             onDataSaved: () => tableRef.reload(),
             formInitialData: {},
         }"
@@ -248,4 +278,5 @@ const columns = computed(() => [
 <i18n>
 es:
     Do you want to reactivate the user?: desea reactivar el usuario?
+    Create business: Crear contrato
 </i18n>

src/pages/Worker/Card/WorkerCalendarItem.vue

@@ -79,7 +79,7 @@ const editEvent = async (event) => {
     };
     const { data } = await axios.patch(
         `Workers/${route.params.id}/updateAbsence`,
-        params
+        params,
     );
 
     if (data) emit('refresh');
@@ -108,14 +108,14 @@ const handleDateSelected = (date) => {
     if (!event) createEvent(_date);
 };
 
-const handleEventSelected = (event, { year, month, day }) => {
+const handleEventSelected = async (event, { year, month, day }) => {
     if (!props.absenceType) {
         notify(t('Choose an absence type from the right menu'), 'warning');
         return;
     }
 
     const date = new Date(year, month - 1, day);
-    if (!event?.absenceId) createEvent(date);
+    if (!event?.absenceId) await createEvent(date);
     else if (event.type == props.absenceType.code) deleteEvent(event, date);
     else editEvent(event);
 };

src/pages/Worker/Card/WorkerDescriptorProxy.vue

@@ -12,6 +12,11 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <WorkerDescriptor v-if="$props.id" :id="$props.id" :summary="WorkerSummary" />
+        <WorkerDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="WorkerSummary"
+            data-key="WorkerDescriptorProxy"
+        />
     </QPopupProxy>
 </template>

src/pages/Worker/Card/WorkerNotes.vue

@@ -5,9 +5,9 @@ import VnNotes from 'src/components/ui/VnNotes.vue';
 
 const route = useRoute();
 
-const filter = {
+const userFilter = {
     order: 'created DESC',
-    where: { workerFk: route.params.id },
+
     include: {
         relation: 'worker',
         scope: {
@@ -22,11 +22,15 @@ const filter = {
     },
 };
 
-const body = {
-    workerFk: route.params.id,
-};
+const body = { workerFk: route.params.id };
 </script>
 
 <template>
-    <VnNotes :add-note="true" url="WorkerObservations" :filter="filter" :body="body" />
+    <VnNotes
+        :add-note="true"
+        url="WorkerObservations"
+        :user-filter="userFilter"
+        :filter="{ where: { workerFk: $route.params.id } }"
+        :body="body"
+    />
 </template>

src/pages/Worker/Card/WorkerOperator.vue

@@ -54,9 +54,8 @@ watch(
             selected.value = [];
         }
     },
-    { immediate: true, deep: true }
+    { immediate: true, deep: true },
 );
-
 </script>
 
 <template>
@@ -105,6 +104,7 @@ watch(
                                 :options="trainsData"
                                 hide-selected
                                 v-model="row.trainFk"
+                                :required="true"
                             />
                         </VnRow>
                         <VnRow>
@@ -115,12 +115,14 @@ watch(
                                 option-label="code"
                                 option-value="code"
                                 v-model="row.itemPackingTypeFk"
+                                :required="true"
                             />
                             <VnSelect
                                 :label="t('worker.operator.warehouse')"
                                 :options="warehousesData"
                                 hide-selected
                                 v-model="row.warehouseFk"
+                                :required="true"
                             />
                         </VnRow>
                         <VnRow>
@@ -175,6 +177,7 @@ watch(
                                 :label="t('worker.operator.isOnReservationMode')"
                                 v-model="row.isOnReservationMode"
                                 lazy-rules
+                                :required="true"
                             />
                         </VnRow>
                         <VnRow>

src/pages/Worker/Card/WorkerPBX.vue

@@ -1,8 +1,8 @@
-src/pages/Worker/Card/WorkerPBX.vue
-
 <script setup>
+import { useI18n } from 'vue-i18n';
 import FormModel from 'src/components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+const { t } = useI18n();
 </script>
 
 <template>
@@ -26,3 +26,8 @@ import VnInput from 'src/components/common/VnInput.vue';
         </template>
     </FormModel>
 </template>
+
+<i18n>
+    es:
+        It must be a 4-digit number and must not end in 00: Debe ser un número de 4 cifras y no terminar en 00
+</i18n>

src/pages/Worker/Card/WorkerPda.vue

@@ -140,6 +140,7 @@ function reloadData() {
                                     id="deviceProductionFk"
                                     hide-selected
                                     data-cy="pda-dialog-select"
+                                    :required="true"
                                 >
                                     <template #option="scope">
                                         <QItem v-bind="scope.itemProps">

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -343,19 +343,29 @@ const updateData = async () => {
 
 const getMailStates = async (date) => {
     const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
+    const year = date.getFullYear();
     const month = date.getMonth() + 1;
-    const prevMonth = month == 1 ? 12 : month - 1;
-    const params = {
-        month,
-        year: date.getFullYear(),
+
+    const getMonthStates = async (month, year) => {
+        return (await axios.get(url, { params: { month, year } })).data;
     };
 
-    const curMonthStates = (await axios.get(url, { params })).data;
-    const prevMonthStates = (
-        await axios.get(url, { params: { ...params, month: prevMonth } })
-    ).data;
+    const curMonthStates = await getMonthStates(month, year);
 
-    workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
+    const prevMonthStates = await getMonthStates(
+        month === 1 ? 12 : month - 1,
+        month === 1 ? year - 1 : year,
+    );
+
+    const postMonthStates = await getMonthStates(
+        month === 12 ? 1 : month + 1,
+        month === 12 ? year + 1 : year,
+    );
+    workerTimeControlMails.value = [
+        ...curMonthStates,
+        ...prevMonthStates,
+        ...postMonthStates,
+    ];
 };
 
 const showWorkerTimeForm = (propValue, formType) => {

src/pages/Worker/WorkerDepartment.vue

@@ -1,16 +1,9 @@
 <script setup>
-import VnSection from 'src/components/common/VnSection.vue';
 import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
 </script>
 
 <template>
-    <VnSection data-key="WorkerDepartment" :search-bar="false">
-        <template #body>
-            <div class="flex flex-center q-pa-md">
-                <WorkerDepartmentTree />
-            </div>
-        </template>
-    </VnSection>
+    <QPage class="q-pa-md flex justify-center"> <WorkerDepartmentTree /> </QPage>
 </template>
 
 <i18n>

src/pages/Zone/Card/ZoneBasicData.vue

@@ -9,22 +9,22 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
-const validAddresses = ref([]);
 const addresses = ref([]);
 
 const setFilteredAddresses = (data) => {
-    const validIds = new Set(validAddresses.value.map((item) => item.addressFk));
-    addresses.value = data.filter((address) => validIds.has(address.id));
+    addresses.value = data.map(({ address }) => address);
 };
 </script>
 
 <template>
     <FetchData
         url="RoadmapAddresses"
+        :filter="{
+            include: { relation: 'address' },
+        }"
         auto-load
-        @on-fetch="(data) => (validAddresses = data)"
+        @on-fetch="setFilteredAddresses"
     />
-    <FetchData url="Addresses" auto-load @on-fetch="setFilteredAddresses" />
     <FormModel auto-load model="Zone">
         <template #form="{ data, validate }">
             <VnRow>
@@ -125,7 +125,6 @@ const setFilteredAddresses = (data) => {
                     map-options
                     :rules="validate('data.addressFk')"
                     :filter-options="['id']"
-                    :where="filterWhere"
                 />
             </VnRow>
             <VnRow>

src/pages/Zone/ZoneFilterPanel.vue

@@ -5,6 +5,7 @@ import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
+import order from 'src/router/modules/order';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -24,7 +25,7 @@ const agencies = ref([]);
 <template>
     <FetchData
         url="AgencyModes"
-        :filter="{ fields: ['id', 'name'] }"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agencies = data)"
         auto-load
     />

src/pages/Zone/ZoneList.vue

@@ -199,9 +199,8 @@ function formatRow(row) {
         <template #more-create-dialog="{ data }">
             <VnSelect
                 url="AgencyModes"
+                sort-by="name ASC"
                 v-model="data.agencyModeFk"
-                option-value="id"
-                option-label="name"
                 :label="t('list.agency')"
             />
             <VnInput

src/router/modules/shelving.js

@@ -111,15 +111,6 @@ export default {
                         shelvingCard,
                     ],
                 },
-                {
-                    path: 'create',
-                    name: 'ShelvingCreate',
-                    meta: {
-                        title: 'shelvingCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
-                },
                 {
                     path: 'parking',
                     name: 'ParkingMain',

src/stores/useStateStore.js

@@ -7,7 +7,11 @@ export const useStateStore = defineStore('stateStore', () => {
     const rightDrawer = ref(false);
     const rightAdvancedDrawer = ref(false);
     const subToolbar = ref(false);
+    const cardDescriptor = ref(null);
 
+    function cardDescriptorChangeValue(descriptor) {
+        cardDescriptor.value = descriptor;
+    }
     function toggleLeftDrawer() {
         leftDrawer.value = !leftDrawer.value;
     }
@@ -49,6 +53,8 @@ export const useStateStore = defineStore('stateStore', () => {
     }
 
     return {
+        cardDescriptor,
+        cardDescriptorChangeValue,
         leftDrawer,
         rightDrawer,
         rightAdvancedDrawer,

test/cypress/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.7'
 services:
     back:
-        image: registry.verdnatura.es/salix-back:dev
+        image: 'registry.verdnatura.es/salix-back:${COMPOSE_TAG:-dev}'
         volumes:
             - ./test/cypress/storage:/salix/storage
             - ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json
@@ -18,4 +18,4 @@ services:
             - TZ
         dns_search: .
     db:
-        image: registry.verdnatura.es/salix-db:dev
+        image: 'registry.verdnatura.es/salix-db:${COMPOSE_TAG:-dev}'

test/cypress/integration/account/accountDescriptorMenu.spec.js

@@ -0,0 +1,24 @@
+describe('ClaimNotes', () => {
+    const descriptorOptions = '[data-cy="descriptor-more-opts-menu"] > .q-list';
+    const url = '/#/account/1/summary';
+
+    it('should see all the account options', () => {
+        cy.login('itManagement');
+        cy.visit(url);
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get(descriptorOptions)
+            .find('.q-item')
+            .its('length')
+            .then((count) => {
+                cy.log('Número de opciones:', count);
+                expect(count).to.equal(5);
+            });
+    });
+
+    it('should not see any option', () => {
+        cy.login('salesPerson');
+        cy.visit(url);
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get(descriptorOptions).should('not.be.visible');
+    });
+});

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

@@ -35,8 +35,7 @@ describe('ClaimDevelopment', () => {
         cy.saveCard();
     });
 
-    // TODO: #8112
-    xit('should add and remove new line', () => {
+    it('should add and remove new line', () => {
         cy.wait(['@workers', '@workers']);
         cy.addCard();
 

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

@@ -1,4 +1,4 @@
-describe('ClaimNotes', () => {
+describe.skip('ClaimNotes', () => {
     const saveBtn = '.q-field__append > .q-btn > .q-btn__content > .q-icon';
     const firstNote = '.q-infinite-scroll :nth-child(1) > .q-card__section--vert';
     beforeEach(() => {
@@ -8,10 +8,7 @@ describe('ClaimNotes', () => {
 
     it('should add a new note', () => {
         const message = 'This is a new message.';
-        cy.get('.q-textarea')
-            .should('be.visible')
-            .should('not.be.disabled')
-            .type(message);
+        cy.get('.q-textarea').should('not.be.disabled').type(message);
 
         cy.get(saveBtn).click();
         cy.get(firstNote).should('have.text', message);

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

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-// redmine.verdnatura.es/issues/8417
-describe.skip('ClaimPhoto', () => {
+describe('ClaimPhoto', () => {
+    const carrouselClose = '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon';
     beforeEach(() => {
         const claimId = 1;
         cy.login('developer');
@@ -16,6 +16,7 @@ describe.skip('ClaimPhoto', () => {
     });
 
     it('should add new file with drag and drop', () => {
+        cy.get('.container').should('be.visible').and('exist');
         cy.get('.container').selectFile('test/cypress/fixtures/image.jpg', {
             action: 'drag-drop',
         });
@@ -23,35 +24,25 @@ describe.skip('ClaimPhoto', () => {
     });
 
     it('should open first image dialog change to second and close', () => {
-        cy.get(':nth-last-child(1) > .q-card').click();
-        cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
-            'be.visible'
-        );
+        cy.dataCy('file-1').click();
+        cy.get(carrouselClose).click();
 
-        cy.get('.q-carousel__control > button').click();
-
-        cy.get(
-            '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon'
-        ).click();
-        cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
-            'not.be.visible'
-        );
+        cy.dataCy('file-1').click();
+        cy.get('.q-carousel__control > button').as('nextButton').click();
+        cy.get('.q-carousel__slide > .q-ma-none').should('be.visible');
+        cy.get(carrouselClose).click();
     });
 
     it('should remove third and fourth file', () => {
+        cy.dataCy('delete-button-4').click();
         cy.get(
-            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon'
-        ).click();
-        cy.get(
-            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
 
+        cy.dataCy('delete-button-3').click();
         cy.get(
-            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon'
-        ).click();
-        cy.get(
-            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
     });