Merge pull request 'fix: improve method into dev' (!1356) from fix_reload_icon into dev

Reviewed-on: #1356
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

package.json

@@ -1,74 +1,74 @@
 {
-  "name": "salix-front",
+    "name": "salix-front",
-  "version": "25.06.0",
+    "version": "25.08.0",
-  "description": "Salix frontend",
+    "description": "Salix frontend",
-  "productName": "Salix",
+    "productName": "Salix",
-  "author": "Verdnatura",
+    "author": "Verdnatura",
-  "private": true,
+    "private": true,
-  "packageManager": "pnpm@8.15.1",
+    "packageManager": "pnpm@8.15.1",
-  "type": "module",
+    "type": "module",
-  "scripts": {
+    "scripts": {
-    "resetDatabase": "cd ../salix && gulp docker",
+        "resetDatabase": "cd ../salix && gulp docker",
-    "lint": "eslint --ext .js,.vue ./",
+        "lint": "eslint --ext .js,.vue ./",
-    "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
+        "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
-    "test:e2e": "cypress open",
+        "test:e2e": "cypress open",
-    "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
-    "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
+        "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-    "test:unit": "vitest",
+        "test:unit": "vitest",
-    "test:unit:ci": "vitest run",
+        "test:unit:ci": "vitest run",
-    "commitlint": "commitlint --edit",
+        "commitlint": "commitlint --edit",
-    "prepare": "npx husky install",
+        "prepare": "npx husky install",
-    "addReferenceTag": "node .husky/addReferenceTag.js",
+        "addReferenceTag": "node .husky/addReferenceTag.js",
-    "docs:dev": "vitepress dev docs",
+        "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
+        "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
+        "docs:preview": "vitepress preview docs"
-  },
+    },
-  "dependencies": {
+    "dependencies": {
-    "@quasar/cli": "^2.4.1",
+        "@quasar/cli": "^2.4.1",
-    "@quasar/extras": "^1.16.16",
+        "@quasar/extras": "^1.16.16",
-    "axios": "^1.4.0",
+        "axios": "^1.4.0",
-    "chromium": "^3.0.3",
+        "chromium": "^3.0.3",
-    "croppie": "^2.6.5",
+        "croppie": "^2.6.5",
-    "moment": "^2.30.1",
+        "moment": "^2.30.1",
-    "pinia": "^2.1.3",
+        "pinia": "^2.1.3",
-    "quasar": "^2.17.7",
+        "quasar": "^2.17.7",
-    "validator": "^13.9.0",
+        "validator": "^13.9.0",
-    "vue": "^3.5.13",
+        "vue": "^3.5.13",
-    "vue-i18n": "^9.3.0",
+        "vue-i18n": "^9.3.0",
-    "vue-router": "^4.2.5"
+        "vue-router": "^4.2.5"
-  },
+    },
-  "devDependencies": {
+    "devDependencies": {
-    "@commitlint/cli": "^19.2.1",
+        "@commitlint/cli": "^19.2.1",
-    "@commitlint/config-conventional": "^19.1.0",
+        "@commitlint/config-conventional": "^19.1.0",
-    "@intlify/unplugin-vue-i18n": "^0.8.2",
+        "@intlify/unplugin-vue-i18n": "^0.8.2",
-    "@pinia/testing": "^0.1.2",
+        "@pinia/testing": "^0.1.2",
-    "@quasar/app-vite": "^2.0.8",
+        "@quasar/app-vite": "^2.0.8",
-    "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
+        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
-    "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
+        "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
-    "@vue/test-utils": "^2.4.4",
+        "@vue/test-utils": "^2.4.4",
-    "autoprefixer": "^10.4.14",
+        "autoprefixer": "^10.4.14",
-    "cypress": "^13.6.6",
+        "cypress": "^13.6.6",
-    "cypress-mochawesome-reporter": "^3.8.2",
+        "cypress-mochawesome-reporter": "^3.8.2",
-    "eslint": "^9.18.0",
+        "eslint": "^9.18.0",
-    "eslint-config-prettier": "^10.0.1",
+        "eslint-config-prettier": "^10.0.1",
-    "eslint-plugin-cypress": "^4.1.0",
+        "eslint-plugin-cypress": "^4.1.0",
-    "eslint-plugin-vue": "^9.32.0",
+        "eslint-plugin-vue": "^9.32.0",
-    "husky": "^8.0.0",
+        "husky": "^8.0.0",
-    "postcss": "^8.4.23",
+        "postcss": "^8.4.23",
-    "prettier": "^3.4.2",
+        "prettier": "^3.4.2",
-    "sass": "^1.83.4",
+        "sass": "^1.83.4",
-    "vitepress": "^1.6.3",
+        "vitepress": "^1.6.3",
-    "vitest": "^0.34.0"
+        "vitest": "^0.34.0"
-  },
+    },
-  "engines": {
+    "engines": {
-    "node": "^20 || ^18 || ^16",
+        "node": "^20 || ^18 || ^16",
-    "npm": ">= 8.1.2",
+        "npm": ">= 8.1.2",
-    "yarn": ">= 1.21.1",
+        "yarn": ">= 1.21.1",
-    "bun": ">= 1.0.25"
+        "bun": ">= 1.0.25"
-  },
+    },
-  "overrides": {
+    "overrides": {
-    "@vitejs/plugin-vue": "^5.2.1",
+        "@vitejs/plugin-vue": "^5.2.1",
-    "vite": "^6.0.11",
+        "vite": "^6.0.11",
-    "vitest": "^0.31.1"
+        "vitest": "^0.31.1"
-  }
+    }
 }

proxy-serve.js

@@ -0,0 +1,6 @@
+export default [
+    {
+        path: '/api',
+        rule: { target: 'http://0.0.0.0:3000' },
+    },
+];

quasar.config.js

@@ -179,7 +179,6 @@ export default configure(function (/* ctx */) {
                 'render', // keep this as last one
             ],
         },
-
         // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
         pwa: {
             workboxMode: 'generateSW', // or 'injectManifest'

src/boot/defaults/constants.js

@@ -0,0 +1,2 @@
+export const langs = ['en', 'es'];
+export const decimalPlaces = 2;

src/boot/keyShortcut.js

@@ -1,6 +1,6 @@
 export default {
-    mounted: function (el, binding) {
+    mounted(el, binding) {
-        const shortcut = binding.value ?? '+';
+        const shortcut = binding.value || '+';
 
         const { key, ctrl, alt, callback } =
             typeof shortcut === 'string'
@@ -8,25 +8,24 @@ export default {
                       key: shortcut,
                       ctrl: true,
                       alt: true,
-                      callback: () =>
+                      callback: () => el?.click(),
-                          document
-                              .querySelector(`button[shortcut="${shortcut}"]`)
-                              ?.click(),
                   }
                 : binding.value;
 
+        if (!el.hasAttribute('shortcut')) {
+            el.setAttribute('shortcut', key);
+        }
+
         const handleKeydown = (event) => {
             if (event.key === key && (!ctrl || event.ctrlKey) && (!alt || event.altKey)) {
                 callback();
             }
         };
 
-        // Attach the event listener to the window
         window.addEventListener('keydown', handleKeydown);
-
         el._handleKeydown = handleKeydown;
     },
-    unmounted: function (el) {
+    unmounted(el) {
         if (el._handleKeydown) {
             window.removeEventListener('keydown', el._handleKeydown);
         }

src/components/CreateBankEntityForm.vue

@@ -14,7 +14,7 @@ const { t } = useI18n();
 const bicInputRef = ref(null);
 const state = useState();
 
-const customer = computed(() => state.get('customer'));
+const customer = computed(() => state.get('Customer'));
 
 const countriesFilter = {
     fields: ['id', 'name', 'code'],

src/components/FormModel.vue

@@ -84,7 +84,7 @@ const $props = defineProps({
     },
     reload: {
         type: Boolean,
-        default: false,
+        default: true,
     },
     defaultTrim: {
         type: Boolean,
@@ -97,7 +97,7 @@ const $props = defineProps({
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
-    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
+    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
 ).value;
 const componentIsRendered = ref(false);
 const arrayData = useArrayData(modelValue);
@@ -105,8 +105,8 @@ const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
 const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
-const originalData = ref({});
+const originalData = computed(() => state.get(modelValue));
-const formData = computed(() => state.get(modelValue));
+const formData = ref({});
 const defaultButtons = computed(() => ({
     save: {
         dataCy: 'saveDefaultBtn',
@@ -127,8 +127,6 @@ const defaultButtons = computed(() => ({
 }));
 
 onMounted(async () => {
-    originalData.value = JSON.parse(JSON.stringify($props.formInitialData ?? {}));
-
     nextTick(() => (componentIsRendered.value = true));
 
     // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
@@ -148,7 +146,7 @@ onMounted(async () => {
                     JSON.stringify(newVal) !== JSON.stringify(originalData.value);
                 isResetting.value = false;
             },
-            { deep: true }
+            { deep: true },
         );
     }
 });
@@ -156,16 +154,24 @@ onMounted(async () => {
 if (!$props.url)
     watch(
         () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', val)
+        (val) => updateAndEmit('onFetch', val),
     );
 
+watch(
+    originalData,
+    (val) => {
+        if (val) formData.value = JSON.parse(JSON.stringify(val));
+    },
+    { immediate: true },
+);
+
 watch(
     () => [$props.url, $props.filter],
     async () => {
-        originalData.value = null;
+        state.set(modelValue, null);
         reset();
         await fetch();
-    }
+    },
 );
 
 onBeforeRouteLeave((to, from, next) => {
@@ -197,7 +203,6 @@ async function fetch() {
         updateAndEmit('onFetch', data);
     } catch (e) {
         state.set(modelValue, {});
-        originalData.value = {};
         throw e;
     }
 }
@@ -236,6 +241,7 @@ async function saveAndGo() {
 }
 
 function reset() {
+    formData.value = JSON.parse(JSON.stringify(originalData.value));
     updateAndEmit('onFetch', originalData.value);
     if ($props.observeFormChanges) {
         hasChanges.value = false;
@@ -254,13 +260,12 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        }
+        },
     );
 }
 
 function updateAndEmit(evt, val, res) {
     state.set(modelValue, val);
-    originalData.value = val && JSON.parse(JSON.stringify(val));
     if (!$props.url) arrayData.store.data = val;
 
     emit(evt, state.get(modelValue), res);

src/components/ItemsFilterPanel.vue

@@ -31,7 +31,6 @@ const props = defineProps({
 const route = useRoute();
 
 const itemTypesOptions = ref([]);
-const suppliersOptions = ref([]);
 const tagOptions = ref([]);
 const tagValues = ref([]);
 const categoryList = ref(null);
@@ -40,13 +39,13 @@ const selectedTypeFk = ref(getParamWhere(route.query.table, 'typeFk', false));
 
 const selectedCategory = computed(() => {
     return (categoryList.value || []).find(
-        (category) => category?.id === selectedCategoryFk.value
+        (category) => category?.id === selectedCategoryFk.value,
     );
 });
 
 const selectedType = computed(() => {
     return (itemTypesOptions.value || []).find(
-        (type) => type?.id === selectedTypeFk.value
+        (type) => type?.id === selectedTypeFk.value,
     );
 });
 
@@ -134,13 +133,6 @@ const setCategoryList = (data) => {
 
 <template>
     <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
-    <FetchData
-        url="Suppliers"
-        limit="30"
-        auto-load
-        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (suppliersOptions = data)"
-    />
     <FetchData
         url="Tags"
         :filter="{ fields: ['id', 'name', 'isFree'] }"
@@ -290,7 +282,7 @@ const setCategoryList = (data) => {
             <QItem class="q-mt-lg">
                 <QBtn
                     icon="add_circle"
-                    shortcut="+"
+                    v-shortcut="'+'"
                     flat
                     class="fill-icon-on-hover q-px-xs"
                     color="primary"

src/components/LeftMenu.vue

@@ -10,12 +10,13 @@ import routes from 'src/router/modules';
 import LeftMenuItem from './LeftMenuItem.vue';
 import LeftMenuItemGroup from './LeftMenuItemGroup.vue';
 import VnInput from './common/VnInput.vue';
+import { useRouter } from 'vue-router';
 
 const { t } = useI18n();
 const route = useRoute();
 const quasar = useQuasar();
 const navigation = useNavigationStore();
-
+const router = useRouter();
 const props = defineProps({
     source: {
         type: String,
@@ -40,7 +41,6 @@ const filteredItems = computed(() => {
         return locale.includes(normalizedSearch);
     });
 });
-
 const filteredPinnedModules = computed(() => {
     if (!search.value) return pinnedModules.value;
     const normalizedSearch = search.value
@@ -71,7 +71,7 @@ watch(
         items.value = [];
         getRoutes();
     },
-    { deep: true }
+    { deep: true },
 );
 
 function findMatches(search, item) {
@@ -103,33 +103,40 @@ function addChildren(module, route, parent) {
 }
 
 function getRoutes() {
-    if (props.source === 'main') {
+    const handleRoutes = {
-        const modules = Object.assign([], navigation.getModules().value);
+        main: getMainRoutes,
-
+        card: getCardRoutes,
-        for (const item of modules) {
+    };
-            const moduleDef = routes.find(
+    try {
-                (route) => toLowerCamel(route.name) === item.module
+        handleRoutes[props.source]();
-            );
+    } catch (error) {
-            if (!moduleDef) continue;
+        throw new Error(`Method is not defined`);
-            item.children = [];
-
-            addChildren(item.module, moduleDef, item.children);
-        }
-
-        items.value = modules;
     }
+}
+function getMainRoutes() {
+    const modules = Object.assign([], navigation.getModules().value);
 
-    if (props.source === 'card') {
+    for (const item of modules) {
-        const currentRoute = route.matched[1];
+        const moduleDef = routes.find(
-        const currentModule = toLowerCamel(currentRoute.name);
+            (route) => toLowerCamel(route.name) === item.module,
-        let moduleDef = routes.find(
-            (route) => toLowerCamel(route.name) === currentModule
         );
+        if (!moduleDef) continue;
+        item.children = [];
 
-        if (!moduleDef) return;
+        addChildren(item.module, moduleDef, item.children);
-        if (!moduleDef?.menus) moduleDef = betaGetRoutes();
-        addChildren(currentModule, moduleDef, items.value);
     }
+
+    items.value = modules;
+}
+
+function getCardRoutes() {
+    const currentRoute = route.matched[1];
+    const currentModule = toLowerCamel(currentRoute.name);
+    let moduleDef = routes.find((route) => toLowerCamel(route.name) === currentModule);
+
+    if (!moduleDef) return;
+    if (!moduleDef?.menus) moduleDef = betaGetRoutes();
+    addChildren(currentModule, moduleDef, items.value);
 }
 
 function betaGetRoutes() {
@@ -174,6 +181,10 @@ function normalize(text) {
         .replace(/[\u0300-\u036f]/g, '')
         .toLowerCase();
 }
+const searchModule = () => {
+    const [item] = filteredItems.value;
+    if (item) router.push({ name: item.name });
+};
 </script>
 
 <template>
@@ -188,10 +199,11 @@ function normalize(text) {
                         filled
                         dense
                         autofocus
+                        @keyup.enter.stop="searchModule()"
                     />
                 </QItem>
                 <QSeparator />
-                <template v-if="filteredPinnedModules.size">
+                <template v-if="filteredPinnedModules.size && !search">
                     <LeftMenuItem
                         v-for="[key, pinnedModule] of filteredPinnedModules"
                         :key="key"
@@ -215,11 +227,18 @@ function normalize(text) {
                     </LeftMenuItem>
                     <QSeparator />
                 </template>
-                <template v-for="item in filteredItems" :key="item.name">
+                <template v-for="(item, index) in filteredItems" :key="item.name">
                     <template
-                        v-if="item.children && !filteredPinnedModules.has(item.name)"
+                        v-if="
+                            search ||
+                            (item.children && !filteredPinnedModules.has(item.name))
+                        "
                     >
-                        <LeftMenuItem :item="item" group="modules">
+                        <LeftMenuItem
+                            :item="item"
+                            group="modules"
+                            :class="search && index === 0 ? 'searched' : ''"
+                        >
                             <template #side>
                                 <QBtn
                                     v-if="item.isPinned === true"
@@ -336,6 +355,9 @@ function normalize(text) {
 .header {
     color: var(--vn-label-color);
 }
+.searched {
+    background-color: var(--vn-section-hover-color);
+}
 </style>
 <i18n>
     es:

src/components/NavBar.vue

@@ -20,6 +20,7 @@ const appName = 'Lilium';
 const pinnedModulesRef = ref();
 
 onMounted(() => stateStore.setMounted());
+const refresh = () => window.location.reload();
 </script>
 <template>
     <QHeader color="white" elevated>
@@ -64,6 +65,13 @@ onMounted(() => stateStore.setMounted());
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>
+                <QIcon
+                    name="refresh"
+                    size="md"
+                    color="red"
+                    v-if="state.get('error')"
+                    @click="refresh"
+                />
                 <QBtn
                     :class="{ 'q-pa-none': quasar.platform.is.mobile }"
                     id="pinnedModules"

src/components/TicketProblems.vue

@@ -2,26 +2,9 @@
 defineProps({ row: { type: Object, required: true } });
 </script>
 <template>
-    <span>
+    <span class="q-gutter-x-xs">
         <QIcon
-            v-if="row.isTaxDataChecked === 0"
+            v-if="row?.risk"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row.risk"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
@@ -30,10 +13,57 @@ defineProps({ row: { type: Object, required: true } });
                 {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
             </QTooltip>
         </QIcon>
-        <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
+        <QIcon
+            v-if="row?.hasComponentLack"
+            name="vn:components"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
+            <QTooltip>
+                {{ $t('ticket.summary.hasItemDelay') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
+            <QTooltip>
+                {{ $t('salesTicketsTable.hasItemLost') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasItemShortage"
+            name="vn:unavailable"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
+            <QTooltip>
+                {{ $t('ticketList.rounding') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasTicketRequest"
+            name="vn:buyrequest"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="!row?.isTaxDataChecked === 0"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
         </QIcon>
     </span>

src/components/VnTable/VnTable.vue

@@ -500,7 +500,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                         <QCard
                             bordered
                             flat
-                            class="row no-wrap justify-between cursor-pointer"
+                            class="row no-wrap justify-between cursor-pointer q-pa-sm"
                             @click="
                                 (_, row) => {
                                     $props.rowClick && $props.rowClick(row);
@@ -581,7 +581,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                             <!-- Actions -->
                             <QCardSection
                                 v-if="colsMap.tableActions"
-                                class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
                                 @click="stopEventPropagation($event)"
                             >
                                 <QBtn
@@ -630,7 +629,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                     size="md"
                     round
                     flat
-                    shortcut="+"
+                    v-shortcut="'+'"
                     :disabled="!disabledAttr"
                 />
                 <QTooltip>
@@ -648,7 +647,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
             color="primary"
             fab
             icon="add"
-            shortcut="+"
+            v-shortcut="'+'"
             data-cy="vnTableCreateBtn"
         />
         <QTooltip self="top right">
@@ -807,12 +806,15 @@ es:
 
 .grid-two {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
+    grid-template-columns: 2fr 2fr;
-    max-width: 100%;
+    .vn-label-value {
-    margin: 0 auto;
+        flex-direction: column;
-    overflow: scroll;
+        white-space: nowrap;
-    white-space: wrap;
+        .fields {
-    width: 100%;
+            display: flex;
+        }
+    }
+    white-space: nowrap;
 }
 
 .w-80 {

src/components/VnTable/VnTableFilter.vue

@@ -27,7 +27,7 @@ function columnName(col) {
 </script>
 <template>
     <VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
-        <template #body="{ params, orders }">
+        <template #body="{ params, orders, searchFn }">
             <div
                 class="row no-wrap flex-center"
                 v-for="col of columns.filter((c) => c.columnFilter ?? true)"
@@ -52,6 +52,7 @@ function columnName(col) {
             <slot
                 name="moreFilterPanel"
                 :params="params"
+                :search-fn="searchFn"
                 :orders="orders"
                 :columns="columns"
             />

src/components/__tests__/FormModel.spec.js

@@ -93,7 +93,7 @@ describe('FormModel', () => {
 
         it('should call axios.patch with the right data', async () => {
             const spy = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
-            const { vm } = mount({ propsData: { url, model, formInitialData } });
+            const { vm } = mount({ propsData: { url, model } });
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             await vm.save();
@@ -106,6 +106,7 @@ describe('FormModel', () => {
             const { vm } = mount({
                 propsData: { url, model, formInitialData, urlCreate: 'mockUrlCreate' },
             });
+            await vm.$nextTick();
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             await vm.save();
@@ -119,7 +120,7 @@ describe('FormModel', () => {
             });
             const spyPatch = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
             const spySaveFn = vi.spyOn(vm.$props, 'saveFn');
-
+            await vm.$nextTick();
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             await vm.save();

src/components/__tests__/Leftmenu.spec.js

@@ -1,9 +1,12 @@
-import { vi, describe, expect, it, beforeAll } from 'vitest';
+import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import Leftmenu from 'components/LeftMenu.vue';
-
+import * as vueRouter from 'vue-router';
 import { useNavigationStore } from 'src/stores/useNavigationStore';
 
+let vm;
+let navigation;
+
 vi.mock('src/router/modules', () => ({
     default: [
         {
@@ -21,6 +24,16 @@ vi.mock('src/router/modules', () => ({
                 {
                     path: '',
                     name: 'CustomerMain',
+                    meta: {
+                        menu: 'Customer',
+                        menuChildren: [
+                            {
+                                name: 'CustomerCreditContracts',
+                                title: 'creditContracts',
+                                icon: 'vn:solunion',
+                            },
+                        ],
+                    },
                     children: [
                         {
                             path: 'list',
@@ -28,6 +41,13 @@ vi.mock('src/router/modules', () => ({
                             meta: {
                                 title: 'list',
                                 icon: 'view_list',
+                                menuChildren: [
+                                    {
+                                        name: 'CustomerCreditContracts',
+                                        title: 'creditContracts',
+                                        icon: 'vn:solunion',
+                                    },
+                                ],
                             },
                         },
                         {
@@ -44,51 +64,325 @@ vi.mock('src/router/modules', () => ({
         },
     ],
 }));
-
+vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
-describe('Leftmenu', () => {
+    matched: [
-    let vm;
+        {
-    let navigation;
+            path: '/',
-    beforeAll(() => {
+            redirect: {
-        vi.spyOn(axios, 'get').mockResolvedValue({
+                name: 'Dashboard',
-            data: [],
-        });
-
-        vm = createWrapper(Leftmenu, {
-            propsData: {
-                source: 'main',
             },
-        }).vm;
+            name: 'Main',
-
+            meta: {},
-        navigation = useNavigationStore();
+            props: {
-        navigation.fetchPinned = vi.fn().mockReturnValue(Promise.resolve(true));
+                default: false,
-        navigation.getModules = vi.fn().mockReturnValue({
+            },
-            value: [
+            children: [
                 {
-                    name: 'customer',
+                    path: '/dashboard',
-                    title: 'customer.pageTitles.customers',
+                    name: 'Dashboard',
-                    icon: 'vn:customer',
+                    meta: {
-                    module: 'customer',
+                        title: 'dashboard',
+                        icon: 'dashboard',
+                    },
                 },
             ],
+        },
+        {
+            path: '/customer',
+            redirect: {
+                name: 'CustomerMain',
+            },
+            name: 'Customer',
+            meta: {
+                title: 'customers',
+                icon: 'vn:client',
+                moduleName: 'Customer',
+                keyBinding: 'c',
+                menu: 'customer',
+            },
+        },
+    ],
+    query: {},
+    params: {},
+    meta: { moduleName: 'mockName' },
+    path: 'mockName/1',
+    name: 'Customer',
+});
+function mount(source = 'main') {
+    vi.spyOn(axios, 'get').mockResolvedValue({
+        data: [],
+    });
+    const wrapper = createWrapper(Leftmenu, {
+        propsData: {
+            source,
+        },
+    });
+
+    navigation = useNavigationStore();
+    navigation.fetchPinned = vi.fn().mockReturnValue(Promise.resolve(true));
+    navigation.getModules = vi.fn().mockReturnValue({
+        value: [
+            {
+                name: 'customer',
+                title: 'customer.pageTitles.customers',
+                icon: 'vn:customer',
+                module: 'customer',
+            },
+        ],
+    });
+    return wrapper;
+}
+
+describe('getRoutes', () => {
+    afterEach(() => vi.clearAllMocks());
+    const getRoutes = vi.fn().mockImplementation((props, getMethodA, getMethodB) => {
+        const handleRoutes = {
+            methodA: getMethodA,
+            methodB: getMethodB,
+        };
+        try {
+            handleRoutes[props.source]();
+        } catch (error) {
+            throw Error('Method not defined');
+        }
+    });
+
+    const getMethodA = vi.fn();
+    const getMethodB = vi.fn();
+    const fn = (props) => getRoutes(props, getMethodA, getMethodB);
+
+    it('should call getMethodB when source is card', () => {
+        let props = { source: 'methodB' };
+        fn(props);
+
+        expect(getMethodB).toHaveBeenCalled();
+        expect(getMethodA).not.toHaveBeenCalled();
+    });
+    it('should call getMethodA when source is main', () => {
+        let props = { source: 'methodA' };
+        fn(props);
+
+        expect(getMethodA).toHaveBeenCalled();
+        expect(getMethodB).not.toHaveBeenCalled();
+    });
+
+    it('should call getMethodA when source is not exists or undefined', () => {
+        let props = { source: 'methodC' };
+        expect(() => fn(props)).toThrowError('Method not defined');
+
+        expect(getMethodA).not.toHaveBeenCalled();
+        expect(getMethodB).not.toHaveBeenCalled();
+    });
+});
+
+describe('Leftmenu as card', () => {
+    beforeAll(() => {
+        vm = mount('card').vm;
+    });
+
+    it('should get routes for card source', async () => {
+        vm.getRoutes();
+    });
+});
+describe('Leftmenu as main', () => {
+    beforeEach(() => {
+        vm = mount().vm;
+    });
+
+    it('should initialize with default props', () => {
+        expect(vm.source).toBe('main');
+    });
+
+    it('should filter items based on search input', async () => {
+        vm.search = 'cust';
+        await vm.$nextTick();
+        expect(vm.filteredItems[0].name).toEqual('customer');
+        expect(vm.filteredItems[0].module).toEqual('customer');
+    });
+    it('should filter items based on search input', async () => {
+        vm.search = 'Rou';
+        await vm.$nextTick();
+        expect(vm.filteredItems).toEqual([]);
+    });
+
+    it('should return pinned items', () => {
+        vm.items = [
+            { name: 'Item 1', isPinned: false },
+            { name: 'Item 2', isPinned: true },
+        ];
+        expect(vm.pinnedModules).toEqual(
+            new Map([['Item 2', { name: 'Item 2', isPinned: true }]]),
+        );
+    });
+
+    it('should find matches in routes', () => {
+        const search = 'child1';
+        const item = {
+            children: [
+                { name: 'child1', children: [] },
+                { name: 'child2', children: [] },
+            ],
+        };
+        const matches = vm.findMatches(search, item);
+        expect(matches).toEqual([{ name: 'child1', children: [] }]);
+    });
+    it('should not proceed if event is already prevented', async () => {
+        const item = { module: 'testModule', isPinned: false };
+        const event = {
+            preventDefault: vi.fn(),
+            stopPropagation: vi.fn(),
+            defaultPrevented: true,
+        };
+
+        await vm.togglePinned(item, event);
+
+        expect(event.preventDefault).not.toHaveBeenCalled();
+        expect(event.stopPropagation).not.toHaveBeenCalled();
+    });
+
+    it('should call quasar.notify with success message', async () => {
+        const item = { module: 'testModule', isPinned: false };
+        const event = {
+            preventDefault: vi.fn(),
+            stopPropagation: vi.fn(),
+            defaultPrevented: false,
+        };
+        const response = { data: { id: 1 } };
+
+        vi.spyOn(axios, 'post').mockResolvedValue(response);
+        vi.spyOn(vm.quasar, 'notify');
+
+        await vm.togglePinned(item, event);
+
+        expect(vm.quasar.notify).toHaveBeenCalledWith({
+            message: 'Data saved',
+            type: 'positive',
         });
     });
 
-    it('should return a proper formated object with two child items', async () => {
+    it('should handle a single matched route with a menu', () => {
-        const expectedMenuItem = [
+        const route = {
-            {
+            matched: [{ meta: { menu: 'customer' } }],
-                children: null,
+        };
-                name: 'CustomerList',
+
-                title: 'globals.pageTitles.list',
+        const result = vm.betaGetRoutes();
-                icon: 'view_list',
+
-            },
+        expect(result.meta.menu).toEqual(route.matched[0].meta.menu);
-            {
+    });
-                children: null,
+    it('should get routes for main source', () => {
-                name: 'CustomerCreate',
+        vm.props.source = 'main';
-                title: 'globals.pageTitles.createCustomer',
+        vm.getRoutes();
-                icon: 'vn:addperson',
+        expect(navigation.getModules).toHaveBeenCalled();
-            },
+    });
-        ];
+
-        const firstMenuItem = vm.items[0];
+    it('should find direct child matches', () => {
-        expect(firstMenuItem.children).toEqual(expect.arrayContaining(expectedMenuItem));
+        const search = 'child1';
+        const item = {
+            children: [{ name: 'child1' }, { name: 'child2' }],
+        };
+        const result = vm.findMatches(search, item);
+        expect(result).toEqual([{ name: 'child1' }]);
+    });
+
+    it('should find nested child matches', () => {
+        const search = 'child3';
+        const item = {
+            children: [
+                { name: 'child1' },
+                {
+                    name: 'child2',
+                    children: [{ name: 'child3' }],
+                },
+            ],
+        };
+        const result = vm.findMatches(search, item);
+        expect(result).toEqual([{ name: 'child3' }]);
+    });
+});
+
+describe('normalize', () => {
+    beforeAll(() => {
+        vm = mount('card').vm;
+    });
+    it('should normalize and lowercase text', () => {
+        const input = 'ÁÉÍÓÚáéíóú';
+        const expected = 'aeiouaeiou';
+        expect(vm.normalize(input)).toBe(expected);
+    });
+
+    it('should handle empty string', () => {
+        const input = '';
+        const expected = '';
+        expect(vm.normalize(input)).toBe(expected);
+    });
+
+    it('should handle text without diacritics', () => {
+        const input = 'hello';
+        const expected = 'hello';
+        expect(vm.normalize(input)).toBe(expected);
+    });
+
+    it('should handle mixed text', () => {
+        const input = 'Héllo Wórld!';
+        const expected = 'hello world!';
+        expect(vm.normalize(input)).toBe(expected);
+    });
+});
+
+describe('addChildren', () => {
+    const module = 'testModule';
+    beforeEach(() => {
+        vm = mount().vm;
+        vi.clearAllMocks();
+    });
+
+    it('should add menu items to parent if matches are found', () => {
+        const parent = 'testParent';
+        const route = {
+            meta: {
+                menu: 'testMenu',
+            },
+            children: [{ name: 'child1' }, { name: 'child2' }],
+        };
+        vm.addChildren(module, route, parent);
+
+        expect(navigation.addMenuItem).toHaveBeenCalled();
+    });
+
+    it('should handle routes with no meta menu', () => {
+        const route = {
+            meta: {},
+            menus: {},
+        };
+
+        const parent = [];
+
+        vm.addChildren(module, route, parent);
+        expect(navigation.addMenuItem).toHaveBeenCalled();
+    });
+
+    it('should handle empty parent array', () => {
+        const parent = [];
+        const route = {
+            meta: {
+                menu: 'child11',
+            },
+            children: [
+                {
+                    name: 'child1',
+                    meta: {
+                        menuChildren: [
+                            {
+                                name: 'CustomerCreditContracts',
+                                title: 'creditContracts',
+                                icon: 'vn:solunion',
+                            },
+                        ],
+                    },
+                },
+            ],
+        };
+        vm.addChildren(module, route, parent);
+        expect(navigation.addMenuItem).toHaveBeenCalled();
     });
 });

src/components/__tests__/UserPanel.spec.js

@@ -0,0 +1,61 @@
+import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import UserPanel from 'src/components/UserPanel.vue';
+import axios from 'axios';
+import { useState } from 'src/composables/useState';
+
+describe('UserPanel', () => {
+    let wrapper;
+    let vm;
+    let state;
+
+    beforeEach(() => {
+        wrapper = createWrapper(UserPanel, {});
+        state = useState();
+        state.setUser({
+            id: 115,
+            name: 'itmanagement',
+            nickname: 'itManagementNick',
+            lang: 'en',
+            darkMode: false,
+            companyFk: 442,
+            warehouseFk: 1,
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should fetch warehouses data on mounted', async () => {
+        const fetchData = wrapper.findComponent({ name: 'FetchData' });
+        expect(fetchData.props('url')).toBe('Warehouses');
+        expect(fetchData.props('autoLoad')).toBe(true);
+    });
+
+    it('should toggle dark mode correctly and update preferences', async () => {
+        await vm.saveDarkMode(true);
+        expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+        expect(vm.user.darkMode).toBe(true);
+        vm.updatePreferences();
+        expect(vm.darkMode).toBe(true);
+    });
+
+    it('should change user language and update preferences', async () => {
+        const userLanguage = 'es';
+        await vm.saveLanguage(userLanguage);
+        expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
+        expect(vm.user.lang).toBe(userLanguage);
+        vm.updatePreferences();
+        expect(vm.locale).toBe(userLanguage);
+    });
+
+    it('should update user data', async () => {
+        const key = 'name';
+        const value = 'itboss';
+        await vm.saveUserData(key, value);
+        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
+    });
+});

src/components/common/VnCard.vue

@@ -10,11 +10,11 @@ import LeftMenu from 'components/LeftMenu.vue';
 import RightMenu from 'components/common/RightMenu.vue';
 const props = defineProps({
     dataKey: { type: String, required: true },
-    baseUrl: { type: String, default: undefined },
+    url: { type: String, default: undefined },
-    customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
+    idInWhere: { type: Boolean, default: false },
     searchDataKey: { type: String, default: undefined },
     searchbarProps: { type: Object, default: undefined },
     redirectOnError: { type: Boolean, default: false },
@@ -23,25 +23,20 @@ const props = defineProps({
 const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
-const url = computed(() => {
-    if (props.baseUrl) {
-        return `${props.baseUrl}/${route.params.id}`;
-    }
-    return props.customUrl;
-});
 const searchRightDataKey = computed(() => {
     if (!props.searchDataKey) return route.name;
     return props.searchDataKey;
 });
+
 const arrayData = useArrayData(props.dataKey, {
-    url: url.value,
+    url: props.url,
-    filter: props.filter,
+    userFilter: props.filter,
+    oneRecord: true,
 });
 
 onBeforeMount(async () => {
     try {
-        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+        await fetch(route.params.id);
-        await arrayData.fetch({ append: false, updateRouter: false });
     } catch {
         const { matched: matches } = router.currentRoute.value;
         const { path } = matches.at(-1);
@@ -49,13 +44,17 @@ onBeforeMount(async () => {
     }
 });
 
-if (props.baseUrl) {
+onBeforeRouteUpdate(async (to, from) => {
-    onBeforeRouteUpdate(async (to, from) => {
+    const id = to.params.id;
-        if (to.params.id !== from.params.id) {
+    if (id !== from.params.id) await fetch(id, true);
-            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
+});
-            await arrayData.fetch({ append: false, updateRouter: false });
+
-        }
+async function fetch(id, append = false) {
-    });
+    const regex = /\/(\d+)/;
+    if (props.idInWhere) arrayData.store.filter.where = { id };
+    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 });
 }
 </script>
 <template>
@@ -83,7 +82,7 @@ if (props.baseUrl) {
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="route.path" />
+                <RouterView :key="$route.path" />
             </div>
         </QPage>
     </QPageContainer>

src/components/common/VnCardBeta.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { onBeforeMount, computed } from 'vue';
+import { onBeforeMount } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
@@ -9,10 +9,9 @@ import VnSubToolbar from '../ui/VnSubToolbar.vue';
 
 const props = defineProps({
     dataKey: { type: String, required: true },
-    baseUrl: { type: String, default: undefined },
+    url: { type: String, default: undefined },
-    customUrl: { type: String, default: undefined },
+    idInWhere: { type: Boolean, default: false },
     filter: { type: Object, default: () => {} },
-    userFilter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
@@ -21,39 +20,35 @@ const props = defineProps({
 });
 
 const stateStore = useStateStore();
-const route = useRoute();
 const router = useRouter();
-const url = computed(() => {
-    if (props.baseUrl) {
-        return `${props.baseUrl}/${route.params.id}`;
-    }
-    return props.customUrl;
-});
-
 const arrayData = useArrayData(props.dataKey, {
-    url: url.value,
+    url: props.url,
-    filter: props.filter,
+    userFilter: props.filter,
-    userFilter: props.userFilter,
+    oneRecord: true,
 });
 
 onBeforeMount(async () => {
+    const route = router.currentRoute.value;
     try {
-        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+        await fetch(route.params.id);
-        await arrayData.fetch({ append: false, updateRouter: false });
     } catch {
-        const { matched: matches } = router.currentRoute.value;
+        const { matched: matches } = route;
         const { path } = matches.at(-1);
         router.push({ path: path.replace(/:id.*/, '') });
     }
 });
 
-if (props.baseUrl) {
+onBeforeRouteUpdate(async (to, from) => {
-    onBeforeRouteUpdate(async (to, from) => {
+    const id = to.params.id;
-        if (to.params.id !== from.params.id) {
+    if (id !== from.params.id) await fetch(id, true);
-            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
+});
-            await arrayData.fetch({ append: false, updateRouter: false });
+
-        }
+async function fetch(id, append = false) {
-    });
+    const regex = /\/(\d+)/;
+    if (props.idInWhere) arrayData.store.filter.where = { id };
+    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 });
 }
 </script>
 <template>
@@ -64,6 +59,6 @@ if (props.baseUrl) {
     </Teleport>
     <VnSubToolbar />
     <div :class="[useCardSize(), $attrs.class]">
-        <RouterView :key="route.path" />
+        <RouterView :key="$route.path" />
     </div>
 </template>

src/components/common/VnDmsList.vue

@@ -17,7 +17,7 @@ import { useSession } from 'src/composables/useSession';
 const route = useRoute();
 const quasar = useQuasar();
 const { t } = useI18n();
-const rows = ref();
+const rows = ref([]);
 const dmsRef = ref();
 const formDialog = ref({});
 const token = useSession().getTokenMultimedia();
@@ -389,6 +389,14 @@ defineExpose({
                     </div>
                 </template>
             </QTable>
+            <div 
+                v-else 
+                class="info-row q-pa-md text-center"
+            >
+                <h5>
+                    {{ t('No data to display') }}
+                </h5>
+            </div>
         </template>
     </VnPaginate>
     <QDialog v-model="formDialog.show">
@@ -405,7 +413,7 @@ defineExpose({
             fab
             color="primary"
             icon="add"
-            shortcut="+"
+            v-shortcut
             @click="showFormDialog()"
             class="fill-icon"
         >

src/components/common/VnLog.vue

@@ -268,7 +268,7 @@ async function applyFilter() {
         filter.where.and.push(selectedFilters.value);
     }
 
-    paginate.value.fetch(filter);
+    paginate.value.fetch({ filter });
 }
 
 function setDate(type) {
@@ -404,7 +404,7 @@ watch(
         ref="paginate"
         :data-key="`${model}Log`"
         :url="`${model}Logs`"
-        :filter="filter"
+        :user-filter="filter"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"

src/components/common/VnSection.vue

@@ -106,7 +106,14 @@ function checkIsMain() {
                     :data-key="dataKey"
                     :array-data="arrayData"
                     :columns="columns"
-                />
+                >
+                    <template #moreFilterPanel="{ params, orders, searchFn }">
+                        <slot
+                            name="moreFilterPanel"
+                            v-bind="{ params, orders, searchFn }"
+                        />
+                    </template>
+                </VnTableFilter>
             </slot>
         </template>
     </RightAdvancedMenu>

src/components/common/VnSelect.vue

@@ -171,7 +171,8 @@ onMounted(() => {
 });
 
 const arrayDataKey =
-    $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
+    $props.dataKey ??
+    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
 
 const arrayData = useArrayData(arrayDataKey, {
     url: $props.url,
@@ -220,7 +221,7 @@ async function fetchFilter(val) {
         optionFilterValue.value ??
         (new RegExp(/\d/g).test(val)
             ? optionValue.value
-            : optionFilter.value ?? optionLabel.value);
+            : (optionFilter.value ?? optionLabel.value));
 
     let defaultWhere = {};
     if ($props.filterOptions.length) {
@@ -239,7 +240,7 @@ async function fetchFilter(val) {
 
     const { data } = await arrayData.applyFilter(
         { filter: filterOptions },
-        { updateRouter: false }
+        { updateRouter: false },
     );
     setOptions(data);
     return data;
@@ -272,7 +273,7 @@ async function filterHandler(val, update) {
                 ref.setOptionIndex(-1);
                 ref.moveOptionSelection(1, true);
             }
-        }
+        },
     );
 }
 
@@ -308,7 +309,7 @@ function handleKeyDown(event) {
         if (inputValue) {
             const matchingOption = myOptions.value.find(
                 (option) =>
-                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
+                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase(),
             );
 
             if (matchingOption) {
@@ -320,11 +321,11 @@ function handleKeyDown(event) {
         }
 
         const focusableElements = document.querySelectorAll(
-            'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])'
+            'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])',
         );
         const currentIndex = Array.prototype.indexOf.call(
             focusableElements,
-            event.target
+            event.target,
         );
         if (currentIndex >= 0 && currentIndex < focusableElements.length - 1) {
             focusableElements[currentIndex + 1].focus();

src/components/common/VnSelectSupplier.vue

@@ -0,0 +1,34 @@
+<script setup>
+import VnSelect from 'components/common/VnSelect.vue';
+
+const model = defineModel({ type: [String, Number, Object] });
+</script>
+
+<template>
+    <VnSelect
+        :label="$t('globals.supplier')"
+        v-bind="$attrs"
+        v-model="model"
+        url="Suppliers"
+        option-value="id"
+        option-label="nickname"
+        :fields="['id', 'name', 'nickname', 'nif']"
+        :filter-options="['id', 'name', 'nickname', 'nif']"
+        sort-by="name ASC"
+    >
+        <template #option="scope">
+            <QItem v-bind="scope.itemProps">
+                <QItemSection>
+                    <QItemLabel>
+                        {{ scope.opt?.name }}
+                    </QItemLabel>
+                    <QItemLabel caption>
+                        {{
+                            `#${scope.opt?.id} , ${scope.opt?.nickname} (${scope.opt?.nif})`
+                        }}
+                    </QItemLabel>
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnSelect>
+</template>

src/components/common/VnSelectWorker.vue

@@ -53,6 +53,7 @@ const url = computed(() => {
         :fields="['id', 'name', 'nickname', 'code']"
         :filter-options="['id', 'name', 'nickname', 'code']"
         sort-by="nickname ASC"
+        data-cy="vnWorkerSelect"
     >
         <template #prepend v-if="$props.hasAvatar">
             <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />

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

@@ -1,51 +1,78 @@
-import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
+import {
+    describe,
+    it,
+    expect,
+    vi,
+    beforeAll,
+    afterEach,
+    beforeEach,
+    afterAll,
+} from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnNotes from 'src/components/ui/VnNotes.vue';
+import vnDate from 'src/boot/vnDate';
 
 describe('VnNotes', () => {
     let vm;
     let wrapper;
     let spyFetch;
     let postMock;
-    let expectedBody;
+    let patchMock;
-    const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
+    let expectedInsertBody;
-
+    let expectedUpdateBody;
-    function generateExpectedBody() {
+    const defaultOptions = {
-        expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
+        url: '/test',
-    }
+        body: { name: 'Tony', lastName: 'Stark' },
-
+        selectType: false,
-    async function setTestParams(text, observationType, type){
+        saveUrl: null,
-        vm.newNote.text = text;
+        justInput: false,
-        vm.newNote.observationTypeFk = observationType;
+    };
-        wrapper.setProps({ selectType: type });
+    function generateWrapper(
-    }
+        options = defaultOptions,
-
+        text = null,
-    beforeAll(async () => {        
+        observationType = null,
-        vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
+    ) {
-
+        vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         wrapper = createWrapper(VnNotes, {
-            propsData: {
+            propsData: options,
-                url: '/test',
-                body: { name: 'Tony', lastName: 'Stark' },
-            }
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;
-    });
+        vm.newNote.text = text;
+        vm.newNote.observationTypeFk = observationType;
+    }
+
+    function createSpyFetch() {
+        spyFetch = vi.spyOn(vm.$refs.vnPaginateRef, 'fetch');
+    }
+
+    function generateExpectedBody() {
+        expectedInsertBody = {
+            ...vm.$props.body,
+            ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk },
+        };
+        expectedUpdateBody = { ...vm.$props.body, ...{ notes: vm.newNote.text } };
+    }
 
     beforeEach(() => {
-        postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
+        postMock = vi.spyOn(axios, 'post');
-        spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
+        patchMock = vi.spyOn(axios, 'patch');
     });
 
     afterEach(() => {
         vi.clearAllMocks();
-        expectedBody = {};
+        expectedInsertBody = {};
+        expectedUpdateBody = {};
+    });
+
+    afterAll(() => {
+        vi.restoreAllMocks();
     });
 
     describe('insert', () => {
-        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
+        it('should not call axios.post and vnPaginateRef.fetch when newNote.text is null', async () => {
-            await setTestParams( null, null, true );
+            generateWrapper({ selectType: true });
+            createSpyFetch();
 
             await vm.insert();
 
@@ -53,8 +80,9 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
-        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
+        it('should not call axios.post and vnPaginateRef.fetch when newNote.text is empty', async () => {
-            await setTestParams( "", null, false );
+            generateWrapper(null, '');
+            createSpyFetch();
 
             await vm.insert();
 
@@ -62,8 +90,9 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
-        it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
+        it('should not call axios.post and vnPaginateRef.fetch when observationTypeFk is null and selectType is true', async () => {
-            await setTestParams( "Test Note", null, true );
+            generateWrapper({ selectType: true }, 'Test Note');
+            createSpyFetch();
 
             await vm.insert();
 
@@ -71,37 +100,57 @@ describe('VnNotes', () => {
             expect(spyFetch).not.toHaveBeenCalled();
         });
 
-        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
+        it('should call axios.post and vnPaginateRef.fetch when observationTypeFk is missing and selectType is false', async () => {
-            await setTestParams( "Test Note", null, false );
+            generateWrapper(null, 'Test Note');
-
+            createSpyFetch();
             generateExpectedBody();
 
             await vm.insert();
 
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
-            expect(spyFetch).toHaveBeenCalled();
-        });
-
-        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {            
-            await setTestParams( "Test Note", 1, false );
-
-            generateExpectedBody();
-
-            await vm.insert();
-
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
             expect(spyFetch).toHaveBeenCalled();
         });
 
         it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
-            await setTestParams( "Test Note", 1, true );
+            generateWrapper({ selectType: true }, 'Test Note', 1);
-
+            createSpyFetch();
             generateExpectedBody();
 
             await vm.insert();
 
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
             expect(spyFetch).toHaveBeenCalled();
         });
     });
+
+    describe('update', () => {
+        it('should call axios.patch with saveUrl when saveUrl is set and justInput is true', async () => {
+            generateWrapper({
+                url: '/business',
+                justInput: true,
+                saveUrl: '/saveUrlTest',
+            });
+            generateExpectedBody();
+
+            await vm.update();
+
+            expect(patchMock).toHaveBeenCalledWith(vm.$props.saveUrl, expectedUpdateBody);
+        });
+
+        it('should call axios.patch with url when saveUrl is not set and justInput is true', async () => {
+            generateWrapper({
+                url: '/business',
+                body: { workerFk: 1110 },
+                justInput: true,
+            });
+            generateExpectedBody();
+
+            await vm.update();
+
+            expect(patchMock).toHaveBeenCalledWith(
+                `${vm.$props.url}/${vm.$props.body.workerFk}`,
+                expectedUpdateBody,
+            );
+        });
+    });
 });

src/components/ui/CardDescriptor.vue

@@ -59,10 +59,11 @@ onBeforeMount(async () => {
         url: $props.url,
         filter: $props.filter,
         skip: 0,
+        oneRecord: true,
     });
     store = arrayData.store;
     entity = computed(() => {
-        const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+        const data = store.data ?? {};
         if (data) emit('onFetch', data);
         return data;
     });
@@ -73,7 +74,7 @@ onBeforeMount(async () => {
         () => [$props.url, $props.filter],
         async () => {
             if (!isSameDataKey.value) await getData();
-        }
+        },
     );
 });
 
@@ -84,7 +85,7 @@ async function getData() {
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
         state.set($props.dataKey, data);
-        emit('onFetch', Array.isArray(data) ? data[0] : data);
+        emit('onFetch', data);
     } finally {
         isLoading.value = false;
     }
@@ -108,7 +109,7 @@ const iconModule = computed(() => route.matched[1].meta.icon);
 const toModule = computed(() =>
     route.matched[1].path.split('/').length > 2
         ? route.matched[1].redirect
-        : route.matched[1].children[0].redirect
+        : route.matched[1].children[0].redirect,
 );
 </script>
 

src/components/ui/CardSummary.vue

@@ -15,6 +15,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     entityId: {
         type: [Number, String],
         default: null,
@@ -34,10 +38,12 @@ const isSummary = ref();
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
+    userFilter: props.userFilter,
     skip: 0,
+    oneRecord: true,
 });
 const { store } = arrayData;
-const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+const entity = computed(() => store.data);
 const isLoading = ref(false);
 
 defineExpose({
@@ -56,7 +62,7 @@ async function fetch() {
     store.filter = props.filter ?? {};
     isLoading.value = true;
     const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-    emit('onFetch', Array.isArray(data) ? data[0] : data);
+    emit('onFetch', data);
     isLoading.value = false;
 }
 </script>
@@ -203,4 +209,13 @@ async function fetch() {
 .summaryHeader {
     color: $white;
 }
+
+.cardSummary :deep(.q-card__section[content]) {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0;
+    > * {
+        flex: 1;
+    }
+}
 </style>

src/components/ui/VnFilterPanel.vue

@@ -114,7 +114,7 @@ async function clearFilters() {
         arrayData.resetPagination();
         // Filtrar los params no removibles
         const removableFilters = Object.keys(userParams.value).filter((param) =>
-            $props.unremovableParams.includes(param)
+            $props.unremovableParams.includes(param),
         );
         const newParams = {};
         // Conservar solo los params que no son removibles
@@ -162,13 +162,13 @@ const formatTags = (tags) => {
 
 const tags = computed(() => {
     const filteredTags = tagsList.value.filter(
-        (tag) => !($props.customTags || []).includes(tag.label)
+        (tag) => !($props.customTags || []).includes(tag.label),
     );
     return formatTags(filteredTags);
 });
 
 const customTags = computed(() =>
-    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label))
+    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label)),
 );
 
 async function remove(key) {
@@ -188,10 +188,13 @@ function formatValue(value) {
 const getLocale = (label) => {
     const param = label.split('.').at(-1);
     const globalLocale = `globals.params.${param}`;
+    const moduleName = route.meta.moduleName;
+    const moduleLocale = `${moduleName.toLowerCase()}.${param}`;
     if (te(globalLocale)) return t(globalLocale);
-    else if (te(t(`params.${param}`)));
+    else if (te(moduleLocale)) return t(moduleLocale);
     else {
-        const camelCaseModuleName = route.meta.moduleName.charAt(0).toLowerCase() + route.meta.moduleName.slice(1);    
+        const camelCaseModuleName =
+            moduleName.charAt(0).toLowerCase() + moduleName.slice(1);
         return t(`${camelCaseModuleName}.params.${param}`);
     }
 };

src/components/ui/VnNotes.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref, reactive } from 'vue';
+import { ref, reactive, useAttrs, computed } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -16,12 +16,22 @@ import VnSelect from 'components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'components/common/VnInput.vue';
 
+const emit = defineEmits(['onFetch']);
+
+const $attrs = useAttrs();
+
+const isRequired = computed(() => {
+    return Object.keys($attrs).includes('required')
+});
+
 const $props = defineProps({
     url: { type: String, default: null },
+    saveUrl: {type: String, default: null},
     filter: { type: Object, default: () => {} },
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
     selectType: { type: Boolean, default: false },
+    justInput: { type: Boolean, default: false },
 });
 
 const { t } = useI18n();
@@ -29,6 +39,13 @@ const quasar = useQuasar();
 const newNote = reactive({ text: null, observationTypeFk: null });
 const observationTypes = ref([]);
 const vnPaginateRef = ref();
+let originalText;
+
+function handleClick(e) {
+    if (e.shiftKey && e.key === 'Enter') return;
+    if ($props.justInput) confirmAndUpdate();
+    else insert();
+}
 
 async function insert() {
     if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
@@ -41,8 +58,36 @@ async function insert() {
     await axios.post($props.url, newBody);
     await vnPaginateRef.value.fetch();
 }
+
+function confirmAndUpdate() {
+    if(!newNote.text && originalText)
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('New note is empty'),
+                    message: t('Are you sure remove this note?'),
+                },
+            })
+            .onOk(update)
+            .onCancel(() => {
+                newNote.text = originalText;
+            });
+    else update();
+}
+
+async function update() {
+    originalText = newNote.text;
+    const body = $props.body;
+    const newBody = {
+        ...body,
+        ...{ notes: newNote.text },
+    };
+    await axios.patch(`${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`, newBody);
+}
+
 onBeforeRouteLeave((to, from, next) => {
-    if (newNote.text)
+    if ((newNote.text && !$props.justInput) || (newNote.text !== originalText) && $props.justInput)
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
@@ -53,6 +98,13 @@ onBeforeRouteLeave((to, from, next) => {
         });
     else next();
 });
+
+function fetchData([ data ]) {
+    newNote.text = data?.notes;
+    originalText = data?.notes;
+    emit('onFetch', data);
+}
+
 </script>
 <template>
     <FetchData
@@ -62,8 +114,19 @@ onBeforeRouteLeave((to, from, next) => {
         auto-load
         @on-fetch="(data) => (observationTypes = data)"
     />
-    <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
+    <FetchData
-        <QCardSection horizontal>
+        v-if="justInput"
+        :url="url"
+        :filter="filter"
+        @on-fetch="fetchData"
+        auto-load
+    />
+    <QCard 
+        class="q-pa-xs q-mb-lg full-width" 
+        :class="{ 'just-input': $props.justInput }"
+        v-if="$props.addNote || $props.justInput"
+    >
+        <QCardSection horizontal v-if="!$props.justInput">
             {{ t('New note') }}
         </QCardSection>
         <QCardSection class="q-px-xs q-my-none q-py-none">
@@ -75,19 +138,19 @@ onBeforeRouteLeave((to, from, next) => {
                     v-model="newNote.observationTypeFk"
                     option-label="description"
                     style="flex: 0.15"
-                    :required="true"
+                    :required="isRequired"
                     @keyup.enter.stop="insert"
                 />
                 <VnInput
                     v-model.trim="newNote.text"
                     type="textarea"
-                    :label="t('Add note here...')"
+                    :label="$props.justInput && newNote.text ? '' : t('Add note here...')"
                     filled
                     size="lg"
                     autogrow
-                    @keyup.enter.stop="insert"
+                    @keyup.enter.stop="handleClick"
+                    :required="isRequired"
                     clearable
-                    :required="true"
                 >
                     <template #append>
                         <QBtn
@@ -95,7 +158,7 @@ onBeforeRouteLeave((to, from, next) => {
                             icon="save"
                             color="primary"
                             flat
-                            @click="insert"
+                            @click="handleClick"
                             class="q-mb-xs"
                             dense
                             data-cy="saveNote"
@@ -106,6 +169,7 @@ onBeforeRouteLeave((to, from, next) => {
         </QCardSection>
     </QCard>
     <VnPaginate
+        v-if="!$props.justInput"
         :data-key="$props.url"
         :url="$props.url"
         order="created DESC"
@@ -198,6 +262,11 @@ onBeforeRouteLeave((to, from, next) => {
         }
     }
 }
+.just-input {
+    padding-right: 18px;
+    margin-bottom: 2px;
+    box-shadow: none;
+}
 </style>
 <i18n>
     es:
@@ -205,4 +274,6 @@ onBeforeRouteLeave((to, from, next) => {
         New note: Nueva nota
         Save (Enter): Guardar (Intro)
         Observation type: Tipo de observación
+        New note is empty: La nueva nota esta vacia
+        Are you sure remove this note?: Estas seguro de quitar esta nota?
 </i18n>

src/components/ui/VnPaginate.vue

@@ -123,7 +123,7 @@ watch(
     () => props.data,
     () => {
         store.data = props.data;
-    }
+    },
 );
 
 watch(
@@ -132,12 +132,12 @@ watch(
         if (!mounted.value) return;
         emit('onChange', data);
     },
-    { immediate: true }
+    { immediate: true },
 );
 
 watch(
     () => [props.url, props.filter],
-    ([url, filter]) => mounted.value && fetch({ url, filter })
+    ([url, filter]) => mounted.value && fetch({ url, filter }),
 );
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
@@ -198,7 +198,7 @@ function endPagination() {
 async function onLoad(index, done) {
     if (!store.data || !mounted.value) return done();
 
-    if (store.data.length === 0 || !props.url) return done(false);
+    if (store.data.length === 0 || !arrayData.store.url) return done(false);
 
     pagination.value.page = pagination.value.page + 1;
 

src/components/ui/VnSms.vue

@@ -49,7 +49,7 @@ function formatNumber(number) {
             <VnPaginate
                 :data-key="$props.url"
                 :url="$props.url"
-                :filter="filter"
+                :user-filter="filter"
                 order="smsFk DESC"
                 :offset="100"
                 :limit="5"

src/components/ui/VnSubToolbar.vue

@@ -19,23 +19,26 @@ onMounted(() => {
     const observer = new MutationObserver(
         () =>
             (hasContent.value =
-                actions.value?.childNodes?.length + data.value?.childNodes?.length)
+                actions.value?.childNodes?.length + data.value?.childNodes?.length),
     );
     if (actions.value) observer.observe(actions.value, opts);
     if (data.value) observer.observe(data.value, opts);
 });
 
-onBeforeUnmount(() => stateStore.toggleSubToolbar());
+const actionsChildCount = () => !!actions.value?.childNodes?.length;
+
+onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
 </script>
 
 <template>
     <QToolbar
         id="subToolbar"
-        class="justify-end sticky"
         v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
+        class="justify-end sticky"
     >
         <slot name="st-data">
-            <div id="st-data"></div>
+            <div id="st-data" :class="{ 'full-width': !actionsChildCount() }">
+            </div>
         </slot>
         <QSpace />
         <slot name="st-actions">

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

@@ -51,16 +51,6 @@ describe('CardSummary', () => {
         expect(vm.store.filter).toEqual('cardFilter');
     });
 
-    it('should compute entity correctly from store data', () => {
-        vm.store.data = [{ id: 1, name: 'Entity 1' }];
-        expect(vm.entity).toEqual({ id: 1, name: 'Entity 1' });
-    });
-
-    it('should handle empty data gracefully', () => {
-        vm.store.data = [];
-        expect(vm.entity).toBeUndefined();
-    });
-
     it('should respond to prop changes and refetch data', async () => {
         const newUrl = 'CardSummary/35';
         const newKey = 'cardSummaryKey/35';
@@ -72,7 +62,7 @@ describe('CardSummary', () => {
         expect(vm.store.filter).toEqual({ key: newKey });
     });
 
-    it('should return true if route path ends with /summary' , () => {
+    it('should return true if route path ends with /summary', () => {
         expect(vm.isSummary).toBe(true);
     });
 });

src/composables/__tests__/useArrayData.spec.js

@@ -16,7 +16,7 @@ describe('useArrayData', () => {
         vi.clearAllMocks();
     });
 
-    it('should fetch and repalce url with new params', async () => {
+    it('should fetch and replace url with new params', async () => {
         vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
 
         const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
@@ -33,11 +33,11 @@ describe('useArrayData', () => {
         });
         expect(routerReplace.path).toEqual('mockSection/list');
         expect(JSON.parse(routerReplace.query.params)).toEqual(
-            expect.objectContaining(params)
+            expect.objectContaining(params),
         );
     });
 
-    it('Should get data and send new URL without keeping parameters, if there is only one record', async () => {
+    it('should get data and send new URL without keeping parameters, if there is only one record', async () => {
         vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }] });
 
         const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
@@ -56,7 +56,7 @@ describe('useArrayData', () => {
         expect(routerPush.query).toBeUndefined();
     });
 
-    it('Should get data and send new URL keeping parameters, if you have more than one record', async () => {
+    it('should get data and send new URL keeping parameters, if you have more than one record', async () => {
         vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }, { id: 2 }] });
 
         vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
@@ -95,4 +95,25 @@ describe('useArrayData', () => {
         expect(routerPush.path).toEqual('mockName/');
         expect(routerPush.query.params).toBeDefined();
     });
+
+    it('should return one record', async () => {
+        vi.spyOn(axios, 'get').mockReturnValueOnce({
+            data: [
+                { id: 1, name: 'Entity 1' },
+                { id: 2, name: 'Entity 2' },
+            ],
+        });
+        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
+        await arrayData.fetch({});
+
+        expect(arrayData.store.data).toEqual({ id: 1, name: 'Entity 1' });
+    });
+
+    it('should handle empty data gracefully if has to return one record', async () => {
+        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
+        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
+        await arrayData.fetch({});
+
+        expect(arrayData.store.data).toBeUndefined();
+    });
 });

src/composables/useArrayData.js

@@ -57,6 +57,7 @@ export function useArrayData(key, userOptions) {
             'navigate',
             'mapKey',
             'keepData',
+            'oneRecord',
         ];
         if (typeof userOptions === 'object') {
             for (const option in userOptions) {
@@ -93,6 +94,9 @@ export function useArrayData(key, userOptions) {
 
         if (params.filter.where || exprFilter)
             params.filter.where = { ...params.filter.where, ...exprFilter };
+
+        if (!params?.filter?.order?.length) delete params?.filter?.order;
+
         params.filter = JSON.stringify(params.filter);
 
         store.isLoading = true;
@@ -109,7 +113,11 @@ export function useArrayData(key, userOptions) {
         store.isLoading = false;
         canceller = null;
 
-        processData(response.data, { map: !!store.mapKey, append });
+        processData(response.data, {
+            map: !!store.mapKey,
+            append,
+            oneRecord: store.oneRecord,
+        });
 
         return response;
     }
@@ -311,7 +319,11 @@ export function useArrayData(key, userOptions) {
         return { params, limit };
     }
 
-    function processData(data, { map = true, append = true }) {
+    function processData(data, { map = true, append = true, oneRecord = false }) {
+        if (oneRecord) {
+            store.data = Array.isArray(data) ? data[0] : data;
+            return;
+        }
         if (!append) {
             store.data = [];
             store.map = new Map();

src/css/app.scss

@@ -212,6 +212,10 @@ select:-webkit-autofill {
     justify-content: center;
 }
 
+.q-card__section[dense] {
+    padding: 0;
+}
+
 input[type='number'] {
     -moz-appearance: textfield;
 }

src/css/fonts/icon.svg

@@ -127,6 +127,7 @@
 <glyph unicode="&#xe975;" glyph-name="stowaway" d="M1006.933 452.267l-260.267 106.667 29.867 29.867c4.267 4.267 4.267 12.8 4.267 17.067-4.267 4.267-8.533 8.533-12.8 8.533h-157.867c0 93.867 76.8 157.867 174.933 157.867 4.267 0 8.533 4.267 12.8 8.533s4.267 8.533 0 17.067l-81.067 153.6c-4.267 0-12.8 4.267-17.067 4.267-46.933 0-93.867-17.067-132.267-42.667-21.333-17.067-42.667-38.4-55.467-59.733-12.8 21.333-29.867 42.667-55.467 59.733-34.133 12.8-81.067 34.133-128 34.133-4.267 0-12.8-4.267-12.8-8.533l-85.333-153.6c-4.267-4.267-4.267-4.267 0-12.8 4.267-4.267 8.533-8.533 12.8-8.533 98.133 0 174.933-59.733 174.933-153.6v0h-140.8c-4.267 0-12.8-4.267-12.8-8.533-8.533-4.267-4.267-17.067 0-21.333l21.333-21.333-277.333-110.933c-8.533-8.533-12.8-12.8-8.533-21.333 0-8.533 8.533-12.8 17.067-12.8v0l98.133 4.267-81.067-85.333c0-4.267-4.267-8.533 0-12.8 0-4.267 4.267-8.533 8.533-8.533l85.333-34.133v-179.2c0-8.533 4.267-12.8 8.533-12.8l358.4-145.067h8.533l358.4 145.067c4.267 4.267 8.533 8.533 8.533 12.8v179.2l85.333 34.133c4.267 0 8.533 4.267 8.533 8.533s0 8.533-4.267 12.8l-68.267 98.133 102.4-4.267c8.533 0 12.8 4.267 17.067 12.8 8.533 0 4.267 4.267-4.267 12.8zM110.933 456.533l196.267 76.8 8.533-8.533-166.4-64-38.4-4.267zM153.6 285.867v0l-68.267 34.133 68.267 98.133 328.533-132.267-68.267-98.133-260.267 98.133zM490.667-29.867l-328.533 132.267v153.6l243.2-98.133h12.8c0 0 0 0 4.267 0v0c0 0 4.267 0 4.267 4.267l64 85.333c0-4.267 0-277.333 0-277.333zM490.667 324.267l-298.667 115.2 149.333 64 153.6-157.867v-17.067h-4.267zM529.067 337.067l157.867 157.867 140.8-55.467-298.667-115.2c0 0 0 12.8 0 12.8zM849.067 102.4l-328.533-132.267v281.6l64-85.333c0 0 0-4.267 4.267-4.267v0h17.067l243.2 98.133v-157.867zM938.667 324.267l-324.267-132.267-68.267 98.133 328.533 132.267 64-98.133zM870.4 460.8l-157.867 64 12.8 8.533 187.733-76.8-42.667 4.267z" />
 <glyph unicode="&#xe976;" glyph-name="supplier" d="M797.867 405.333l98.133 34.133 21.333-59.733-98.133-34.133-21.333 59.733zM1019.733 341.333c-4.267-8.533-8.533-12.8-17.067-17.067l-332.8-119.467c4.267-4.267 8.533-12.8 12.8-17.067l277.333 102.4 21.333-59.733-277.333-102.4c0-8.533 4.267-12.8 4.267-21.333 0-85.333-68.267-157.867-157.867-157.867-85.333 0-157.867 68.267-157.867 157.867 0 55.467 29.867 106.667 72.533 132.267l-217.6 610.133c-8.533 25.6-38.4 42.667-68.267 29.867l-157.867-55.467-21.333 59.733 157.867 59.733c59.733 17.067 123.733-12.8 149.333-72.533l221.867-614.4c8.533 0 12.8 0 21.333 4.267l-119.467 332.8c-4.267 17.067 4.267 34.133 17.067 38.4l136.533 51.2c0 0 0 0 0 0l115.2 42.667c0 0 0 0 0 0l136.533 51.2c8.533 4.267 17.067 4.267 25.6 0s12.8-8.533 17.067-17.067l145.067-396.8c0-4.267 0-12.8-4.267-21.333zM695.467 657.067l-59.733-21.333 8.533-21.333 59.733 21.333-8.533 21.333zM644.267 106.667c0 51.2-42.667 93.867-93.867 93.867s-93.867-42.667-93.867-93.867c0-51.2 42.667-93.867 93.867-93.867s93.867 38.4 93.867 93.867zM951.467 371.2l-119.467 332.8-76.8-29.867 17.067-51.2c4.267-8.533 4.267-17.067 0-25.6s-8.533-12.8-17.067-17.067l-115.2-42.667c-4.267 0-8.533 0-12.8 0-12.8 0-25.6 8.533-29.867 21.333l-17.067 51.2-76.8-29.867 119.467-332.8 328.533 123.733z" />
 <glyph unicode="&#xe977;" glyph-name="supplierfalse" d="M198.827 882.773c22.187 0.427 41.813-14.080 48.64-34.133l8.107-22.187 105.813-105.813-54.187 149.333c-25.6 59.733-89.6 89.6-149.333 72.533l-13.653-5.12 54.613-54.613zM708.693 129.28l-173.653 173.653 15.36-43.093c-8.533-4.267-12.8-4.267-21.333-4.267l-29.867 83.2-108.373 108.373 74.24-208.64c-42.667-25.6-72.533-76.8-72.533-132.267 0-89.6 72.533-157.867 157.867-157.867 89.6 0 157.867 72.533 157.867 157.867 0 8.533-4.267 12.8-4.267 21.333l4.693 1.707zM550.4 12.373c-51.2 0-93.867 42.667-93.867 93.867s42.667 93.867 93.867 93.867 93.867-42.667 93.867-93.867c0-55.467-42.667-93.867-93.867-93.867zM960 289.707l-122.453-45.227 49.493-49.067 94.293 34.56zM504.32 577.707l-0.853 2.133 76.8 29.867 17.067-51.2c4.267-12.8 17.067-21.333 29.867-21.333 4.267 0 8.533 0 12.8 0l115.2 42.667c8.533 4.267 12.8 8.533 17.067 17.067s4.267 17.067 0 25.6l-17.067 51.2 76.8 29.867 119.467-332.8-174.507-65.707 45.653-45.653 180.053 64.427c8.533 4.267 12.8 8.533 17.067 17.067s4.267 17.067 4.267 21.333l-145.067 396.8c-4.267 8.533-8.533 12.8-17.067 17.067s-17.067 4.267-25.6 0l-136.533-51.2-115.2-42.667-134.4-50.347 54.187-54.187zM695.467 656.64l8.533-21.333-59.733-21.333-8.533 21.333 59.733 21.333zM896 439.040l-98.133-34.133 21.333-59.733 98.133 34.133zM39.253 960c-9.813 0-20.053-3.84-27.733-11.52-15.36-15.787-15.36-40.533 0-55.893l945.493-945.067c7.68-7.68 17.493-11.52 27.733-11.52 9.813 0 20.053 3.84 27.733 11.52 15.36 15.787 15.36 40.533 0 55.893l-945.493 945.067c-7.68 7.68-17.493 11.52-27.733 11.52z" />
+<glyph unicode="&#xe978;" glyph-name="inactive-car" d="M1024 900.267l-59.733 59.733-964.267-964.267 59.733-59.733 964.267 964.267zM0 55.893v448.853l119.467 341.333c5.547 17.067 15.787 30.72 30.72 41.387 14.507 10.24 31.147 15.787 49.067 15.787h625.92c6.827 0 13.653-0.853 20.053-2.133l-111.36-111.36h-514.987l-59.733-170.667h403.2l-113.92-113.92h-334.507v-284.587h50.773l-164.693-164.693zM316.587 423.253c8.96-8.96 15.787-19.627 19.627-30.72l-110.080-110.080c-11.52 4.267-21.76 10.667-30.72 19.627-16.64 16.64-24.747 36.693-24.747 60.587s8.107 43.947 24.747 60.587c16.64 16.64 36.693 24.747 60.587 24.747s43.947-8.107 60.587-24.747zM768 277.333c-23.893 0-43.947 8.107-60.587 24.747s-24.747 36.693-24.747 60.587 8.107 43.947 24.747 60.587c16.64 16.64 36.693 24.747 60.587 24.747s43.947-8.107 60.587-24.747c16.64-16.64 24.747-36.693 24.747-60.587s-8.107-43.947-24.747-60.587c-16.64-16.64-36.693-24.747-60.587-24.747zM936.96 753.067l87.040-248.32v-455.253c0-16.213-5.547-29.44-16.213-40.533s-24.32-16.213-40.533-16.213h-56.747c-16.213 0-29.44 5.547-40.533 16.213s-16.213 24.32-16.213 40.533v56.747h-563.2l113.92 113.92h505.6v284.587h-221.44l113.92 113.92h61.867l-16.213 46.080 88.32 88.32z" />
 <glyph unicode="&#xe979;" glyph-name="tags" d="M729.6 960c-42.667 0-89.6 0-132.267 0-21.333 0-38.4-8.533-51.2-21.333-140.8-140.8-281.6-281.6-422.4-422.4-25.6-25.6-25.6-51.2 0-76.8 93.867-93.867 187.733-187.733 281.6-281.6 25.6-25.6 51.2-25.6 76.8 0 140.8 140.8 281.6 281.6 422.4 422.4 17.067 12.8 21.333 29.867 21.333 51.2 0 93.867 0 183.467 0 277.333 0 34.133-17.067 51.2-51.2 51.2-51.2 0-98.133 0-145.067 0zM682.667 763.733c0 25.6 17.067 46.933 42.667 46.933s46.933-21.333 46.933-46.933c0-25.6-21.333-46.933-46.933-46.933-21.333 0-42.667 21.333-42.667 46.933zM878.933 482.133c4.267-12.8 0-21.333-8.533-29.867-34.133-51.2-64-98.133-98.133-149.333-76.8-115.2-153.6-234.667-230.4-349.867-12.8-17.067-21.333-21.333-38.4-8.533-115.2 76.8-226.133 149.333-337.067 226.133-17.067 8.533-17.067 21.333-8.533 38.4 12.8 21.333 29.867 46.933 42.667 68.267 8.533 12.8 8.533 12.8 17.067 0 55.467-55.467 115.2-115.2 170.667-170.667 8.533-8.533 17.067-17.067 29.867-21.333 29.867-12.8 55.467-4.267 76.8 21.333 123.733 123.733 247.467 247.467 371.2 371.2 4.267 4.267 4.267 8.533 8.533 12.8 0-8.533 0-8.533 4.267-8.533z" />
 <glyph unicode="&#xe97a;" glyph-name="tax" d="M448 192c0 174.933 145.067 320 320 320 76.8 0 145.067-25.6 196.267-68.267v324.267c4.267 51.2-38.4 98.133-93.867 98.133h-204.8c-21.333 55.467-72.533 93.867-136.533 93.867s-115.2-38.4-136.533-98.133h-209.067c-55.467 0-98.133-42.667-98.133-93.867v-674.133c0-51.2 42.667-98.133 98.133-98.133h332.8c-42.667 55.467-68.267 123.733-68.267 196.267zM529.067 861.867c29.867 0 46.933-21.333 46.933-46.933 0-29.867-25.6-46.933-46.933-46.933-29.867 0-46.933 21.333-46.933 46.933-4.267 29.867 17.067 46.933 46.933 46.933zM708.267 247.467c-8.533 0-12.8 4.267-17.067 8.533s-8.533 8.533-8.533 17.067v17.067c0 8.533 0 12.8 4.267 17.067s8.533 8.533 17.067 8.533c8.533 0 12.8-4.267 17.067-8.533s4.267-12.8 4.267-17.067v-12.8c4.267-21.333-4.267-29.867-17.067-29.867zM870.4 132.267c4.267-4.267 4.267-12.8 4.267-17.067v-21.333c0-12.8-8.533-21.333-21.333-21.333-8.533 0-12.8 4.267-17.067 8.533s-8.533 12.8-8.533 17.067v17.067c0 8.533 4.267 12.8 8.533 17.067s8.533 8.533 17.067 8.533c8.533 0 12.8-4.267 17.067-8.533zM768 448c-140.8 0-256-115.2-256-256s115.2-256 256-256 256 115.2 256 256-115.2 256-256 256zM635.733 273.067v17.067c0 21.333 4.267 34.133 17.067 46.933s29.867 17.067 51.2 17.067c21.333 0 38.4-4.267 51.2-17.067s17.067-29.867 17.067-46.933v-17.067c0-21.333-4.267-34.133-17.067-46.933s-29.867-17.067-51.2-17.067-38.4 4.267-51.2 17.067c-8.533 12.8-17.067 29.867-17.067 46.933zM721.067 59.733l-34.133 17.067 153.6 243.2 34.133-17.067-153.6-243.2zM925.867 98.133c0-21.333-4.267-34.133-17.067-46.933s-29.867-17.067-51.2-17.067-38.4 4.267-51.2 17.067c-12.8 12.8-21.333 25.6-21.333 46.933v17.067c0 21.333 4.267 34.133 17.067 46.933s29.867 17.067 51.2 17.067 38.4-4.267 51.2-17.067c12.8-12.8 17.067-29.867 17.067-46.933v-17.067h4.267z" />
 <glyph unicode="&#xe97b;" glyph-name="thermometer" d="M641.567 326.792v35.527h64.784v25.078h-64.784v119.118h64.784v25.078h-64.784v119.118h64.784v25.078h-64.784v121.208h64.784v25.078h-64.784v8.359c0 71.053-58.514 129.567-129.567 129.567s-129.567-58.514-129.567-129.567v-503.641c-54.335-39.706-87.771-104.49-87.771-173.453 0-119.118 96.131-217.339 217.339-217.339 119.118 0 217.339 96.131 217.339 217.339 0 66.873-33.437 131.657-87.771 173.453zM512-28.473c-100.31 0-179.722 81.502-179.722 179.722 0 64.784 33.437 123.298 87.771 154.645v524.539c0 50.155 41.796 91.951 91.951 91.951s91.951-41.796 91.951-91.951v-522.449c54.335-31.347 87.771-89.861 87.771-154.645 0-100.31-79.412-181.812-179.722-181.812zM652.016 435.461v25.078h35.527v-25.078h-35.527zM652.016 579.657v25.078h35.527v-25.078h-35.527zM652.016 723.853v25.078h35.527v-25.078h-35.527zM568.424 284.996v543.347c0 0 0 0 0 0s0 0 0 0v0 0c0 31.347-25.078 56.424-56.424 56.424s-56.424-25.078-56.424-56.424v0-543.347c-52.245-20.898-87.771-73.143-87.771-131.657 0-79.412 64.784-144.196 144.196-144.196s144.196 64.784 144.196 144.196c0 58.514-35.527 108.669-87.771 131.657zM470.204 824.163v4.18c0 22.988 18.808 41.796 41.796 41.796s41.796-18.808 41.796-41.796v-219.429h-85.682v215.249z" />

src/css/icons.scss

@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'icon';
-  src:  url('fonts/icon.eot?7j3xju');
+  src:  url('fonts/icon.eot?uocffs');
-  src:  url('fonts/icon.eot?7j3xju#iefix') format('embedded-opentype'),
+  src:  url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
-    url('fonts/icon.ttf?7j3xju') format('truetype'),
+    url('fonts/icon.ttf?uocffs') format('truetype'),
-    url('fonts/icon.woff?7j3xju') format('woff'),
+    url('fonts/icon.woff?uocffs') format('woff'),
-    url('fonts/icon.svg?7j3xju#icon') format('svg');
+    url('fonts/icon.svg?uocffs#icon') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -25,6 +25,9 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-inactive-car:before {
+  content: "\e978";
+}
 .icon-hasItemLost:before {
   content: "\e957";
 }

src/i18n/locale/en.yml

@@ -326,15 +326,19 @@ globals:
         ticketsMonitor: Tickets monitor
         clientsActionsMonitor: Clients and actions
         serial: Serial
+        business: Business
         medical: Mutual
         pit: IRPF
         wasteRecalc: Waste recaclulate
         operator: Operator
         parking: Parking
+        vehicleList: Vehicles
+        vehicle: Vehicle
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?
     params:
+        description: Description
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
@@ -357,7 +361,13 @@ globals:
         correctingFk: Rectificative
         daysOnward: Days onward
         countryFk: Country
+        countryCodeFk: Country
         companyFk: Company
+    model: Model
+    fuel: Fuel
+    active: Active
+    inactive: Inactive
+    deliveryPoint: Delivery point
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -377,7 +387,7 @@ login:
     loginError: Invalid username or password
     fieldRequired: This field is required
     twoFactorRequired: Two-factor verification required
-twoFactorRequired:
+twoFactor:
     validate: Validate
     insert: Enter the verification code
     explanation: >-
@@ -456,48 +466,6 @@ ticket:
         consigneeStreet: Street
     create:
         address: Address
-invoiceOut:
-    card:
-        issued: Issued
-        customerCard: Customer card
-        ticketList: Ticket List
-    summary:
-        issued: Issued
-        dued: Due
-        booked: Booked
-        taxBreakdown: Tax breakdown
-        taxableBase: Taxable base
-        rate: Rate
-        fee: Fee
-        tickets: Tickets
-        totalWithVat: Amount
-    globalInvoices:
-        errors:
-            chooseValidClient: Choose a valid client
-            chooseValidCompany: Choose a valid company
-            chooseValidPrinter: Choose a valid printer
-            chooseValidSerialType: Choose a serial type
-            fillDates: Invoice date and the max date should be filled
-            invoiceDateLessThanMaxDate: Invoice date can not be less than max date
-            invoiceWithFutureDate: Exists an invoice with a future date
-            noTicketsToInvoice: There are not tickets to invoice
-            criticalInvoiceError: 'Critical invoicing error, process stopped'
-            invalidSerialTypeForAll: The serial type must be global when invoicing all clients
-        table:
-            addressId: Address id
-            streetAddress: Street
-        statusCard:
-            percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}'
-            pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs'
-    negativeBases:
-        clientId: Client Id
-        base: Base
-        active: Active
-        hasToInvoice: Has to Invoice
-        verifiedData: Verified Data
-        comercial: Comercial
-        errors:
-            downloadCsvFailed: CSV download failed
 department:
     chat: Chat
     bossDepartment: Boss Department
@@ -509,6 +477,24 @@ department:
     hasToSendMail: Send check-ins by email
     departmentRemoved: Department removed
 worker:
+    pageTitles:
+        workers: Workers
+        list: List
+        basicData: Basic data
+        summary: Summary
+        notifications: Notifications
+        workerCreate: New worker
+        department: Department
+        pda: PDA
+        notes: Notas
+        dms: My documentation
+        pbx: Private Branch Exchange
+        log: Log
+        calendar: Calendar
+        timeControl: Time control
+        locker: Locker
+        balance: Balance
+        medical: Medical
     list:
         department: Department
         schedule: Schedule
@@ -524,15 +510,24 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
-        fiDueDate: FI due date
+        fiDueDate: DNI expiration date
         sex: Sex
-        seniority: Seniority
+        seniority: Antiquity
         fi: DNI/NIE/NIF
         birth: Birth
         isFreelance: Freelance
         isSsDiscounted: SS Bonification
         hasMachineryAuthorized: Machinery authorized
         isDisable: Disable
+        business: Business
+        started: Started
+        ended: Ended
+        reasonEnd: Reason End
+        department: Departament
+        workerBusinessCategory: Worker Business Category
+        notes: Notes
+        workCenter: Center
+        professionalCategory: Professional Category
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -591,6 +586,23 @@ worker:
         sizeLimit: Size limit
         isOnReservationMode: Reservation mode
         machine: Machine
+    business:
+        tableVisibleColumns:
+            started: Start Date
+            ended: End Date
+            company: Company
+            reasonEnd: Reason for Termination
+            department: Department
+            professionalCategory: Professional Category
+            calendarType: Work Calendar
+            workCenter: Work Center
+            payrollCategories: Contract Category
+            occupationCode: Contribution Code
+            rate: Rate
+            businessType: Contract Type
+            amount: Salary
+            basicSalary: Transport Workers Salary
+            notes: Notes
 wagon:
     type:
         submit: Submit
@@ -623,6 +635,8 @@ wagon:
         name: Name
 
 supplier:
+    search: Search supplier
+    searchInfo: Search supplier by id or name
     list:
         payMethod: Pay method
         account: Account

src/i18n/locale/es.yml

@@ -326,15 +326,19 @@ globals:
         ticketsMonitor: Monitor de tickets
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
+        business: Contratos
         medical: Mutua
         pit: IRPF
         wasteRecalc: Recalcular mermas
         operator: Operario
         parking: Parking
+        vehicleList: Vehículos
+        vehicle: Vehículo
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?
     params:
+        description: Descripción
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
@@ -348,13 +352,14 @@ globals:
         from: Desde
         to: Hasta
         supplierFk: Proveedor
-        supplierRef: Ref. proveedor
+        supplierRef: Nº factura
         serial: Serie
         amount: Importe
         awbCode: AWB
         daysOnward: Días adelante
         packing: ITP
         countryFk: País
+        countryCodeFk: País
         companyFk: Empresa
 errors:
     statusUnauthorized: Acceso denegado
@@ -481,6 +486,26 @@ department:
     hasToSendMail: Enviar fichadas por mail
     departmentRemoved: Departamento eliminado
 worker:
+    pageTitles:
+        workers: Trabajadores
+        list: Listado
+        basicData: Datos básicos
+        summary: Resumen
+        notifications: Notificaciones
+        workerCreate: Nuevo trabajador
+        department: Departamentos
+        pda: PDA
+        notes: Notas
+        dms: Mi documentación
+        pbx: Centralita
+        log: Historial
+        calendar: Calendario
+        timeControl: Control de horario
+        locker: Taquilla
+        balance: Balance
+        business: Contrato
+        formation: Formación
+        medical: Mutua
     list:
         department: Departamento
         schedule: Horario
@@ -505,6 +530,15 @@ worker:
         isSsDiscounted: Bonificación SS
         hasMachineryAuthorized: Autorizado para maquinaria
         isDisable: Deshabilitado
+        business: Contrato
+        started: Antigüedad
+        ended: Fin
+        reasonEnd: Motivo finalización
+        department: Departamento
+        workerBusinessCategory: Categoria profesional
+        notes: Notas
+        workCenter: Centro
+        professionalCategory: Categoria profesional
     notificationsManager:
         activeNotifications: Notificaciones activas
         availableNotifications: Notificaciones disponibles
@@ -551,6 +585,23 @@ worker:
             debit: Debe
             credit: Haber
             concept: Concepto
+    business:
+        tableVisibleColumns:
+            started: Fecha inicio
+            ended: Fecha fin
+            company: Empresa
+            reasonEnd: Motivo finalización
+            department: Departamento
+            professionalCategory: Categoria profesional
+            calendarType: Calendario laboral
+            workCenter: Centro
+            payrollCategories: Categoria contrato
+            occupationCode: Cotización
+            rate: Tarifa
+            businessType: Contrato
+            amount: Salario
+            basicSalary: Salario transportistas
+            notes: Notas
     operator:
         numberOfWagons: Número de vagones
         train: tren
@@ -563,7 +614,6 @@ worker:
         sizeLimit: Tamaño límite
         isOnReservationMode: Modo de reserva
         machine: Máquina
-
 wagon:
     type:
         submit: Guardar
@@ -594,6 +644,8 @@ wagon:
         volume: Volumen
         name: Nombre
 supplier:
+    search: Buscar proveedor
+    searchInfo: Buscar proveedor por id o nombre
     list:
         payMethod: Método de pago
         account: Cuenta
@@ -601,6 +653,7 @@ supplier:
         tableVisibleColumns:
             nif: NIF/CIF
             account: Cuenta
+        
     summary:
         responsible: Responsable
         verified: Verificado

src/layouts/MainLayout.vue

@@ -2,7 +2,7 @@
 import Navbar from 'src/components/NavBar.vue';
 </script>
 <template>
-    <QLayout view="hHh LpR fFf" v-shortcut>
+    <QLayout view="hHh LpR fFf">
         <Navbar />
         <RouterView></RouterView>
         <QFooter v-if="$q.platform.is.mobile"></QFooter>

src/layouts/OutLayout.vue

@@ -1,12 +1,12 @@
 <script setup>
 import { Dark, Quasar } from 'quasar';
-import { computed } from 'vue';
+import { computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { localeEquivalence } from 'src/i18n/index';
 import quasarLang from 'src/utils/quasarLang';
+import { langs } from 'src/boot/defaults/constants.js';
 
 const { t, locale } = useI18n();
-
 const userLocale = computed({
     get() {
         return locale.value;
@@ -28,7 +28,6 @@ const darkMode = computed({
         Dark.set(value);
     },
 });
-const langs = ['en', 'es'];
 </script>
 
 <template>

src/pages/Account/AccountAliasList.vue

@@ -3,6 +3,7 @@ import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import exprBuilder from './Alias/AliasExprBuilder';
 
 const tableRef = ref();
 const { t } = useI18n();
@@ -31,15 +32,6 @@ const columns = computed(() => [
         create: true,
     },
 ]);
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : { alias: { like: `%${value}%` } };
-    }
-};
 </script>
 
 <template>

src/pages/Account/AccountConnections.vue

@@ -46,7 +46,7 @@ const killSession = async ({ userId, created }) => {
             <VnPaginate
                 :data-key="urlPath"
                 ref="paginateRef"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 order="created DESC"
                 auto-load

src/pages/Account/AccountExprBuilder.js

@@ -0,0 +1,18 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'nickname':
+            return { [param]: { like: `%${value}%` } };
+        case 'roleFk':
+            return { [param]: value };
+    }
+};

src/pages/Account/AccountList.vue

@@ -4,15 +4,16 @@ import { computed, ref } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import exprBuilder from './AccountExprBuilder.js';
+import filter from './Card/AccountFilter.js';
 import VnSection from 'src/components/common/VnSection.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const filter = {
+const tableRef = ref();
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+
-};
 const dataKey = 'AccountList';
 const roles = ref([]);
 const columns = computed(() => [
@@ -117,25 +118,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : {
-                      or: [
-                          { name: { like: `%${value}%` } },
-                          { nickname: { like: `%${value}%` } },
-                      ],
-                  };
-        case 'name':
-        case 'nickname':
-            return { [param]: { like: `%${value}%` } };
-        case 'roleFk':
-            return { [param]: value };
-    }
-}
 </script>
 <template>
     <FetchData url="VnRoles" @on-fetch="(data) => (roles = data)" auto-load />

src/pages/Account/Alias/AliasExprBuilder.js

@@ -0,0 +1,8 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : { alias: { like: `%${value}%` } };
+    }
+};

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

@@ -1,21 +1,13 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
-const { t } = useI18n();
 </script>
 
 <template>
     <VnCardBeta
         data-key="Alias"
-        base-url="MailAliases"
+        url="MailAliases"
         :descriptor="AliasDescriptor"
         search-data-key="AccountAliasList"
-        :searchbar-props="{
-            url: 'MailAliases',
-            info: t('mailAlias.searchInfo'),
-            label: t('mailAlias.search'),
-            searchUrl: 'table',
-        }"
     />
 </template>

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

@@ -7,7 +7,6 @@ import { useQuasar } from 'quasar';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
-import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -29,9 +28,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
-
 const removeAlias = () => {
     quasar
         .dialog({
@@ -56,10 +52,8 @@ const removeAlias = () => {
         ref="descriptor"
         :url="`MailAliases/${entityId}`"
         module="Alias"
-        @on-fetch="setData"
+        data-key="Alias"
-        data-key="aliasData"
+        title="alias"
-        :title="data.title"
-        :subtitle="data.subtitle"
     >
         <template #menu>
             <QItem v-ripple clickable @click="removeAlias()">

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

@@ -1,13 +1,11 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
-import { useArrayData } from 'src/composables/useArrayData';
-
 const route = useRoute();
 const { t } = useI18n();
 
@@ -18,20 +16,15 @@ const $props = defineProps({
     },
 });
 
-const { store } = useArrayData('Alias');
-const alias = ref(store.data);
 const entityId = computed(() => $props.id || route.params.id);
 </script>
 
 <template>
-    <CardSummary
+    <CardSummary ref="summary" :url="`MailAliases/${entityId}`" data-key="Alias">
-        ref="summary"
+        <template #header="{ entity: alias }">
-        :url="`MailAliases/${entityId}`"
+            {{ alias.id }} - {{ alias.alias }}
-        @on-fetch="(data) => (alias = data)"
+        </template>
-        data-key="MailAliasesSummary"
+        <template #body="{ entity: alias }">
-    >
-        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
-        <template #body>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
                     <router-link

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

@@ -69,7 +69,7 @@ const fetchAliases = () => paginateRef.value.fetch();
             <VnPaginate
                 ref="paginateRef"
                 data-key="AliasUsers"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 :limit="0"
                 auto-load

src/pages/Account/Card/AccountBasicData.vue

@@ -1,46 +1,20 @@
 <script setup>
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import { ref, watch } from 'vue';
-
-const route = useRoute();
-const { t } = useI18n();
-const formModelRef = ref(null);
-
-const accountFilter = {
-    where: { id: route.params.id },
-    fields: ['id', 'email', 'nickname', 'name', 'accountStateFk', 'packages', 'pickup'],
-    include: [],
-};
-
-watch(
-    () => route.params.id,
-    () => formModelRef.value.reset()
-);
 </script>
 <template>
-    <FormModel
+    <FormModel :url-update="`VnUsers/${$route.params.id}/update-user`" model="Account">
-        ref="formModelRef"
-        url="VnUsers/preview"
-        :url-update="`VnUsers/${route.params.id}/update-user`"
-        :filter="accountFilter"
-        model="Accounts"
-        auto-load
-        @on-data-saved="formModelRef.fetch()"
-    >
         <template #form="{ data }">
             <div class="q-gutter-y-sm">
-                <VnInput v-model="data.name" :label="t('account.card.nickname')" />
+                <VnInput v-model="data.name" :label="$t('account.card.nickname')" />
-                <VnInput v-model="data.nickname" :label="t('account.card.alias')" />
+                <VnInput v-model="data.nickname" :label="$t('account.card.alias')" />
-                <VnInput v-model="data.email" :label="t('globals.params.email')" />
+                <VnInput v-model="data.email" :label="$t('globals.params.email')" />
                 <VnSelect
                     url="Languages"
                     v-model="data.lang"
-                    :label="t('account.card.lang')"
+                    :label="$t('account.card.lang')"
                     option-value="code"
                     option-label="code"
                 />
@@ -49,7 +23,7 @@ watch(
                     table="user"
                     column="twoFactor"
                     v-model="data.twoFactor"
-                    :label="t('account.card.twoFactor')"
+                    :label="$t('account.card.twoFactor')"
                     option-value="code"
                     option-label="code"
                 />

src/pages/Account/Card/AccountCard.vue

@@ -1,8 +1,14 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
+import filter from './AccountFilter.js';
 </script>
-
 <template>
-    <VnCardBeta data-key="AccountId" :descriptor="AccountDescriptor" />
+    <VnCardBeta
+        url="VnUsers/preview"
+        :id-in-where="true"
+        data-key="Account"
+        :descriptor="AccountDescriptor"
+        :filter="filter"
+    />
 </template>

src/pages/Account/Card/AccountDescriptor.vue

@@ -1,36 +1,18 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
+import filter from './AccountFilter.js';
 import useHasAccount from 'src/composables/useHasAccount.js';
 
-const $props = defineProps({
+const $props = defineProps({ id: { type: Number, default: null } });
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
 
 const route = useRoute();
-const { t } = useI18n();
+const entityId = computed(() => $props.id || route.params.id);
-const entityId = computed(() => {
-    return $props.id || route.params.id;
-});
-const data = ref(useCardDescription());
 const hasAccount = ref();
-const setData = (entity) => (data.value = useCardDescription(entity.nickname, entity.id));
-
-const filter = {
-    where: { id: entityId },
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
 
 onMounted(async () => {
     hasAccount.value = await useHasAccount(entityId.value);
@@ -43,10 +25,8 @@ onMounted(async () => {
         :url="`VnUsers/preview`"
         :filter="filter"
         module="Account"
-        @on-fetch="setData"
+        data-key="Account"
-        data-key="AccountId"
+        title="nickname"
-        :title="data.title"
-        :subtitle="data.subtitle"
     >
         <template #menu>
             <AccountDescriptorMenu :entity-id="entityId" />
@@ -62,7 +42,7 @@ onMounted(async () => {
                                 <QIcon name="vn:claims" />
                             </div>
                             <div class="text-grey-5" style="opacity: 0.4">
-                                {{ t('account.imageNotFound') }}
+                                {{ $t('account.imageNotFound') }}
                             </div>
                         </div>
                     </div>
@@ -70,8 +50,8 @@ onMounted(async () => {
             </VnImg>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('account.card.nickname')" :value="entity.name" />
+            <VnLv :label="$t('account.card.nickname')" :value="entity.name" />
-            <VnLv :label="t('account.card.role')" :value="entity.role.name" />
+            <VnLv :label="$t('account.card.role')" :value="entity.role?.name" />
         </template>
         <template #actions="{ entity }">
             <QCardActions class="q-gutter-x-md">
@@ -84,7 +64,7 @@ onMounted(async () => {
                     size="sm"
                     class="fill-icon"
                 >
-                    <QTooltip>{{ t('account.card.deactivated') }}</QTooltip>
+                    <QTooltip>{{ $t('account.card.deactivated') }}</QTooltip>
                 </QIcon>
                 <QIcon
                     color="primary"
@@ -95,7 +75,7 @@ onMounted(async () => {
                     size="sm"
                     class="fill-icon"
                 >
-                    <QTooltip>{{ t('account.card.enabled') }}</QTooltip>
+                    <QTooltip>{{ $t('account.card.enabled') }}</QTooltip>
                 </QIcon>
             </QCardActions>
         </template>

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -29,7 +29,7 @@ const router = useRouter();
 const state = useState();
 const user = state.getUser();
 const { notify } = useQuasar();
-const account = computed(() => useArrayData('AccountId').store.data[0]);
+const account = computed(() => useArrayData('Account').store.data[0]);
 account.value.hasAccount = hasAccount.value;
 const entityId = computed(() => +route.params.id);
 const hasitManagementAccess = ref();
@@ -152,7 +152,7 @@ onMounted(() => {
             openConfirmationModal(
                 t('account.card.actions.disableAccount.title'),
                 t('account.card.actions.disableAccount.subtitle'),
-                () => deleteAccount()
+                () => deleteAccount(),
             )
         "
     >
@@ -177,7 +177,7 @@ onMounted(() => {
             openConfirmationModal(
                 t('account.card.actions.enableAccount.title'),
                 t('account.card.actions.enableAccount.subtitle'),
-                () => updateStatusAccount(true)
+                () => updateStatusAccount(true),
             )
         "
     >
@@ -191,7 +191,7 @@ onMounted(() => {
             openConfirmationModal(
                 t('account.card.actions.disableAccount.title'),
                 t('account.card.actions.disableAccount.subtitle'),
-                () => updateStatusAccount(false)
+                () => updateStatusAccount(false),
             )
         "
     >
@@ -206,7 +206,7 @@ onMounted(() => {
             openConfirmationModal(
                 t('account.card.actions.activateUser.title'),
                 t('account.card.actions.activateUser.title'),
-                () => updateStatusUser(true)
+                () => updateStatusUser(true),
             )
         "
     >
@@ -220,7 +220,7 @@ onMounted(() => {
             openConfirmationModal(
                 t('account.card.actions.deactivateUser.title'),
                 t('account.card.actions.deactivateUser.title'),
-                () => updateStatusUser(false)
+                () => updateStatusUser(false),
             )
         "
     >

src/pages/Account/Card/AccountFilter.js

@@ -0,0 +1,3 @@
+export default {
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};

src/pages/Account/Card/AccountMailAlias.vue

@@ -86,7 +86,7 @@ watch(
     () => route.params.id,
     () => {
         getAccountData();
-    }
+    },
 );
 
 onMounted(async () => await getAccountData(false));
@@ -99,7 +99,7 @@ onMounted(async () => await getAccountData(false));
             <VnPaginate
                 ref="paginateRef"
                 data-key="AccountMailAliases"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 auto-load
             >
@@ -130,7 +130,8 @@ onMounted(async () => await getAccountData(false));
                                             openConfirmationModal(
                                                 t('User will be removed from alias'),
                                                 t('¿Seguro que quieres continuar?'),
-                                                () => deleteMailAlias(row, rows, rowIndex)
+                                                () =>
+                                                    deleteMailAlias(row, rows, rowIndex),
                                             )
                                         "
                                     >
@@ -157,7 +158,7 @@ onMounted(async () => await getAccountData(false));
                 icon="add"
                 color="primary"
                 @click="openCreateMailAliasForm()"
-                shortcut="+"
+                v-shortcut="'+'"
             >
                 <QTooltip>{{ t('warehouses.add') }}</QTooltip>
             </QBtn>

src/pages/Account/Card/AccountSummary.vue

@@ -1,58 +1,41 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-
+import filter from './AccountFilter.js';
-import { useArrayData } from 'src/composables/useArrayData';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 
+const $props = defineProps({ id: { type: Number, default: 0 } });
+
 const route = useRoute();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-const { store } = useArrayData('Account');
-const account = ref(store.data);
-
 const entityId = computed(() => $props.id || route.params.id);
-const filter = {
-    where: { id: entityId },
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
 </script>
 
 <template>
     <CardSummary
-        data-key="AccountId"
+        data-key="Account"
+        ref="AccountSummary"
         url="VnUsers/preview"
         :filter="filter"
-        @on-fetch="(data) => (account = data)"
     >
-        <template #header>{{ account.id }} - {{ account.nickname }}</template>
+        <template #header="{ entity }">{{ entity.id }} - {{ entity.nickname }}</template>
-        <template #menu="">
+        <template #menu>
             <AccountDescriptorMenu :entity-id="entityId" />
         </template>
-        <template #body>
+        <template #body="{ entity }">
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
                     <router-link
                         :to="{ name: 'AccountBasicData', params: { id: entityId } }"
                         class="header header-link"
                     >
-                        {{ t('globals.pageTitles.basicData') }}
+                        {{ $t('globals.pageTitles.basicData') }}
                         <QIcon name="open_in_new" />
                     </router-link>
                 </QCardSection>
-                <VnLv :label="t('account.card.nickname')" :value="account.name" />
+                <VnLv :label="$t('account.card.nickname')" :value="entity.name" />
-                <VnLv :label="t('account.card.role')" :value="account.role.name" />
+                <VnLv :label="$t('account.card.role')" :value="entity.role?.name" />
             </QCard>
         </template>
     </CardSummary>

src/pages/Account/InheritedRoles.vue

@@ -59,7 +59,7 @@ const redirectToRoleSummary = (id) =>
             <VnPaginate
                 ref="paginateRef"
                 :data-key="dataKey"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 :limit="0"
                 auto-load

src/pages/Account/Role/AccountRoles.vue

@@ -5,6 +5,7 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import { useRoute } from 'vue-router';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RoleSummary from './Card/RoleSummary.vue';
+import exprBuilder from './RoleExprBuilder.js';
 import VnSection from 'src/components/common/VnSection.vue';
 
 const route = useRoute();
@@ -66,24 +67,7 @@ const columns = computed(() => [
         ],
     },
 ]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : {
-                      or: [
-                          { name: { like: `%${value}%` } },
-                          { nickname: { like: `%${value}%` } },
-                      ],
-                  };
-        case 'name':
-        case 'description':
-            return { [param]: { like: `%${value}%` } };
-    }
-};
 </script>
-
 <template>
     <VnSection
         :data-key="dataKey"

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

@@ -58,7 +58,7 @@ const redirectToRoleSummary = (id) =>
             <VnPaginate
                 ref="paginateRef"
                 data-key="InheritedRoles"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 :limit="0"
                 auto-load

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

@@ -1,24 +1,16 @@
 <script setup>
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-const route = useRoute();
-const { t } = useI18n();
 </script>
 <template>
-    <FormModel :url="`VnRoles/${route.params.id}`" model="VnRole" auto-load>
+    <FormModel model="Role" auto-load>
         <template #form="{ data }">
             <VnRow>
-                <div class="col">
+                <VnInput v-model="data.name" :label="$t('globals.name')" />
-                    <VnInput v-model="data.name" :label="t('globals.name')" />
-                </div>
             </VnRow>
             <VnRow>
-                <div class="col">
+                <VnInput v-model="data.description" :label="$t('role.description')" />
-                    <VnInput v-model="data.description" :label="t('role.description')" />
-                </div>
             </VnRow>
         </template>
     </FormModel>

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

@@ -3,5 +3,10 @@ import VnCardBeta from 'components/common/VnCardBeta.vue';
 import RoleDescriptor from './RoleDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Role" :descriptor="RoleDescriptor" />
+    <VnCardBeta
+        url="VnRoles"
+        data-key="Role"
+        :id-in-where="true"
+        :descriptor="RoleDescriptor"
+    />
 </template>

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

@@ -1,10 +1,9 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 const $props = defineProps({
@@ -26,11 +25,6 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
-const filter = {
-    where: { id: entityId },
-};
 const removeRole = async () => {
     await axios.delete(`VnRoles/${entityId.value}`);
     notify(t('Role removed'), 'positive');
@@ -39,13 +33,10 @@ const removeRole = async () => {
 
 <template>
     <CardDescriptor
-        :url="`VnRoles/${entityId}`"
+        url="VnRoles"
-        :filter="filter"
+        :filter="{ where: { id: entityId } }"
         module="Role"
-        @on-fetch="setData"
         data-key="Role"
-        :title="data.title"
-        :subtitle="data.subtitle"
         :summary="$props.summary"
     >
         <template #menu>

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

@@ -1,10 +1,9 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -16,24 +15,18 @@ const $props = defineProps({
     },
 });
 
-const { store } = useArrayData('Role');
-const role = ref(store.data);
 const entityId = computed(() => $props.id || route.params.id);
-const filter = {
-    where: { id: entityId },
-};
 </script>
 
 <template>
     <CardSummary
         ref="summary"
-        :url="`VnRoles/${entityId}`"
+        url="VnRoles"
-        :filter="filter"
+        :filter="{ where: { id: entityId } }"
-        @on-fetch="(data) => (role = data)"
         data-key="Role"
     >
-        <template #header> {{ role.id }} - {{ role.name }} </template>
+        <template #header="{ entity }"> {{ entity.id }} - {{ entity.name }} </template>
-        <template #body>
+        <template #body="{ entity }">
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
                     <a
@@ -44,9 +37,9 @@ const filter = {
                         <QIcon name="open_in_new" />
                     </a>
                 </QCardSection>
-                <VnLv :label="t('role.id')" :value="role.id" />
+                <VnLv :label="t('role.id')" :value="entity.id" />
-                <VnLv :label="t('globals.name')" :value="role.name" />
+                <VnLv :label="t('globals.name')" :value="entity.name" />
-                <VnLv :label="t('role.description')" :value="role.description" />
+                <VnLv :label="t('role.description')" :value="entity.description" />
             </QCard>
         </template>
     </CardSummary>

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

@@ -63,7 +63,7 @@ watch(
         store.url = urlPath.value;
         store.filter = filter.value;
         fetchSubRoles();
-    }
+    },
 );
 
 const fetchSubRoles = () => paginateRef.value.fetch();
@@ -80,7 +80,7 @@ const redirectToRoleSummary = (id) =>
             <VnPaginate
                 ref="paginateRef"
                 data-key="SubRoles"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 auto-load
             >
@@ -109,7 +109,7 @@ const redirectToRoleSummary = (id) =>
                                             openConfirmationModal(
                                                 t('El rol va a ser eliminado'),
                                                 t('¿Seguro que quieres continuar?'),
-                                                () => deleteSubRole(row, rows, rowIndex)
+                                                () => deleteSubRole(row, rows, rowIndex),
                                             )
                                         "
                                     >
@@ -131,7 +131,7 @@ const redirectToRoleSummary = (id) =>
             <QBtn
                 fab
                 icon="add"
-                shortcut="+"
+                v-shortcut="'+'"
                 color="primary"
                 @click="openCreateSubRoleForm()"
             >

src/pages/Account/Role/RoleExprBuilder.js

@@ -0,0 +1,16 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'description':
+            return { [param]: { like: `%${value}%` } };
+    }
+};

src/pages/Claim/Card/ClaimBasicData.vue

@@ -28,7 +28,6 @@ const workersOptions = ref([]);
         model="Claim"
         :url-update="`Claims/updateClaim/${route.params.id}`"
         auto-load
-        :reload="true"
     >
         <template #form="{ data, validate }">
             <VnRow>

src/pages/Claim/Card/ClaimCard.vue

@@ -6,8 +6,9 @@ import filter from './ClaimFilter.js';
 <template>
     <VnCardBeta
         data-key="Claim"
-        base-url="Claims" 
+        url="Claims"
         :descriptor="ClaimDescriptor"
+        search-data-key="ClaimList"
         :filter="filter"
     />
 </template>

src/pages/Claim/Card/ClaimDescriptor.vue

@@ -3,12 +3,10 @@ import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDateHourMinSec, toPercentage } from 'src/filters';
-import { useState } from 'src/composables/useState';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import { getUrl } from 'src/composables/getUrl';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
@@ -23,7 +21,6 @@ const $props = defineProps({
 });
 
 const route = useRoute();
-const state = useState();
 const { t } = useI18n();
 const salixUrl = ref();
 const entityId = computed(() => {
@@ -39,12 +36,7 @@ const STATE_COLOR = {
 function stateColor(code) {
     return STATE_COLOR[code];
 }
-const data = ref(useCardDescription());
+
-const setData = (entity) => {
-    if (!entity) return;
-    data.value = useCardDescription(entity?.client?.name, entity.id);
-    state.set('ClaimDescriptor', entity);
-};
 onMounted(async () => {
     salixUrl.value = await getUrl('');
 });
@@ -56,7 +48,6 @@ onMounted(async () => {
         :filter="filter"
         module="Claim"
         title="client.name"
-        @on-fetch="setData"
         data-key="Claim"
     >
         <template #menu="{ entity }">

src/pages/Claim/Card/ClaimLines.vue

@@ -57,7 +57,6 @@ function onFetch(rows, newRows) {
         const price = row.quantity * sale.price;
         const discount = (sale.discount * price) / 100;
         amountClaimed.value = amountClaimed.value + (price - discount);
-
     }
 }
 
@@ -208,7 +207,6 @@ async function saveWhenHasChanges() {
                     selection="multiple"
                     v-model:selected="selected"
                     :grid="$q.screen.lt.md"
-                    
                 >
                     <template #body-cell-claimed="{ row }">
                         <QTd auto-width align="right" class="text-primary shrink">
@@ -319,7 +317,13 @@ async function saveWhenHasChanges() {
     </div>
 
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" shortcut="+" icon="add" @click="showImportDialog()" />
+        <QBtn
+            fab
+            color="primary"
+            v-shortcut="'+'"
+            icon="add"
+            @click="showImportDialog()"
+        />
     </QPageSticky>
 </template>
 
@@ -330,9 +334,10 @@ async function saveWhenHasChanges() {
     width: 100%;
 }
 .grid-style-transition {
-    transition: transform 0.28s, background-color 0.28s;
+    transition:
+        transform 0.28s,
+        background-color 0.28s;
 }
-
 </style>
 
 <i18n>

src/pages/Claim/Card/ClaimPhoto.vue

@@ -61,7 +61,7 @@ watch(
     () => {
         claimDmsFilter.value.where.id = router.currentRoute.value.params.id;
         claimDmsRef.value.fetch();
-    }
+    },
 );
 
 function openDialog(dmsId) {
@@ -249,7 +249,7 @@ function onDrag() {
             <QBtn
                 fab
                 @click="inputFile.nativeEl.click()"
-                shortcut="+"
+                v-shortcut="'+'"
                 icon="add"
                 color="primary"
             >

src/pages/Customer/Card/CustomerAddress.vue

@@ -61,7 +61,7 @@ watch(
     (newValue) => {
         if (!newValue) return;
         getClientData(newValue);
-    }
+    },
 );
 
 const getClientData = async (id) => {
@@ -117,7 +117,7 @@ const toCustomerAddressEdit = (addressId) => {
         data-key="CustomerAddresses"
         order="id DESC"
         ref="vnPaginateRef"
-        :filter="addressFilter"
+        :user-filter="addressFilter"
         :url="`Clients/${route.params.id}/addresses`"
     />
     <div class="full-width flex justify-center">
@@ -137,7 +137,7 @@ const toCustomerAddressEdit = (addressId) => {
                         <QIcon
                             :style="{
                                 'font-variation-settings': `'FILL' ${isDefaultAddress(
-                                    item
+                                    item,
                                 )}`,
                             }"
                             color="primary"
@@ -150,7 +150,7 @@ const toCustomerAddressEdit = (addressId) => {
                                     t(
                                         isDefaultAddress(item)
                                             ? 'Default address'
-                                            : 'Set as default'
+                                            : 'Set as default',
                                     )
                                 }}
                             </QTooltip>
@@ -216,7 +216,7 @@ const toCustomerAddressEdit = (addressId) => {
             color="primary"
             fab
             icon="add"
-            shortcut="+"
+            v-shortcut="'+'"
         />
         <QTooltip>
             {{ t('New consignee') }}

src/pages/Customer/Card/CustomerBalance.vue

@@ -158,7 +158,7 @@ const columns = computed(() => [
                     openConfirmationModal(
                         t('Send compensation'),
                         t('Do you want to report compensation to the client by mail?'),
-                        () => sendEmail(`Receipts/${id}/balance-compensation-email`)
+                        () => sendEmail(`Receipts/${id}/balance-compensation-email`),
                     ),
             },
         ],
@@ -291,7 +291,7 @@ const showBalancePdf = ({ id }) => {
             color="primary"
             fab
             icon="add"
-            shortcut="+"
+            v-shortcut="'+'"
         />
         <QTooltip>
             {{ t('New payment') }}

src/pages/Customer/Card/CustomerBasicData.vue

@@ -54,10 +54,10 @@ function onBeforeSave(formData, originalData) {
         auto-load
     />
     <FormModel
-        :url="`Clients/${route.params.id}`"
+        :url-update="`Clients/${route.params.id}`"
         auto-load
-        model="customer"
         :mapper="onBeforeSave"
+        model="Customer"
     >
         <template #form="{ data, validate }">
             <VnRow>

src/pages/Customer/Card/CustomerBillingData.vue

@@ -28,7 +28,7 @@ const getBankEntities = (data, formData) => {
 </script>
 
 <template>
-    <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="customer">
+    <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="Customer">
         <template #form="{ data, validate }">
             <VnRow>
                 <VnSelect

src/pages/Customer/Card/CustomerCard.vue

@@ -5,8 +5,8 @@ import CustomerDescriptor from './CustomerDescriptor.vue';
 
 <template>
     <VnCardBeta
-        data-key="Client"
+        data-key="Customer"
-        base-url="Clients"
+        :url="`Clients/${$route.params.id}/getCard`"
         :descriptor="CustomerDescriptor"
     />
 </template>

src/pages/Customer/Card/CustomerConsumption.vue

@@ -119,7 +119,7 @@ const openSendEmailDialog = async () => {
     openConfirmationModal(
         t('The consumption report will be sent'),
         t('Please, confirm'),
-        () => sendCampaignMetricsEmail({ address: arrayData.store.data.email })
+        () => sendCampaignMetricsEmail({ address: arrayData.store.data.email }),
     );
 };
 const sendCampaignMetricsEmail = ({ address }) => {

src/pages/Customer/Card/CustomerContacts.vue

@@ -62,7 +62,7 @@ const customerContactsRef = ref(null);
                                 color="primary"
                                 flat
                                 icon="add"
-                                shortcut="+"
+                                v-shortcut="'+'"
                             >
                                 <QTooltip>
                                     {{ t('Add contact') }}

src/pages/Customer/Card/CustomerCreditContracts.vue

@@ -75,7 +75,7 @@ const updateData = () => {
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg">
             <VnPaginate
-                :filter="filter"
+                :user-filter="filter"
                 @on-fetch="fetch"
                 auto-load
                 data-key="CustomerCreditContracts"
@@ -195,7 +195,7 @@ const updateData = () => {
             color="primary"
             fab
             icon="add"
-            shortcut="+"
+            v-shortcut="'+'"
         />
         <QTooltip>
             {{ t('New contract') }}

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -11,6 +11,15 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
+import { useState } from 'src/composables/useState';
+const state = useState();
+
+const customer = ref();
+
+onMounted(async () => {
+    customer.value = state.get('Customer');
+    if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
+});
 
 const customerDebt = ref();
 const customerCredit = ref();
@@ -48,11 +57,9 @@ const debtWarning = computed(() => {
     <CardDescriptor
         module="Customer"
         :url="`Clients/${entityId}/getCard`"
-        :title="data.title"
-        :subtitle="data.subtitle"
-        @on-fetch="setData"
         :summary="$props.summary"
-        data-key="customer"
+        data-key="Customer"
+        @on-fetch="setData"
         width="lg-width"
     >
         <template #menu="{ entity }">
@@ -61,7 +68,7 @@ const debtWarning = computed(() => {
         <template #body="{ entity }">
             <VnLv
                 :label="t('customer.summary.payMethod')"
-                :value="entity.payMethod.name"
+                :value="entity.payMethod?.name"
             />
 
             <VnLv
@@ -90,7 +97,7 @@ const debtWarning = computed(() => {
             </VnLv>
             <VnLv
                 :label="t('customer.extendedList.tableVisibleColumns.businessTypeFk')"
-                :value="entity.businessType.description"
+                :value="entity.businessType?.description"
             />
         </template>
         <template #icons="{ entity }">
@@ -143,13 +150,13 @@ const debtWarning = computed(() => {
                         <br />
                         {{
                             t('unpaidDated', {
-                                dated: toDate(customer.unpaid.dated),
+                                dated: toDate(customer.unpaid?.dated),
                             })
                         }}
                         <br />
                         {{
                             t('unpaidAmount', {
-                                amount: toCurrency(customer.unpaid.amount),
+                                amount: toCurrency(customer.unpaid?.amount),
                             })
                         }}
                     </QTooltip>
@@ -192,6 +199,7 @@ const debtWarning = computed(() => {
                         query: {
                             createForm: JSON.stringify({
                                 clientFk: entity.id,
+                                addressId: entity.defaultAddressFk,
                             }),
                         },
                     }"

src/pages/Customer/Card/CustomerFileManagement.vue

@@ -236,7 +236,7 @@ const toCustomerFileManagementCreate = () => {
             @click.stop="toCustomerFileManagementCreate()"
             color="primary"
             fab
-            shortcut="+"
+            v-shortcut="'+'"
             icon="add"
         />
         <QTooltip>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -35,7 +35,7 @@ function handleLocation(data, location) {
     <FormModel
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
         auto-load
-        model="customer"
+        model="Customer"
     >
         <template #form="{ data, validate }">
             <VnRow>

src/pages/Customer/Card/CustomerNotes.vue

@@ -23,5 +23,6 @@ const noteFilter = computed(() => {
         :body="{ clientFk: route.params.id }"
         style="overflow-y: auto"
         :select-type="true"
+        required
     />
 </template>

src/pages/Customer/Card/CustomerSamples.vue

@@ -104,7 +104,7 @@ const tableRef = ref();
             color="primary"
             fab
             icon="add"
-            shortcut="+"
+            v-shortcut="'+'"
         />
         <QTooltip>
             {{ t('Send sample') }}

src/pages/Customer/Card/CustomerWebAccess.vue

@@ -27,7 +27,7 @@ async function hasCustomerRole() {
     <FormModel
         :url-update="`Clients/${route.params.id}/updateUser`"
         :filter="filter"
-        model="customer"
+        model="Customer"
         :mapper="
             ({ account }) => {
                 const { name, email, active } = account;

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -49,7 +49,7 @@ const getData = async (observations) => {
             notes.value = originalNotes
                 .map((observation) => {
                     const type = observationTypes.value.find(
-                        (type) => type.id === observation.observationTypeFk
+                        (type) => type.id === observation.observationTypeFk,
                     );
                     return type
                         ? {
@@ -112,8 +112,8 @@ function getPayload() {
                     (oNote) =>
                         oNote.id === note.id &&
                         (note.description !== oNote.description ||
-                            note.observationTypeFk !== oNote.observationTypeFk)
+                            note.observationTypeFk !== oNote.observationTypeFk),
-                )
+                ),
             )
             .map((note) => ({
                 data: note,
@@ -130,9 +130,7 @@ async function handleDialog(data) {
             .dialog({
                 component: VnConfirm,
                 componentProps: {
-                    title: t(
+                    title: t('confirmTicket'),
-                        'confirmTicket'
-                    ),
                     message: t('confirmDeletionMessage'),
                 },
             })
@@ -341,7 +339,7 @@ function handleLocation(data, location) {
                 class="cursor-pointer add-icon q-mt-md"
                 flat
                 icon="add"
-                shortcut="+"
+                v-shortcut="'+'"
             >
                 <QTooltip>
                     {{ t('Add note') }}

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -39,7 +39,7 @@ const optionsSamplesVisible = ref([]);
 const sampleType = ref({ hasPreview: false });
 const initialData = reactive({});
 const entityId = computed(() => route.params.id);
-const customer = computed(() => state.get('customer'));
+const customer = computed(() => state.get('Customer'));
 const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [

src/pages/Customer/composables/getAddresses.js

@@ -1,8 +1,9 @@
 import axios from 'axios';
 
-export async function getAddresses(clientId) {   
+export async function getAddresses(clientId, _filter = {}) {   
     if (!clientId) return;
     const filter = {
+        ..._filter,
         fields: ['nickname', 'street', 'city', 'id'],
         where: { isActive: true },
         order: 'nickname ASC',

src/pages/Customer/composables/getClient.js

@@ -1,7 +1,8 @@
 import axios from 'axios';
 
-export async function getClient(clientId) {
+export async function getClient(clientId, _filter = {}) {
     const filter = {
+        ..._filter,
         include: {
             relation: 'defaultAddress',
             scope: {

src/pages/Department/Card/DepartmentBasicData.vue

@@ -1,27 +1,16 @@
 <script setup>
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-
-const route = useRoute();
-const { t } = useI18n();
 </script>
 <template>
-    <FormModel
+    <FormModel model="Department" auto-load class="full-width">
-        :url="`Departments/${route.params.id}`"
-        model="department"
-        auto-load
-        class="full-width"
-    >
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('globals.name')"
+                    :label="$t('globals.name')"
                     v-model="data.name"
                     :rules="validate('globals.name')"
                     clearable
@@ -29,33 +18,33 @@ const { t } = useI18n();
                 />
                 <VnInput
                     v-model="data.code"
-                    :label="t('globals.code')"
+                    :label="$t('globals.code')"
                     :rules="validate('globals.code')"
                     clearable
                 />
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('department.chat')"
+                    :label="$t('department.chat')"
                     v-model="data.chatName"
                     :rules="validate('department.chat')"
                     clearable
                 />
                 <VnInput
                     v-model="data.notificationEmail"
-                    :label="t('globals.params.email')"
+                    :label="$t('globals.params.email')"
                     :rules="validate('globals.params.email')"
                     clearable
                 />
             </VnRow>
             <VnRow>
                 <VnSelectWorker
-                    :label="t('department.bossDepartment')"
+                    :label="$t('department.bossDepartment')"
                     v-model="data.workerFk"
                     :rules="validate('department.bossDepartment')"
                 />
                 <VnSelect
-                    :label="t('department.selfConsumptionCustomer')"
+                    :label="$t('department.selfConsumptionCustomer')"
                     v-model="data.clientFk"
                     url="Clients"
                     option-value="id"
@@ -67,11 +56,11 @@ const { t } = useI18n();
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('department.telework')"
+                    :label="$t('department.telework')"
                     v-model="data.isTeleworking"
                 />
                 <QCheckbox
-                    :label="t('department.notifyOnErrors')"
+                    :label="$t('department.notifyOnErrors')"
                     v-model="data.hasToMistake"
                     :false-value="0"
                     :true-value="1"
@@ -79,17 +68,17 @@ const { t } = useI18n();
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('department.worksInProduction')"
+                    :label="$t('department.worksInProduction')"
                     v-model="data.isProduction"
                 />
                 <QCheckbox
-                    :label="t('department.hasToRefill')"
+                    :label="$t('department.hasToRefill')"
                     v-model="data.hasToRefill"
                 />
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('department.hasToSendMail')"
+                    :label="$t('department.hasToSendMail')"
                     v-model="data.hasToSendMail"
                 />
             </VnRow>

src/pages/Department/Card/DepartmentCard.vue

@@ -7,7 +7,7 @@ import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue
         class="q-pa-md column items-center"
         v-bind="{ ...$attrs }"
         data-key="Department"
-        base-url="Departments"
+        url="Departments"
         :descriptor="DepartmentDescriptor"
     />
 </template>

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -5,7 +5,6 @@ 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 useCardDescription from 'src/composables/useCardDescription';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -32,15 +31,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const department = ref();
-
-const data = ref(useCardDescription());
-
-const setData = (entity) => {
-    if (!entity) return;
-    data.value = useCardDescription(entity.name, entity.id);
-};
-
 const removeDepartment = async () => {
     await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
     router.push({ name: 'WorkerDepartment' });
@@ -54,17 +44,9 @@ const { openConfirmationModal } = useVnConfirm();
         ref="DepartmentDescriptorRef"
         module="Department"
         :url="`Departments/${entityId}`"
-        :title="data.title"
-        :subtitle="data.subtitle"
         :summary="$props.summary"
         :to-module="{ name: 'WorkerDepartment' }"
-        @on-fetch="
+        data-key="Department"
-            (data) => {
-                department = data;
-                setData(data);
-            }
-        "
-        data-key="department"
     >
         <template #menu="{}">
             <QItem
@@ -74,7 +56,7 @@ const { openConfirmationModal } = useVnConfirm();
                     openConfirmationModal(
                         t('Are you sure you want to delete it?'),
                         t('Delete department'),
-                        removeDepartment
+                        removeDepartment,
                     )
                 "
             >

src/pages/Department/Card/DepartmentSummary.vue

@@ -27,7 +27,7 @@ onMounted(async () => {
 
 <template>
     <CardSummary
-        data-key="DepartmentSummary"
+        data-key="Department"
         ref="summary"
         :url="`Departments/${entityId}`"
         class="full-width"

src/pages/Entry/Card/EntryBasicData.vue

@@ -12,6 +12,7 @@ import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toDate } from 'src/filters';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -51,28 +52,12 @@ const onFilterTravelSelected = (formData, id) => {
     >
         <template #form="{ data }">
             <VnRow>
-                <VnSelect
+                <VnSelectSupplier
-                    :label="t('globals.supplier')"
                     v-model="data.supplierFk"
-                    url="Suppliers"
-                    option-value="id"
-                    option-label="nickname"
-                    :fields="['id', 'nickname']"
                     hide-selected
                     :required="true"
                     map-options
-                >
+                />
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                <QItemLabel caption>
-                                    {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
                 <VnSelectDialog
                     :label="t('entry.basicData.travel')"
                     v-model="data.travelFk"

src/pages/Entry/Card/EntryCard.vue

@@ -1,13 +1,13 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
-import filter from './EntryFilter.js'
+import filter from './EntryFilter.js';
 </script>
 <template>
     <VnCardBeta
         data-key="Entry"
-        base-url="Entries"
+        url="Entries"
         :descriptor="EntryDescriptor"
-        :user-filter="filter"
+        :filter="filter"
     />
 </template>