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

Reviewed-on: #1632
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

CHANGELOG.md

@@ -1,3 +1,214 @@
+# Version 25.12 - 2025-03-25
+
+### Added 🆕
+
+- chore: add junit-merge dependency to package.json by:alexm
+- chore: downgrade version from 25.14.0 to 25.12.0 in package.json by:alexm
+- chore: reduce page load timeout in Cypress configuration by:alexm
+- chore: refs #6695 update Cypress to version 14.1.0 and simplify test execution in Jenkinsfile by:alexm
+- chore: refs #8602 add comments for clarity in Cypress commands file by:pablone
+- chore: refs #8602 enhance Cypress support files with detailed comments and organization by:pablone
+- ci: refs #6695 feat jenkins parallel e2e by:alexm
+- feat: integrate vue-router to enhance routing capabilities in ZoneCard component by:alexm
+- feat: refs #6695 implement parallel Cypress testing and enhance timeout configurations by:alexm
+- feat: refs #6695 update Cypress parallel test execution to use 3 instances by:alexm
+- feat: refs #6802 add dash placeholder for empty department names in InvoiceOut list by:jgallego
+- feat: refs #6802 add DepartmentDescriptorProxy to InvoiceOutList and update translations by:jgallego
+- feat: refs #6802 add DepartmentDescriptorProxy to various components and update department handling by:jgallego
+- feat: refs #7587 add 'ticketClaimed' translation and implement claims retrieval in TicketDescriptor by:jtubau
+- feat: refs #7949 show new field in ticket sales by:Jon
+- feat: refs #8045 added new logic to show the correct icon and the correct path to redirect by:Jon
+- feat: refs #8045 modified icon and route to redirect from CardDescriptor by:Jon
+- feat: refs #8074 modified spinner size by:Jon
+- feat: refs #8600 added calendar e2e and modified basic data by:Jon
+- feat: refs #8600 added deliveryDays and modified warehouse E2Es by:Jon
+- feat: refs #8600 added new tests for zoneSummary & zoneLocations by:provira
+- feat: refs #8602 add custom Cypress commands for improved element interaction and request handling by:pablone
+- feat: refs #8602 add new Cypress command for clicking buttons with icons by:pablone
+- feat: refs #8602 add remove functionality for tag filters in EntryBuys component by:pablone
+- feat: refs #8602 add sorting options for select fields and update locale files with supplier name by:pablone
+- feat: refs #8602 refactor EntryBuys component and enhance observation tests by:pablone
+- feat: refs #8602 remove unused state property from useArrayDataStore by:pablone
+- feat: refs #8602 remove unused URL property from VnTable in ClaimList component by:pablone
+- feat: refs #8602 skip warehouse creation and removal test in ZoneWarehouse spec by:pablone
+- feat: refs #8602 streamline beforeSaveFn execution in CrudModel component by:pablone
+- feat: refs #8602 streamline beforeSaveFn execution in VnTable component by:pablone
+- feat: refs #8602 streamline filter logic in EntryBuys component by:pablone
+- feat: refs #8602 update entry components and tests, add data-cy attributes for Cypress integration by:pablone
+- feat: refs #8602 update localization for purchased spaces and enhance Entry components with new labels by:pablone
+- feat: refs #8606 adapt module to VnCatdBeta by:Jon
+- feat: refs #8612 added summary button & changed e2e tests by:provira
+- feat: refs #8612 changed shelving to VnTable & created e2e tests by:provira
+- feat: refs #8616 add summary prop to CardDescriptor in RoadmapDescriptor and WorkerDescriptor by:jtubau
+- feat: refs #8616 add VnCheckbox component to VnFilter and update prop types in VnFilterPanel and VnSearchbar by:jtubau
+- feat: refs #8630 add Agency and Vehicle descriptor components with summary props by:jtubau
+- feat: refs #8638 add AWB field to travel and entry forms, update translations and styles by:pablone
+- feat: refs #8638 add data attributes for transfer buys functionality in EntryBuys.vue and corresponding tests by:pablone
+- feat: refs #8648 enhance roadmapList tests with improved selectors and additional scenarios by:jtubau
+- feat: refs #8664 add CmrFilter component and integrate it into CmrList for enhanced filtering options by:jtubau
+- feat: refs #8721 add ticket navigation and update route columns by:jtubau
+- feat: run.sh build neccessary images by:alexm
+- feat: update Jenkinsfile to pull Docker images for back and db services by:alexm
+- feat: update labels and add department selection in InvoiceOut filter and list by:jgallego
+- refactor: refs #8626 update button styles and improve route redirection logic by:jtubau
+- style: refs #8041 new variable by:benjaminedc
+
+### Changed 📦
+
+- feat: refs #8602 refactor EntryBuys component and enhance observation tests by:pablone
+- refactor(cypress): refs #6695 simplify parallel test execution script by:alexm
+- refactor: deleted useless (origin/Warmfix-DepartmentIcon) by:Jon
+- refactor: refs #6695 enable ClaimNotes test suite by:alexm
+- refactor: refs #6695 fix invoiceOutSummary by:alexm
+- refactor: refs #6695 improve notification check and extend waitForElement timeout by:alexm
+- refactor: refs #6695 remove mocha dependency and optimize Cypress command execution by:alexm
+- refactor: refs #6695 skips by:alexm
+- refactor: refs #6695 skip zoneWarehouse by:alexm
+- refactor: refs #6695 streamline Cypress test execution and remove deprecated configurations by:alexm
+- refactor: refs #6802 replace salesPerson references with department in claims and tickets by:jgallego
+- refactor: refs #6802 replace 'salesPerson' terminology with 'team' across multiple locales and components by:jgallego
+- refactor: refs #6802 update import paths for DepartmentDescriptorProxy to use Worker directory by:jgallego
+- refactor: refs #6802 update InvoiceOutNegativeBases to use Department instead of Worker by:jgallego
+- refactor: refs #6802 update TicketFilter and TicketSale components to use departmentFk and adjust API endpoints by:jgallego
+- refactor: refs #8041 unify class link and unify titles to VnTitles by:benjaminedc
+- refactor: refs #8045 modified icon and module const by:Jon
+- refactor: refs #8197 rename VnCardBeta to VnCard by:alexm
+- refactor: refs #8197 simplify menu retrieval logic in LeftMenu component by:alexm
+- refactor: refs #8322 changed Wagon component to use VnSection/VnCardBeta by:provira
+- refactor: refs #8322 remove keyBinding from Wagon router module by:alexm
+- refactor: refs #8322 update WagonCard component and routing structure by:alexm
+- refactor: refs #8370 modified function to get the correct date by:Jon
+- refactor: refs #8472 remove added div and add class to VnInput by:jtubau
+- refactor: refs #8472 unified styling for the more-create-dialog slot to ensure consistency across all scenarios by:jtubau
+- refactor: refs #8472 update class names from q-span-2 to col-span-2 for consistency in layout by:jtubau
+- refactor: refs #8600 changed test case description by:provira
+- refactor: refs #8600 modified make invoice and send dialog e2es by:Jon
+- refactor: refs #8600 modified upcomingDeliveries e2e and created deliveryDays by:Jon
+- refactor: refs #8600 modified zoneSummary e2e by:Jon
+- refactor: refs #8602 remove redundant date input test from entryList.spec.js by:pablone
+- refactor: refs #8606 clear some warnings by:Jon
+- refactor: refs #8606 deleted code and fixed translation by:Jon
+- refactor: refs #8606 merged previous and e2e changes and corrected minor errors by:Jon
+- refactor: refs #8606 requested changes by:Jon
+- refactor: refs #8616 integrate summary dialog and update navigation in Agency and Vehicle components by:jtubau
+- refactor: refs #8616 integrate VnSelectWorker component in RouteList and optimize format functions by:jtubau
+- refactor: refs #8616 simplify template bindings and improve link generation in VehicleSummary by:jtubau
+- refactor: refs #8616 update routing components for AgencyList and RouteRoadmap in route.js by:jtubau
+- refactor: refs #8619 simplify empty data check in RouteDescriptor component by:jtubau
+- refactor: refs #8626 add cardVisible property to RouteList columns by:jtubau
+- refactor: refs #8626 add formatting for agency and vehicle columns in RouteList by:jtubau
+- refactor: refs #8626 enhance Worker and Agency components with data attributes and improved routing by:jtubau
+- refactor: refs #8626 improve test messages and selectors in route tests by:jtubau
+- refactor: refs #8626 update button styles and improve route redirection logic by:jtubau
+- refactor: refs #8626 update RouteList columns and enable AgencyWorkCenter tests by:jtubau
+- refactor: refs #8630 add vehicle translations and enhance route list columns by:jtubau
+- refactor: refs #8648 update roadmap deletion test to use current element text by:jtubau
+- refactor: refs #8664 enhance CmrList component with query initialization and user parameters by:jtubau
+- refactor: refs #8664 localization files by:jtubau
+- refactor: refs #8664 remove CmrFilter and replace with VnSearchbar in CmrList by:jtubau
+- refactor: remove unnecessary login and reload calls in ClaimDevelopment tests by:alexm
+- refactor: simplify client selection in order creation test by:alexm
+- refactor: update client ID input selector and remove viewport setting by:alexm
+- test: refs #8197 comment out ticket list tests for refactoring by:alexm
+- test: refs #8626 refactor notification check in routeList.spec.js by:jtubau
+- test: refs #8626 refactor routeList.spec.js to use a constant for summary URL by:jtubau
+- test: refs #8626 refactor routeList.spec.js to use selectors and improve readability by:jtubau
+
+### Fixed 🛠️
+
+- fix: add --init flag to Docker container for Cypress tests by:alexm
+- fix: agency list filters by:jtubau
+- fix: align Article label to the left in EntryBuys component by:alexm
+- fix: card descriptor imports by:Jon
+- fix: card descriptor merge by:Jon
+- fix(ClaimAction): update shelving options to use URL instead of static data by:jgallego
+- fix(ClaimSummary): clean url by:alexm
+- fix(cypress.config.js): refs #6695 update reporter to junit and remove unused dependencies by:alexm
+- fix(cypressParallel.sh): refs #6695 improve script readability by:alexm
+- fix(cypressParallel.sh): refs #6695 improve test execution output for clarity by:alexm
+- fix(cypressParallel.sh): refs #6695 simplify test execution output format by:alexm
+- fix(cypress scripts): refs #6695 improve cleanup process and adjust output redirection by:alexm
+- fix: fixed department descriptor icon by:Jon
+- fix: fixed submodule descriptors icons by:Jon
+- fix(invoiceOutSummary.spec.js): refs #6695 remove unnecessary visibility check for descriptor by:alexm
+- fix(Jenkinsfile): reduce parallel Cypress test execution from 3 to 2 by:alexm
+- fix(Jenkinsfile): refs #6695 add credentials for Docker login in E2E stage by:alexm
+- fix(Jenkinsfile): refs #6695 change parallel test execution from 4 to 2 by:alexm
+- fix(Jenkinsfile): refs #6695 increase parallel test execution from 2 to 4 by:alexm
+- fix(Jenkinsfile): refs #6695 update parallel test execution to 4 by:alexm
+- fix(LeftMenu): refs #8197 handle missing children in findRoute and update menu structure by:alexm
+- fix: refs #6695 update Cypress configuration and test result paths by:alexm
+- fix: refs #6695 update Jenkinsfile to build Docker image correctly and modify logout test visit method by:alexm
+- fix: refs #6695 update Jenkinsfile to remove specific e2e XML files and adjust Cypress parallel execution by:alexm
+- fix: refs #6695 update Jenkinsfile to source cypressParallel.sh correctly by:alexm
+- fix: refs #6695 update visit method in TicketLackDetail.spec.js to prevent page reload by:alexm
+- fix: refs #6802 update import path for DepartmentDescriptorProxy in OrderList.vue by:jgallego
+- fix: refs #6802 update OrderFilter to use department relation instead of salesPerson by:jgallego
+- fix: refs #8041 update redirection from preview to summary in ShelvingList tests by:benjaminedc
+- fix: refs #8041 update selector for summary header in ParkingList tests by:benjaminedc
+- fix: refs #8041 update summaryHeader selector in ParkingList test by:benjaminedc
+- fix: refs #8322 update order property for WagonList component by:alexm
+- fix: refs #8370 change param rely on month by:Jon
+- fix: refs #8417 added data-cy to all files and fixed test by:provira
+- fix: refs #8417 added data-cy to delete button by:provira
+- fix: refs #8417 fixed claimPhoto e2e by:provira
+- fix: refs #8417 fixed claimPhoto e2e test by:provira
+- fix: refs #8417 fixed e2e test by:provira
+- fix: refs #8417 fixed e2e test case by:provira
+- fix: refs #8417 fixed failing test case by:provira
+- fix: refs #8417 fixed invoiceOutSummary e2e test by:provira
+- fix: refs #8417 removed .only by:provira
+- fix: refs #8583 basicData, business, summary by:carlossa
+- fix: refs #8583 basicData e2e by:carlossa
+- fix: refs #8583 basicData timeControl by:carlossa
+- fix: refs #8583 cypressconf by:carlossa
+- fix: refs #8583 dataCy operator by:carlossa
+- fix: refs #8583 fix AddCard by:carlossa
+- fix: refs #8583 mutual create by:carlossa
+- fix: refs #8583 operator by:carlossa
+- fix: refs #8583 remove workerTimeControl by:carlossa
+- fix: refs #8583 tMutual, tNotes, TOperator by:carlossa
+- fix: refs #8583 wBusiness by:carlossa
+- fix: refs #8583 wBusiness e2e by:carlossa
+- fix: refs #8583 workerBasicData & workerTimeControl by:carlossa
+- fix: refs #8583 workerBusiness by:carlossa
+- fix: refs #8583 workerBusiness e2e by:carlossa
+- fix: refs #8583 workerBusiness test by:carlossa
+- fix: refs #8583 workerE2E by:carlossa
+- fix: refs #8583 worker mutual e2e by:carlossa
+- fix: refs #8583 workerSummary test by:carlossa
+- fix: refs #8583 workerTimeControl by:carlossa
+- fix: refs #8583 workerTimeControl e2e by:carlossa
+- fix: refs #8600 e2e by:Jon
+- fix: refs #8600 fixed calendar e2e by:Jon
+- fix: refs #8600 fixed e2e and skip client ones by:Jon
+- fix: refs #8600 fixed e2e by:Jon
+- fix: refs #8600 fixed invoiceOut summary e2e by:Jon
+- fix: refs #8600 fixed zoneList & added test case to zoneSummary by:provira
+- fix: refs #8600 zone basic data e2e and skip intermitent invoice out summary it by:Jon
+- fix: refs #8602 delete unused entryDms and stockBought test files (origin/8581-e2eInvoiceIn) by:pablone
+- fix: refs #8606 deleted code by:Jon
+- fix: refs #8612 changed QCheckbox for VnCheckbox by:provira
+- fix: refs #8612 fixed shelving e2e tests by:provira
+- fix: refs #8616 add conditional for SupplierDescriptorProxy and bind attributes in CardDescriptor by:jtubau
+- fix: refs #8616 remove redundant v-on binding from QCheckbox in VnCheckbox.vue by:jtubau
+- fix: refs #8616 update binding syntax for is-editable prop in AgencyList.vue by:jtubau
+- fix: refs #8616 update FormModel prop from 'update-url' to 'url-update' in Agency and RoadMap BasicData by:jtubau
+- fix: refs #8619 handle empty ticket records in RouteDescriptor component by:jtubau
+- fix: refs #8619 update route descriptor to handle empty ticket records and adjust test cases by:jtubau
+- fix: refs #8626 remove duplicate ref attribute from RouteList.vue by:jtubau
+- fix: refs #8630 remove duplicated locations by:jtubau
+- fix: refs #8638 restore invoiceInBasicData by:pablone
+- fix: refs #8638 update comment formatting in VnTable.vue by:pablone
+- fix: refs #8638 update null check for maxlength validation in VnInput.vue by:pablone
+- fix: simplify menu structure in monitor router module (origin/fix_monitor_leftMenu) by:Javier Segarra
+- refactor: refs #6695 fix invoiceOutSummary by:alexm
+- refactor: refs #8606 deleted code and fixed translation by:Jon
+- test: fix intermitent e2e by:alexm
+- test: fix orderList e2e, unestables by:alexm
+- test(OrderList): fix inconsistency by:alexm
+- test(TicketList): fix inconsistency by:alexm
+
 # Version 25.10 - 2025-03-11
 
 ### Added 🆕

src/components/ItemsFilterPanel.vue

@@ -198,8 +198,7 @@ const setCategoryList = (data) => {
                         v-model="params.typeFk"
                         :options="itemTypesOptions"
                         dense
-                        outlined
+                        filled
-                        rounded
                         use-input
                         :disable="!selectedCategoryFk"
                         @update:model-value="
@@ -235,8 +234,7 @@ const setCategoryList = (data) => {
                         v-model="value.selectedTag"
                         :options="tagOptions"
                         dense
-                        outlined
+                        filled
-                        rounded
                         :emit-value="false"
                         use-input
                         :is-clearable="false"
@@ -252,8 +250,7 @@ const setCategoryList = (data) => {
                         option-value="value"
                         option-label="value"
                         dense
-                        outlined
+                        filled
-                        rounded
                         emit-value
                         use-input
                         :disable="!value"
@@ -265,7 +262,6 @@ const setCategoryList = (data) => {
                         v-model="value.value"
                         :label="t('components.itemsFilterPanel.value')"
                         :disable="!value"
-                        is-outlined
                         :is-clearable="false"
                         @keyup.enter="applyTags(params, searchFn)"
                     />

src/components/VnTable/VnTable.vue

@@ -633,6 +633,7 @@ const rowCtrlClickFunction = computed(() => {
                 :data-key="$attrs['data-key']"
                 :columns="columns"
                 :redirect="redirect"
+                v-bind="$attrs?.['table-filter']"
             >
                 <template
                     v-for="(_, slotName) in $slots"
@@ -896,7 +897,7 @@ const rowCtrlClickFunction = computed(() => {
                                         {{ row[splittedColumns.title.name] }}
                                     </span>
                                 </QCardSection>
-                                <!-- Fields -->
+                                <!-- Fields  -->
                                 <QCardSection
                                     class="q-pl-sm q-py-xs"
                                     :class="$props.cardClass"
@@ -1155,7 +1156,7 @@ es:
 
 .grid-create {
     display: grid;
-    grid-template-columns: 1fr 1fr;
+    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
     max-width: 100%;
     grid-gap: 20px;
     margin: 0 auto;

src/components/common/VnCard.vue

@@ -1,12 +1,15 @@
 <script setup>
-import { onBeforeMount } from 'vue';
+import { onBeforeMount, computed } from 'vue';
-import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
+import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
 
+const emit = defineEmits(['onFetch']);
+
 const props = defineProps({
+    id: { type: Number, required: false, default: null },
     dataKey: { type: String, required: true },
     url: { type: String, default: undefined },
     idInWhere: { type: Boolean, default: false },
@@ -16,10 +19,13 @@ const props = defineProps({
     searchDataKey: { type: String, default: undefined },
     searchbarProps: { type: Object, default: undefined },
     redirectOnError: { type: Boolean, default: false },
+    visual: { type: Boolean, default: true },
 });
 
+const route = useRoute();
 const stateStore = useStateStore();
 const router = useRouter();
+const entityId = computed(() => props.id || route?.params?.id);
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     userFilter: props.filter,
@@ -35,7 +41,7 @@ onBeforeMount(async () => {
 
     const route = router.currentRoute.value;
     try {
-        await fetch(route.params.id);
+        await fetch(entityId.value);
     } catch {
         const { matched: matches } = route;
         const { path } = matches.at(-1);
@@ -51,8 +57,7 @@ onBeforeRouteUpdate(async (to, from) => {
             router.push({ name, params: to.params });
         }
     }
-    const id = to.params.id;
+    if (entityId.value !== to.params.id) await fetch(to.params.id, true);
-    if (id !== from.params.id) await fetch(id, true);
 });
 
 async function fetch(id, append = false) {
@@ -61,14 +66,17 @@ async function fetch(id, append = false) {
     else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
     else arrayData.store.url = props.url.replace(regex, `/${id}`);
     await arrayData.fetch({ append, updateRouter: false });
+    emit('onFetch', arrayData.store.data);
 }
 function hasRouteParam(params, valueToCheck = ':addressId') {
     return Object.values(params).includes(valueToCheck);
 }
 </script>
 <template>
-    <VnSubToolbar />
+    <template v-if="visual">
-    <div :class="[useCardSize(), $attrs.class]">
+        <VnSubToolbar />
-        <RouterView :key="$route.path" />
+        <div :class="[useCardSize(), $attrs.class]">
-    </div>
+            <RouterView :key="$route.path" />
+        </div>
+    </template>
 </template>

src/components/common/VnDmsInput.vue

@@ -0,0 +1,166 @@
+<script setup>
+import VnConfirm from '../ui/VnConfirm.vue';
+import VnInput from './VnInput.vue';
+import VnDms from './VnDms.vue';
+import axios from 'axios';
+import { useQuasar } from 'quasar';
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { downloadFile } from 'src/composables/downloadFile';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const documentDialogRef = ref({});
+const editDownloadDisabled = ref(false);
+const $props = defineProps({
+    defaultDmsCode: {
+        type: String,
+        default: 'InvoiceIn',
+    },
+    disable: {
+        type: Boolean,
+        default: true,
+    },
+    data: {
+        type: Object,
+        default: null,
+    },
+    formRef: {
+        type: Object,
+        default: null,
+    },
+});
+
+function deleteFile(dmsFk) {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('globals.confirmDeletion'),
+                message: t('globals.confirmDeletionMessage'),
+            },
+        })
+        .onOk(async () => {
+            await axios.post(`dms/${dmsFk}/removeFile`);
+            $props.formRef.formData.dmsFk = null;
+            $props.formRef.formData.dms = undefined;
+            $props.formRef.hasChanges = true;
+            $props.formRef.save();
+        });
+}
+</script>
+<template>
+    <div class="row no-wrap">
+        <VnInput
+            :label="t('Document')"
+            v-model="data.dmsFk"
+            clearable
+            clear-icon="close"
+            class="full-width"
+            :disable="disable"
+        />
+        <div
+            v-if="data.dmsFk"
+            class="row no-wrap q-pa-xs q-gutter-x-xs"
+            data-cy="dms-buttons"
+        >
+            <QBtn
+                :disable="editDownloadDisabled"
+                @click="downloadFile(data.dmsFk)"
+                icon="cloud_download"
+                color="primary"
+                flat
+                :class="{
+                    'no-pointer-events': editDownloadDisabled,
+                }"
+                padding="xs"
+                round
+            >
+                <QTooltip>{{ t('Download file') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                :disable="editDownloadDisabled"
+                @click="
+                    () => {
+                        documentDialogRef.show = true;
+                        documentDialogRef.dms = data.dms;
+                    }
+                "
+                icon="edit"
+                color="primary"
+                flat
+                :class="{
+                    'no-pointer-events': editDownloadDisabled,
+                }"
+                padding="xs"
+                round
+            >
+                <QTooltip>{{ t('Edit document') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                :disable="editDownloadDisabled"
+                @click="deleteFile(data.dmsFk)"
+                icon="delete"
+                color="primary"
+                flat
+                round
+                :class="{
+                    'no-pointer-events': editDownloadDisabled,
+                }"
+                padding="xs"
+            >
+                <QTooltip>{{ t('Delete file') }}</QTooltip>
+            </QBtn>
+        </div>
+        <QBtn
+            v-else
+            icon="add_circle"
+            color="primary"
+            flat
+            round
+            v-shortcut="'+'"
+            padding="xs"
+            @click="
+                () => {
+                    documentDialogRef.show = true;
+                    delete documentDialogRef.dms;
+                }
+            "
+            data-cy="dms-create"
+        >
+            <QTooltip>{{ t('Create document') }}</QTooltip>
+        </QBtn>
+    </div>
+    <QDialog v-model="documentDialogRef.show">
+        <VnDms
+            model="dms"
+            :default-dms-code="defaultDmsCode"
+            :form-initial-data="documentDialogRef.dms"
+            :url="
+                documentDialogRef.dms
+                    ? `Dms/${documentDialogRef.dms.id}/updateFile`
+                    : 'Dms/uploadFile'
+            "
+            :description="documentDialogRef.supplierName"
+            @on-data-saved="
+                (_, { data }) => {
+                    let dmsData = data;
+                    if (Array.isArray(data)) dmsData = data[0];
+                    formRef.formData.dmsFk = dmsData.id;
+                    formRef.formData.dms = dmsData;
+                    formRef.hasChanges = true;
+                    formRef.save();
+                }
+            "
+        />
+    </QDialog>
+</template>
+<i18n>
+es:
+    Document: Documento
+    Download file: Descargar archivo
+    Edit document: Editar documento
+    Delete file: Eliminar archivo
+    Create document: Crear documento
+
+</i18n>

src/components/common/VnInput.vue

@@ -84,7 +84,7 @@ const mixinRules = [
     ...($attrs.rules ?? []),
     (val) => {
         const maxlength = $props.maxlength;
-        if (maxlength && +val.length > maxlength)
+        if (maxlength && +val?.length > maxlength)
             return t(`maxLength`, { value: maxlength });
         const { min, max } = vnInputRef.value.$attrs;
         if (!min) return null;

src/components/common/VnLog.vue

@@ -619,7 +619,6 @@ watch(
                                                         :value="prop.val.val"
                                                         :name="prop.name"
                                                     />
-                                                    <VnIconLink />
                                                     <span
                                                         v-if="
                                                             propIndex <
@@ -708,6 +707,7 @@ watch(
                         v-model="searchInput"
                         class="full-width"
                         clearable
+                        filled
                         clear-icon="close"
                         @keyup.enter="() => selectFilter('search')"
                         @focusout="() => selectFilter('search')"
@@ -727,6 +727,7 @@ watch(
                         v-model="selectedFilters.changedModel"
                         option-label="locale"
                         option-value="value"
+                        filled
                         :options="actions"
                         @update:model-value="selectFilter('action')"
                         hide-selected
@@ -752,8 +753,7 @@ watch(
                             class="full-width"
                             :label="t('globals.user')"
                             v-model="userSelect"
-                            option-label="name"
+                            filled
-                            option-value="id"
                             :url="`${model}Logs/${route.params.id}/editors`"
                             :fields="['id', 'nickname', 'name', 'image']"
                             sort-by="nickname"
@@ -782,6 +782,7 @@ watch(
                         :label="t('globals.changes')"
                         v-model="changeInput"
                         class="full-width"
+                        filled
                         clearable
                         clear-icon="close"
                         @keyup.enter="selectFilter('change')"
@@ -818,6 +819,7 @@ watch(
                         @clear="selectFilter('date', 'to')"
                         v-model="dateFrom"
                         clearable
+                        filled
                         clear-icon="close"
                     />
                 </QItem>
@@ -830,6 +832,7 @@ watch(
                         @clear="selectFilter('date', 'from')"
                         v-model="dateTo"
                         clearable
+                        filled
                         clear-icon="close"
                     />
                 </QItem>
@@ -843,6 +846,7 @@ watch(
             dense
             flat
             minimal
+            filled
             @update:model-value="
                 (value) => {
                     dateFromDialog = false;

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

@@ -4,12 +4,15 @@ import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe('VnDmsList', () => {
     let vm;
-    const dms = { 
+    const dms = {
-        userFk: 1, 
+        userFk: 1,
-        name: 'DMS 1' 
+        name: 'DMS 1',
     };
-    
+
     beforeAll(() => {
+        vi.mock('src/composables/getUrl', () => ({
+            getUrl: vi.fn().mockResolvedValue(''),
+        }));
         vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         vm = createWrapper(VnDmsList, {
             props: {
@@ -18,8 +21,8 @@ describe('VnDmsList', () => {
                 filter: 'wd.workerFk',
                 updateModel: 'Workers',
                 deleteModel: 'WorkerDms',
-                downloadModel: 'WorkerDms' 
+                downloadModel: 'WorkerDms',
-            }
+            },
         }).vm;
     });
 
@@ -29,46 +32,45 @@ describe('VnDmsList', () => {
 
     describe('setData()', () => {
         const data = [
-            { 
+            {
-                userFk: 1, 
+                userFk: 1,
                 name: 'Jessica',
                 lastName: 'Jones',
                 file: '4.jpg',
-                created: '2021-07-28 21:00:00'
+                created: '2021-07-28 21:00:00',
             },
-            { 
+            {
-                userFk: 2, 
+                userFk: 2,
                 name: 'Bruce',
                 lastName: 'Banner',
                 created: '2022-07-28 21:00:00',
                 dms: {
-                    userFk: 2, 
+                    userFk: 2,
                     name: 'Bruce',
                     lastName: 'BannerDMS',
                     created: '2022-07-28 21:00:00',
                     file: '4.jpg',
-                } 
+                },
             },
             {
                 userFk: 3,
                 name: 'Natasha',
                 lastName: 'Romanoff',
                 file: '4.jpg',
-                created: '2021-10-28 21:00:00'
+                created: '2021-10-28 21:00:00',
-            }  
+            },
-        ]
+        ];
 
         it('Should replace objects that contain the "dms" property with the value of the same and sort by creation date', () => {
             vm.setData(data);
             expect([vm.rows][0][0].lastName).toEqual('BannerDMS');
             expect([vm.rows][0][1].lastName).toEqual('Romanoff');
-
         });
     });
 
     describe('parseDms()', () => {
-        const resultDms = { ...dms, userId:1};
+        const resultDms = { ...dms, userId: 1 };
-        
+
         it('Should add properties that end with "Fk" by changing the suffix to "Id"', () => {
             const parsedDms = vm.parseDms(dms);
             expect(parsedDms).toEqual(resultDms);
@@ -76,12 +78,12 @@ describe('VnDmsList', () => {
     });
 
     describe('showFormDialog()', () => {
-        const resultDms = { ...dms, userId:1};
+        const resultDms = { ...dms, userId: 1 };
-        
+
         it('should call fn parseDms() and set show true if dms is defined', () => {
             vm.showFormDialog(dms);
             expect(vm.formDialog.show).toEqual(true);
             expect(vm.formDialog.dms).toEqual(resultDms);
         });
     });
-});	
+});

src/components/ui/CardDescriptor.vue

@@ -1,375 +1,38 @@
 <script setup>
-import { onBeforeMount, watch, computed, ref } from 'vue';
+import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
+import VnDescriptor from './VnDescriptor.vue';
-import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
-import { useArrayData } from 'composables/useArrayData';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useState } from 'src/composables/useState';
-import { useRoute, useRouter } from 'vue-router';
-import { useClipboard } from 'src/composables/useClipboard';
-import VnMoreOptions from './VnMoreOptions.vue';
 
 const $props = defineProps({
-    url: {
+    id: {
-        type: String,
-        default: '',
-    },
-    filter: {
-        type: Object,
-        default: null,
-    },
-    title: {
-        type: String,
-        default: '',
-    },
-    subtitle: {
         type: Number,
-        default: null,
+        default: false,
     },
-    dataKey: {
+    card: {
-        type: String,
-        default: null,
-    },
-    summary: {
         type: Object,
         default: null,
     },
-    width: {
-        type: String,
-        default: 'md-width',
-    },
-    toModule: {
-        type: String,
-        default: null,
-    },
 });
 
-const state = useState();
-const route = useRoute();
-const router = useRouter();
-const { t } = useI18n();
-const { copyText } = useClipboard();
-const { viewSummary } = useSummaryDialog();
-let arrayData;
-let store;
-let entity;
-const isLoading = ref(false);
-const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
-const DESCRIPTOR_PROXY = 'DescriptorProxy';
-const moduleName = ref();
-const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
-defineExpose({ getData });
-
-onBeforeMount(async () => {
-    arrayData = useArrayData($props.dataKey, {
-        url: $props.url,
-        userFilter: $props.filter,
-        skip: 0,
-        oneRecord: true,
-    });
-    store = arrayData.store;
-    entity = computed(() => {
-        const data = store.data ?? {};
-        if (data) emit('onFetch', data);
-        return data;
-    });
-
-    // It enables to load data only once if the module is the same as the dataKey
-    if (!isSameDataKey.value || !route.params.id) await getData();
-    watch(
-        () => [$props.url, $props.filter],
-        async () => {
-            if (!isSameDataKey.value) await getData();
-        },
-    );
-});
-
-function getName() {
-    let name = $props.dataKey;
-    if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
-        name = name.split(DESCRIPTOR_PROXY)[0];
-    }
-    return name;
-}
-const routeName = computed(() => {
-    let routeName = getName();
-    return `${routeName}Summary`;
-});
-
-async function getData() {
-    store.url = $props.url;
-    store.filter = $props.filter ?? {};
-    isLoading.value = true;
-    try {
-        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-        state.set($props.dataKey, data);
-        emit('onFetch', data);
-    } finally {
-        isLoading.value = false;
-    }
-}
-
-function getValueFromPath(path) {
-    if (!path) return;
-    const keys = path.toString().split('.');
-    let current = entity.value;
-
-    for (const key of keys) {
-        if (current[key] === undefined) return undefined;
-        else current = current[key];
-    }
-    return current;
-}
-
-function copyIdText(id) {
-    copyText(id, {
-        component: {
-            copyValue: id,
-        },
-    });
-}
-
 const emit = defineEmits(['onFetch']);
-
+const entity = ref();
-const iconModule = computed(() => {
-    moduleName.value = getName();
-    if ($props.toModule) {
-        return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
-    }
-    if (isSameModuleName) {
-        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
-            ?.meta?.icon;
-    } else {
-        return route.matched[1].meta.icon;
-    }
-});
-
-const toModule = computed(() => {
-    moduleName.value = getName();
-    if ($props.toModule) return $props.toModule;
-    if (isSameModuleName) {
-        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
-            ?.redirect;
-    } else {
-        return route.matched[1].path.split('/').length > 2
-            ? route.matched[1].redirect
-            : route.matched[1].children[0].redirect;
-    }
-});
 </script>
 
 <template>
-    <div class="descriptor" data-cy="cardDescriptor">
+    <component
-        <template v-if="entity && !isLoading">
+        :is="card"
-            <div class="header bg-primary q-pa-sm justify-between">
+        :id
-                <slot name="header-extra-action">
+        :visual="false"
-                    <QBtn
+        v-bind="$attrs"
-                        round
+        @on-fetch="
-                        flat
+            (data) => {
-                        dense
+                entity = data;
-                        size="md"
+                emit('onFetch', data);
-                        :icon="iconModule"
-                        color="white"
-                        class="link"
-                        :to="toModule"
-                    >
-                        <QTooltip>
-                            {{ t('globals.goToModuleIndex') }}
-                        </QTooltip>
-                    </QBtn>
-                </slot>
-                <QBtn
-                    @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
-                    round
-                    flat
-                    dense
-                    size="md"
-                    icon="preview"
-                    color="white"
-                    class="link"
-                    v-if="summary"
-                    data-cy="openSummaryBtn"
-                >
-                    <QTooltip>
-                        {{ t('components.smartCard.openSummary') }}
-                    </QTooltip>
-                </QBtn>
-                <RouterLink :to="{ name: routeName, params: { id: entity.id } }">
-                    <QBtn
-                        class="link"
-                        color="white"
-                        dense
-                        flat
-                        icon="launch"
-                        round
-                        size="md"
-                        data-cy="goToSummaryBtn"
-                    >
-                        <QTooltip>
-                            {{ t('components.cardDescriptor.summary') }}
-                        </QTooltip>
-                    </QBtn>
-                </RouterLink>
-                <VnMoreOptions v-if="$slots.menu">
-                    <template #menu="{ menuRef }">
-                        <slot name="menu" :entity="entity" :menu-ref="menuRef" />
-                    </template>
-                </VnMoreOptions>
-            </div>
-            <slot name="before" />
-            <div class="body q-py-sm">
-                <QList dense>
-                    <QItemLabel header class="ellipsis text-h5" :lines="1">
-                        <div class="title">
-                            <span
-                                v-if="$props.title"
-                                :title="getValueFromPath(title)"
-                                :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_title`"
-                            >
-                                {{ getValueFromPath(title) ?? $props.title }}
-                            </span>
-                            <slot v-else name="description" :entity="entity">
-                                <span
-                                    :title="entity.name"
-                                    :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_description`"
-                                    v-text="entity.name"
-                                />
-                            </slot>
-                        </div>
-                    </QItemLabel>
-                    <QItem>
-                        <QItemLabel
-                            class="subtitle"
-                            :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_subtitle`"
-                        >
-                            #{{ getValueFromPath(subtitle) ?? entity.id }}
-                        </QItemLabel>
-                        <QBtn
-                            round
-                            flat
-                            dense
-                            size="sm"
-                            icon="content_copy"
-                            color="primary"
-                            @click.stop="copyIdText(entity.id)"
-                        >
-                            <QTooltip>
-                                {{ t('globals.copyId') }}
-                            </QTooltip>
-                        </QBtn>
-                    </QItem>
-                </QList>
-                <div
-                    class="list-box q-mt-xs"
-                    :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_listbox`"
-                >
-                    <slot name="body" :entity="entity" />
-                </div>
-            </div>
-            <div class="icons">
-                <slot name="icons" :entity="entity" />
-            </div>
-            <div class="actions justify-center" data-cy="descriptor_actions">
-                <slot name="actions" :entity="entity" />
-            </div>
-            <slot name="after" />
-        </template>
-        <SkeletonDescriptor v-if="!entity || isLoading" />
-    </div>
-    <QInnerLoading
-        :label="t('globals.pleaseWait')"
-        :showing="isLoading"
-        color="primary"
-    />
-</template>
-
-<style lang="scss">
-.body {
-    background-color: var(--vn-section-color);
-    .text-h5 {
-        font-size: 20px;
-        padding-top: 5px;
-        padding-bottom: 0px;
-    }
-    .q-item {
-        min-height: 20px;
-
-        .link {
-            margin-left: 10px;
-        }
-    }
-    .vn-label-value {
-        display: flex;
-        padding: 0px 16px;
-        .label {
-            color: var(--vn-label-color);
-            font-size: 14px;
-
-            &:not(:has(a))::after {
-                content: ':';
             }
-        }
+        "
-        .value {
+    />
-            color: var(--vn-text-color);
+    <VnDescriptor v-model="entity" v-bind="$attrs">
-            font-size: 14px;
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
-            margin-left: 4px;
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-            overflow: hidden;
+        </template>
-            text-overflow: ellipsis;
+    </VnDescriptor>
-            white-space: nowrap;
+</template>
-            text-align: left;
-        }
-        .info {
-            margin-left: 5px;
-        }
-    }
-}
-</style>
-
-<style lang="scss" scoped>
-.title {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    span {
-        color: var(--vn-text-color);
-        font-weight: bold;
-    }
-}
-.subtitle {
-    color: var(--vn-text-color);
-    font-size: 16px;
-    margin-bottom: 2px;
-}
-.list-box {
-    .q-item__label {
-        color: var(--vn-label-color);
-        padding-bottom: 0%;
-    }
-}
-.descriptor {
-    width: 256px;
-    .header {
-        display: flex;
-        align-items: center;
-    }
-    .icons {
-        margin: 0 10px;
-        display: flex;
-        justify-content: center;
-        .q-icon {
-            margin-right: 5px;
-        }
-    }
-    .actions {
-        margin: 0 5px;
-        justify-content: center !important;
-    }
-}
-</style>
-<i18n>
-    en:
-        globals:
-            copyId: Copy ID
-    es:
-        globals:
-            copyId: Copiar ID
-</i18n>

src/components/ui/EntityDescriptor.vue

@@ -0,0 +1,78 @@
+<script setup>
+import { onBeforeMount, watch, computed, ref } from 'vue';
+import { useArrayData } from 'composables/useArrayData';
+import { useState } from 'src/composables/useState';
+import { useRoute } from 'vue-router';
+import VnDescriptor from './VnDescriptor.vue';
+
+const $props = defineProps({
+    url: {
+        type: String,
+        default: '',
+    },
+    filter: {
+        type: Object,
+        default: null,
+    },
+    dataKey: {
+        type: String,
+        default: null,
+    },
+});
+
+const state = useState();
+const route = useRoute();
+let arrayData;
+let store;
+let entity;
+const isLoading = ref(false);
+const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+defineExpose({ getData });
+
+onBeforeMount(async () => {
+    arrayData = useArrayData($props.dataKey, {
+        url: $props.url,
+        userFilter: $props.filter,
+        skip: 0,
+        oneRecord: true,
+    });
+    store = arrayData.store;
+    entity = computed(() => {
+        const data = store.data ?? {};
+        if (data) emit('onFetch', data);
+        return data;
+    });
+
+    // It enables to load data only once if the module is the same as the dataKey
+    if (!isSameDataKey.value || !route.params.id) await getData();
+    watch(
+        () => [$props.url, $props.filter],
+        async () => {
+            if (!isSameDataKey.value) await getData();
+        },
+    );
+});
+
+async function getData() {
+    store.url = $props.url;
+    store.filter = $props.filter ?? {};
+    isLoading.value = true;
+    try {
+        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        state.set($props.dataKey, data);
+        emit('onFetch', data);
+    } finally {
+        isLoading.value = false;
+    }
+}
+
+const emit = defineEmits(['onFetch']);
+</script>
+
+<template>
+    <VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey">
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+        </template>
+    </VnDescriptor>
+</template>

src/components/ui/VnDescriptor.vue

@@ -0,0 +1,318 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useRoute, useRouter } from 'vue-router';
+import { useClipboard } from 'src/composables/useClipboard';
+import VnMoreOptions from './VnMoreOptions.vue';
+
+const entity = defineModel({ type: Object, default: null });
+const $props = defineProps({
+    title: {
+        type: String,
+        default: '',
+    },
+    subtitle: {
+        type: Number,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+    width: {
+        type: String,
+        default: 'md-width',
+    },
+    module: {
+        type: String,
+        default: null,
+    },
+    toModule: {
+        type: String,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+const { copyText } = useClipboard();
+const { viewSummary } = useSummaryDialog();
+const DESCRIPTOR_PROXY = 'DescriptorProxy';
+const moduleName = ref();
+const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
+
+function getName() {
+    let name = $props.module;
+    if ($props.module.includes(DESCRIPTOR_PROXY)) {
+        name = name.split(DESCRIPTOR_PROXY)[0];
+    }
+    return name;
+}
+const routeName = computed(() => {
+    let routeName = getName();
+    return `${routeName}Summary`;
+});
+
+function getValueFromPath(path) {
+    if (!path) return;
+    const keys = path.toString().split('.');
+    let current = entity.value;
+
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
+    }
+    return current;
+}
+
+function copyIdText(id) {
+    copyText(id, {
+        component: {
+            copyValue: id,
+        },
+    });
+}
+
+const emit = defineEmits(['onFetch']);
+
+const iconModule = computed(() => {
+    moduleName.value = getName();
+    if ($props.toModule) {
+        return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
+    }
+    if (isSameModuleName) {
+        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
+            ?.meta?.icon;
+    } else {
+        return route.matched[1].meta.icon;
+    }
+});
+
+const toModule = computed(() => {
+    moduleName.value = getName();
+    if ($props.toModule) return $props.toModule;
+    if (isSameModuleName) {
+        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
+            ?.redirect;
+    } else {
+        return route.matched[1].path.split('/').length > 2
+            ? route.matched[1].redirect
+            : route.matched[1].children[0].redirect;
+    }
+});
+</script>
+
+<template>
+    <div class="descriptor" data-cy="vnDescriptor">
+        <template v-if="entity && entity?.id">
+            <div class="header bg-primary q-pa-sm justify-between">
+                <slot name="header-extra-action">
+                    <QBtn
+                        round
+                        flat
+                        dense
+                        size="md"
+                        :icon="iconModule"
+                        color="white"
+                        class="link"
+                        :to="toModule"
+                    >
+                        <QTooltip>
+                            {{ t('globals.goToModuleIndex') }}
+                        </QTooltip>
+                    </QBtn>
+                </slot>
+                <QBtn
+                    @click.stop="viewSummary(entity.id, summary, width)"
+                    round
+                    flat
+                    dense
+                    size="md"
+                    icon="preview"
+                    color="white"
+                    class="link"
+                    v-if="summary"
+                    data-cy="openSummaryBtn"
+                >
+                    <QTooltip>
+                        {{ t('components.smartCard.openSummary') }}
+                    </QTooltip>
+                </QBtn>
+                <RouterLink :to="{ name: routeName, params: { id: entity.id } }">
+                    <QBtn
+                        class="link"
+                        color="white"
+                        dense
+                        flat
+                        icon="launch"
+                        round
+                        size="md"
+                        data-cy="goToSummaryBtn"
+                    >
+                        <QTooltip>
+                            {{ t('components.vnDescriptor.summary') }}
+                        </QTooltip>
+                    </QBtn>
+                </RouterLink>
+                <VnMoreOptions v-if="$slots.menu">
+                    <template #menu="{ menuRef }">
+                        <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                    </template>
+                </VnMoreOptions>
+            </div>
+            <slot name="before" />
+            <div class="body q-py-sm">
+                <QList dense>
+                    <QItemLabel header class="ellipsis text-h5" :lines="1">
+                        <div class="title">
+                            <span
+                                v-if="title"
+                                :title="getValueFromPath(title)"
+                                :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
+                            >
+                                {{ getValueFromPath(title) ?? title }}
+                            </span>
+                            <slot v-else name="description" :entity="entity">
+                                <span
+                                    :title="entity.name"
+                                    :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_description`"
+                                    v-text="entity.name"
+                                />
+                            </slot>
+                        </div>
+                    </QItemLabel>
+                    <QItem>
+                        <QItemLabel
+                            class="subtitle"
+                            :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
+                        >
+                            #{{ getValueFromPath(subtitle) ?? entity.id }}
+                        </QItemLabel>
+                        <QBtn
+                            round
+                            flat
+                            dense
+                            size="sm"
+                            icon="content_copy"
+                            color="primary"
+                            @click.stop="copyIdText(entity.id)"
+                        >
+                            <QTooltip>
+                                {{ t('globals.copyId') }}
+                            </QTooltip>
+                        </QBtn>
+                    </QItem>
+                </QList>
+                <div
+                    class="list-box q-mt-xs"
+                    :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_listbox`"
+                >
+                    <slot name="body" :entity="entity" />
+                </div>
+            </div>
+            <div class="icons">
+                <slot name="icons" :entity="entity" />
+            </div>
+            <div class="actions justify-center" data-cy="descriptor_actions">
+                <slot name="actions" :entity="entity" />
+            </div>
+            <slot name="after" />
+        </template>
+        <SkeletonDescriptor v-if="!entity" />
+    </div>
+    <QInnerLoading :label="t('globals.pleaseWait')" :showing="!entity" color="primary" />
+</template>
+
+<style lang="scss">
+.body {
+    background-color: var(--vn-section-color);
+    .text-h5 {
+        font-size: 20px;
+        padding-top: 5px;
+        padding-bottom: 0px;
+    }
+    .q-item {
+        min-height: 20px;
+
+        .link {
+            margin-left: 10px;
+        }
+    }
+    .vn-label-value {
+        display: flex;
+        padding: 0px 16px;
+        .label {
+            color: var(--vn-label-color);
+            font-size: 14px;
+
+            &:not(:has(a))::after {
+                content: ':';
+            }
+        }
+        .value {
+            color: var(--vn-text-color);
+            font-size: 14px;
+            margin-left: 4px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            text-align: left;
+        }
+        .info {
+            margin-left: 5px;
+        }
+    }
+}
+</style>
+
+<style lang="scss" scoped>
+.title {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    span {
+        color: var(--vn-text-color);
+        font-weight: bold;
+    }
+}
+.subtitle {
+    color: var(--vn-text-color);
+    font-size: 16px;
+    margin-bottom: 2px;
+}
+.list-box {
+    .q-item__label {
+        color: var(--vn-label-color);
+        padding-bottom: 0%;
+    }
+}
+.descriptor {
+    width: 256px;
+    .header {
+        display: flex;
+        align-items: center;
+    }
+    .icons {
+        margin: 0 10px;
+        display: flex;
+        justify-content: center;
+        .q-icon {
+            margin-right: 5px;
+        }
+    }
+    .actions {
+        margin: 0 5px;
+        justify-content: center !important;
+    }
+}
+</style>
+<i18n>
+    en:
+        globals:
+            copyId: Copy ID
+    es:
+        globals:
+            copyId: Copiar ID
+</i18n>

src/components/ui/VnNotes.vue

@@ -40,6 +40,11 @@ const quasar = useQuasar();
 const newNote = reactive({ text: null, observationTypeFk: null });
 const observationTypes = ref([]);
 const vnPaginateRef = ref();
+
+const defaultObservationType = computed(() => 
+    observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
+);
+
 let originalText;
 
 function handleClick(e) {
@@ -111,14 +116,22 @@ function fetchData([data]) {
     originalText = data?.notes;
     emit('onFetch', data);
 }
+
+const handleObservationTypes = (data) => {
+    observationTypes.value = data;
+    if(defaultObservationType.value) {
+        newNote.observationTypeFk = defaultObservationType.value;
+    }
+};
+
 </script>
 <template>
     <FetchData
         v-if="selectType"
         url="ObservationTypes"
-        :filter="{ fields: ['id', 'description'] }"
+        :filter="{ fields: ['id', 'description', 'code'] }"
         auto-load
-        @on-fetch="(data) => (observationTypes = data)"
+        @on-fetch="handleObservationTypes"
     />
     <FetchData
         v-if="justInput"
@@ -154,6 +167,7 @@ function fetchData([data]) {
                     filled
                     size="lg"
                     autogrow
+                    autofocus
                     @keyup.enter.stop="handleClick"
                     :required="isRequired"
                     clearable
@@ -189,7 +203,6 @@ function fetchData([data]) {
         :search-url="false"
         @on-fetch="
             newNote.text = '';
-            newNote.observationTypeFk = null;
         "
     >
         <template #body="{ rows }">

src/components/ui/VnToSummary.vue

@@ -26,6 +26,7 @@ const id = props.entityId;
         :to="{ name: routeName, params: { id: id } }"
         class="header link"
         :href="url"
+        data-cy="goToSummaryBtn"
     >
         <QIcon name="open_in_new" color="white" size="sm" />
     </router-link>

src/composables/__tests__/downloadFile.spec.js

@@ -6,10 +6,12 @@ const session = useSession();
 const token = session.getToken();
 
 describe('downloadFile', () => {
-    const baseUrl = 'http://localhost:9000';
     let defaulCreateObjectURL;
 
     beforeAll(() => {
+        vi.mock('src/composables/getUrl', () => ({
+            getUrl: vi.fn().mockResolvedValue(''),
+        }));
         defaulCreateObjectURL = window.URL.createObjectURL;
         window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
     });
@@ -22,15 +24,14 @@ describe('downloadFile', () => {
             headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
         };
         vi.spyOn(axios, 'get').mockImplementation((url) => {
-            if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
+            if (url.includes('downloadFile')) return Promise.resolve(res);
-            else if (url.includes('downloadFile')) return Promise.resolve(res);
         });
 
         await downloadFile(1);
 
         expect(axios.get).toHaveBeenCalledWith(
-            `${baseUrl}/api/dms/1/downloadFile?access_token=${token}`,
+            `/api/dms/1/downloadFile?access_token=${token}`,
-            { responseType: 'blob' }
+            { responseType: 'blob' },
         );
     });
 });

src/composables/downloadFile.js

@@ -7,18 +7,33 @@ const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
-    const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
+    const appUrl = await getAppUrl();
     const response = await axios.get(
         url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
-        { responseType: 'blob' }
+        { responseType: 'blob' },
     );
 
+    download(response);
+}
+
+export async function downloadDocuware(url, params) {
+    const appUrl = await getAppUrl();
+    const response = await axios.get(`${appUrl}/api/` + url, {
+        responseType: 'blob',
+        params,
+    });
+
+    download(response);
+}
+
+function download(response) {
     const contentDisposition = response.headers['content-disposition'];
     const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
-    const filename =
+    const filename = matches?.[1] ? matches[1].replace(/['"]/g, '') : 'downloaded-file';
-        matches != null && matches[1]
-            ? matches[1].replace(/['"]/g, '')
-            : 'downloaded-file';
 
     exportFile(filename, response.data);
 }
+
+async function getAppUrl() {
+    return (await getUrl('', 'lilium')).replace('/#/', '');
+}

src/css/app.scss

@@ -325,7 +325,6 @@ input::-webkit-inner-spin-button {
         min-height: auto !important;
         display: flex;
         align-items: flex-end;
-        padding-bottom: 2px;
         .q-field__native.row {
             min-height: auto !important;
         }

src/i18n/locale/en.yml

@@ -646,6 +646,7 @@ worker:
         model: Model
         serialNumber: Serial number
         removePDA: Deallocate PDA
+        sendToTablet: Send to tablet
     create:
         lastName: Last name
         birth: Birth
@@ -816,6 +817,7 @@ travel:
     search: Search travel
     searchInfo: You can search by travel id or name
     id: Id
+    awbFk: AWB
     travelList:
         tableVisibleColumns:
             ref: Reference

src/i18n/locale/es.yml

@@ -731,6 +731,7 @@ worker:
         model: Modelo
         serialNumber: Número de serie
         removePDA: Desasignar PDA
+        sendToTablet: Enviar a la tablet
     create:
         lastName: Apellido
         birth: Fecha de nacimiento
@@ -899,6 +900,7 @@ travel:
     search: Buscar envío
     searchInfo: Buscar envío por id o nombre
     id: Id
+    awbFk: Guía aérea
     travelList:
         tableVisibleColumns:
             ref: Referencia

src/pages/Account/AccountFilter.vue

@@ -47,7 +47,7 @@ const rolesOptions = ref([]);
                         :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -57,7 +57,7 @@ const rolesOptions = ref([]);
                         :label="t('account.card.alias')"
                         v-model="params.nickname"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -75,8 +75,7 @@ const rolesOptions = ref([]);
                         use-input
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                         :input-debounce="0"
                     />
                 </QItemSection>

src/pages/Account/Acls/AclFilter.vue

@@ -56,8 +56,7 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -72,8 +71,7 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -83,7 +81,7 @@ onBeforeMount(() => {
                         :label="t('acls.aclFilter.property')"
                         v-model="params.property"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -98,8 +96,7 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -114,8 +111,7 @@ onBeforeMount(() => {
                         option-label="name"
                         use-input
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>

src/pages/Account/Alias/Card/AliasDescriptor.vue

@@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import axios from 'axios';
@@ -48,7 +48,7 @@ const removeAlias = () => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         ref="descriptor"
         :url="`MailAliases/${entityId}`"
         data-key="Alias"
@@ -63,7 +63,7 @@ const removeAlias = () => {
         <template #body="{ entity }">
             <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>

src/pages/Account/Card/AccountDescriptor.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
@@ -20,7 +20,7 @@ onMounted(async () => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         ref="descriptor"
         :url="`VnUsers/preview`"
         :filter="{ ...filter, where: { id: entityId } }"
@@ -78,7 +78,7 @@ onMounted(async () => {
                 </QIcon>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <style scoped>
 .q-item__label {

src/pages/Account/Card/AccountSummary.vue

@@ -18,7 +18,7 @@ const entityId = computed(() => $props.id || route.params.id);
         data-key="Account"
         ref="AccountSummary"
         url="VnUsers/preview"
-        :filter="filter"
+        :filter="{ ...filter, where: { id: entityId } }"
     >
         <template #header="{ entity }">{{ entity.id }} - {{ entity.nickname }}</template>
         <template #menu>

src/pages/Account/Role/AccountRolesFilter.vue

@@ -27,7 +27,7 @@ const props = defineProps({
                         :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -37,7 +37,7 @@ const props = defineProps({
                         :label="t('role.description')"
                         v-model="params.description"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>

src/pages/Account/Role/Card/RoleDescriptor.vue

@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -32,7 +32,7 @@ const removeRole = async () => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         url="VnRoles"
         :filter="{ where: { id: entityId } }"
         data-key="Role"
@@ -47,7 +47,7 @@ const removeRole = async () => {
         <template #body="{ entity }">
             <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <style scoped>
 .q-item__label {

src/pages/Claim/Card/ClaimBasicData.vue

@@ -2,6 +2,7 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import { getDifferences, getUpdatedValues } from 'src/filters';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FetchData from 'components/FetchData.vue';
@@ -9,12 +10,18 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
 
 const route = useRoute();
 const { t } = useI18n();
 const workersOptions = ref([]);
+
+function onBeforeSave(formData, originalData) {
+    return getUpdatedValues(
+        Object.keys(getDifferences(formData, originalData)),
+        formData,
+    );
+}
 </script>
 <template>
     <FetchData
@@ -27,6 +34,7 @@ const workersOptions = ref([]);
     <FormModel
         model="Claim"
         :url-update="`Claims/updateClaim/${route.params.id}`"
+        :mapper="onBeforeSave"
         auto-load
     >
         <template #form="{ data, validate }">

src/pages/Claim/Card/ClaimDescriptor.vue

@@ -6,7 +6,7 @@ import { toDateHourMinSec, toPercentage } from 'src/filters';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import { getUrl } from 'src/composables/getUrl';
@@ -44,7 +44,7 @@ onMounted(async () => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Claims/${entityId}`"
         :filter="filter"
         title="client.name"
@@ -147,7 +147,7 @@ onMounted(async () => {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <style scoped>
 .q-item__label {

src/pages/Claim/ClaimFilter.vue

@@ -33,7 +33,7 @@ const props = defineProps({
                     :label="t('claim.customerId')"
                     v-model="params.clientFk"
                     lazy-rules
-                    is-outlined
+                    filled
                 >
                     <template #prepend> <QIcon name="badge" size="xs" /></template>
                 </VnInput>
@@ -41,12 +41,11 @@ const props = defineProps({
                     :label="t('Client Name')"
                     v-model="params.clientName"
                     lazy-rules
-                    is-outlined
+                    filled
                 />
                 <VnSelect
-                    outlined
                     dense
-                    rounded
+                    filled
                     :label="t('globals.params.departmentFk')"
                     v-model="params.departmentFk"
                     option-value="id"
@@ -61,8 +60,7 @@ const props = defineProps({
                     :use-like="false"
                     option-filter="firstName"
                     dense
-                    outlined
+                    filled
-                    rounded
                 />
                 <VnSelect
                     :label="t('claim.state')"
@@ -70,14 +68,12 @@ const props = defineProps({
                     :options="states"
                     option-label="description"
                     dense
-                    outlined
+                    filled
-                    rounded
                 />
                 <VnInputDate
                     v-model="params.created"
                     :label="t('claim.created')"
-                    outlined
+                    filled
-                    rounded
                     dense
                 />
                 <VnSelect
@@ -86,8 +82,7 @@ const props = defineProps({
                     url="Items/withName"
                     :use-like="false"
                     sort-by="id DESC"
-                    outlined
+                    filled
-                    rounded
                     dense
                 />
                 <VnSelect
@@ -98,15 +93,13 @@ const props = defineProps({
                     :use-like="false"
                     option-filter="firstName"
                     dense
-                    outlined
+                    filled
-                    rounded
                 />
                 <VnSelect
                     :label="t('claim.zone')"
                     v-model="params.zoneFk"
                     url="Zones"
-                    outlined
+                    filled
-                    rounded
                     dense
                 />
                 <QCheckbox

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -7,7 +7,7 @@ import { toCurrency, toDate } from 'src/filters';
 
 import useCardDescription from 'src/composables/useCardDescription';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
@@ -54,7 +54,7 @@ const debtWarning = computed(() => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Clients/${entityId}/getCard`"
         :summary="$props.summary"
         data-key="Customer"
@@ -232,7 +232,7 @@ const debtWarning = computed(() => {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>

src/pages/Customer/CustomerFilter.vue

@@ -41,7 +41,7 @@ const exprBuilder = (param, value) => {
         <template #body="{ params, searchFn }">
             <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnInput :label="t('FI')" v-model="params.fi" is-outlined>
+                    <VnInput :label="t('FI')" v-model="params.fi" filled>
                         <template #prepend>
                             <QIcon name="badge" size="xs" />
                         </template>
@@ -50,7 +50,7 @@ const exprBuilder = (param, value) => {
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                    <VnInput :label="t('Name')" v-model="params.name" filled />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
@@ -58,16 +58,15 @@ const exprBuilder = (param, value) => {
                     <VnInput
                         :label="t('customer.summary.socialName')"
                         v-model="params.socialName"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
                         option-value="id"
@@ -89,8 +88,7 @@ const exprBuilder = (param, value) => {
                         map-options
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                         auto-load
                         :input-debounce="0"
                     />
@@ -98,12 +96,12 @@ const exprBuilder = (param, value) => {
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('City')" v-model="params.city" is-outlined />
+                    <VnInput :label="t('City')" v-model="params.city" filled />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
+                    <VnInput :label="t('Phone')" v-model="params.phone" filled>
                         <template #prepend>
                             <QIcon name="phone" size="xs" />
                         </template>
@@ -112,7 +110,7 @@ const exprBuilder = (param, value) => {
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput :label="t('Email')" v-model="params.email" is-outlined>
+                    <VnInput :label="t('Email')" v-model="params.email" filled>
                         <template #prepend>
                             <QIcon name="email" size="sm" />
                         </template>
@@ -132,19 +130,14 @@ const exprBuilder = (param, value) => {
                         map-options
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                         auto-load
                         sortBy="name ASC"
                 /></QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput
+                    <VnInput :label="t('Postcode')" v-model="params.postcode" filled />
-                        :label="t('Postcode')"
-                        v-model="params.postcode"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
         </template>

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -45,8 +45,7 @@ const departments = ref();
                     dense
                     option-label="name"
                     option-value="id"
-                    outlined
+                    filled
-                    rounded
                     emit-value
                     hide-selected
                     map-options
@@ -67,8 +66,7 @@ const departments = ref();
                         map-options
                         option-label="name"
                         option-value="id"
-                        outlined
+                        filled
-                        rounded
                         use-input
                         v-model="params.departmentFk"
                         @update:model-value="searchFn()"
@@ -91,8 +89,7 @@ const departments = ref();
                         map-options
                         option-label="name"
                         option-value="id"
-                        outlined
+                        filled
-                        rounded
                         use-input
                         v-model="params.countryFk"
                         @update:model-value="searchFn()"
@@ -108,7 +105,7 @@ const departments = ref();
                     <VnInput
                         :label="t('P. Method')"
                         clearable
-                        is-outlined
+                        filled
                         v-model="params.paymentMethod"
                     />
                 </QItemSection>
@@ -119,7 +116,7 @@ const departments = ref();
                     <VnInput
                         :label="t('Balance D.')"
                         clearable
-                        is-outlined
+                        filled
                         v-model="params.balance"
                     />
                 </QItemSection>
@@ -137,8 +134,7 @@ const departments = ref();
                         map-options
                         option-label="name"
                         option-value="id"
-                        outlined
+                        filled
-                        rounded
                         use-input
                         v-model="params.workerFk"
                         @update:model-value="searchFn()"
@@ -154,7 +150,7 @@ const departments = ref();
                     <VnInputDate
                         :label="t('L. O. Date')"
                         clearable
-                        is-outlined
+                        filled
                         v-model="params.date"
                     />
                 </QItemSection>
@@ -165,7 +161,7 @@ const departments = ref();
                     <VnInput
                         :label="t('Credit I.')"
                         clearable
-                        is-outlined
+                        filled
                         v-model="params.credit"
                     />
                 </QItemSection>
@@ -175,7 +171,7 @@ const departments = ref();
                 <QItemSection>
                     <VnInputDate
                         :label="t('From')"
-                        is-outlined
+                        filled
                         v-model="params.defaulterSinced"
                     />
                 </QItemSection>

src/pages/Customer/Payments/CustomerPaymentsFilter.vue

@@ -25,7 +25,7 @@ const props = defineProps({
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('Order ID')" v-model="params.orderFk" is-outlined>
+                    <VnInput :label="t('Order ID')" v-model="params.orderFk" filled>
                         <template #prepend>
                             <QIcon name="vn:basket" size="xs" />
                         </template>
@@ -34,11 +34,7 @@ const props = defineProps({
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput :label="t('Customer ID')" v-model="params.clientFk" filled>
-                        :label="t('Customer ID')"
-                        v-model="params.clientFk"
-                        is-outlined
-                    >
                         <template #prepend>
                             <QIcon name="vn:client" size="xs" />
                         </template>
@@ -47,19 +43,15 @@ const props = defineProps({
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputNumber
+                    <VnInputNumber :label="t('Amount')" v-model="params.amount" filled />
-                        :label="t('Amount')"
-                        v-model="params.amount"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                    <VnInputDate v-model="params.from" :label="t('From')" filled />
                 </QItemSection>
                 <QItemSection>
-                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                    <VnInputDate v-model="params.to" :label="t('To')" filled />
                 </QItemSection>
             </QItem>
         </template>

src/pages/Entry/Card/EntryBasicData.vue

@@ -14,6 +14,8 @@ import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import VnSelectTravelExtended from 'src/components/common/VnSelectTravelExtended.vue';
 import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 import VnCheckbox from 'src/components/common/VnCheckbox.vue';
+import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import VnDmsInput from 'src/components/common/VnDmsInput.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -24,6 +26,7 @@ const user = state.getUser().fn();
 
 const companiesOptions = ref([]);
 const currenciesOptions = ref([]);
+const entryRef = ref({});
 
 onMounted(() => {
     checkEntryLock(route.params.id, user.id);
@@ -48,10 +51,11 @@ onMounted(() => {
         auto-load
     />
     <FormModel
-        :url-update="`Entries/${route.params.id}`"
+        ref="entryRef"
         model="Entry"
-        auto-load
+        :url-update="`Entries/${route.params.id}`"
         :clear-store-on-unmount="false"
+        auto-load
     >
         <template #form="{ data }">
             <VnRow class="q-py-sm">
@@ -67,11 +71,18 @@ onMounted(() => {
                 />
             </VnRow>
             <VnRow class="q-py-sm">
-                <VnInput v-model="data.reference" :label="t('globals.reference')" />
+                <VnInput
-                <VnInputNumber
+                    v-model="data.reference"
-                    v-model="data.invoiceAmount"
+                    :label="t('entry.list.tableVisibleColumns.reference')"
-                    :label="t('entry.summary.invoiceAmount')"
+                />
-                    :positive="false"
+                <VnSelect
+                    v-model="data.typeFk"
+                    url="entryTypes"
+                    :fields="['code', 'description']"
+                    option-value="code"
+                    optionLabel="description"
+                    sortBy="description"
+                    :label="t('entry.list.tableVisibleColumns.entryTypeDescription')"
                 />
             </VnRow>
             <VnRow class="q-py-sm">
@@ -113,7 +124,6 @@ onMounted(() => {
                     name="initialTemperature"
                     :label="t('entry.basicData.initialTemperature')"
                     :step="0.5"
-                    :decimal-places="2"
                     :positive="false"
                 />
                 <VnInputNumber
@@ -121,20 +131,21 @@ onMounted(() => {
                     name="finalTemperature"
                     :label="t('entry.basicData.finalTemperature')"
                     :step="0.5"
-                    :decimal-places="2"
                     :positive="false"
                 />
-                <VnSelect
-                    v-model="data.typeFk"
-                    url="entryTypes"
-                    :fields="['code', 'description']"
-                    option-value="code"
-                    optionLabel="description"
-                    sortBy="description"
-                />
             </VnRow>
             <VnRow class="q-py-sm">
-                <QInput
+                <VnInputNumber
+                    v-model="data.invoiceAmount"
+                    :label="t('entry.list.tableVisibleColumns.invoiceAmount')"
+                    :positive="false"
+                    @update:model-value="data.buyerFk = user.id"
+                />
+                <VnSelectWorker v-model="data.buyerFk" hide-selected />
+                <VnDmsInput :data="data" :formRef="entryRef" :disable="false" />
+            </VnRow>
+            <VnRow class="q-py-sm">
+                <VnInputNumber
                     :label="t('entry.basicData.observation')"
                     type="textarea"
                     v-model="data.observation"

src/pages/Entry/Card/EntryBuys.vue

@@ -18,6 +18,7 @@ import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import { checkEntryLock } from 'src/composables/checkEntryLock';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const $props = defineProps({
     id: {
@@ -44,6 +45,8 @@ const entityId = ref($props.id ?? route.params.id);
 const entryBuysRef = ref();
 const footerFetchDataRef = ref();
 const footer = ref({});
+const dialogRef = ref(false);
+const newEntryRef = ref(null);
 const columns = [
     {
         align: 'center',
@@ -250,6 +253,7 @@ const columns = [
         component: 'number',
         attrs: {
             positive: false,
+            decimalPlaces: 3,
         },
         cellEvent: {
             'update:modelValue': async (value, oldValue, row) => {
@@ -497,6 +501,23 @@ async function setBuyUltimate(itemFk, data) {
     });
 }
 
+async function transferBuys(rows, newEntry) {
+    if (!newEntry) return;
+
+    const promises = rows.map((row) => {
+        return axios.patch('Buys', { id: row.id, entryFk: newEntry });
+    });
+
+    await Promise.all(promises);
+
+    await axios.post(`Entries/${newEntry}/recalcEntryPrices`);
+    await axios.post(`Entries/${entityId.value}/recalcEntryPrices`);
+
+    entryBuysRef.value.reload();
+    newEntryRef.value = null;
+    dialogRef.value = false;
+}
+
 onMounted(() => {
     stateStore.rightDrawer = false;
     if ($props.editableMode) checkEntryLock(entityId.value, user.id);
@@ -571,6 +592,47 @@ onMounted(() => {
                     </QItem>
                 </QList>
             </QBtnDropdown>
+            <QBtn
+                icon="move_group"
+                color="primary"
+                :title="t('Transfer buys')"
+                data-cy="transferBuys"
+                flat
+                @click="dialogRef = true"
+                :disable="!selectedRows.length"
+            />
+            <QDialog v-model="dialogRef">
+                <QCard>
+                    <QCardSection>
+                        <span>{{ t('Transfer buys') }}</span>
+                    </QCardSection>
+                    <QCardSection>
+                        <VnInputNumber
+                            v-model="newEntryRef"
+                            :label="t('Entry')"
+                            type="number"
+                            data-cy="entryDestinyInput"
+                        />
+                    </QCardSection>
+                    <QCardSection>
+                        <QCardActions>
+                            <QBtn
+                                label="Cancel"
+                                flat
+                                color="primary"
+                                @click="dialogRef = false"
+                            />
+                            <QBtn
+                                label="Transfer"
+                                data-cy="transferBuysBtn"
+                                flat
+                                color="primary"
+                                @click="transferBuys(selectedRows, newEntryRef)"
+                            />
+                        </QCardActions>
+                    </QCardSection>
+                </QCard>
+            </QDialog>
         </QBtnGroup>
     </Teleport>
     <FetchData
@@ -620,7 +682,7 @@ onMounted(() => {
             },
             columnGridStyle: {
                 'max-width': '50%',
-                'margin-right': '30px',
+                'margin-right': '5%',
                 flex: 1,
             },
             previousStyle: {
@@ -652,6 +714,7 @@ onMounted(() => {
                     :fields="['id', 'nickname']"
                     option-label="nickname"
                     sort-by="nickname ASC"
+                    :use-like="false"
                 />
                 <VnSelect
                     :label="t('Family')"
@@ -816,6 +879,8 @@ es:
     Create buy: Crear compra
     Invert quantity value: Invertir valor de cantidad
     Check buy amount: Marcar como correcta la cantidad de compra
+    Transfer buys: Transferir compras
+    Entry: Entrada
 </i18n>
 <style lang="scss" scoped>
 .centered-container {

src/pages/Entry/Card/EntryDescriptor.vue

@@ -6,7 +6,7 @@ import { toDate } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import { useQuasar } from 'quasar';
 import { usePrintService } from 'composables/usePrintService';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 import axios from 'axios';
@@ -92,7 +92,7 @@ const getEntryRedirectionFilter = (entry) => {
 };
 
 function showEntryReport() {
-    openReport(`Entries/${entityId.value}/entry-order-pdf`);
+    openReport(`Entries/${entityId.value}/entry-order-pdf`, {}, true);
 }
 
 function showNotification(type, message) {
@@ -145,9 +145,9 @@ async function deleteEntry() {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Entries/${entityId}`"
-        :filter="entryFilter"
+        :user-filter="entryFilter"
         title="supplier.nickname"
         data-key="Entry"
         width="lg-width"
@@ -264,7 +264,7 @@ async function deleteEntry() {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <i18n>
 es:

src/pages/Entry/Card/EntrySummary.vue

@@ -84,7 +84,10 @@ onMounted(async () => {
                             :label="t('globals.company')"
                             :value="entry?.company?.code"
                         />
-                        <VnLv :label="t('globals.reference')" :value="entry?.reference" />
+                        <VnLv
+                            :label="t('entry.list.tableVisibleColumns.reference')"
+                            :value="entry?.reference"
+                        />
                         <VnLv
                             :label="t('entry.summary.invoiceNumber')"
                             :value="entry?.invoiceNumber"
@@ -159,6 +162,7 @@ onMounted(async () => {
                         />
                     </div>
                     <div class="card-content">
+                        <VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
                         <VnCheckbox
                             :label="t('entry.summary.travelDelivered')"
                             v-model="entry.travel.isDelivered"

src/pages/Entry/EntryFilter.vue

@@ -101,14 +101,14 @@ const entryFilterPanel = ref();
                         :label="t('params.landed')"
                         v-model="params.landed"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                         data-cy="landed"
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput v-model="params.id" label="Id" is-outlined />
+                    <VnInput v-model="params.id" label="Id" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -118,8 +118,7 @@ const entryFilterPanel = ref();
                         @update:model-value="searchFn()"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -128,7 +127,7 @@ const entryFilterPanel = ref();
                     <VnInput
                         v-model="params.reference"
                         :label="t('entry.list.tableVisibleColumns.reference')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -143,8 +142,7 @@ const entryFilterPanel = ref();
                         :fields="['id', 'name']"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -153,7 +151,7 @@ const entryFilterPanel = ref();
                     <VnInput
                         v-model="params.evaNotes"
                         :label="t('params.evaNotes')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -168,8 +166,7 @@ const entryFilterPanel = ref();
                         sort-by="name ASC"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -184,8 +181,7 @@ const entryFilterPanel = ref();
                         sort-by="name ASC"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -207,7 +203,7 @@ const entryFilterPanel = ref();
                     <VnInput
                         v-model="params.invoiceNumber"
                         :label="t('params.invoiceNumber')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -224,8 +220,16 @@ const entryFilterPanel = ref();
                         option-label="description"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.evaNotes"
+                        :label="t('params.evaNotes')"
+                        filled
                     />
                 </QItemSection>
             </QItem>

src/pages/Entry/EntryStockBought.vue

@@ -162,8 +162,8 @@ async function beforeSave(data, getChanges) {
     }
 
     await Promise.all(patchPromises);
-    const filteredChanges = changes.filter((change) => change?.isReal !== false);
+    data.creates = [];
-    data.creates = filteredChanges;
+    return data;
 }
 </script>
 <template>
@@ -203,7 +203,7 @@ async function beforeSave(data, getChanges) {
             </VnRow>
         </template>
     </VnSubToolbar>
-    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
+    <QDialog v-model="travelDialogRef" :class="['vn-row', 'wrap']">
         <FormModelPopup
             :url-update="`Travels/${travel?.id}`"
             model="travel"
@@ -252,12 +252,15 @@ async function beforeSave(data, getChanges) {
                     </span>
                 </template>
                 <template #column-footer-reserve>
-                    <span>
+                    <span class="q-pr-xs">
                         {{ round(footer.reserve) }}
                     </span>
                 </template>
                 <template #column-footer-bought>
-                    <span :style="boughtStyle(footer?.bought, footer?.reserve)">
+                    <span
+                        :style="boughtStyle(footer?.bought, footer?.reserve)"
+                        class="q-pr-xs"
+                    >
                         {{ round(footer.bought) }}
                     </span>
                 </template>
@@ -275,7 +278,7 @@ async function beforeSave(data, getChanges) {
 }
 .column {
     min-width: 35%;
-    margin-top: 5%;
+    margin-top: 1%;
 }
 .text-negative {
     color: $negative !important;

src/pages/Entry/locale/es.yml

@@ -25,7 +25,7 @@ entry:
             entryTypeDescription: Tipo entrada
             invoiceAmount: Importe
             dated: Fecha
-        inventoryEntry: Es inventario
+            inventoryEntry: Es inventario
     summary:
         commission: Comisión
         currency: Moneda
@@ -33,7 +33,8 @@ entry:
         invoiceAmount: Importe
         ordered: Pedida
         booked: Contabilizada
-        excludedFromAvailable: Excluido
+        excludedFromAvailable: Excluir del disponible
+        isConfirmed: Lista para etiquetar
         travelReference: Referencia
         travelAgency: Agencia
         travelShipped: F. envio
@@ -56,7 +57,7 @@ entry:
         observation: Observación
         commission: Comisión
         booked: Contabilizada
-        excludedFromAvailable: Excluido
+        excludedFromAvailable: Excluir del disponible
         initialTemperature: Ini °C
         finalTemperature: Fin °C
     buys:
@@ -119,9 +120,9 @@ entry:
         supplierName: Proveedor
 entryFilter:
     params:
-        isExcludedFromAvailable: Excluido
+        isExcludedFromAvailable: Excluir del disponible
         isOrdered: Pedida
-        isConfirmed: Confirmado
+        isConfirmed: Lista para etiquetar
         isReceived: Recibida
         isRaid: Raid
         landed: Fecha

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
 import VnLv from 'src/components/ui/VnLv.vue';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import filter from './InvoiceInFilter.js';
 import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
@@ -84,7 +84,7 @@ async function setInvoiceCorrection(id) {
 }
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         ref="cardDescriptorRef"
         data-key="InvoiceIn"
         :url="`InvoiceIns/${entityId}`"
@@ -159,7 +159,7 @@ async function setInvoiceCorrection(id) {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <style lang="scss" scoped>
 .q-dialog {

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -40,17 +40,13 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInputDate
                         :label="$t('globals.from')"
                         v-model="params.from"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate
+                    <VnInputDate :label="$t('globals.to')" v-model="params.to" filled />
-                        :label="$t('globals.to')"
-                        v-model="params.to"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -58,7 +54,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInputNumber
                         :label="$t('globals.daysAgo')"
                         v-model="params.daysAgo"
-                        is-outlined
+                        filled
                         :step="0"
                         @update:model-value="(val) => handleDaysAgo(params, val)"
                         @remove="(val) => handleDaysAgo(params, val)"
@@ -67,12 +63,7 @@ function handleDaysAgo(params, daysAgo) {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectSupplier
+                    <VnSelectSupplier v-model="params.supplierFk" dense filled />
-                        v-model="params.supplierFk"
-                        dense
-                        outlined
-                        rounded
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -80,7 +71,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('supplierRef')"
                         v-model="params.supplierRef"
-                        is-outlined
+                        filled
                         lazy-rules
                     />
                 </QItemSection>
@@ -90,7 +81,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('fi')"
                         v-model="params.fi"
-                        is-outlined
+                        filled
                         lazy-rules
                     />
                 </QItemSection>
@@ -100,7 +91,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('serial')"
                         v-model="params.serial"
-                        is-outlined
+                        filled
                         lazy-rules
                     />
                 </QItemSection>
@@ -110,7 +101,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('account')"
                         v-model="params.account"
-                        is-outlined
+                        filled
                         lazy-rules
                     />
                 </QItemSection>
@@ -120,7 +111,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInput
                         :label="getLocale('globals.params.awbCode')"
                         v-model="params.awbCode"
-                        is-outlined
+                        filled
                         lazy-rules
                     />
                 </QItemSection>
@@ -130,7 +121,7 @@ function handleDaysAgo(params, daysAgo) {
                     <VnInputNumber
                         :label="$t('globals.amount')"
                         v-model="params.amount"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -142,7 +133,7 @@ function handleDaysAgo(params, daysAgo) {
                         url="Companies"
                         option-label="code"
                         :fields="['id', 'code']"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>

src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue

@@ -25,8 +25,7 @@ const { t } = useI18n();
                     <VnInputNumber
                         v-model="params.daysAgo"
                         :label="t('params.daysAgo')"
-                        outlined
+                        filled
-                        rounded
                         dense
                     />
                 </QItemSection>
@@ -36,8 +35,7 @@ const { t } = useI18n();
                     <VnInput
                         v-model="params.serial"
                         :label="t('params.serial')"
-                        outlined
+                        filled
-                        rounded
                         dense
                     />
                 </QItemSection>

src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue

@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
@@ -34,7 +34,7 @@ function ticketFilter(invoice) {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         ref="descriptor"
         :url="`InvoiceOuts/${entityId}`"
         :filter="filter"
@@ -93,5 +93,5 @@ function ticketFilter(invoice) {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>

src/pages/InvoiceOut/InvoiceOutFilter.vue

@@ -33,17 +33,13 @@ const states = ref();
                     <VnInput
                         :label="t('globals.params.clientFk')"
                         v-model="params.clientFk"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput v-model="params.fi" :label="t('globals.params.fi')" filled />
-                        v-model="params.fi"
-                        :label="t('globals.params.fi')"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -51,7 +47,7 @@ const states = ref();
                     <VnInputNumber
                         :label="t('globals.amount')"
                         v-model="params.amount"
-                        is-outlined
+                        filled
                         data-cy="InvoiceOutFilterAmountBtn"
                     />
                 </QItemSection>
@@ -62,8 +58,7 @@ const states = ref();
                         :label="t('invoiceOut.params.min')"
                         dense
                         lazy-rules
-                        outlined
+                        filled
-                        rounded
                         type="number"
                         v-model.number="params.min"
                     />
@@ -73,8 +68,7 @@ const states = ref();
                         :label="t('invoiceOut.params.max')"
                         dense
                         lazy-rules
-                        outlined
+                        filled
-                        rounded
                         type="number"
                         v-model.number="params.max"
                     />
@@ -94,7 +88,7 @@ const states = ref();
                     <VnInputDate
                         v-model="params.created"
                         :label="t('invoiceOut.params.created')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -103,15 +97,14 @@ const states = ref();
                     <VnInputDate
                         v-model="params.dued"
                         :label="t('invoiceOut.params.dued')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
+                        filled
-                        rounded
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
                         option-value="id"

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -26,7 +26,7 @@ const serialTypesOptions = ref([]);
 
 const handleInvoiceOutSerialsFetch = (data) => {
     serialTypesOptions.value = Array.from(
-        new Set(data.map((item) => item.type).filter((type) => type))
+        new Set(data.map((item) => item.type).filter((type) => type)),
     );
 };
 
@@ -99,8 +99,7 @@ onMounted(async () => {
                 option-label="name"
                 hide-selected
                 dense
-                outlined
+                filled
-                rounded
                 data-cy="InvoiceOutGlobalClientSelect"
             >
                 <template #option="scope">
@@ -124,19 +123,18 @@ onMounted(async () => {
                 option-label="type"
                 hide-selected
                 dense
-                outlined
+                filled
-                rounded
                 data-cy="InvoiceOutGlobalSerialSelect"
             />
             <VnInputDate
                 v-model="formData.invoiceDate"
                 :label="t('invoiceDate')"
-                is-outlined
+                filled
             />
             <VnInputDate
                 v-model="formData.maxShipped"
                 :label="t('maxShipped')"
-                is-outlined
+                filled
                 data-cy="InvoiceOutGlobalMaxShippedDate"
             />
             <VnSelect
@@ -145,8 +143,7 @@ onMounted(async () => {
                 :options="companiesOptions"
                 option-label="code"
                 dense
-                outlined
+                filled
-                rounded
                 data-cy="InvoiceOutGlobalCompanySelect"
             />
             <VnSelect
@@ -154,8 +151,7 @@ onMounted(async () => {
                 v-model="formData.printer"
                 :options="printersOptions"
                 dense
-                outlined
+                filled
-                rounded
                 data-cy="InvoiceOutGlobalPrinterSelect"
             />
         </div>
@@ -166,7 +162,7 @@ onMounted(async () => {
             color="primary"
             class="q-mt-md full-width"
             unelevated
-            rounded
+            filled
             dense
         />
         <QBtn
@@ -175,7 +171,7 @@ onMounted(async () => {
             color="primary"
             class="q-mt-md full-width"
             unelevated
-            rounded
+            filled
             dense
             @click="getStatus = 'stopping'"
         />

src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue

@@ -35,17 +35,13 @@ const props = defineProps({
                     <VnInputDate
                         v-model="params.from"
                         :label="t('globals.from')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate
+                    <VnInputDate v-model="params.to" :label="t('globals.to')" filled />
-                        v-model="params.to"
-                        :label="t('globals.to')"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -57,8 +53,7 @@ const props = defineProps({
                         option-label="code"
                         option-value="code"
                         dense
-                        outlined
+                        filled
-                        rounded
                         @update:model-value="searchFn()"
                     >
                         <template #option="scope">
@@ -84,9 +79,8 @@ const props = defineProps({
                         v-model="params.country"
                         option-label="name"
                         option-value="name"
-                        outlined
                         dense
-                        rounded
+                        filled
                         @update:model-value="searchFn()"
                     >
                         <template #option="scope">
@@ -110,9 +104,8 @@ const props = defineProps({
                         url="Clients"
                         :label="t('globals.client')"
                         v-model="params.clientId"
-                        outlined
                         dense
-                        rounded
+                        filled
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>
@@ -122,7 +115,7 @@ const props = defineProps({
                     <VnInputNumber
                         v-model="params.amount"
                         :label="t('globals.amount')"
-                        is-outlined
+                        filled
                         :positive="false"
                     />
                 </QItemSection>
@@ -130,9 +123,8 @@ const props = defineProps({
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
                         option-value="id"

src/pages/Item/Card/ItemDescriptor.vue

@@ -3,7 +3,7 @@ import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'src/components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
@@ -90,7 +90,7 @@ const updateStock = async () => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         data-key="Item"
         :summary="$props.summary"
         :url="`Items/${entityId}/getCard`"
@@ -162,7 +162,7 @@ const updateStock = async () => {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>

src/pages/Item/ItemFixedPriceFilter.vue

@@ -13,7 +13,6 @@ const props = defineProps({
         required: true,
     },
 });
-
 </script>
 
 <template>
@@ -28,8 +27,7 @@ const props = defineProps({
                         :fields="['id', 'nickname']"
                         option-label="nickname"
                         dense
-                        outlined
+                        filled
-                        rounded
                         use-input
                         @update:model-value="searchFn()"
                         sort-by="nickname ASC"
@@ -46,8 +44,7 @@ const props = defineProps({
                         :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         dense
-                        outlined
+                        filled
-                        rounded
                         use-input
                         @update:model-value="searchFn()"
                     />
@@ -58,7 +55,7 @@ const props = defineProps({
                     <VnInputDate
                         :label="t('params.started')"
                         v-model="params.started"
-                        is-outlined
+                        filled
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>
@@ -68,7 +65,7 @@ const props = defineProps({
                     <VnInputDate
                         :label="t('params.ended')"
                         v-model="params.ended"
-                        is-outlined
+                        filled
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>

src/pages/Item/ItemListFilter.vue

@@ -177,11 +177,7 @@ onMounted(async () => {
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput v-model="params.search" :label="t('params.search')" filled />
-                        v-model="params.search"
-                        :label="t('params.search')"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -197,8 +193,7 @@ onMounted(async () => {
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -213,8 +208,7 @@ onMounted(async () => {
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -240,8 +234,7 @@ onMounted(async () => {
                         option-label="nickname"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -252,8 +245,7 @@ onMounted(async () => {
                         @update:model-value="searchFn()"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -282,8 +274,7 @@ onMounted(async () => {
                         :options="tagOptions"
                         option-label="name"
                         dense
-                        outlined
+                        filled
-                        rounded
                         :emit-value="false"
                         use-input
                         :is-clearable="false"
@@ -299,8 +290,7 @@ onMounted(async () => {
                         option-value="value"
                         option-label="value"
                         dense
-                        outlined
+                        filled
-                        rounded
                         emit-value
                         use-input
                         :disable="!tag"
@@ -312,7 +302,7 @@ onMounted(async () => {
                         v-model="tag.value"
                         :label="t('params.value')"
                         :disable="!tag"
-                        is-outlined
+                        filled
                         :is-clearable="false"
                         @keydown.enter.prevent="applyTags(params, searchFn)"
                     />
@@ -351,8 +341,7 @@ onMounted(async () => {
                         option-label="label"
                         option-value="label"
                         dense
-                        outlined
+                        filled
-                        rounded
                         :emit-value="false"
                         use-input
                         :is-clearable="false"
@@ -377,7 +366,7 @@ onMounted(async () => {
                         v-model="fieldFilter.value"
                         :label="t('params.value')"
                         :disable="!fieldFilter.selectedField"
-                        is-outlined
+                        filled
                         @keydown.enter="applyFieldFilters(params, searchFn)"
                     />
                 </QItemSection>

src/pages/Item/ItemRequestFilter.vue

@@ -87,11 +87,7 @@ onMounted(async () => {
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput v-model="params.search" :label="t('params.search')" filled />
-                        v-model="params.search"
-                        :label="t('params.search')"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -99,7 +95,7 @@ onMounted(async () => {
                     <VnInput
                         v-model="params.ticketFk"
                         :label="t('params.ticketFk')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -114,8 +110,7 @@ onMounted(async () => {
                         option-label="nickname"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -124,7 +119,7 @@ onMounted(async () => {
                     <VnInput
                         v-model="params.clientFk"
                         :label="t('params.clientFk')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -139,8 +134,7 @@ onMounted(async () => {
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -153,25 +147,16 @@ onMounted(async () => {
                         :params="{ departmentCodes: ['VT'] }"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate
+                    <VnInputDate v-model="params.from" :label="t('params.from')" filled />
-                        v-model="params.from"
-                        :label="t('params.from')"
-                        is-outlined
-                    />
                 </QItemSection>
                 <QItemSection>
-                    <VnInputDate
+                    <VnInputDate v-model="params.to" :label="t('params.to')" filled />
-                        v-model="params.to"
-                        :label="t('params.to')"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -180,7 +165,7 @@ onMounted(async () => {
                         :label="t('params.daysOnward')"
                         v-model="params.daysOnward"
                         lazy-rules
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -195,8 +180,7 @@ onMounted(async () => {
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>

src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue

@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import filter from './ItemTypeFilter.js';
@@ -25,7 +25,7 @@ const entityId = computed(() => {
 });
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`ItemTypes/${entityId}`"
         :filter="filter"
         title="code"
@@ -46,5 +46,5 @@ const entityId = computed(() => {
                 :value="entity.category?.name"
             />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>

src/pages/Monitor/Ticket/MonitorTicketFilter.vue

@@ -77,7 +77,7 @@ const getLocale = (label) => {
                     <VnInput
                         :label="t('globals.params.clientFk')"
                         v-model="params.clientFk"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -86,7 +86,7 @@ const getLocale = (label) => {
                     <VnInput
                         :label="t('params.orderFk')"
                         v-model="params.orderFk"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -95,7 +95,7 @@ const getLocale = (label) => {
                     <VnInputNumber
                         :label="t('params.scopeDays')"
                         v-model="params.scopeDays"
-                        is-outlined
+                        filled
                         @update:model-value="(val) => handleScopeDays(params, val)"
                         @remove="(val) => handleScopeDays(params, val)"
                     />
@@ -106,66 +106,54 @@ const getLocale = (label) => {
                     <VnInput
                         :label="t('params.nickname')"
                         v-model="params.nickname"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
-                        option-value="id"
-                        option-label="name"
                         url="Departments"
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput :label="t('params.refFk')" v-model="params.refFk" filled />
-                        :label="t('params.refFk')"
-                        v-model="params.refFk"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
 
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('params.agencyModeFk')"
                         v-model="params.agencyModeFk"
                         url="AgencyModes/isActive"
-                        is-outlined
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.stateFk')"
                         v-model="params.stateFk"
                         url="States"
-                        is-outlined
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('params.groupedStates')"
                         v-model="params.alertLevel"
                         :options="groupedStates"
@@ -176,9 +164,8 @@ const getLocale = (label) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehouses"
@@ -188,9 +175,8 @@ const getLocale = (label) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.countryFk')"
                         v-model="params.countryFk"
                         url="Countries"
@@ -200,9 +186,8 @@ const getLocale = (label) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.provinceFk')"
                         v-model="params.provinceFk"
                         url="Provinces"
@@ -212,9 +197,8 @@ const getLocale = (label) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.department"
                         option-label="name"
@@ -226,9 +210,8 @@ const getLocale = (label) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.packing')"
                         v-model="params.packing"
                         url="ItemPackingTypes"

src/pages/Order/Card/CatalogFilterValueDialog.vue

@@ -57,9 +57,8 @@ const getSelectedTagValues = async (tag) => {
                 option-value="id"
                 option-label="name"
                 dense
-                outlined
                 class="q-mb-md"
-                rounded
+                filled
                 :emit-value="false"
                 use-input
                 @update:model-value="getSelectedTagValues"
@@ -79,8 +78,7 @@ const getSelectedTagValues = async (tag) => {
                         option-value="value"
                         option-label="value"
                         dense
-                        outlined
+                        filled
-                        rounded
                         emit-value
                         use-input
                         :disable="!value || !selectedTag"
@@ -92,16 +90,14 @@ const getSelectedTagValues = async (tag) => {
                         v-model="value.value"
                         :label="t('components.itemsFilterPanel.value')"
                         :disable="!value"
-                        is-outlined
                         class="col"
                         data-cy="catalogFilterValueDialogValueInput"
                     />
                     <QBtn
                         icon="delete"
                         size="md"
-                        outlined
                         dense
-                        rounded
+                        filled
                         flat
                         class="filter-icon col-2"
                         @click="tagValues.splice(index, 1)"

src/pages/Order/Card/OrderCard.vue

@@ -6,9 +6,11 @@ import filter from './OrderFilter.js';
 
 <template>
     <VnCard
-        data-key="Order"
+        :data-key="$attrs['data-key'] ?? 'Order'"
         url="Orders"
         :filter="filter"
         :descriptor="OrderDescriptor"
+        v-bind="$attrs"
+        v-on="$attrs"
     />
 </template>

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -221,8 +221,7 @@ function addOrder(value, field, params) {
                         option-value="id"
                         option-label="name"
                         dense
-                        outlined
+                        filled
-                        rounded
                         emit-value
                         use-input
                         sort-by="name ASC"
@@ -251,8 +250,7 @@ function addOrder(value, field, params) {
                         v-model="orderBySelected"
                         :options="orderByList"
                         dense
-                        outlined
+                        filled
-                        rounded
                         @update:model-value="(value) => addOrder(value, 'field', params)"
                     />
                 </QItemSection>
@@ -264,8 +262,7 @@ function addOrder(value, field, params) {
                         v-model="orderWaySelected"
                         :options="orderWayList"
                         dense
-                        outlined
+                        filled
-                        rounded
                         @update:model-value="(value) => addOrder(value, 'way', params)"
                     />
                 </QItemSection>
@@ -275,8 +272,7 @@ function addOrder(value, field, params) {
                 <VnInput
                     :label="t('components.itemsFilterPanel.value')"
                     dense
-                    outlined
+                    filled
-                    rounded
                     :is-clearable="false"
                     v-model="searchByTag"
                     @keyup.enter="(val) => onSearchByTag(val, params)"

src/pages/Order/Card/OrderDescriptor.vue

@@ -4,10 +4,10 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency, toDate } from 'src/filters';
 import { useState } from 'src/composables/useState';
-import filter from './OrderFilter.js';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import FetchData from 'components/FetchData.vue';
+import OrderCard from './OrderCard.vue';
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 
 const DEFAULT_ITEMS = 0;
@@ -24,11 +24,14 @@ const route = useRoute();
 const state = useState();
 const { t } = useI18n();
 const getTotalRef = ref();
+const total = ref(0);
 
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
+const orderTotal = computed(() => state.get('orderTotal') ?? 0);
+
 const setData = (entity) => {
     if (!entity) return;
     getTotalRef.value && getTotalRef.value.fetch();
@@ -38,9 +41,6 @@ const setData = (entity) => {
 const getConfirmationValue = (isConfirmed) => {
     return t(isConfirmed ? 'globals.confirmed' : 'order.summary.notConfirmed');
 };
-
-const orderTotal = computed(() => state.get('orderTotal') ?? 0);
-const total = ref(0);
 </script>
 
 <template>
@@ -54,12 +54,12 @@ const total = ref(0);
         "
     />
     <CardDescriptor
-        ref="descriptor"
+        v-bind="$attrs"
-        :url="`Orders/${entityId}`"
+        :id="entityId"
-        :filter="filter"
+        :card="OrderCard"
         title="client.name"
         @on-fetch="setData"
-        data-key="Order"
+        module="Order"
     >
         <template #body="{ entity }">
             <VnLv

src/pages/Order/Card/OrderDescriptorProxy.vue

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

src/pages/Order/Card/OrderFilter.vue

@@ -49,8 +49,7 @@ const sourceList = ref([]);
                     v-model="params.clientFk"
                     lazy-rules
                     dense
-                    outlined
+                    filled
-                    rounded
                 />
                 <VnSelect
                     :label="t('agency')"
@@ -58,13 +57,11 @@ const sourceList = ref([]);
                     :options="agencyList"
                     :input-debounce="0"
                     dense
-                    outlined
+                    filled
-                    rounded
                 />
                 <VnSelect
-                    outlined
                     dense
-                    rounded
+                    filled
                     :label="t('globals.params.departmentFk')"
                     v-model="params.departmentFk"
                     option-value="id"
@@ -75,21 +72,14 @@ const sourceList = ref([]);
                     v-model="params.from"
                     :label="t('fromLanded')"
                     dense
-                    outlined
+                    filled
-                    rounded
-                />
-                <VnInputDate
-                    v-model="params.to"
-                    :label="t('toLanded')"
-                    dense
-                    outlined
-                    rounded
                 />
+                <VnInputDate v-model="params.to" :label="t('toLanded')" dense filled />
                 <VnInput
                     :label="t('orderId')"
                     v-model="params.orderFk"
                     lazy-rules
-                    is-outlined
+                    filled
                 />
                 <VnSelect
                     :label="t('application')"
@@ -98,8 +88,7 @@ const sourceList = ref([]);
                     option-label="value"
                     option-value="value"
                     dense
-                    outlined
+                    filled
-                    rounded
                     :input-debounce="0"
                 />
                 <QCheckbox

src/pages/Route/Agency/Card/AgencyDescriptor.vue

@@ -3,7 +3,7 @@ import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 
 const props = defineProps({
@@ -21,7 +21,7 @@ const { store } = useArrayData();
 const card = computed(() => store.data);
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         data-key="Agency"
         :url="`Agencies/${entityId}`"
         :title="card?.name"
@@ -31,5 +31,5 @@ const card = computed(() => store.data);
         <template #body="{ entity: agency }">
             <VnLv :label="t('globals.name')" :value="agency.name" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>

src/pages/Route/Card/RouteAutonomousFilter.vue

@@ -71,7 +71,7 @@ const exprBuilder = (param, value) => {
             <QList dense>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInput v-model="params.routeFk" :label="t('ID')" is-outlined />
+                        <VnInput v-model="params.routeFk" :label="t('ID')" filled />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm" v-if="agencyList">
@@ -83,8 +83,7 @@ const exprBuilder = (param, value) => {
                             option-value="id"
                             option-label="name"
                             dense
-                            outlined
+                            filled
-                            rounded
                             emit-value
                             map-options
                             use-input
@@ -102,8 +101,7 @@ const exprBuilder = (param, value) => {
                             option-value="id"
                             option-label="name"
                             dense
-                            outlined
+                            filled
-                            rounded
                             emit-value
                             map-options
                             use-input
@@ -123,8 +121,7 @@ const exprBuilder = (param, value) => {
                             option-value="name"
                             option-label="name"
                             dense
-                            outlined
+                            filled
-                            rounded
                             emit-value
                             map-options
                             use-input
@@ -135,20 +132,12 @@ const exprBuilder = (param, value) => {
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInputDate
+                        <VnInputDate v-model="params.dated" :label="t('Date')" filled />
-                            v-model="params.dated"
-                            :label="t('Date')"
-                            is-outlined
-                        />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInputDate
+                        <VnInputDate v-model="params.from" :label="t('From')" filled />
-                            v-model="params.from"
-                            :label="t('From')"
-                            is-outlined
-                        />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
@@ -156,7 +145,7 @@ const exprBuilder = (param, value) => {
                         <VnInputDate
                             v-model="params.to"
                             :label="t('To')"
-                            is-outlined
+                            filled
                             is-clearable
                         />
                     </QItemSection>
@@ -166,23 +155,23 @@ const exprBuilder = (param, value) => {
                         <VnInput
                             v-model="params.packages"
                             :label="t('Packages')"
-                            is-outlined
+                            filled
                         />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInput v-model="params.m3" :label="t('m3')" is-outlined />
+                        <VnInput v-model="params.m3" :label="t('m3')" filled />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInput v-model="params.kmTotal" :label="t('Km')" is-outlined />
+                        <VnInput v-model="params.kmTotal" :label="t('Km')" filled />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInput v-model="params.price" :label="t('Price')" is-outlined />
+                        <VnInput v-model="params.price" :label="t('Price')" filled />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
@@ -190,7 +179,7 @@ const exprBuilder = (param, value) => {
                         <VnInput
                             v-model="params.invoiceInFk"
                             :label="t('Received')"
-                            is-outlined
+                            filled
                         />
                     </QItemSection>
                 </QItem>

src/pages/Route/Card/RouteDescriptor.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import useCardDescription from 'composables/useCardDescription';
 import VnLv from 'components/ui/VnLv.vue';
 import { dashIfEmpty, toDate } from 'src/filters';
@@ -41,13 +41,12 @@ const getZone = async () => {
     zone.value = zoneData.name;
 };
 const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
 onMounted(async () => {
     getZone();
 });
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Routes/${entityId}`"
         :filter="filter"
         :title="null"
@@ -69,7 +68,7 @@ onMounted(async () => {
         <template #menu="{ entity }">
             <RouteDescriptorMenu :route="entity" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <i18n>
 es:

src/pages/Route/Card/RouteFilter.vue

@@ -36,8 +36,7 @@ const emit = defineEmits(['search']);
                         :label="t('globals.worker')"
                         v-model="params.workerFk"
                         dense
-                        outlined
+                        filled
-                        rounded
                         :input-debounce="0"
                     />
                 </QItemSection>
@@ -52,8 +51,7 @@ const emit = defineEmits(['search']);
                         option-value="id"
                         option-label="name"
                         dense
-                        outlined
+                        filled
-                        rounded
                         :input-debounce="0"
                     />
                 </QItemSection>
@@ -63,7 +61,7 @@ const emit = defineEmits(['search']);
                     <VnInputDate
                         v-model="params.from"
                         :label="t('globals.from')"
-                        is-outlined
+                        filled
                         :disable="Boolean(params.scopeDays)"
                         @update:model-value="params.scopeDays = null"
                     />
@@ -74,7 +72,7 @@ const emit = defineEmits(['search']);
                     <VnInputDate
                         v-model="params.to"
                         :label="t('globals.to')"
-                        is-outlined
+                        filled
                         :disable="Boolean(params.scopeDays)"
                         @update:model-value="params.scopeDays = null"
                     />
@@ -86,7 +84,7 @@ const emit = defineEmits(['search']);
                         v-model="params.scopeDays"
                         type="number"
                         :label="t('globals.daysOnward')"
-                        is-outlined
+                        filled
                         clearable
                         :disable="Boolean(params.from || params.to)"
                         @update:model-value="
@@ -107,15 +105,14 @@ const emit = defineEmits(['search']);
                         option-label="numberPlate"
                         option-filter-value="numberPlate"
                         dense
-                        outlined
+                        filled
-                        rounded
                         :input-debounce="0"
                     />
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnInput v-model="params.m3" label="m³" is-outlined clearable />
+                    <VnInput v-model="params.m3" label="m³" filled clearable />
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">
@@ -127,8 +124,7 @@ const emit = defineEmits(['search']);
                         option-value="id"
                         option-label="name"
                         dense
-                        outlined
+                        filled
-                        rounded
                         :input-debounce="0"
                     />
                 </QItemSection>
@@ -138,7 +134,7 @@ const emit = defineEmits(['search']);
                     <VnInput
                         v-model="params.description"
                         :label="t('globals.description')"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>

src/pages/Route/Cmr/CmrList.vue

@@ -28,7 +28,6 @@ const userParams = {
     shipped: null,
 };
 
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -175,6 +174,7 @@ function downloadPdfs() {
         :data-key
         url="Cmrs/filter"
         :columns="columns"
+        :order="['shipped DESC', 'cmrFk ASC']"
         :user-params="userParams"
         default-mode="table"
         v-model:selected="selectedRows"

src/pages/Route/Roadmap/RoadmapDescriptor.vue

@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
@@ -30,7 +30,7 @@ const entityId = computed(() => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Roadmaps/${entityId}`"
         :filter="filter"
         data-key="Roadmap"
@@ -52,7 +52,7 @@ const entityId = computed(() => {
         <template #menu="{ entity }">
             <RoadmapDescriptorMenu :route="entity" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <i18n>
 es:

src/pages/Route/Roadmap/RoadmapFilter.vue

@@ -31,12 +31,12 @@ const emit = defineEmits(['search']);
         <template #body="{ params }">
             <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                    <VnInputDate v-model="params.from" :label="t('From')" filled />
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                    <VnInputDate v-model="params.to" :label="t('To')" filled />
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">
@@ -44,7 +44,7 @@ const emit = defineEmits(['search']);
                     <VnInput
                         v-model="params.tractorPlate"
                         :label="t('Tractor Plate')"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>
@@ -54,7 +54,7 @@ const emit = defineEmits(['search']);
                     <VnInput
                         v-model="params.trailerPlate"
                         :label="t('Trailer Plate')"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>
@@ -66,8 +66,7 @@ const emit = defineEmits(['search']);
                         :fields="['id', 'nickname']"
                         v-model="params.supplierFk"
                         dense
-                        outlined
+                        filled
-                        rounded
                         emit-value
                         map-options
                         use-input
@@ -81,7 +80,7 @@ const emit = defineEmits(['search']);
                         v-model="params.price"
                         :label="t('Price')"
                         type="number"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>
@@ -91,7 +90,7 @@ const emit = defineEmits(['search']);
                     <VnInput
                         v-model="params.driverName"
                         :label="t('Driver name')"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>
@@ -101,7 +100,7 @@ const emit = defineEmits(['search']);
                     <VnInput
                         v-model="params.phone"
                         :label="t('Phone')"
-                        is-outlined
+                        filled
                         clearable
                     />
                 </QItemSection>

src/pages/Route/RouteList.vue

@@ -54,9 +54,9 @@ const columns = computed(() => [
         label: t('globals.worker'),
         component: markRaw(VnSelectWorker),
         create: true,
+        cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
         columnFilter: false,
-        cardVisible: true,
         width: '100px',
     },
     {
@@ -74,7 +74,6 @@ const columns = computed(() => [
         create: true,
         columnFilter: true,
         cardVisible: true,
-        visible: true,
     },
     {
         name: 'vehicleFk',
@@ -93,7 +92,6 @@ const columns = computed(() => [
         create: true,
         columnFilter: true,
         cardVisible: true,
-        visible: true,
     },
     {
         align: 'center',

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

@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import VnLv from 'src/components/ui/VnLv.vue';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -20,7 +20,7 @@ const route = useRoute();
 const entityId = computed(() => props.id || route.params.id);
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Vehicles/${entityId}`"
         data-key="Vehicle"
         title="numberPlate"
@@ -54,7 +54,7 @@ const entityId = computed(() => props.id || route.params.id);
             <VnLv :label="$t('globals.model')" :value="entity.model" />
             <VnLv :label="$t('globals.country')" :value="entity.countryCodeFk" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 <i18n>
 es:

src/pages/Shelving/Card/ShelvingDescriptor.vue

@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import ShelvingDescriptorMenu from 'pages/Shelving/Card/ShelvingDescriptorMenu.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
@@ -24,7 +24,7 @@ const entityId = computed(() => {
 });
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Shelvings/${entityId}`"
         :filter="filter"
         title="code"
@@ -45,5 +45,5 @@ const entityId = computed(() => {
         <template #menu="{ entity }">
             <ShelvingDescriptorMenu :shelving="entity" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>

src/pages/Shelving/Card/ShelvingFilter.vue

@@ -39,15 +39,14 @@ const emit = defineEmits(['search']);
                         option-label="code"
                         :filter-options="['id', 'code']"
                         dense
-                        outlined
+                        filled
-                        rounded
                         sort-by="code ASC"
                     />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnSelectWorker v-model="params.userFk" outlined rounded />
+                    <VnSelectWorker v-model="params.userFk" filled />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-md">

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

@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import filter from './ParkingFilter.js';
 const props = defineProps({
@@ -16,7 +16,7 @@ const route = useRoute();
 const entityId = computed(() => props.id || route.params.id);
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         data-key="Parking"
         :url="`Parkings/${entityId}`"
         title="code"
@@ -28,5 +28,5 @@ const entityId = computed(() => props.id || route.params.id);
             <VnLv :label="$t('parking.pickingOrder')" :value="entity.pickingOrder" />
             <VnLv :label="$t('parking.sector')" :value="entity.sector?.description" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>

src/pages/Shelving/Parking/ParkingFilter.vue

@@ -36,11 +36,7 @@ const emit = defineEmits(['search']);
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput :label="t('params.code')" v-model="params.code" filled />
-                        :label="t('params.code')"
-                        v-model="params.code"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -51,8 +47,7 @@ const emit = defineEmits(['search']);
                         option-label="description"
                         :label="t('params.sectorFk')"
                         dense
-                        outlined
+                        filled
-                        rounded
                         :options="sectors"
                         use-input
                         input-debounce="0"

src/pages/Supplier/Card/SupplierBalanceFilter.vue

@@ -33,7 +33,7 @@ defineProps({
                         :label="t('params.from')"
                         v-model="params.from"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -47,8 +47,7 @@ defineProps({
                         :include="{ relation: 'accountingType' }"
                         sort-by="id"
                         dense
-                        outlined
+                        filled
-                        rounded
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -74,8 +73,7 @@ defineProps({
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>

src/pages/Supplier/Card/SupplierConsumptionFilter.vue

@@ -25,20 +25,12 @@ defineProps({
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput v-model="params.search" :label="t('params.search')" filled />
-                        v-model="params.search"
-                        :label="t('params.search')"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput v-model="params.itemId" :label="t('params.itemId')" filled />
-                        v-model="params.itemId"
-                        :label="t('params.itemId')"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -54,8 +46,7 @@ defineProps({
                         option-label="nickname"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -73,8 +64,7 @@ defineProps({
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -102,8 +92,7 @@ defineProps({
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -113,7 +102,7 @@ defineProps({
                         :label="t('params.from')"
                         v-model="params.from"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -123,7 +112,7 @@ defineProps({
                         :label="t('params.to')"
                         v-model="params.to"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>

src/pages/Supplier/Card/SupplierDescriptor.vue

@@ -3,7 +3,7 @@ import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { toDateString } from 'src/filters';
@@ -61,7 +61,7 @@ const getEntryQueryParams = (supplier) => {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Suppliers/${entityId}`"
         :filter="filter"
         data-key="Supplier"
@@ -136,7 +136,7 @@ const getEntryQueryParams = (supplier) => {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>

src/pages/Ticket/Card/TicketDescriptor.vue

@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import DepartmentDescriptorProxy from 'pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { toDateTimeFormat } from 'src/filters/date';
@@ -57,7 +57,7 @@ function getInfo() {
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Tickets/${entityId}`"
         :filter="filter"
         data-key="Ticket"
@@ -155,7 +155,7 @@ function getInfo() {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>

src/pages/Ticket/Negative/TicketLackFilter.vue

@@ -81,7 +81,7 @@ const setUserParams = (params) => {
                             v-model="params.days"
                             :label="t('negative.days')"
                             dense
-                            is-outlined
+                            filled
                             type="number"
                             @update:model-value="
                                 (value) => {
@@ -97,7 +97,7 @@ const setUserParams = (params) => {
                             v-model="params.id"
                             :label="t('negative.id')"
                             dense
-                            is-outlined
+                            filled
                         />
                     </QItemSection>
                 </QItem>
@@ -107,7 +107,7 @@ const setUserParams = (params) => {
                             v-model="params.producer"
                             :label="t('negative.producer')"
                             dense
-                            is-outlined
+                            filled
                         />
                     </QItemSection>
                 </QItem>
@@ -117,7 +117,7 @@ const setUserParams = (params) => {
                             v-model="params.origen"
                             :label="t('negative.origen')"
                             dense
-                            is-outlined
+                            filled
                         />
                     </QItemSection> </QItem
                 ><QItem>
@@ -133,8 +133,7 @@ const setUserParams = (params) => {
                             option-label="name"
                             hide-selected
                             dense
-                            outlined
+                            filled
-                            rounded
                         /> </QItemSection
                     ><QItemSection v-else>
                         <QSkeleton class="full-width" type="QSelect" />
@@ -151,8 +150,7 @@ const setUserParams = (params) => {
                             option-label="name"
                             hide-selected
                             dense
-                            outlined
+                            filled
-                            rounded
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">

src/pages/Ticket/TicketAdvanceFilter.vue

@@ -71,7 +71,7 @@ onMounted(async () => await getItemPackingTypes());
                     <VnInputDate
                         v-model="params.dateFuture"
                         :label="t('params.dateFuture')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -80,7 +80,7 @@ onMounted(async () => await getItemPackingTypes());
                     <VnInputDate
                         v-model="params.dateToAdvance"
                         :label="t('params.dateToAdvance')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -95,8 +95,7 @@ onMounted(async () => await getItemPackingTypes());
                         :info="t('iptInfo')"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
+                        filled
-                        rounded
                         :use-like="false"
                     >
                     </VnSelect>
@@ -113,8 +112,7 @@ onMounted(async () => await getItemPackingTypes());
                         :info="t('iptInfo')"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
+                        filled
-                        rounded
                         :use-like="false"
                     >
                     </VnSelect>
@@ -125,7 +123,7 @@ onMounted(async () => await getItemPackingTypes());
                     <VnInputNumber
                         v-model="params.scopeDays"
                         :label="t('Days onward')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -147,8 +145,7 @@ onMounted(async () => await getItemPackingTypes());
                         url="Departments"
                         :fields="['id', 'name']"
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -162,8 +159,7 @@ onMounted(async () => await getItemPackingTypes());
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
+                        filled
-                        rounded
                     >
                     </VnSelect>
                 </QItemSection>

src/pages/Ticket/TicketFilter.vue

@@ -63,18 +63,10 @@ const getGroupedStates = (data) => {
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput v-model="params.clientFk" :label="t('Customer ID')" filled />
-                        v-model="params.clientFk"
-                        :label="t('Customer ID')"
-                        is-outlined
-                    />
                 </QItemSection>
                 <QItemSection>
-                    <VnInput
+                    <VnInput v-model="params.orderFk" :label="t('Order ID')" filled />
-                        v-model="params.orderFk"
-                        :label="t('Order ID')"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -82,7 +74,7 @@ const getGroupedStates = (data) => {
                     <VnInputDate
                         v-model="params.from"
                         :label="t('From')"
-                        is-outlined
+                        filled
                         data-cy="From_date"
                     />
                 </QItemSection>
@@ -90,7 +82,7 @@ const getGroupedStates = (data) => {
                     <VnInputDate
                         v-model="params.to"
                         :label="t('To')"
-                        is-outlined
+                        filled
                         data-cy="To_date"
                     />
                 </QItemSection>
@@ -98,9 +90,8 @@ const getGroupedStates = (data) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        outlined
                         dense
-                        rounded
+                        filled
                         :label="t('globals.params.departmentFk')"
                         v-model="params.departmentFk"
                         option-value="id"
@@ -125,8 +116,7 @@ const getGroupedStates = (data) => {
                         map-options
                         use-input
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -146,19 +136,14 @@ const getGroupedStates = (data) => {
                         map-options
                         use-input
                         dense
-                        outlined
+                        filled
-                        rounded
                         sort-by="name ASC"
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput v-model="params.refFk" :label="t('Invoice Ref.')" filled />
-                        v-model="params.refFk"
-                        :label="t('Invoice Ref.')"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -166,17 +151,13 @@ const getGroupedStates = (data) => {
                     <VnInput
                         v-model="params.scopeDays"
                         :label="t('Days onward')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput v-model="params.nickname" :label="t('Nickname')" filled />
-                        v-model="params.nickname"
-                        :label="t('Nickname')"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -241,8 +222,7 @@ const getGroupedStates = (data) => {
                         map-options
                         use-input
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -260,8 +240,7 @@ const getGroupedStates = (data) => {
                         map-options
                         use-input
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -281,8 +260,7 @@ const getGroupedStates = (data) => {
                         map-options
                         use-input
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -291,7 +269,7 @@ const getGroupedStates = (data) => {
                     <VnInput
                         v-model="params.collectionFk"
                         :label="t('Collection')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>

src/pages/Ticket/TicketFutureFilter.vue

@@ -73,7 +73,7 @@ onMounted(async () => {
                     <VnInputDate
                         v-model="params.originScopeDays"
                         :label="t('params.originScopeDays')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -82,7 +82,7 @@ onMounted(async () => {
                     <VnInputDate
                         v-model="params.futureScopeDays"
                         :label="t('params.futureScopeDays')"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -91,7 +91,7 @@ onMounted(async () => {
                     <VnInput
                         :label="t('params.litersMax')"
                         v-model="params.litersMax"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -100,7 +100,7 @@ onMounted(async () => {
                     <VnInput
                         :label="t('params.linesMax')"
                         v-model="params.linesMax"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -115,8 +115,7 @@ onMounted(async () => {
                         :info="t('iptInfo')"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
+                        filled
-                        rounded
                     >
                     </VnSelect>
                 </QItemSection>
@@ -132,8 +131,7 @@ onMounted(async () => {
                         :info="t('iptInfo')"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
+                        filled
-                        rounded
                     >
                     </VnSelect>
                 </QItemSection>
@@ -148,8 +146,7 @@ onMounted(async () => {
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
+                        filled
-                        rounded
                     >
                     </VnSelect>
                 </QItemSection>
@@ -164,8 +161,7 @@ onMounted(async () => {
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
+                        filled
-                        rounded
                     >
                     </VnSelect>
                 </QItemSection>
@@ -191,8 +187,7 @@ onMounted(async () => {
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
-                        outlined
+                        filled
-                        rounded
                     >
                     </VnSelect>
                 </QItemSection>

src/pages/Travel/Card/TravelBasicData.vue

@@ -36,7 +36,7 @@ const warehousesOptionsIn = ref([]);
         auto-load
         :filter="{ where: { isDestiny: TRUE } }"
     />
-    <FormModel :url-update="`Travels/${route.params.id}`" model="Travel" auto-load>
+    <FormModel :url-update="`Travels/${route.params.id}`" model="Travel">
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.ref" :label="t('globals.reference')" />
@@ -57,8 +57,8 @@ const warehousesOptionsIn = ref([]);
             <VnRow>
                 <VnInputDate
                     v-model="data.availabled"
-                    :label="t('travel.summary.availabled')" 
+                    :label="t('travel.summary.availabled')"
-                    />
+                />
                 <VnInputTime
                     v-model="data.availabled"
                     :label="t('travel.summary.availabledHour')"
@@ -96,6 +96,7 @@ const warehousesOptionsIn = ref([]);
                         </QIcon>
                     </template>
                 </VnInput>
+                <VnInput v-model="data.awbFk" :label="t('travel.awbFk')" />
             </VnRow>
             <VnRow>
                 <QCheckbox v-model="data.isRaid" :label="t('travel.basicData.isRaid')" />

src/pages/Travel/Card/TravelDescriptor.vue

@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
@@ -31,7 +31,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
 </script>
 
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         :url="`Travels/${entityId}`"
         :title="data.title"
         :subtitle="data.subtitle"
@@ -79,7 +79,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>

src/pages/Travel/Card/TravelFilter.js

@@ -12,6 +12,7 @@ export default {
         'isRaid',
         'daysInForward',
         'availabled',
+        'awbFk',
     ],
     include: [
         {

src/pages/Travel/ExtraCommunityFilter.vue

@@ -87,7 +87,7 @@ warehouses();
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput label="id" v-model="params.id" is-outlined />
+                    <VnInput label="id" v-model="params.id" filled />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -95,7 +95,7 @@ warehouses();
                     <VnInput
                         :label="t('extraCommunity.filter.reference')"
                         v-model="params.reference"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -106,8 +106,7 @@ warehouses();
                         type="number"
                         :label="t('extraCommunity.filter.totalEntries')"
                         dense
-                        outlined
+                        filled
-                        rounded
                         min="0"
                         class="input-number"
                     >
@@ -141,8 +140,7 @@ warehouses();
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -152,7 +150,7 @@ warehouses();
                         :label="t('extraCommunity.filter.shippedFrom')"
                         v-model="params.shippedFrom"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -162,7 +160,7 @@ warehouses();
                         :label="t('extraCommunity.filter.landedTo')"
                         v-model="params.landedTo"
                         @update:model-value="searchFn()"
-                        is-outlined
+                        filled
                     />
                 </QItemSection>
             </QItem>
@@ -176,8 +174,7 @@ warehouses();
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -191,8 +188,7 @@ warehouses();
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -206,8 +202,7 @@ warehouses();
                         option-label="name"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -218,8 +213,7 @@ warehouses();
                         v-model="params.cargoSupplierFk"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -229,8 +223,7 @@ warehouses();
                         v-model="params.entrySupplierFk"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
@@ -245,8 +238,7 @@ warehouses();
                         :filter-options="['code', 'name']"
                         hide-selected
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>

src/pages/Travel/TravelFilter.vue

@@ -33,19 +33,14 @@ defineExpose({ states });
         </template>
         <template #body="{ params, searchFn }">
             <div class="q-pa-sm q-gutter-y-sm">
-                <VnInput
+                <VnInput :label="t('travel.Id')" v-model="params.id" lazy-rules filled>
-                    :label="t('travel.Id')"
-                    v-model="params.id"
-                    lazy-rules
-                    is-outlined
-                >
                     <template #prepend> <QIcon name="badge" size="xs" /></template>
                 </VnInput>
                 <VnInput
                     :label="t('travel.ref')"
                     v-model="params.ref"
                     lazy-rules
-                    is-outlined
+                    filled
                 />
                 <VnSelect
                     :label="t('travel.agency')"
@@ -56,8 +51,7 @@ defineExpose({ states });
                     :use-like="false"
                     option-filter="name"
                     dense
-                    outlined
+                    filled
-                    rounded
                 />
                 <VnSelect
                     :label="t('travel.warehouseInFk')"
@@ -69,22 +63,19 @@ defineExpose({ states });
                     option-label="name"
                     option-filter="name"
                     dense
-                    outlined
+                    filled
-                    rounded
                 />
                 <VnInputDate
                     :label="t('travel.shipped')"
                     v-model="params.shipped"
                     @update:model-value="searchFn()"
-                    outlined
+                    filled
-                    rounded
                 />
                 <VnInputTime
                     v-model="params.shipmentHour"
                     @update:model-value="searchFn()"
                     :label="t('travel.shipmentHour')"
-                    outlined
+                    filled
-                    rounded
                     dense
                 />
                 <VnSelect
@@ -97,36 +88,33 @@ defineExpose({ states });
                     option-label="name"
                     option-filter="name"
                     dense
-                    outlined
+                    filled
-                    rounded
                 />
                 <VnInputDate
                     :label="t('travel.landed')"
                     v-model="params.landed"
                     @update:model-value="searchFn()"
                     dense
-                    outlined
+                    filled
-                    rounded
                 />
                 <VnInputTime
                     v-model="params.landingHour"
                     @update:model-value="searchFn()"
                     :label="t('travel.landingHour')"
-                    outlined
+                    filled
-                    rounded
                     dense
                 />
                 <VnInput
                     :label="t('travel.totalEntries')"
                     v-model="params.totalEntries"
                     lazy-rules
-                    is-outlined
+                    filled
                 />
                 <VnInput
                     :label="t('travel.daysOnward')"
                     v-model="params.daysOnward"
                     lazy-rules
-                    is-outlined
+                    filled
                 />
             </div>
         </template>

src/pages/Worker/Card/WorkerCalendarFilter.vue

@@ -40,7 +40,7 @@ watch(
     (newValue) => {
         checkHolidays(newValue);
     },
-    { deep: true, immediate: true }
+    { deep: true, immediate: true },
 );
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
@@ -174,8 +174,7 @@ const yearList = ref(generateYears());
                     v-model="selectedYear"
                     :options="yearList"
                     dense
-                    outlined
+                    filled
-                    rounded
                     use-input
                     :is-clearable="false"
                 />
@@ -188,8 +187,7 @@ const yearList = ref(generateYears());
                     option-value="businessFk"
                     option-label="businessFk"
                     dense
-                    outlined
+                    filled
-                    rounded
                     use-input
                     :is-clearable="false"
                 >

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -2,7 +2,7 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'src/components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
@@ -52,7 +52,7 @@ const handlePhotoUpdated = (evt = false) => {
 };
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         ref="cardDescriptorRef"
         :data-key="dataKey"
         :summary="$props.summary"
@@ -167,7 +167,7 @@ const handlePhotoUpdated = (evt = false) => {
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
     <VnChangePassword
         ref="changePassRef"
         :submit-fn="

src/pages/Worker/Card/WorkerPda.vue

@@ -5,24 +5,25 @@ import { ref, computed } from 'vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'src/composables/useArrayData';
+import { downloadDocuware } from 'src/composables/downloadFile';
+
 import FetchData from 'components/FetchData.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
-import { useVnConfirm } from 'composables/useVnConfirm';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
-
+const loadingDocuware = ref(true);
-const paginate = ref();
+const tableRef = ref();
 const dialog = ref();
 const route = useRoute();
 const { openConfirmationModal } = useVnConfirm();
 const routeId = computed(() => route.params.id);
-
+const worker = computed(() => useArrayData('Worker').store.data);
 const initialData = computed(() => {
     return {
         userFk: routeId.value,
@@ -31,154 +32,268 @@ const initialData = computed(() => {
     };
 });
 
-const deallocatePDA = async (deviceProductionFk) => {
+const columns = computed(() => [
-    await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
+    {
-        pda: deviceProductionFk,
+        align: 'center',
-    });
+        label: t('globals.state'),
-    notify(t('PDA deallocated'), 'positive');
+        name: 'state',
-
+        format: (row) => row?.docuware?.state,
-    paginate.value.fetch();
+        columnFilter: false,
-};
+        chip: {
+            condition: (_, row) => !!row.docuware,
+            color: (row) => (isSigned(row) ? 'bg-positive' : 'bg-warning'),
+        },
+        visible: false,
+    },
+    {
+        align: 'right',
+        label: t('worker.pda.currentPDA'),
+        name: 'deviceProductionFk',
+        columnClass: 'shrink',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('Model'),
+        name: 'modelFk',
+        format: ({ deviceProduction }) => deviceProduction.modelFk,
+        cardVisible: true,
+    },
+    {
+        align: 'right',
+        label: t('Serial number'),
+        name: 'serialNumber',
+        format: ({ deviceProduction }) => deviceProduction.serialNumber,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('Current SIM'),
+        name: 'simFk',
+        cardVisible: true,
+    },
+    {
+        align: 'right',
+        name: 'actions',
+        columnFilter: false,
+        cardVisible: true,
+    },
+]);
 
 function reloadData() {
     initialData.value.deviceProductionFk = null;
     initialData.value.simFk = null;
-    paginate.value.fetch();
+    tableRef.value.reload();
+}
+
+async function fetchDocuware() {
+    loadingDocuware.value = true;
+
+    const id = `${worker.value?.lastName} ${worker.value?.firstName}`;
+    const rows = tableRef.value.CrudModelRef.formData;
+
+    const promises = rows.map(async (row) => {
+        const { data } = await axios.post(`Docuwares/${id}/checkFile`, {
+            fileCabinet: 'hr',
+            signed: false,
+            mergeFilter: [
+                {
+                    DBName: 'TIPO_DOCUMENTO',
+                    Value: ['PDA'],
+                },
+                {
+                    DBName: 'FILENAME',
+                    Value: [`${row.deviceProductionFk}-pda`],
+                },
+            ],
+        });
+        row.docuware = data;
+    });
+
+    await Promise.allSettled(promises);
+    loadingDocuware.value = false;
+}
+
+async function sendToTablet(rows) {
+    const promises = rows.map(async (row) => {
+        await axios.post(`Docuwares/upload-pda-pdf`, {
+            ids: [row.deviceProductionFk],
+        });
+        row.docuware = true;
+    });
+    await Promise.allSettled(promises);
+    notify(t('PDF sended to signed'), 'positive');
+    tableRef.value.reload();
+}
+
+async function deallocatePDA(deviceProductionFk) {
+    await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
+        pda: deviceProductionFk,
+    });
+    const index = tableRef.value.CrudModelRef.formData.findIndex(
+        (data) => data?.deviceProductionFk == deviceProductionFk,
+    );
+    delete tableRef.value.CrudModelRef.formData[index];
+    notify(t('PDA deallocated'), 'positive');
+}
+
+function isSigned(row) {
+    return row.docuware?.state === 'Firmado';
 }
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md centerCard">
+    <FetchData
-        <FetchData
+        url="workers/getAvailablePda"
-            url="workers/getAvailablePda"
+        @on-fetch="(data) => (deviceProductions = data)"
-            @on-fetch="(data) => (deviceProductions = data)"
+        auto-load
-            auto-load
+    />
-        />
+    <VnTable
-        <VnPaginate
+        ref="tableRef"
-            ref="paginate"
+        data-key="WorkerPda"
-            data-key="WorkerPda"
+        url="DeviceProductionUsers"
-            url="DeviceProductionUsers"
+        :user-filter="{ order: 'id' }"
-            :user-filter="{ where: { userFk: routeId } }"
+        :filter="{ where: { userFk: routeId } }"
-            order="id"
+        search-url="pda"
-            search-url="pda"
+        auto-load
-            auto-load
+        :columns="columns"
-        >
+        @onFetch="fetchDocuware"
-            <template #body="{ rows }">
+        :hasSubToolbar="true"
-                <QCard
+        :default-remove="false"
-                    flat
+        :default-reset="false"
-                    bordered
+        :default-save="false"
-                    :key="row.id"
+        :table="{
-                    v-for="row of rows"
+            'row-key': 'deviceProductionFk',
-                    class="card q-px-md q-mb-sm container"
+            selection: 'multiple',
-                >
+        }"
-                    <VnRow>
+        :table-filter="{ hiddenTags: ['userFk'] }"
-                        <VnInput
+    >
-                            :label="t('worker.pda.currentPDA')"
+        <template #moreBeforeActions>
-                            :model-value="row?.deviceProductionFk"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Model')"
-                            :model-value="row?.deviceProduction?.modelFk"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Serial number')"
-                            :model-value="row?.deviceProduction?.serialNumber"
-                            disable
-                        />
-                        <VnInput
-                            :label="t('Current SIM')"
-                            :model-value="row?.simFk"
-                            disable
-                        />
-                        <QBtn
-                            flat
-                            icon="delete"
-                            color="primary"
-                            class="btn-delete"
-                            @click="
-                                openConfirmationModal(
-                                    t(`Remove PDA`),
-                                    t('Do you want to remove this PDA?'),
-                                    () => deallocatePDA(row.deviceProductionFk),
-                                )
-                            "
-                        >
-                            <QTooltip>
-                                {{ t('worker.pda.removePDA') }}
-                            </QTooltip>
-                        </QBtn>
-                    </VnRow>
-                </QCard>
-            </template>
-        </VnPaginate>
-        <QPageSticky :offset="[18, 18]">
             <QBtn
-                @click.stop="dialog.show()"
+                :label="t('globals.refresh')"
+                icon="refresh"
+                @click="tableRef.reload()"
+            />
+            <QBtn
+                :disable="!tableRef?.selected?.length"
+                :label="t('globals.send')"
+                icon="install_mobile"
+                @click="sendToTablet(tableRef?.selected)"
+                class="bg-primary"
+            />
+        </template>
+        <template #column-actions="{ row }">
+            <QBtn
+                flat
+                icon="delete"
                 color="primary"
-                fab
+                @click="
-                icon="add"
+                    openConfirmationModal(
-                v-shortcut="'+'"
+                        t(`Remove PDA`),
+                        t('Do you want to remove this PDA?'),
+                        () => deallocatePDA(row.deviceProductionFk),
+                    )
+                "
+                data-cy="workerPda-remove"
             >
-                <QDialog ref="dialog">
+                <QTooltip>
-                    <FormModelPopup
+                    {{ t('worker.pda.removePDA') }}
-                        :title="t('Add new device')"
+                </QTooltip>
-                        url-create="DeviceProductionUsers"
-                        model="DeviceProductionUser"
-                        :form-initial-data="initialData"
-                        @on-data-saved="reloadData()"
-                    >
-                        <template #form-inputs="{ data }">
-                            <VnRow>
-                                <VnSelect
-                                    :label="t('worker.pda.newPDA')"
-                                    v-model="data.deviceProductionFk"
-                                    :options="deviceProductions"
-                                    option-label="id"
-                                    option-value="id"
-                                    id="deviceProductionFk"
-                                    hide-selected
-                                    data-cy="pda-dialog-select"
-                                    :required="true"
-                                >
-                                    <template #option="scope">
-                                        <QItem v-bind="scope.itemProps">
-                                            <QItemSection>
-                                                <QItemLabel
-                                                    >ID: {{ scope.opt?.id }}</QItemLabel
-                                                >
-                                                <QItemLabel caption>
-                                                    {{ scope.opt?.modelFk }},
-                                                    {{ scope.opt?.serialNumber }}
-                                                </QItemLabel>
-                                            </QItemSection>
-                                        </QItem>
-                                    </template>
-                                </VnSelect>
-                                <VnInput
-                                    v-model="data.simFk"
-                                    :label="t('SIM serial number')"
-                                    id="simSerialNumber"
-                                    use-input
-                                />
-                            </VnRow>
-                        </template>
-                    </FormModelPopup>
-                </QDialog>
             </QBtn>
-            <QTooltip>
+            <QBtn
-                {{ t('globals.new') }}
+                v-if="!isSigned(row)"
-            </QTooltip>
+                :loading="loadingDocuware"
-        </QPageSticky>
+                icon="install_mobile"
-    </QPage>
+                flat
+                color="primary"
+                @click="
+                    openConfirmationModal(
+                        t('Sign PDA'),
+                        t('Are you sure you want to send it?'),
+                        () => sendToTablet([row]),
+                    )
+                "
+                data-cy="workerPda-send"
+            >
+                <QTooltip>
+                    {{ t('worker.pda.sendToTablet') }}
+                </QTooltip>
+            </QBtn>
+            <QBtn
+                v-if="isSigned(row)"
+                :loading="loadingDocuware"
+                icon="cloud_download"
+                flat
+                color="primary"
+                @click="
+                    downloadDocuware('Docuwares/download-pda-pdf', {
+                        file: row.deviceProductionFk + '-pda',
+                        worker: worker?.lastName + ' ' + worker?.firstName,
+                    })
+                "
+                data-cy="workerPda-download"
+            >
+                <QTooltip>
+                    {{ t('worker.pda.download') }}
+                </QTooltip>
+            </QBtn>
+        </template>
+    </VnTable>
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" v-shortcut="'+'">
+            <QDialog ref="dialog">
+                <FormModelPopup
+                    :title="t('Add new device')"
+                    url-create="DeviceProductionUsers"
+                    model="DeviceProductionUser"
+                    :form-initial-data="initialData"
+                    @on-data-saved="reloadData()"
+                >
+                    <template #form-inputs="{ data }">
+                        <VnRow>
+                            <VnSelect
+                                :label="t('PDA')"
+                                v-model="data.deviceProductionFk"
+                                :options="deviceProductions"
+                                option-label="modelFk"
+                                option-value="id"
+                                id="deviceProductionFk"
+                                hide-selected
+                                data-cy="pda-dialog-select"
+                                :required="true"
+                            >
+                                <template #option="scope">
+                                    <QItem v-bind="scope.itemProps">
+                                        <QItemSection>
+                                            <QItemLabel
+                                                >ID: {{ scope.opt?.id }}</QItemLabel
+                                            >
+                                            <QItemLabel caption>
+                                                {{ scope.opt?.modelFk }},
+                                                {{ scope.opt?.serialNumber }}
+                                            </QItemLabel>
+                                        </QItemSection>
+                                    </QItem>
+                                </template>
+                            </VnSelect>
+                            <VnSelect
+                                url="Sims"
+                                option-label="line"
+                                option-value="code"
+                                v-model="data.simFk"
+                                :label="t('SIM serial number')"
+                                id="simSerialNumber"
+                            />
+                        </VnRow>
+                    </template>
+                </FormModelPopup>
+            </QDialog>
+        </QBtn>
+        <QTooltip>
+            {{ t('globals.new') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
-<style lang="scss" scoped>
-.btn-delete {
-    max-width: 4%;
-    margin-top: 30px;
-}
-</style>
 <i18n>
 es:
     Model: Modelo
@@ -190,4 +305,6 @@ es:
     Do you want to remove this PDA?: ¿Desea eliminar este PDA?
     You can only have one PDA: Solo puedes tener un PDA si no eres autonomo
     This PDA is already assigned to another user: Este PDA ya está asignado a otro usuario
+    Are you sure you want to send it?: ¿Seguro que quieres enviarlo?
+    Sign PDA: Firmar PDA
 </i18n>

src/pages/Worker/Department/Card/DepartmentDescriptor.vue

@@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import VnLv from 'src/components/ui/VnLv.vue';
-import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'src/components/ui/EntityDescriptor.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -40,7 +40,7 @@ const removeDepartment = async () => {
 const { openConfirmationModal } = useVnConfirm();
 </script>
 <template>
-    <CardDescriptor
+    <EntityDescriptor
         ref="DepartmentDescriptorRef"
         :url="`Departments/${entityId}`"
         :summary="$props.summary"
@@ -95,7 +95,7 @@ const { openConfirmationModal } = useVnConfirm();
                 </QBtn>
             </QCardActions>
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>
 
 <i18n>

src/pages/Worker/WorkerFilter.vue

@@ -35,7 +35,7 @@ const getLocale = (label) => {
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('FI')" v-model="params.fi" is-outlined
+                    <VnInput :label="t('FI')" v-model="params.fi" filled
                         ><template #prepend>
                             <QIcon name="badge" size="xs"></QIcon> </template
                     ></VnInput>
@@ -43,29 +43,17 @@ const getLocale = (label) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput :label="t('First Name')" v-model="params.firstName" filled />
-                        :label="t('First Name')"
-                        v-model="params.firstName"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput :label="t('Last Name')" v-model="params.lastName" filled />
-                        :label="t('Last Name')"
-                        v-model="params.lastName"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput :label="t('User Name')" v-model="params.userName" filled />
-                        :label="t('User Name')"
-                        v-model="params.userName"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -79,23 +67,18 @@ const getLocale = (label) => {
                         emit-value
                         map-options
                         dense
-                        outlined
+                        filled
-                        rounded
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                    <VnInput :label="t('Email')" v-model="params.email" filled />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnInput :label="t('Extension')" v-model="params.extension" filled />
-                        :label="t('Extension')"
-                        v-model="params.extension"
-                        is-outlined
-                    />
                 </QItemSection>
             </QItem>
             <QItem>

src/pages/Zone/Card/ZoneDescriptor.vue

@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { toTimeFormat } from 'src/filters/date';
 import { toCurrency } from 'filters/index';
@@ -25,7 +25,7 @@ const entityId = computed(() => {
 </script>
 
 <template>
-    <CardDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone">
+    <EntityDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone">
         <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
         </template>
@@ -36,5 +36,5 @@ const entityId = computed(() => {
             <VnLv :label="$t('list.price')" :value="toCurrency(entity.price)" />
             <VnLv :label="$t('zone.bonus')" :value="toCurrency(entity.bonus)" />
         </template>
-    </CardDescriptor>
+    </EntityDescriptor>
 </template>

src/pages/Zone/ZoneDeliveryPanel.vue

@@ -95,8 +95,7 @@ watch(
                 :filter-options="['code']"
                 hide-selected
                 dense
-                outlined
+                filled
-                rounded
                 map-key="geoFk"
                 data-cy="ZoneDeliveryDaysPostcodeSelect"
             >
@@ -128,8 +127,7 @@ watch(
                 option-label="name"
                 hide-selected
                 dense
-                outlined
+                filled
-                rounded
                 data-cy="ZoneDeliveryDaysAgencySelect"
             />
             <VnSelect
@@ -144,7 +142,6 @@ watch(
                 option-label="name"
                 hide-selected
                 dense
-                outlined
                 rounded
             />
         </div>

test/cypress/integration/entry/entryCard/entryBuys.spec.js

@@ -80,6 +80,11 @@ describe('EntryBuys', () => {
         checkColor('amount', COLORS.positive);
         cy.saveCard();
 
+        cy.get('tbody > tr [tabindex="0"][role="checkbox"]').click();
+        cy.dataCy('transferBuys').should('be.enabled').click();
+        cy.dataCy('entryDestinyInput').should('be.visible').type('100');
+        cy.dataCy('transferBuysBtn').click();
+
         cy.deleteEntry();
     });
 

test/cypress/integration/invoiceIn/invoiceInSerial.spec.js

@@ -10,14 +10,16 @@ describe('InvoiceInSerial', () => {
     });
 
     it('should filter by last days ', () => {
-        let before;
         cy.dataCy('vnTableCell_total')
             .invoke('text')
-            .then((total) => (before = +total));
+            .then((before) => {
-
+                cy.dataCy('Last days_input')
-        cy.dataCy('Last days_input').type('{selectall}1{enter}');
+                    .type('{selectall}1{enter}')
-        cy.dataCy('vnTableCell_total')
+                    .then(() => {
-            .invoke('text')
+                        cy.dataCy('vnTableCell_total')
-            .then((total) => expect(+total).to.be.lessThan(before));
+                            .invoke('text')
+                            .then((after) => expect(+after).to.be.lessThan(+before));
+                    });
+            });
     });
 });

test/cypress/integration/route/cmr/cmrList.spec.js

@@ -0,0 +1,91 @@
+describe('Cmr list', () => {
+    const getLinkSelector = (colField) =>
+        `tr:first-child > [data-col-field="${colField}"] > .no-padding > .link`;
+
+    const selectors = {
+        ticket: getLinkSelector('ticketFk'),
+        client: getLinkSelector('clientFk'),
+        lastRowSelectCheckBox:
+            '.q-virtual-scroll__content > tr:last-child > :nth-child(1) > .q-checkbox',
+        downloadBtn: '#subToolbar > .q-btn',
+        viewCmr: 'tableAction-0',
+        descriptorOpenSummaryBtn: '.descriptor [data-cy="openSummaryBtn"]',
+        summaryTitle: '.summaryHeader',
+        descriptorId: '.descriptor .subtitle',
+        descriptorTitle: '.descriptor .title',
+        summaryGoToSummaryBtn: '.summaryHeader [data-cy="goToSummaryBtn"]',
+        descriptorGoToSummaryBtn: '.descriptor [data-cy="goToSummaryBtn"]',
+        removeFilter: '.q-chip__icon--remove',
+    };
+
+    const data = {
+        ticket: '1',
+        client: 'Bruce Wayne',
+    };
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit('/#/route/cmr');
+        cy.typeSearchbar('{enter}');
+        cy.get(selectors.removeFilter).click();
+    });
+
+    it('Should download selected cmr', () => {
+        const downloadsFolder = Cypress.config('downloadsFolder');
+        cy.get(selectors.lastRowSelectCheckBox).should('be.visible').click();
+        cy.get(selectors.downloadBtn).should('be.visible').click();
+        cy.wait(3000);
+
+        const fileName = 'cmrs.zip';
+        cy.readFile(`${downloadsFolder}/${fileName}`).should('exist');
+    });
+
+    it('Should open selected cmr pdf', () => {
+        cy.window().then((win) => {
+            cy.stub(win, 'open').as('windowOpen');
+        });
+        cy.dataCy(selectors.viewCmr).last().click();
+        cy.get('@windowOpen').should('be.calledWithMatch', '\/api\/Cmrs\/3');
+    });
+
+    describe('Ticket pop-ups', () => {
+        it('Should redirect to the ticket summary from the ticket descriptor pop-up', () => {
+            cy.get(selectors.ticket).should('be.visible').click();
+            cy.containContent(selectors.descriptorId, data.ticket);
+            cy.get(selectors.descriptorGoToSummaryBtn).should('be.visible').click();
+            cy.url().should('include', '/ticket/1/summary');
+            cy.containContent(selectors.summaryTitle, data.client);
+        });
+
+        it('Should redirect to the ticket summary from summary pop-up from the ticket descriptor pop-up', () => {
+            cy.get(selectors.ticket).should('be.visible').click();
+            cy.containContent(selectors.descriptorId, data.ticket);
+            cy.get(selectors.descriptorOpenSummaryBtn).should('be.visible').click();
+            cy.containContent(selectors.summaryTitle, data.client);
+            cy.get(selectors.summaryGoToSummaryBtn).should('be.visible').click();
+            cy.url().should('include', '/ticket/1/summary');
+            cy.containContent(selectors.summaryTitle, data.client);
+        });
+    });
+
+    describe('Client pop-ups', () => {
+        it('Should redirect to the client summary from the client descriptor pop-up', () => {
+            cy.get(selectors.client).should('be.visible').click();
+            cy.containContent(selectors.descriptorTitle, data.client);
+            cy.get(selectors.descriptorGoToSummaryBtn).should('be.visible').click();
+            cy.url().should('include', '/customer/1101/summary');
+            cy.containContent(selectors.summaryTitle, data.client);
+        });
+
+        it('Should redirect to the client summary from summary pop-up from the client descriptor pop-up', () => {
+            cy.get(selectors.client).should('be.visible').click();
+            cy.containContent(selectors.descriptorTitle, data.client);
+            cy.get(selectors.descriptorOpenSummaryBtn).should('be.visible').click();
+            cy.containContent(selectors.summaryTitle, data.client);
+            cy.get(selectors.summaryGoToSummaryBtn).should('be.visible').click();
+            cy.url().should('include', '/customer/1101/summary');
+            cy.containContent(selectors.summaryTitle, data.client);
+        });
+    });
+});

test/cypress/integration/route/routeExtendedList.spec.js

@@ -154,10 +154,9 @@ describe('Route extended list', () => {
         cy.validateContent(selectors.served, checkboxState.check);
     });
 
-    it('Should delete the selected routes', () => {
+    it('Should delete the selected route', () => {
         cy.get(selectors.lastRowSelectCheckBox).click();
         cy.get(selectors.removeBtn).click();
-
         cy.dataCy(selectors.confirmBtn).click();
 
         cy.checkNotification(dataSaved);

test/cypress/integration/ticket/ticketList.spec.js

@@ -35,7 +35,7 @@ describe('TicketList', () => {
         cy.get('.summaryBody').should('exist');
     });
 
-    it.skip('filter client and create ticket', () => {
+    it('filter client and create ticket', () => {
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
         searchResults();
         cy.wait('@ticketSearchbar');
@@ -44,6 +44,7 @@ describe('TicketList', () => {
         cy.dataCy('Customer ID_input').type('1101{enter}');
 
         cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
+        cy.waitSpinner();
         cy.dataCy('Customer_select').should('have.value', 'Bruce Wayne');
         cy.dataCy('Address_select').click();
 

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

@@ -25,7 +25,7 @@ describe('VnLog', () => {
 
     it('should show claimDescriptor', () => {
         cy.dataCy('iconLaunch-claimFk').first().click();
-        cy.dataCy('cardDescriptor_subtitle').contains('1');
+        cy.dataCy('vnDescriptor_subtitle').contains('1');
         cy.dataCy('iconLaunch-claimFk').first().click();
     });
 });

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

@@ -1,23 +1,80 @@
 describe('WorkerPda', () => {
-    const select = '[data-cy="pda-dialog-select"]';
+    const deviceId = 4;
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/worker/1110/pda`);
     });
 
-    it('assign pda', () => {
+    it('assign and delete pda', () => {
-        cy.addBtnClick();
+        creatNewPDA();
-        cy.get(select).click();
+        cy.checkNotification('Data created');
-        cy.get(select).type('{downArrow}{enter}');
+        cy.visit(`/#/worker/1110/pda`);
-        cy.get('.q-notification__message').should('have.text', 'Data created');
+        removeNewPDA();
+        cy.checkNotification('PDA deallocated');
     });
 
-    it('delete pda', () => {
+    it('send and download pdf to docuware', () => {
-        cy.get('.btn-delete').click();
+        //Send
-        cy.get(
+        cy.intercept('POST', '/api/Docuwares/upload-pda-pdf', (req) => {
-            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+            req.reply({
-        ).click();
+                statusCode: 200,
-        cy.get('.q-notification__message').should('have.text', 'PDA deallocated');
+                body: {},
+            });
+        });
+
+        creatNewPDA();
+
+        cy.dataCy('workerPda-send').click();
+        cy.clickConfirm();
+        cy.checkNotification('PDF sended to signed');
+
+        //Download
+        cy.intercept('POST', /\/api\/Docuwares\/Jones%20Jessica\/checkFile/, (req) => {
+            req.reply({
+                statusCode: 200,
+                body: {
+                    id: deviceId,
+                    state: 'Firmado',
+                },
+            });
+        });
+        cy.get('#st-actions').contains('refresh').click();
+        cy.intercept('GET', '/api/Docuwares/download-pda-pdf**', (req) => {
+            req.reply({
+                statusCode: 200,
+                body: {},
+            });
+        });
+
+        cy.dataCy('workerPda-download').click();
+        removeNewPDA();
     });
+
+    it('send 2 pdfs to docuware', () => {
+        cy.intercept('POST', '/api/Docuwares/upload-pda-pdf', (req) => {
+            req.reply({
+                statusCode: 200,
+                body: {},
+            });
+        });
+
+        creatNewPDA();
+        creatNewPDA(2);
+        cy.selectRows([1, 2]);
+        cy.get('#st-actions').contains('Send').click();
+        cy.checkNotification('PDF sended to signed');
+
+        removeNewPDA();
+    });
+
+    function creatNewPDA(id = deviceId) {
+        cy.addBtnClick();
+        cy.selectOption('[data-cy="pda-dialog-select"]', id);
+        cy.saveCard();
+    }
+
+    function removeNewPDA() {
+        cy.dataCy('workerPda-remove').first().click();
+        cy.clickConfirm();
+    }
 });

test/cypress/support/commands.js

@@ -370,8 +370,23 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
     cy.get(selector).should('have.text', expectedValue);
 });
 
+Cypress.Commands.add('containContent', (selector, expectedValue) => {
+    cy.get(selector)
+        .should('be.visible')
+        .invoke('text')
+        .then((text) => {
+            expect(text).to.include(expectedValue);
+        });
+});
+
+Cypress.Commands.add('openActionDescriptor', (opt) => {
+    cy.openActionsDescriptor();
+    const listItem = '[role="menu"] .q-list .q-item';
+    cy.contains(listItem, opt).click();
+});
+
 Cypress.Commands.add('openActionsDescriptor', () => {
-    cy.get('[data-cy="cardDescriptor"] [data-cy="descriptor-more-opts"]').click();
+    cy.get('[data-cy="vnDescriptor"] [data-cy="descriptor-more-opts"]').click();
 });
 
 Cypress.Commands.add('openUserPanel', () => {
@@ -466,16 +481,16 @@ Cypress.Commands.add('validateDescriptor', (toCheck = {}) => {
 
     const popupSelector = popup ? '[role="menu"] ' : '';
 
-    if (title) cy.get(`${popupSelector}[data-cy="cardDescriptor_title"]`).contains(title);
+    if (title) cy.get(`${popupSelector}[data-cy="vnDescriptor_title"]`).contains(title);
     if (description)
-        cy.get(`${popupSelector}[data-cy="cardDescriptor_description"]`).contains(
+        cy.get(`${popupSelector}[data-cy="vnDescriptor_description"]`).contains(
             description,
         );
     if (subtitle)
-        cy.get(`${popupSelector}[data-cy="cardDescriptor_subtitle"]`).contains(subtitle);
+        cy.get(`${popupSelector}[data-cy="vnDescriptor_subtitle"]`).contains(subtitle);
 
     for (const index in listbox)
-        cy.get(`${popupSelector}[data-cy="cardDescriptor_listbox"] > *`)
+        cy.get(`${popupSelector}[data-cy="vnDescriptor_listbox"] > *`)
             .eq(index)
             .should('contain.text', listbox[index]);
 });