Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into beta

CHANGELOG.md

@@ -1,3 +1,82 @@
+# Version 25.00 - 2025-01-14
+
+### Added 🆕
+
+-   chore: refs #7056 move test by:jorgep
+-   feat: refs #7050 7050 add object check by:Jtubau
+-   feat: refs #7050 7050 add test to isEmpty() by:Jtubau
+-   feat: refs #7056 add tests in FormModel by:jorgep
+-   feat: refs #7056 update route meta information and add FormModel tests by:jorgep
+-   feat: refs #7074 tests for fns setData(), parseDms() and showFormDialog() (7074-makeFrontTestToVnDmsList) by:Jtubau
+-   feat: refs #7079 created VnLocation front test by:provira
+-   feat: refs #7189 add Accept-Language header to axios requests by:jorgep
+-   feat: refs #7924 add custom inspection checkbox and localization support by:jgallego
+-   feat: refs #7924 update custom inspection label for clarity in English and Spanish locales by:jgallego
+-   feat: refs #8004 enhance FetchedTags component with column support and styling updates by:pablone
+-   feat: refs #8004 hide rightFilter by:pablone
+-   feat: refs #8246 added new field in list by:Jon
+-   feat: refs #8266 added descriptor to item name by:jtubau
+-   feat: refs #8293 add zone filter by:Jtubau
+-   feat: refs #8293 include zone data in each record by:Jtubau
+-   fix: refs #8004 more list style issues by:pablone
+-   fix: refs #8004 some style issues on all list by:pablone
+-   style: refs #8004 update layout and styling in FetchedTags and ItemList components by:pablone
+-   style: update CustomerBalance.vue to set label color by:jgallego
+
+### Changed 📦
+
+-   perf: order by:alexm
+-   perf: redirect transition list to card by:alexm
+-   perf: refs #8201 onDataSaved fetch by:Jon
+-   perf: revert processData by:alexm
+-   perf: simplify if by:alexm
+-   perf: simplify if (perf_redirectTransition) by:alexm
+-   refactor: item fixedPrice by:Jon
+-   refactor: refs #7050 refactorize by:jtubau
+-   refactor: refs #7050 removed blank spaces by:jtubau
+-   refactor: refs #7052 move EditTableCellValueForm tests to a new location and enhance test coverage by:jgallego
+-   refactor: refs #7052 remove unnecessary console logs from EditTableCellValueForm tests by:jgallego
+-   refactor: refs #7074 move dms constant to global scope by:Jtubau
+-   refactor: refs #7079 removed useless code by:provira
+-   refactor: refs #7924 simplify custom inspection icon rendering in ExtraCommunity.vue by:jgallego
+-   refactor: refs #8004 remove console log from CardSummary component on mount by:pablone
+-   refactor: refs #8004 remove consoleLogs by:pablone
+-   refactor: refs #8004 remove unused stateStore import in InvoiceInList.vue by:pablone
+-   refactor: refs #8004 remove unused travelFilterRef and chip definition in TravelList.vue by:pablone
+-   refactor: refs #8004 replace VnSelect with VnSelectWorker in CustomerList component by:pablone
+-   refactor: refs #8201 added onMounted to stablish the value to show icons by:Jon
+-   refactor: refs #8201 deleted condition by:Jon
+-   refactor: refs #8201 deleted log by:Jon
+-   refactor: refs #8201 deleted logs by:Jon
+-   refactor: refs #8266 8266 change expedition item name by:Jtubau
+-   refactor: refs #8266 change expedition label by:Jtubau
+-   refactor: refs #8293 remove redundant attributes by:Jtubau
+-   refactor: refs #8320 changed folder names from "specs" to "**tests**" by:provira
+-   refactor: refs #8320 moved front tests to their respective sections by:provira
+-   refactor: refs #8813 removed unused class property by:provira
+
+### Fixed 🛠️
+
+-   fix: discount class by:PAU ROVIRA ROSALENY
+-   fix: duplicate transalation after test to dev by:alexm
+-   fix: fix translations by:carlossa
+-   fix: redirect to sales when confirming lines by:Jon
+-   fix: refs #7050 delete import added by mistake by:Jtubau
+-   fix: refs #7133 handleSalesModelValue function to handle empty input by:jorgep
+-   fix: refs #7189 update user language on sessionStorage by:jorgep
+-   fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component by:jorgep
+-   fix: refs #8004 more list style issues by:pablone
+-   fix: refs #8004 some style issues on all list by:pablone
+-   fix: refs #8004 update label for daysOnward in TravelFilter component and add translations by:pablone
+-   fix: refs #8004 vnTable card with and add permanent labels by:pablone
+-   fix: refs #8201 added onDataSaved emi to refetch when cahnges are made by:Jon
+-   fix: refs #8201 use arrayData to fix the error by:Jon
+-   fix: refs #8314 space between label and value by:jtubau
+-   fix: refs #8813 fixed ClaimLines format by:provira
+-   fix: update button sizes in ExtraCommunity.vue for better visibility by:jgallego
+-   perf: revert processData by:alexm
+-   refactor: item fixedPrice by:Jon
+
 # Version 24.52 - 2024-01-07
 
 ### Added 🆕

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.52.0",
+    "version": "25.02.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -25,6 +25,7 @@
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
+        "moment": "^2.30.1",
         "pinia": "^2.1.3",
         "quasar": "^2.14.5",
         "validator": "^13.9.0",

pnpm-lock.yaml

@@ -20,6 +20,9 @@ dependencies:
   croppie:
     specifier: ^2.6.5
     version: 2.6.5
+  moment:
+    specifier: ^2.30.1
+    version: 2.30.1
   pinia:
     specifier: ^2.1.3
     version: 2.1.7(typescript@5.5.4)(vue@3.4.19)
@@ -832,8 +835,8 @@ packages:
       vue-i18n:
         optional: true
     dependencies:
-      '@intlify/message-compiler': 10.0.0
+      '@intlify/message-compiler': 11.0.0-rc.1
-      '@intlify/shared': 10.0.0
+      '@intlify/shared': 11.0.0-rc.1
       jsonc-eslint-parser: 1.4.1
       source-map: 0.6.1
       vue-i18n: 9.9.1(vue@3.4.19)
@@ -847,11 +850,11 @@ packages:
       '@intlify/message-compiler': 9.9.1
       '@intlify/shared': 9.9.1
 
-  /@intlify/message-compiler@10.0.0:
+  /@intlify/message-compiler@11.0.0-rc.1:
-    resolution: {integrity: sha512-OcaWc63NC/9p1cMdgoNKBj4d61BH8sUW1Hfs6YijTd9656ZR4rNqXAlRnBrfS5ABq0vjQjpa8VnyvH9hK49yBw==}
+    resolution: {integrity: sha512-TGw2uBfuTFTegZf/BHtUQBEKxl7Q/dVGLoqRIdw8lFsp9g/53sYn5iD+0HxIzdYjbWL6BTJMXCPUHp9PxDTRPw==}
     engines: {node: '>= 16'}
     dependencies:
-      '@intlify/shared': 10.0.0
+      '@intlify/shared': 11.0.0-rc.1
       source-map-js: 1.0.2
     dev: true
 
@@ -862,8 +865,8 @@ packages:
       '@intlify/shared': 9.9.1
       source-map-js: 1.0.2
 
-  /@intlify/shared@10.0.0:
+  /@intlify/shared@11.0.0-rc.1:
-    resolution: {integrity: sha512-6ngLfI7DOTew2dcF9WMJx+NnMWghMBhIiHbGg+wRvngpzD5KZJZiJVuzMsUQE1a5YebEmtpTEfUrDp/NqVGdiw==}
+    resolution: {integrity: sha512-8tR1xe7ZEbkabTuE/tNhzpolygUn9OaYp9yuYAF4MgDNZg06C3Qny80bes2/e9/Wm3aVkPUlCw6WgU7mQd0yEg==}
     engines: {node: '>= 16'}
     dev: true
 
@@ -887,7 +890,7 @@ packages:
         optional: true
     dependencies:
       '@intlify/bundle-utils': 4.0.0(vue-i18n@9.9.1)
-      '@intlify/shared': 10.0.0
+      '@intlify/shared': 11.0.0-rc.1
       '@rollup/pluginutils': 4.2.1
       '@vue/compiler-sfc': 3.4.19
       debug: 4.3.4(supports-color@8.1.1)
@@ -4960,6 +4963,10 @@ packages:
       uuid: 8.3.2
     dev: true
 
+  /moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+    dev: false
+
   /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 

src/boot/__tests__/axios.spec.js

@@ -1,4 +1,3 @@
-import { Notify } from 'quasar';
 import { onRequest, onResponseError } from 'src/boot/axios';
 import { describe, expect, it, vi } from 'vitest';
 
@@ -27,6 +26,7 @@ describe('Axios boot', () => {
             expect(resultConfig).toEqual(
                 expect.objectContaining({
                     headers: {
+                        'Accept-Language': 'en-US',
                         Authorization: 'DEFAULT_TOKEN',
                     },
                 })

src/boot/axios.js

@@ -3,12 +3,12 @@ import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
 import useNotify from 'src/composables/useNotify.js';
 import { useStateQueryStore } from 'src/stores/useStateQueryStore';
+import { i18n } from 'src/boot/i18n';
 
 const session = useSession();
 const { notify } = useNotify();
 const stateQuery = useStateQueryStore();
 const baseUrl = '/api/';
-
 axios.defaults.baseURL = baseUrl;
 const axiosNoError = axios.create({ baseURL: baseUrl });
 
@@ -16,6 +16,7 @@ const onRequest = (config) => {
     const token = session.getToken();
     if (token.length && !config.headers.Authorization) {
         config.headers.Authorization = token;
+        config.headers['Accept-Language'] = i18n.global.locale.value;
     }
     stateQuery.add(config);
     return config;

src/boot/i18n.js

@@ -1,9 +1,11 @@
 import { boot } from 'quasar/wrappers';
 import { createI18n } from 'vue-i18n';
 import messages from 'src/i18n';
+import { useState } from 'src/composables/useState';
+const user = useState().getUser();
 
 const i18n = createI18n({
-    locale: navigator.language || navigator.userLanguage,
+    locale: user.value.lang || navigator.language || navigator.userLanguage,
     fallbackLocale: 'en',
     globalInjection: true,
     messages,

src/boot/qformMixin.js

@@ -31,7 +31,7 @@ export default {
             console.error(error);
         }
         form.addEventListener('keyup', function (evt) {
-            if (evt.key === 'Enter') {
+            if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
                 const input = evt.target;
                 if (input.type == 'textarea' && evt.shiftKey) {
                     evt.preventDefault();

src/components/CrudModel.vue

@@ -127,7 +127,7 @@ function resetData(data) {
     originalData.value = JSON.parse(JSON.stringify(data));
     formData.value = JSON.parse(JSON.stringify(data));
 
-    if (watchChanges.value) watchChanges.value(); //destoy watcher
+    if (watchChanges.value) watchChanges.value(); //destroy watcher
     watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
 }
 
@@ -270,10 +270,8 @@ function getChanges() {
 
 function isEmpty(obj) {
     if (obj == null) return true;
-    if (obj === undefined) return true;
+    if (Array.isArray(obj)) return !obj.length;
-    if (Object.keys(obj).length === 0) return true;
+    return !Object.keys(obj).length;
-
-    if (obj.length > 0) return false;
 }
 
 async function reload(params) {

src/components/FormModel.vue

@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
-import { onBeforeRouteLeave, useRouter } from 'vue-router';
+import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useState } from 'src/composables/useState';
@@ -12,7 +12,6 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute } from 'vue-router';
 
 const { push } = useRouter();
 const quasar = useQuasar();

src/components/NavBar.vue

@@ -17,12 +17,10 @@ const stateQuery = useStateQueryStore();
 const state = useState();
 const user = state.getUser();
 const appName = 'Lilium';
+const pinnedModulesRef = ref();
 
 onMounted(() => stateStore.setMounted());
-
-const pinnedModulesRef = ref();
 </script>
-
 <template>
     <QHeader color="white" elevated>
         <QToolbar class="q-py-sm q-px-md">
@@ -66,16 +64,6 @@ const pinnedModulesRef = ref();
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>
-                <QBtn
-                    flat
-                    v-if="!quasar.platform.is.mobile"
-                    @click="pinnedModulesRef.redirect($route.params.id)"
-                    icon="more_up"
-                >
-                    <QTooltip>
-                        {{ t('Go to Salix') }}
-                    </QTooltip>
-                </QBtn>
                 <QBtn
                     :class="{ 'q-pa-none': quasar.platform.is.mobile }"
                     id="pinnedModules"
@@ -107,7 +95,6 @@ const pinnedModulesRef = ref();
         <VnBreadcrumbs v-if="$q.screen.lt.md" class="q-ml-md" />
     </QHeader>
 </template>
-
 <style lang="scss" scoped>
 .searchbar {
     width: max-content;
@@ -116,9 +103,3 @@ const pinnedModulesRef = ref();
     background-color: var(--vn-section-color);
 }
 </style>
-<i18n>
-en:
-    Go to Salix: Go to Salix
-es:
-    Go to Salix: Ir a Salix
-</i18n>

src/components/UserPanel.vue

@@ -87,10 +87,10 @@ async function saveDarkMode(value) {
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
     try {
-        await axios.patch(query, {
+        await axios.patch(query, { lang: value });
-            lang: value,
+
-        });
         user.value.lang = value;
+        useState().setUser(user.value);
         onDataSaved();
     } catch (error) {
         onDataError();

src/components/VnTable/VnTable.vue

@@ -150,6 +150,7 @@ const tableModes = [
         disable: $props.disableOption?.card,
     },
 ];
+
 onBeforeMount(() => {
     const urlParams = route.query[$props.searchUrl];
     hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@@ -383,7 +384,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                         :class="col.headerClass"
                     >
                         <div
-                            class="column self-start q-ml-xs ellipsis"
+                            class="column ellipsis"
                             :class="`text-${col?.align ?? 'left'}`"
                             :style="$props.columnSearch ? 'height: 75px' : ''"
                         >
@@ -425,7 +426,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                     <!-- Columns -->
                     <QTd
                         auto-width
-                        class="no-margin q-px-xs"
+                        class="no-margin"
                         :class="[getColAlign(col), col.columnClass]"
                         :style="col.style"
                         v-if="col.visible ?? true"
@@ -537,13 +538,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                                         :key="col.name"
                                         class="fields"
                                     >
-                                        <VnLv
+                                        <VnLv :label="col.label + ':'">
-                                            :label="
-                                                !col.component && col.label
-                                                    ? `${col.label}:`
-                                                    : ''
-                                            "
-                                        >
                                             <template #value>
                                                 <span
                                                     @click="stopEventPropagation($event)"
@@ -705,7 +700,7 @@ es:
 
 .grid-three {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
+    grid-template-columns: repeat(auto-fit, minmax(350px, max-content));
     max-width: 100%;
     grid-gap: 20px;
     margin: 0 auto;
@@ -754,21 +749,6 @@ es:
         top: 0;
         padding: 12px 0;
     }
-    tbody {
-        .q-checkbox {
-            display: flex;
-            margin-bottom: 9px;
-            & .q-checkbox__label {
-                margin-left: 31px;
-                color: var(--vn-text-color);
-            }
-            & .q-checkbox__inner {
-                position: absolute;
-                left: 0;
-                color: var(--vn-label-color);
-            }
-        }
-    }
     .sticky {
         position: sticky;
         right: 0;

src/components/__tests__/CrudModel.spec.js

@@ -0,0 +1,248 @@
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import CrudModel from 'components/CrudModel.vue';
+import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
+
+describe('CrudModel', () => {
+    let wrapper;
+    let vm;
+    let data;
+    beforeAll(() => {
+        wrapper = createWrapper(CrudModel, {
+            global: {
+                stubs: [
+                    'vnPaginate',
+                    'useState',
+                    'arrayData',
+                    'useStateStore',
+                    'vue-i18n',
+                ],
+                mocks: {
+                    validate: vi.fn(),
+                },
+            },
+            propsData: {
+                dataRequired: {
+                    fk: 1,
+                },
+                dataKey: 'crudModelKey',
+                model: 'crudModel',
+                url: 'crudModelUrl',
+                saveFn: '',
+            },
+        });
+        wrapper=wrapper.wrapper;
+        vm=wrapper.vm;
+    });
+
+    beforeEach(() => {
+        vm.fetch([]);
+        vm.watchChanges = null;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('insert()', () => {
+        it('should new element in list with index 0 if formData not has data', () => {
+            vm.insert();
+
+            expect(vm.formData.length).toEqual(1);
+            expect(vm.formData[0].fk).toEqual(1);
+            expect(vm.formData[0].$index).toEqual(0);
+        });
+    });
+
+    describe('getChanges()', () => {
+        it('should return correct updates and creates', async () => {
+            vm.fetch([
+                { id: 1, name: 'New name one' },
+                { id: 2, name: 'New name two' },
+                { id: 3, name: 'Bruce Wayne' },
+            ]);
+
+            vm.originalData = [
+                { id: 1, name: 'Tony Starks' },
+                { id: 2, name: 'Jessica Jones' },
+                { id: 3, name: 'Bruce Wayne' },
+            ];
+
+            vm.insert();
+            const result = vm.getChanges();
+
+            const expected = {
+                creates: [
+                    {
+                        $index: 3,
+                        fk: 1,
+                    },
+                ],
+                updates: [
+                    {
+                        data: {
+                            name: 'New name one',
+                        },
+                        where: {
+                            id: 1,
+                        },
+                    },
+                    {
+                        data: {
+                            name: 'New name two',
+                        },
+                        where: {
+                            id: 2,
+                        },
+                    },
+                ],
+            };
+
+            expect(result).toEqual(expected);
+        });
+    });
+
+    describe('getDifferences()', () => {
+        it('should return the differences between two objects', async () => {
+            const obj1 = {
+                a: 1,
+                b: 2,
+                c: 3,
+            };
+            const obj2 = {
+                a: null,
+                b: 4,
+                d: 5,
+            };
+
+            const result = vm.getDifferences(obj1, obj2);
+
+            expect(result).toEqual({
+                a: null,
+                b: 4,
+                d: 5,
+            });
+        });
+    });
+
+    describe('isEmpty()', () => {
+        let dummyObj;
+        let dummyArray;
+        let result;
+        it('should return true if object si null', async () => {
+            dummyObj = null;
+            result = vm.isEmpty(dummyObj);
+
+            expect(result).toBe(true);
+        });
+
+        it('should return true if object si undefined', async () => {
+            dummyObj = undefined;
+            result = vm.isEmpty(dummyObj);
+
+            expect(result).toBe(true);
+        });
+
+        it('should return true if object is empty', async () => {
+            dummyObj ={};
+            result = vm.isEmpty(dummyObj);    
+
+            expect(result).toBe(true);
+        });
+
+        it('should return false if object is not empty', async () => {
+            dummyObj = {a:1, b:2, c:3};
+            result = vm.isEmpty(dummyObj);
+
+            expect(result).toBe(false);
+        });
+
+        it('should return true if array is empty', async () => {
+            dummyArray = [];
+            result = vm.isEmpty(dummyArray); 
+
+            expect(result).toBe(true);
+        });
+        
+        it('should return false if array is not empty', async () => {
+            dummyArray = [1,2,3];
+            result = vm.isEmpty(dummyArray);
+
+            expect(result).toBe(false);
+        })
+    });
+
+    describe('resetData()', () => {
+        it('should add $index to elements in data[] and sets originalData and formData with data', async () => {
+            data = [{
+                name: 'Tony',
+                lastName: 'Stark',
+                age: 42,
+            }];
+
+            vm.resetData(data);
+            
+            expect(vm.originalData).toEqual(data);
+            expect(vm.originalData[0].$index).toEqual(0);
+            expect(vm.formData).toEqual(data);
+            expect(vm.formData[0].$index).toEqual(0);
+            expect(vm.watchChanges).not.toBeNull();
+        });
+
+        it('should dont do nothing if data is null', async () => {
+            vm.resetData(null);
+
+            expect(vm.watchChanges).toBeNull();
+        });
+
+        it('should set originalData and formatData with data and generate watchChanges', async () => {
+            data = {
+                name: 'Tony',
+                lastName: 'Stark',
+                age: 42,
+            };
+            
+            vm.resetData(data);
+
+            expect(vm.originalData).toEqual(data);
+            expect(vm.formData).toEqual(data);
+            expect(vm.watchChanges).not.toBeNull();
+        });
+    });
+
+    describe('saveChanges()', () => {
+        data = [{
+            name: 'Tony',
+            lastName: 'Stark',
+            age: 42,
+        }];
+
+        it('should call saveFn if exists', async () => {
+            await wrapper.setProps({ saveFn: vi.fn() });
+
+            vm.saveChanges(data);
+            
+            expect(vm.saveFn).toHaveBeenCalledOnce();
+            expect(vm.isLoading).toBe(false);
+            expect(vm.hasChanges).toBe(false);
+
+            await wrapper.setProps({ saveFn: '' });
+        });
+
+        it("should use default url if there's not saveFn", async () => {
+            const postMock =vi.spyOn(axios, 'post');
+            
+            vm.formData = [{
+                name: 'Bruce',
+                lastName: 'Wayne',
+                age: 45,
+            }]
+
+            await vm.saveChanges(data);
+
+            expect(postMock).toHaveBeenCalledWith(vm.url + '/crud', data);
+            expect(vm.isLoading).toBe(false);
+            expect(vm.hasChanges).toBe(false);
+            expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));
+        });
+    });
+});

src/components/__tests__/EditTableCellValueForm.spec.js

@@ -0,0 +1,56 @@
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import EditForm from 'components/EditTableCellValueForm.vue';
+import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+
+const fieldA = 'fieldA';
+const fieldB = 'fieldB';
+
+describe('EditForm', () => {
+    let vm;
+    const mockRows = [
+        { id: 1, itemFk: 101 },
+        { id: 2, itemFk: 102 },
+    ];
+    const mockFieldsOptions = [
+        { label: 'Field A', field: fieldA, component: 'input', attrs: {} },
+        { label: 'Field B', field: fieldB, component: 'date', attrs: {} },
+    ];
+    const editUrl = '/api/edit';
+
+    beforeAll(() => {
+        vi.spyOn(axios, 'post').mockResolvedValue({ status: 200 });
+        vm = createWrapper(EditForm, {
+            props: {
+                rows: mockRows,
+                fieldsOptions: mockFieldsOptions,
+                editUrl,
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('onSubmit()', () => {
+        it('should call axios.post with the correct parameters in the payload', async () => {
+            const selectedField = { field: fieldA, component: 'input', attrs: {} };
+            const newValue = 'Test Value';
+
+            vm.selectedField = selectedField;
+            vm.newValue = newValue;
+
+            await vm.onSubmit();
+
+            const payload = axios.post.mock.calls[0][1];
+
+            expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object));
+            expect(payload.field).toEqual(fieldA);
+            expect(payload.newValue).toEqual(newValue);
+
+            expect(payload.lines).toEqual(expect.arrayContaining(mockRows));
+
+            expect(vm.isLoading).toEqual(false);
+        });
+    });
+});

src/components/__tests__/FormModel.spec.js

@@ -0,0 +1,149 @@
+import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import FormModel from 'src/components/FormModel.vue';
+
+describe('FormModel', () => {
+    const model = 'mockModel';
+    const url = 'mockUrl';
+    const formInitialData = { mockKey: 'mockVal' };
+
+    describe('modelValue', () => {
+        it('should use the provided model', () => {
+            const { vm } = mount({ propsData: { model } });
+            expect(vm.modelValue).toBe(model);
+        });
+
+        it('should use the route meta title when model is not provided', () => {
+            const { vm } = mount({});
+            expect(vm.modelValue).toBe('formModel_mockTitle');
+        });
+    });
+
+    describe('onMounted()', () => {
+        let mockGet;
+
+        beforeAll(() => {
+            mockGet = vi.spyOn(axios, 'get').mockResolvedValue({ data: {} });
+        });
+
+        afterAll(() => {
+            mockGet.mockRestore();
+        });
+
+        it('should not fetch when has formInitialData', () => {
+            mount({ propsData: { url, model, autoLoad: true, formInitialData } });
+            expect(mockGet).not.toHaveBeenCalled();
+        });
+
+        it('should fetch when there is url and auto-load', () => {
+            mount({ propsData: { url, model, autoLoad: true } });
+            expect(mockGet).toHaveBeenCalled();
+        });
+
+        it('should not observe changes', () => {
+            const { vm } = mount({
+                propsData: { url, model, observeFormChanges: false, formInitialData },
+            });
+
+            expect(vm.hasChanges).toBe(true);
+            vm.reset();
+            expect(vm.hasChanges).toBe(true);
+        });
+
+        it('should observe changes', async () => {
+            const { vm } = mount({
+                propsData: { url, model, formInitialData },
+            });
+            vm.state.set(model, formInitialData);
+            expect(vm.hasChanges).toBe(false);
+
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            expect(vm.hasChanges).toBe(true);
+            vm.formData.mockKey = 'mockVal';
+        });
+    });
+
+    describe('trimData()', () => {
+        let vm;
+        beforeAll(() => {
+            vm = mount({}).vm;
+        });
+
+        it('should trim whitespace from string values', () => {
+            const data = { key1: '  value1  ', key2: '  value2  ' };
+            const trimmedData = vm.trimData(data);
+            expect(trimmedData).toEqual({ key1: 'value1', key2: 'value2' });
+        });
+
+        it('should not modify non-string values', () => {
+            const data = { key1: 123, key2: true, key3: null, key4: undefined };
+            const trimmedData = vm.trimData(data);
+            expect(trimmedData).toEqual(data);
+        });
+    });
+
+    describe('save()', async () => {
+        it('should not call if there are not changes', async () => {
+            const { vm } = mount({ propsData: { url, model } });
+
+            await vm.save();
+            expect(vm.hasChanges).toBe(false);
+        });
+
+        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 } });
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            await vm.save();
+            expect(spy).toHaveBeenCalled();
+            vm.formData.mockKey = 'mockVal';
+        });
+
+        it('should call axios.post with the right data', async () => {
+            const spy = vi.spyOn(axios, 'post').mockResolvedValue({ data: {} });
+            const { vm } = mount({
+                propsData: { url, model, formInitialData, urlCreate: 'mockUrlCreate' },
+            });
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            await vm.save();
+            expect(spy).toHaveBeenCalled();
+            vm.formData.mockKey = 'mockVal';
+        });
+
+        it('should use the saveFn', async () => {
+            const { vm } = mount({
+                propsData: { url, model, formInitialData, saveFn: () => {} },
+            });
+            const spyPatch = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
+            const spySaveFn = vi.spyOn(vm.$props, 'saveFn');
+
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            await vm.save();
+            expect(spyPatch).not.toHaveBeenCalled();
+            expect(spySaveFn).toHaveBeenCalled();
+            vm.formData.mockKey = 'mockVal';
+        });
+
+        it('should reload the data after save', async () => {
+            const { vm } = mount({
+                propsData: { url, model, formInitialData, reload: true },
+            });
+            vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
+
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            await vm.save();
+            vm.formData.mockKey = 'mockVal';
+        });
+    });
+});
+
+function mount({ propsData = {} }) {
+    return createWrapper(FormModel, {
+        propsData,
+    });
+}

src/components/common/RightMenu.vue

@@ -2,7 +2,11 @@
 import { ref, onMounted, useSlots } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
+import { useQuasar } from 'quasar';
 
+const { t } = useI18n();
+const quasar = useQuasar();
+const stateStore = useStateStore();
 const slots = useSlots();
 const hasContent = ref(false);
 const rightPanel = ref(null);
@@ -11,7 +15,6 @@ onMounted(() => {
     rightPanel.value = document.querySelector('#right-panel');
     if (!rightPanel.value) return;
 
-    // Check if there's content to display
     const observer = new MutationObserver(() => {
         hasContent.value = rightPanel.value.childNodes.length;
     });
@@ -21,12 +24,9 @@ onMounted(() => {
         childList: true,
         attributes: true,
     });
-
+    if ((!slots['right-panel'] && !hasContent.value) || quasar.platform.is.mobile)
-    if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
+        stateStore.rightDrawer = false;
 });
-
-const { t } = useI18n();
-const stateStore = useStateStore();
 </script>
 <template>
     <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
@@ -45,7 +45,7 @@ const stateStore = useStateStore();
             </QBtn>
         </div>
     </Teleport>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256">
         <QScrollArea class="fit">
             <div id="right-panel"></div>
             <slot v-if="!hasContent" name="right-panel" />

src/components/common/VnInputDate.vue

@@ -106,7 +106,7 @@ const manageDate = (date) => {
             :class="{ required: isRequired }"
             :rules="mixinRules"
             :clearable="false"
-            @click="isPopupOpen = true"
+            @click="isPopupOpen = !isPopupOpen"
             hide-bottom-space
         >
             <template #append>
@@ -125,13 +125,6 @@ const manageDate = (date) => {
                         isPopupOpen = false;
                     "
                 />
-                <QIcon
-                    v-if="showEvent"
-                    name="event"
-                    class="cursor-pointer"
-                    @click="isPopupOpen = !isPopupOpen"
-                    :title="t('Open date')"
-                />
             </template>
             <QMenu
                 v-if="$q.screen.gt.xs"
@@ -151,15 +144,6 @@ const manageDate = (date) => {
         </QInput>
     </div>
 </template>
-<style lang="scss">
-.vn-input-date.q-field--standard.q-field--readonly .q-field__control:before {
-    border-bottom-style: solid;
-}
-
-.vn-input-date.q-field--outlined.q-field--readonly .q-field__control:before {
-    border-style: solid;
-}
-</style>
 <i18n>
     es:
         Open date: Abrir fecha

src/components/common/VnInputTime.vue

@@ -80,7 +80,7 @@ function dateToTime(newDate) {
             :class="{ required: isRequired }"
             style="min-width: 100px"
             :rules="mixinRules"
-            @click="isPopupOpen = false"
+            @click="isPopupOpen = !isPopupOpen"
             type="time"
             hide-bottom-space
         >
@@ -100,12 +100,6 @@ function dateToTime(newDate) {
                         isPopupOpen = false;
                     "
                 />
-                <QIcon
-                    name="Schedule"
-                    class="cursor-pointer"
-                    @click="isPopupOpen = !isPopupOpen"
-                    :title="t('Open time')"
-                />
             </template>
             <QMenu
                 v-if="$q.screen.gt.xs"

src/components/common/VnLocation.vue

@@ -26,7 +26,7 @@ const locationProperties = [
     (obj) => obj.country?.name,
 ];
 
-const formatLocation = (obj, properties) => {
+const formatLocation = (obj, properties = locationProperties) => {
     const parts = properties.map((prop) => {
         if (typeof prop === 'string') {
             return obj[prop];

src/components/common/VnSelect.vue

@@ -113,8 +113,15 @@ const $props = defineProps({
 });
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
-const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
+const {
-    toRefs($props);
+    optionLabel,
+    optionValue,
+    optionCaption,
+    optionFilter,
+    optionFilterValue,
+    options,
+    modelValue,
+} = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
@@ -321,6 +328,11 @@ function handleKeyDown(event) {
         }
     }
 }
+
+function getCaption(opt) {
+    if (optionCaption.value === false) return;
+    return opt[optionCaption.value] || opt[optionValue.value];
+}
 </script>
 
 <template>
@@ -391,8 +403,8 @@ function handleKeyDown(event) {
                     <QItemLabel>
                         {{ opt[optionLabel] }}
                     </QItemLabel>
-                    <QItemLabel caption v-if="optionCaption !== false">
+                    <QItemLabel caption v-if="getCaption(opt)">
-                        {{ `#${opt[optionCaption] || opt[optionValue]}` }}
+                        {{ `#${getCaption(opt)}` }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

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

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

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

@@ -0,0 +1,91 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import VnLocation from 'components/common/VnLocation.vue';
+import { vi, afterEach, expect, it, beforeEach, describe } from 'vitest';
+
+function buildComponent(data) {
+    return createWrapper(VnLocation, {
+        global: {
+            props: {
+                location: data
+            }
+        },
+    }).vm;
+}
+
+afterEach(() => {
+    vi.clearAllMocks();
+});
+
+describe('formatLocation', () => {
+    let locationBase;
+
+    beforeEach(() => {
+        locationBase = {
+            postcode: '46680',
+            city: 'Algemesi',
+            province: { name: 'Valencia' },
+            country: { name: 'Spain' }
+        };
+    });
+
+    it('should return the postcode, city, province and country', () => {
+        const location = { ...locationBase };
+        const vm = buildComponent(location);
+        expect(vm.formatLocation(location)).toEqual('46680, Algemesi(Valencia), Spain');
+    });
+
+    it('should return the postcode and country', () => {
+        const location = { ...locationBase, city: undefined };
+        const vm = buildComponent(location);
+        expect(vm.formatLocation(location)).toEqual('46680, Spain');
+    });
+
+    it('should return the city, province and country', () => {
+        const location = { ...locationBase, postcode: undefined };
+        const vm = buildComponent(location);
+        expect(vm.formatLocation(location)).toEqual('Algemesi(Valencia), Spain');
+    });
+
+    it('should return the country', () => {
+        const location = { ...locationBase, postcode: undefined, city: undefined, province: undefined };
+        const vm = buildComponent(location);
+        expect(vm.formatLocation(location)).toEqual('Spain');
+    });
+});
+
+describe('showLabel', () => {
+    let locationBase;
+
+    beforeEach(() => {
+        locationBase = {
+            code: '46680',
+            town: 'Algemesi',
+            province: 'Valencia',
+            country: 'Spain'
+        };
+    });
+
+    it('should show the label with postcode, city, province and country', () => {
+        const location = { ...locationBase };
+        const vm = buildComponent(location);
+        expect(vm.showLabel(location)).toEqual('46680, Algemesi(Valencia), Spain');
+    });
+
+    it('should show the label with postcode and country', () => {
+        const location = { ...locationBase, town: undefined };
+        const vm = buildComponent(location);
+        expect(vm.showLabel(location)).toEqual('46680, Spain');
+    });
+
+    it('should show the label with city, province and country', () => {
+        const location = { ...locationBase, code: undefined };
+        const vm = buildComponent(location);
+        expect(vm.showLabel(location)).toEqual('Algemesi(Valencia), Spain');
+    });
+
+    it('should show the label with country', () => {
+        const location = { ...locationBase, code: undefined, town: undefined, province: undefined };
+        const vm = buildComponent(location);
+        expect(vm.showLabel(location)).toEqual('Spain');
+    });
+});

src/components/ui/CardSummary.vue

@@ -1,10 +1,10 @@
 <script setup>
-import { ref, computed, watch, onBeforeMount } from 'vue';
+import { ref, computed, watch, onBeforeMount, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { isDialogOpened } from 'src/filters';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const props = defineProps({
     url: {
@@ -40,6 +40,7 @@ const { store } = arrayData;
 const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
+const stateStore = useStateStore();
 defineExpose({
     entity,
     fetch,
@@ -51,6 +52,9 @@ onBeforeMount(async () => {
     watch(props, async () => await fetch());
 });
 
+onMounted(() => {
+    stateStore.rightDrawerChangeValue(false);
+});
 async function fetch() {
     store.url = props.url;
     store.filter = props.filter ?? {};
@@ -60,7 +64,6 @@ async function fetch() {
     isLoading.value = false;
 }
 </script>
-
 <template>
     <div class="summary container">
         <QCard class="cardSummary">
@@ -81,7 +84,7 @@ async function fetch() {
                         <span v-else></span>
                     </slot>
                     <slot name="header" :entity="entity" dense>
-                        <VnLv :label="`${entity.id} -`" :value="entity.name" />
+                        {{ entity.id + ' - ' + entity.name }}
                     </slot>
                     <slot name="header-right" :entity="entity">
                         <span></span>
@@ -94,7 +97,6 @@ async function fetch() {
         </QCard>
     </div>
 </template>
-
 <style lang="scss">
 .summary.container {
     display: flex;

src/components/ui/FetchedTags.vue

@@ -16,7 +16,13 @@ const $props = defineProps({
         required: false,
         default: 'value',
     },
+    columns: {
+        type: Number,
+        required: false,
+        default: null,
+    },
 });
+
 const tags = computed(() => {
     return Object.keys($props.item)
         .filter((i) => i.startsWith(`${$props.tag}`))
@@ -28,10 +34,21 @@ const tags = computed(() => {
             return acc;
         }, {});
 });
+
+const columnStyle = computed(() => {
+    if ($props.columns) {
+        return {
+            'grid-template-columns': `repeat(${$props.columns}, 1fr)`,
+            'max-width': `${$props.columns * 4}rem`,
+        };
+    }
+    return {};
+});
 </script>
+
 <template>
     <div class="fetchedTags">
-        <div class="wrap">
+        <div class="wrap" :style="columnStyle">
             <div
                 v-for="(val, key) in tags"
                 :key="key"
@@ -39,37 +56,43 @@ const tags = computed(() => {
                 :title="`${key}: ${val}`"
                 :class="{ empty: !val }"
             >
-                {{ val }}
+                <span class="text">{{ val }} </span>
             </div>
         </div>
     </div>
 </template>
-
 <style lang="scss" scoped>
 .fetchedTags {
     align-items: center;
     .wrap {
-        width: 100%;
+        display: grid;
-        flex-wrap: wrap;
-        display: flex;
     }
 
     .inline-tag {
+        display: flex;
+        align-items: center;
+        justify-content: center;
         height: 1rem;
         margin: 0.05rem;
-        color: $color-font-secondary;
+        color: var(--vn-label-color);
         text-align: center;
         font-size: smaller;
         padding: 1px;
-        flex: 1;
+        border: 1px solid var(--vn-label-color);
-        border: 1px solid $color-spacer;
         text-overflow: ellipsis;
         overflow: hidden;
         min-width: 4rem;
         max-width: 4rem;
     }
+
+    .text {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        font-size: smaller;
+    }
     .empty {
-        border: 1px solid #2b2b2b;
+        border: 1px solid var(--vn-empty-tag);
     }
 }
 </style>

src/components/ui/VnLinkPhone.vue

@@ -30,7 +30,7 @@ onBeforeMount(async () => {
             .data;
         if (!channel) channel = defaultChannel;
 
-        phone.value = await parsePhone(props.phoneNumber, props.country.toLowerCase());
+        phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
         config[
             type
         ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;

src/components/ui/VnLv.vue

@@ -39,7 +39,7 @@ const val = computed(() => $props.value);
         <template v-else>
             <div v-if="label || $slots.label" class="label">
                 <slot name="label">
-                    <span>{{ label }}</span>
+                    <span style="color: var(--vn-label-color)">{{ label }}</span>
                 </slot>
             </div>
             <div class="value">

src/components/ui/VnNotes.vue

@@ -110,7 +110,7 @@ onBeforeRouteLeave((to, from, next) => {
         :url="$props.url"
         order="created DESC"
         :limit="0"
-        :filter="$props.filter"
+        :user-filter="$props.filter"
         auto-load
         ref="vnPaginateRef"
         class="show"

src/composables/useArrayData.js

@@ -124,12 +124,14 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         const { limit } = filter;
         store.hasMoreData = limit && response.data.length >= limit;
 
-        processData(response.data, { map: !!store.mapKey, append });
+        if (!append && !isDialogOpened() && updateRouter) {
-        if (!append && !isDialogOpened()) updateRouter && updateStateParams();
+            if (updateStateParams(response.data)?.redirect) return;
-
+        }
         store.isLoading = false;
         canceller = null;
 
+        processData(response.data, { map: !!store.mapKey, append });
+
         return response;
     }
 
@@ -259,7 +261,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         if (Object.values(store.userParams).length) await fetch({});
     }
 
-    function updateStateParams() {
+    function updateStateParams(data) {
         if (!route?.path) return;
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
         if (store?.searchUrl)
@@ -276,15 +278,15 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             const { path } = matches.at(-1);
 
             const to =
-                store?.data?.length === 1
+                data?.length === 1
-                    ? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`)
+                    ? path.replace(/\/(list|:id)|-list/, `/${data[0].id}`)
                     : path.replace(/:id.*/, '');
 
             if (route.path != to) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                return router.push(pushUrl);
+                return router.push(pushUrl) && { redirect: true };
             }
         }
 

src/css/app.scss

@@ -250,7 +250,7 @@ input::-webkit-inner-spin-button {
 .q-table {
     th,
     td {
-        padding: 1px 10px 1px 10px;
+        padding: 1px 3px 1px 3px;
         max-width: 130px;
         div span {
             overflow: hidden;
@@ -306,3 +306,20 @@ input::-webkit-inner-spin-button {
 .no-visible {
     visibility: hidden;
 }
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+        display: flex;
+        align-items: flex-end;
+        padding-bottom: 2px;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}
+
+.q-date__header-today {
+    border-radius: 12px;
+    border: 1px solid;
+    box-shadow: 0 4px 6px #00000000;
+}

src/filters/toDateHourMin.js

@@ -1,5 +1,6 @@
 export default function toDateHourMin(date) {
-    const dateHour = new Date(date).toLocaleDateString('es-ES', {
+    if (!date) return date;
+    return new Date(date).toLocaleDateString('es-ES', {
         timeZone: 'Europe/Madrid',
         year: 'numeric',
         month: '2-digit',
@@ -7,5 +8,4 @@ export default function toDateHourMin(date) {
         hour: '2-digit',
         minute: '2-digit',
     });
-    return dateHour;
 }

src/filters/toDateHourMinSec.js

@@ -1,5 +1,6 @@
 export default function toDateHourMinSec(date) {
-    const dateHour = new Date(date).toLocaleDateString('es-ES', {
+    if (!date) return date;
+    return new Date(date).toLocaleDateString('es-ES', {
         timeZone: 'Europe/Madrid',
         year: 'numeric',
         month: '2-digit',
@@ -8,5 +9,4 @@ export default function toDateHourMinSec(date) {
         minute: '2-digit',
         second: '2-digit',
     });
-    return dateHour;
 }

src/i18n/locale/en.yml

@@ -142,7 +142,7 @@ globals:
         workCenters: Work centers
         modes: Modes
         zones: Zones
-        zonesList: Zones
+        zonesList: List
         deliveryDays: Delivery days
         upcomingDeliveries: Upcoming deliveries
         role: Role

src/i18n/locale/es.yml

@@ -144,7 +144,7 @@ globals:
         workCenters: Centros de trabajo
         modes: Modos
         zones: Zonas
-        zonesList: Zonas
+        zonesList: Listado
         deliveryDays: Días de entrega
         upcomingDeliveries: Próximos repartos
         role: Role
@@ -863,6 +863,7 @@ components:
         ended: Hasta
         mine: Para mi
         hasMinPrice: Precio mínimo
+        wareHouseFk: Almacén
         # LatestBuysFilter
         salesPersonFk: Comprador
         active: Activo

src/pages/Account/Card/AccountDescriptor.vue

@@ -53,7 +53,6 @@ const hasAccount = ref(false);
             <AccountDescriptorMenu :has-account="hasAccount" />
         </template>
         <template #before>
-            <!-- falla id :id="entityId.value" collection="user" size="160x160" -->
             <VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
                 <template #error>
                     <div
@@ -75,7 +74,7 @@ const hasAccount = ref(false);
             <VnLv :label="t('account.card.nickname')" :value="entity.name" />
             <VnLv :label="t('account.card.role')" :value="entity.role.name" />
         </template>
-        <template #actions="{ entity }">
+        <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-md">
                 <QIcon
                     v-if="!entity.active"
@@ -83,7 +82,7 @@ const hasAccount = ref(false);
                     name="vn:disabled"
                     flat
                     round
-                    size="sm"
+                    size="xs"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.deactivated') }}</QTooltip>
@@ -91,10 +90,10 @@ const hasAccount = ref(false);
                 <QIcon
                     color="primary"
                     name="contact_mail"
-                    v-if="entity.hasAccount"
+                    v-if="hasAccount"
                     flat
                     round
-                    size="sm"
+                    size="xs"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.enabled') }}</QTooltip>

src/pages/Claim/Card/ClaimDevelopment.vue

@@ -164,19 +164,7 @@ const columns = computed(() => [
                             :autofocus="col.tabIndex == 1"
                             input-debounce="0"
                             hide-selected
-                        >
+                        />
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{ scope.opt?.nickname }}
-                                            {{ scope.opt?.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectWorker>
                         <VnSelect
                             v-else
                             v-model="row[col.model]"

src/pages/Claim/Card/ClaimLines.vue

@@ -57,6 +57,7 @@ function onFetch(rows, newRows) {
         const price = row.quantity * sale.price;
         const discount = (sale.discount * price) / 100;
         amountClaimed.value = amountClaimed.value + (price - discount);
+
     }
 }
 
@@ -207,9 +208,10 @@ 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">
+                        <QTd auto-width align="right" class="text-primary shrink">
                             <QInput
                                 v-model.number="row.quantity"
                                 type="number"
@@ -220,7 +222,7 @@ async function saveWhenHasChanges() {
                         </QTd>
                     </template>
                     <template #body-cell-description="{ row, value }">
-                        <QTd auto-width align="right" class="text-primary">
+                        <QTd auto-width align="right" class="link expand">
                             {{ value }}
                             <ItemDescriptorProxy
                                 :id="row.sale.itemFk"
@@ -228,7 +230,7 @@ async function saveWhenHasChanges() {
                         </QTd>
                     </template>
                     <template #body-cell-discount="{ row, value, rowIndex }">
-                        <QTd auto-width align="right" class="text-primary">
+                        <QTd auto-width align="right" class="link shrink">
                             {{ value }}
                             <VnDiscount
                                 :quantity="row.quantity"
@@ -264,7 +266,7 @@ async function saveWhenHasChanges() {
                                         </QItemSection>
                                         <QItemSection side>
                                             <template v-if="column.name === 'claimed'">
-                                                <QItemLabel class="text-primary">
+                                                <QItemLabel class="text-primary shrink">
                                                     <QInput
                                                         v-model.number="
                                                             props.row.quantity
@@ -282,7 +284,7 @@ async function saveWhenHasChanges() {
                                             <template
                                                 v-else-if="column.name === 'discount'"
                                             >
-                                                <QItemLabel class="text-primary">
+                                                <QItemLabel class="text-primary shrink">
                                                     {{ column.value }}
                                                     <VnDiscount
                                                         :quantity="props.row.quantity"
@@ -330,6 +332,7 @@ async function saveWhenHasChanges() {
 .grid-style-transition {
     transition: transform 0.28s, background-color 0.28s;
 }
+
 </style>
 
 <i18n>

src/pages/Claim/Card/ClaimSummary.vue

@@ -345,12 +345,9 @@ function claimUrl(section) {
                                 <span v-if="col.name != 'description'">{{
                                     t(col.value)
                                 }}</span>
-                                <QBtn
+                                <span class="link" v-if="col.name === 'description'">{{
-                                    v-if="col.name == 'description'"
+                                    t(col.value)
-                                    flat
+                                }}</span>
-                                    color="blue"
-                                    >{{ col.value }}</QBtn
-                                >
                                 <ItemDescriptorProxy
                                     v-if="col.name == 'description'"
                                     :id="props.row.sale.itemFk"

src/pages/Claim/ClaimFilter.vue

@@ -30,7 +30,7 @@ defineExpose({ states });
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <div class="q-pa-sm q-gutter-y-sm">
                 <VnInput
                     :label="t('claim.customerId')"
@@ -49,12 +49,9 @@ defineExpose({ states });
                 <VnSelect
                     :label="t('Salesperson')"
                     v-model="params.salesPersonFk"
-                    @update:model-value="searchFn()"
                     url="Workers/activeWithInheritedRole"
                     :filter="{ where: { role: 'salesPerson' } }"
                     :use-like="false"
-                    option-value="id"
-                    option-label="name"
                     option-filter="firstName"
                     dense
                     outlined
@@ -63,12 +60,9 @@ defineExpose({ states });
                 <VnSelect
                     :label="t('claim.attendedBy')"
                     v-model="params.attenderFk"
-                    @update:model-value="searchFn()"
                     url="Workers/activeWithInheritedRole"
                     :filter="{ where: { role: 'salesPerson' } }"
                     :use-like="false"
-                    option-value="id"
-                    option-label="name"
                     option-filter="firstName"
                     dense
                     outlined
@@ -77,9 +71,7 @@ defineExpose({ states });
                 <VnSelect
                     :label="t('claim.state')"
                     v-model="params.claimStateFk"
-                    @update:model-value="searchFn()"
                     :options="states"
-                    option-value="id"
                     option-label="description"
                     dense
                     outlined
@@ -87,7 +79,6 @@ defineExpose({ states });
                 />
                 <VnInputDate
                     v-model="params.created"
-                    @update:model-value="searchFn()"
                     :label="t('claim.created')"
                     outlined
                     rounded
@@ -96,10 +87,7 @@ defineExpose({ states });
                 <VnSelect
                     :label="t('Item')"
                     v-model="params.itemFk"
-                    @update:model-value="searchFn()"
                     url="Items/withName"
-                    option-value="id"
-                    option-label="name"
                     :use-like="false"
                     sort-by="id DESC"
                     outlined
@@ -118,21 +106,26 @@ defineExpose({ states });
                 <VnSelect
                     :label="t('claim.responsible')"
                     v-model="params.claimResponsibleFk"
-                    @update:model-value="searchFn()"
                     url="Workers/activeWithInheritedRole"
                     :filter="{ where: { role: 'salesPerson' } }"
                     :use-like="false"
-                    option-value="id"
-                    option-label="name"
                     option-filter="firstName"
                     dense
                     outlined
                     rounded
                 />
+                <VnSelect
+                    :label="t('claim.zone')"
+                    v-model="params.zoneFk"
+                    url="Zones"
+                    :use-like="false"
+                    outlined
+                    rounded
+                    dense
+                />
                 <QCheckbox
                     v-model="params.myTeam"
                     :label="t('params.myTeam')"
-                    @update:model-value="searchFn()"
                     toggle-indeterminate
                 />
             </div>
@@ -153,6 +146,7 @@ en:
         created: Created
         myTeam: My team
         itemFk: Item
+        zoneFk: Zone
 es:
     params:
         search: Contiene
@@ -165,6 +159,7 @@ es:
         created: Creada
         myTeam: Mi equipo
         itemFk: Artículo
+        zoneFk: Zona
     Client Name: Nombre del cliente
     Salesperson: Comercial
     Item: Artículo

src/pages/Claim/ClaimList.vue

@@ -10,6 +10,7 @@ import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -95,7 +96,12 @@ const columns = computed(() => [
                 optionLabel: 'description',
             },
         },
-        orderBy: 'priority',
+        orderBy: 'cs.priority',
+    },
+    {
+        align: 'left',
+        label: t('claim.zone'),
+        name: 'zoneFk',
     },
     {
         align: 'right',
@@ -105,6 +111,7 @@ const columns = computed(() => [
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, ClaimSummary),
+                isPrimary: true,
             },
         ],
     },
@@ -131,11 +138,10 @@ const STATE_COLOR = {
     <VnTable
         data-key="ClaimList"
         url="Claims/filter"
-        :order="['t.priority ASC', 'created ASC']"
+        :order="['cs.priority ASC', 'created ASC']"
         :columns="columns"
         redirect="claim"
         :right-search="false"
-        auto-load
     >
         <template #column-clientFk="{ row }">
             <span class="link" @click.stop>
@@ -148,6 +154,12 @@ const STATE_COLOR = {
                 <VnUserLink :name="row.workerName" :worker-id="row.workerFk" />
             </span>
         </template>
+        <template #column-zoneFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.zoneName }}
+                <ZoneDescriptorProxy :id="row.zoneId" />
+            </span>
+        </template>
     </VnTable>
 </template>
 

src/pages/Customer/Card/CustomerBalance.vue

@@ -84,6 +84,7 @@ const columns = computed(() => [
         label: t('Creation date'),
         format: ({ created }) => toDateHourMin(created),
         cardVisible: true,
+        style: 'color: var(--vn-label-color)',
     },
     {
         align: 'left',

src/pages/Customer/Card/CustomerBasicData.vue

@@ -16,14 +16,17 @@ const { t } = useI18n();
 
 const businessTypes = ref([]);
 const contactChannels = ref([]);
-const handleSalesModelValue = (val) => ({
+const handleSalesModelValue = (val) => {
+    if (!val) val = '';
+    return {
         or: [
             { id: val },
             { name: val },
             { nickname: { like: '%' + val + '%' } },
             { code: { like: `${val}%` } },
         ],
-});
+    };
+};
 
 const exprBuilder = (param, value) => {
     return {

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -14,7 +14,12 @@ import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 import { useState } from 'src/composables/useState';
 const state = useState();
 
-const customer = computed(() => state.get('customer'));
+const customer = ref();
+
+onMounted(async () => {
+    customer.value = state.get('customer');
+    if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
+});
 
 const $props = defineProps({
     id: {
@@ -38,7 +43,6 @@ const entityId = computed(() => {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     data.value = useCardDescription(entity?.name, entity?.id);
-    if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
 };
 const debtWarning = computed(() => {
     return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';

src/pages/Customer/CustomerFilter.vue

@@ -12,14 +12,17 @@ defineProps({
         required: true,
     },
 });
-const handleSalesModelValue = (val) => ({
+const handleSalesModelValue = (val) => {
+    if (!val) val = '';
+    return {
         or: [
             { id: val },
             { name: val },
             { nickname: { like: '%' + val + '%' } },
             { code: { like: `${val}%` } },
         ],
-});
+    };
+};
 
 const exprBuilder = (param, value) => {
     return {

src/pages/Customer/CustomerList.vue

@@ -2,22 +2,21 @@
 import { ref, computed, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { toDate } from 'src/filters';
+
+import RightMenu from 'src/components/common/RightMenu.vue';
+import CustomerSummary from './Card/CustomerSummary.vue';
+import CustomerFilter from './CustomerFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import CustomerSummary from './Card/CustomerSummary.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import { toDate } from 'src/filters';
-import CustomerFilter from './CustomerFilter.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const { t } = useI18n();
 const router = useRouter();
-
 const tableRef = ref();
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -405,6 +404,7 @@ function handleLocation(data, location) {
         ref="tableRef"
         data-key="CustomerList"
         url="Clients/filter"
+        order="id DESC"
         :create="{
             urlCreate: 'Clients/createWithUser',
             title: t('globals.pageTitles.customerCreate'),
@@ -414,10 +414,9 @@ function handleLocation(data, location) {
                 isEqualizated: false,
             },
         }"
-        order="id DESC"
         :columns="columns"
-        redirect="customer"
         :right-search="false"
+        redirect="customer"
     >
         <template #more-create-dialog="{ data }">
             <VnSelectWorker
@@ -430,7 +429,26 @@ function handleLocation(data, location) {
                 :id-value="data.salesPersonFk"
                 emit-value
                 auto-load
+            >
+                <template #prepend>
+                    <VnAvatar
+                        :worker-id="data.salesPersonFk"
+                        color="primary"
+                        :title="title"
                     />
+                </template>
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ scope.opt?.nickname }},
+                                {{ scope.opt?.code }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelectWorker>
             <VnLocation
                 :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
@@ -451,7 +469,7 @@ function handleLocation(data, location) {
 </template>
 <i18n>
 es:
-    Web user: Usuario Web
+    Web user: Usuario web
 </i18n>
 <style lang="scss" scoped>
 .col-content {

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -247,8 +247,16 @@ function handleLocation(data, location) {
                     :label="t('Longitude')"
                     clearable
                     v-model="data.longitude"
+                    :decimal-places="7"
+                    :positive="false"
+                />
+                <VnInputNumber
+                    :label="t('Latitude')"
+                    clearable
+                    v-model="data.latitude"
+                    :decimal-places="7"
+                    :positive="false"
                 />
-                <VnInputNumber :label="t('Latitude')" clearable v-model="data.latitude" />
             </VnRow>
             <h4 class="q-mb-xs">{{ t('Notes') }}</h4>
             <VnRow

src/pages/Department/Card/DepartmentBasicData.vue

@@ -52,7 +52,7 @@ const { t } = useI18n();
                 <VnSelectWorker
                     :label="t('department.bossDepartment')"
                     v-model="data.workerFk"
-                    :rules="validate('department.workerFk')"
+                    :rules="validate('department.bossDepartment')"
                 />
                 <VnSelect
                     :label="t('department.selfConsumptionCustomer')"

src/pages/Entry/EntryBuysTableDialog.vue

@@ -1,24 +1,24 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { QBtn } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { usePrintService } from 'composables/usePrintService';
-const { openReport } = usePrintService();
 
+const { openReport } = usePrintService();
+const buyRows = ref([]);
 const route = useRoute();
 const { t } = useI18n();
 const $props = defineProps({
     id: {
-        type: String,
+        type: Number,
         required: false,
         default: null,
     },
 });
 const entityId = computed(() => $props.id || route.params.id);
-
 const entriesTableColumns = computed(() => [
     {
         align: 'left',
@@ -63,34 +63,39 @@ const entriesTableColumns = computed(() => [
         field: 'grouping',
     },
 ]);
-</script>
 
+function downloadCSV(rows) {
+    const headers = ['id', 'itemFk', 'name', 'stickers', 'packing', 'comment'];
+
+    const csvRows = rows.map((row) => {
+        const buy = row;
+        const item = buy.item || {};
+
+        return [
+            buy.id,
+            buy.itemFk,
+            item.name || '',
+            buy.stickers,
+            buy.packing,
+            item.comment || '',
+        ].join(',');
+    });
+
+    const csvContent = [headers.join(','), ...csvRows].join('\n');
+
+    const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.href = url;
+    link.setAttribute('download', `${entityId.value}data.csv`);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+}
+</script>
 <template>
     <QDialog ref="dialogRef">
         <QCard style="min-width: 800px">
-            <QCardSection class="row items-center q-pb-none">
-                <QAvatar
-                    :icon="icon"
-                    color="primary"
-                    text-color="white"
-                    size="xl"
-                    v-if="icon"
-                />
-                <span class="text-h6 text-grey">{{ title }}</span>
-                <QSpace />
-                <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
-            </QCardSection>
-            <QCardActions align="right">
-                <QBtn
-                    :label="t('myEntries.printLabels')"
-                    color="primary"
-                    icon="print"
-                    :loading="isLoading"
-                    @click="openReport(`Entries/${entityId}/labelSupplier`)"
-                    unelevated
-                    autofocus
-                />
-            </QCardActions>
             <QCardSection class="row items-center">
                 <VnPaginate
                     ref="entryBuysPaginateRef"
@@ -101,6 +106,7 @@ const entriesTableColumns = computed(() => [
                 >
                     <template #body="{ rows }">
                         <QTable
+                            ref="buyRows"
                             :rows="rows"
                             :columns="entriesTableColumns"
                             row-key="id"
@@ -110,6 +116,26 @@ const entriesTableColumns = computed(() => [
                             :grid="$q.screen.lt.md"
                             :no-data-label="t('globals.noResults')"
                         >
+                            <template #top-left>
+                                <QBtn
+                                    :label="t('myEntries.downloadCsv')"
+                                    color="primary"
+                                    icon="csv"
+                                    @click="downloadCSV(rows)"
+                                    unelevated
+                                />
+                            </template>
+                            <template #top-right>
+                                <QBtn
+                                    class="q-mr-lg"
+                                    :label="t('myEntries.printLabels')"
+                                    color="primary"
+                                    icon="print"
+                                    @click="
+                                        openReport(`Entries/${entityId}/labelSupplier`)
+                                    "
+                                />
+                            </template>
                             <template #body="props">
                                 <QTr>
                                     <QTd v-for="col in props.cols" :key="col.name">
@@ -118,7 +144,6 @@ const entriesTableColumns = computed(() => [
                                     <QBtn
                                         icon="visibility"
                                         v-if="props.row.stickers > 0"
-                                        :loading="isLoading"
                                         @click="
                                             openReport(
                                                 `Entries/${props.row.id}/buy-label-supplier`

src/pages/Entry/EntryFilter.vue

@@ -1,8 +1,6 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
 
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -20,11 +18,6 @@ const props = defineProps({
 
 const currenciesOptions = ref([]);
 const companiesOptions = ref([]);
-
-const stateStore = useStateStore();
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
 </script>
 
 <template>

src/pages/Entry/EntryList.vue

@@ -49,8 +49,10 @@ const columns = computed(() => [
         align: 'left',
         label: t('globals.id'),
         name: 'id',
-        isTitle: true,
+        isId: true,
-        cardVisible: true,
+        chip: {
+            condition: () => true,
+        },
     },
     {
         align: 'left',
@@ -177,9 +179,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
 </script>
 <template>
     <VnSearchbar
@@ -207,7 +206,6 @@ onMounted(async () => {
         order="id DESC"
         :columns="columns"
         redirect="entry"
-        auto-load
         :right-search="false"
     >
         <template #column-status="{ row }">

src/pages/Entry/MyEntries.vue

@@ -102,7 +102,7 @@ const columns = computed(() => [
         actions: [
             {
                 title: t('myEntries.printLabels'),
-                icon: 'print',
+                icon: 'move_item',
                 isPrimary: true,
                 action: (row) => printBuys(row.id),
             },

src/pages/Entry/locale/en.yml

@@ -17,5 +17,6 @@ myEntries:
     warehouseInFk: Warehouse in
     daysOnward: Days onward
     daysAgo: Days ago
+    downloadCsv: Download CSV
 wasteRecalc:
     recalcOk: The wastes were successfully recalculated

src/pages/Entry/locale/es.yml

@@ -20,5 +20,6 @@ myEntries:
     warehouseInFk: Alm. entrada
     daysOnward: Días adelante
     daysAgo: Días atras
+    downloadCsv: Descargar CSV
 wasteRecalc:
     recalcOk: Se han recalculado las mermas correctamente

src/pages/InvoiceIn/InvoiceInList.vue

@@ -1,7 +1,6 @@
 <script setup>
-import { ref, computed, onMounted, onUnmounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
 import { downloadFile } from 'src/composables/downloadFile';
 import { toDate, toCurrency } from 'src/filters/index';
@@ -17,14 +16,10 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'src/components/FetchData.vue';
 
-const stateStore = useStateStore();
 const user = useState().getUser();
 const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 
-onMounted(async () => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));
-
 const tableRef = ref();
 const companies = ref([]);
 const cols = computed(() => [
@@ -38,6 +33,10 @@ const cols = computed(() => [
         align: 'left',
         name: 'id',
         label: 'Id',
+        isId: true,
+        chip: {
+            condition: () => true,
+        },
     },
     {
         align: 'left',
@@ -51,6 +50,7 @@ const cols = computed(() => [
             },
         },
         columnClass: 'expand',
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -81,6 +81,7 @@ const cols = computed(() => [
             component: 'date',
         },
         format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.dueDated)),
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -92,6 +93,7 @@ const cols = computed(() => [
         name: 'amount',
         label: t('InvoiceIn.list.amount'),
         format: ({ amount }) => toCurrency(amount),
+        cardVisible: true,
     },
     {
         name: 'companyFk',

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, onUnmounted, ref, computed, watchEffect } from 'vue';
+import { ref, computed, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -10,7 +10,6 @@ import { usePrintService } from 'src/composables/usePrintService';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
-import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
 import axios from 'axios';
 import RightMenu from 'src/components/common/RightMenu.vue';
@@ -21,7 +20,6 @@ import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
-const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const invoiceOutSerialsOptions = ref([]);
@@ -147,8 +145,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-onMounted(() => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
     openReport(`${MODEL}/${id}/download`);
@@ -214,7 +210,6 @@ watchEffect(selectedRows);
         order="id DESC"
         :columns="columns"
         redirect="invoice-out"
-        auto-load
         :table="{
             'row-key': 'id',
             selection: 'multiple',

src/pages/Item/Card/ItemBasicData.vue

@@ -203,6 +203,12 @@ const onIntrastatCreated = (response, formData) => {
                     v-model="data.hasKgPrice"
                     :label="t('item.basicData.hasKgPrice')"
                 />
+                <QCheckbox
+                    v-model="data.isCustomInspectionRequired"
+                    :label="t('item.basicData.isCustomInspectionRequired')"
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <div>
                     <QCheckbox
                         v-model="data.isFragile"

src/pages/Item/Card/ItemDiary.vue

@@ -233,7 +233,7 @@ async function updateWarehouse(warehouseFk) {
             </div>
         </template>
     </VnSubToolbar>
-    <QPage class="column items-center q-pa-md">
+    <QPage class="column items-center">
         <QTable
             :rows="itemBalances"
             :columns="columns"

src/pages/Item/ItemFixedPrice.vue

@@ -53,7 +53,6 @@ const columns = computed(() => [
         name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
-        cardVisible: true,
         columnField: {
             component: 'input',
             type: 'number',
@@ -65,14 +64,12 @@ const columns = computed(() => [
         name: 'name',
         ...defaultColumnAttrs,
         create: true,
-        cardVisible: true,
     },
     {
         label: t('item.fixedPrice.groupingPrice'),
         field: 'rate2',
         name: 'rate2',
         ...defaultColumnAttrs,
-        cardVisible: true,
         component: 'input',
         type: 'number',
     },
@@ -81,7 +78,6 @@ const columns = computed(() => [
         field: 'rate3',
         name: 'rate3',
         ...defaultColumnAttrs,
-        cardVisible: true,
         component: 'input',
         type: 'number',
     },
@@ -91,7 +87,6 @@ const columns = computed(() => [
         field: 'minPrice',
         name: 'minPrice',
         ...defaultColumnAttrs,
-        cardVisible: true,
         component: 'input',
         type: 'number',
     },
@@ -100,7 +95,6 @@ const columns = computed(() => [
         field: 'started',
         name: 'started',
         format: ({ started }) => toDate(started),
-        cardVisible: true,
         ...defaultColumnAttrs,
         columnField: {
             component: 'date',
@@ -116,7 +110,6 @@ const columns = computed(() => [
         field: 'ended',
         name: 'ended',
         ...defaultColumnAttrs,
-        cardVisible: true,
         columnField: {
             component: 'date',
             class: 'shrink',
@@ -251,11 +244,14 @@ const upsertPrice = async (props, resetMinPrice = false) => {
     }
     if (!changes.updates && !changes.creates) return;
     const data = await upsertFixedPrice(row);
-    tableRef.value.CrudModelRef.formData[props.rowIndex] = data;
+    Object.assign(tableRef.value.CrudModelRef.formData[props.rowIndex], data);
+    notify(t('globals.dataSaved'), 'positive');
+    tableRef.value.reload();
 };
 
 async function upsertFixedPrice(row) {
     const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
+    data.hasMinPrice = data.hasMinPrice ? 1 : 0;
     return data;
 }
 
@@ -395,18 +391,12 @@ function handleOnDataSave({ CrudModelRef }) {
         </template>
     </VnSubToolbar>
     <VnTable
-        @on-fetch="
-            (data) =>
-                data.forEach((item) => {
-                    item.hasMinPrice = `${item.hasMinPrice !== 0}`;
-                })
-        "
         :default-remove="false"
         :default-reset="false"
         :default-save="false"
         data-key="ItemFixedPrices"
         url="FixedPrices/filter"
-        :order="['itemFk DESC', 'name DESC']"
+        :order="['name DESC', 'itemFk DESC']"
         save-url="FixedPrices/crud"
         ref="tableRef"
         dense
@@ -466,7 +456,7 @@ function handleOnDataSave({ CrudModelRef }) {
             </span>
             <span class="subName">{{ row.subName }}</span>
             <ItemDescriptorProxy :id="row.itemFk" />
-            <FetchedTags :item="row" />
+            <FetchedTags :item="row" :columns="3" />
         </template>
         <template #column-rate2="props">
             <QTd class="col">
@@ -498,14 +488,15 @@ function handleOnDataSave({ CrudModelRef }) {
                     <QCheckbox
                         :model-value="props.row.hasMinPrice"
                         @update:model-value="updateMinPrice($event, props)"
-                        :false-value="'false'"
+                        :false-value="0"
-                        :true-value="'true'"
+                        :true-value="1"
+                        :toggle-indeterminate="false"
                     />
                     <VnInput
                         class="col"
                         type="currency"
                         mask="###.##"
-                        :disable="props.row.hasMinPrice === 1"
+                        :disable="props.row.hasMinPrice === 0"
                         v-model.number="props.row.minPrice"
                         v-on="getRowUpdateInputEvents(props)"
                     >

src/pages/Item/ItemFixedPriceFilter.vue

@@ -32,7 +32,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnSelect
-                        :label="t('components.itemsFilterPanel.buyerFk')"
+                        :label="t('params.buyerFk')"
                         v-model="params.buyerFk"
                         :options="itemTypeWorkersOptions"
                         option-value="id"
@@ -51,7 +51,7 @@ const itemTypeWorkersOptions = ref([]);
                         url="Warehouses"
                         auto-load
                         :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-                        :label="t('globals.warehouse')"
+                        :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         option-label="name"
                         option-value="id"
@@ -66,7 +66,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('components.itemsFilterPanel.started')"
+                        :label="t('params.started')"
                         v-model="params.started"
                         is-outlined
                         @update:model-value="searchFn()"
@@ -76,7 +76,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('components.itemsFilterPanel.ended')"
+                        :label="t('params.ended')"
                         v-model="params.ended"
                         is-outlined
                         @update:model-value="searchFn()"
@@ -86,7 +86,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('components.itemsFilterPanel.mine')"
+                        :label="t('params.mine')"
                         v-model="params.mine"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -94,14 +94,14 @@ const itemTypeWorkersOptions = ref([]);
 
                     <QCheckbox
                         v-model="params.showBadDates"
-                        :label="t(`components.itemsFilterPanel.showBadDates`)"
+                        :label="t(`params.showBadDates`)"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
                     >
                     </QCheckbox>
 
                     <QCheckbox
-                        :label="t('components.itemsFilterPanel.hasMinPrice')"
+                        :label="t('params.hasMinPrice')"
                         v-model="params.hasMinPrice"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -111,3 +111,23 @@ const itemTypeWorkersOptions = ref([]);
         </template>
     </ItemsFilterPanel>
 </template>
+<i18n>
+en:
+    params:
+        buyerFk: Buyer
+        warehouseFk: Warehouse
+        started: Started
+        ended: Ended
+        mine: Mine
+        showBadDates: Show future items
+        hasMinPrice: Has Min Price
+es:
+    params:
+        buyerFk: Comprador
+        warehouseFk: Almacén
+        started: Desde
+        ended: Hasta
+        mine: Para mi
+        showBadDates: Ver items a futuro
+        hasMinPrice: Precio mínimo
+ </i18n>

src/pages/Item/ItemList.vue

@@ -11,6 +11,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import ItemSummary from '../Item/Card/ItemSummary.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
+import ItemTypeDescriptorProxy from './ItemType/Card/ItemTypeDescriptorProxy.vue';
 import { cloneItem } from 'src/pages/Item/composables/cloneItem';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import ItemListFilter from './ItemListFilter.vue';
@@ -56,7 +57,6 @@ const columns = computed(() => [
         name: 'image',
         align: 'left',
         columnFilter: false,
-        cardVisible: true,
     },
     {
         label: t('item.list.id'),
@@ -94,7 +94,7 @@ const columns = computed(() => [
         columnFilter: {
             name: 'search',
         },
-        cardVisible: true,
+        columnClass: 'expand',
     },
     {
         label: t('item.list.stems'),
@@ -132,10 +132,13 @@ const columns = computed(() => [
                 fields: ['id', 'name'],
             },
         },
-        columnField: {
-            component: null,
-        },
         create: true,
+        visible: false,
+    },
+    {
+        label: t('item.list.typeName'),
+        name: 'typeName',
+        align: 'left',
     },
     {
         label: t('item.list.category'),
@@ -220,7 +223,6 @@ const columns = computed(() => [
         label: t('item.list.weight'),
         toolTip: t('item.list.weightByPiece'),
         name: 'weightByPiece',
-        align: 'left',
         component: 'input',
         columnField: {
             component: null,
@@ -296,7 +298,6 @@ const columns = computed(() => [
     },
 ]);
 </script>
-
 <template>
     <VnSearchbar
         data-key="ItemList"
@@ -341,6 +342,13 @@ const columns = computed(() => [
                 <ItemDescriptorProxy :id="row.id" />
             </span>
         </template>
+        <template #column-typeName="{ row }">
+            <span class="link" @click.stop>
+                {{ row.typeName }}
+                {{ row.typeFk }}
+                <ItemTypeDescriptorProxy :id="row.typeFk" />
+            </span>
+        </template>
         <template #column-userName="{ row }">
             <span class="link" @click.stop>
                 {{ row.userName }}
@@ -354,15 +362,15 @@ const columns = computed(() => [
                     {{ row?.subName.toUpperCase() }}
                 </div>
             </div>
-            <FetchedTags :item="row" :max-length="6" />
+            <FetchedTags :item="row" :columns="3" />
         </template>
     </VnTable>
 </template>
-
 <style lang="scss" scoped>
 .subName {
     text-transform: uppercase;
     color: var(--vn-label-color);
+    font-size: small;
 }
 </style>
 <i18n>

src/pages/Item/ItemRequest.vue

@@ -172,13 +172,13 @@ const changeQuantity = async (request) => {
         };
 
         await axios.patch(`Sales/${request.saleFk}`, params);
+    }
+    await confirmRequest(request);
     notify(t('globals.dataSaved'), 'positive');
-        confirmRequest(request);
-    } else confirmRequest(request);
 };
 
 const confirmRequest = async (request) => {
-    if (request.itemFk && request.saleQuantity) {
+    if (!request.itemFk || !request.saleQuantity) return;
     const params = {
         itemFk: request.itemFk,
         quantity: request.saleQuantity,
@@ -188,8 +188,6 @@ const confirmRequest = async (request) => {
     const { data } = await axios.post(`TicketRequests/${request.id}/confirm`, params);
     request.itemDescription = data.concept;
     request.isOk = true;
-        notify(t('globals.dataSaved'), 'positive');
-    }
 };
 
 const getState = (isOk) => {

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

@@ -6,13 +6,11 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-
 import useCardDescription from 'src/composables/useCardDescription';
 
 const $props = defineProps({
     id: {
         type: Number,
-        required: false,
         default: null,
     },
     summary: {
@@ -24,6 +22,10 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
 const itemTypeFilter = {
     include: [
         { relation: 'worker' },
@@ -33,10 +35,6 @@ const itemTypeFilter = {
     ],
 };
 
-const entityId = computed(() => {
-    return $props.id || route.params.id;
-});
-
 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
 </script>
@@ -48,8 +46,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         :filter="itemTypeFilter"
         :title="data.title"
         :subtitle="data.subtitle"
+        data-key="itemTypeDescriptor"
         @on-fetch="setData"
-        data-key="entry"
     >
         <template #body="{ entity }">
             <VnLv :label="t('shared.code')" :value="entity.code" />

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

@@ -0,0 +1,17 @@
+<script setup>
+import ItemTypeDescriptor from './ItemTypeDescriptor.vue';
+import ItemTypeSummary from './ItemTypeSummary.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <ItemTypeDescriptor v-if="$props.id" :id="$props.id" :summary="ItemTypeSummary" />
+    </QPopupProxy>
+</template>

src/pages/Item/locale/en.yml

@@ -135,7 +135,7 @@ item:
         origin: Orig.
         userName: Buyer
         weight: Weight
-        weightByPiece: Weight/Piece
+        weightByPiece: Weight/stem
         stemMultiplier: Multiplier
         producer: Producer
         landed: Landed
@@ -158,6 +158,7 @@ item:
         isFragileTooltip: Is shown at website, app that this item cannot travel (wreath, palms, ...)
         isPhotoRequested: Do photo
         isPhotoRequestedTooltip: This item does need a photo
+        isCustomInspectionRequired: Needs physical inspection (PIF)
         description: Description
     fixedPrice:
         itemFk: Item ID

src/pages/Item/locale/es.yml

@@ -136,7 +136,7 @@ item:
         size: Medida
         origin: Orig.
         weight: Peso
-        weightByPiece: Peso (gramos)/tallo
+        weightByPiece: Peso/tallo
         userName: Comprador
         stemMultiplier: Multiplicador
         producer: Productor
@@ -160,6 +160,7 @@ item:
         isFragileTooltip: Se muestra en la web, app que este artículo no puede viajar (coronas, palmas, ...)
         isPhotoRequested: Hacer foto
         isPhotoRequestedTooltip: Este artículo necesita una foto
+        isCustomInspectionRequired: Necesita inspección física (PIF)
         description: Descripción
     fixedPrice:
         itemFk: ID Artículo

src/pages/Monitor/Ticket/MonitorTicketFilter.vue

@@ -281,6 +281,7 @@ en:
         problems: With problems
         pending: Pending
         alertLevel: Grouped State
+        department: Department
     FREE: Free
     DELIVERED: Delivered
     ON_PREPARATION: On preparation
@@ -300,6 +301,7 @@ es:
         problems: Con problemas
         pending: Pendiente
         alertLevel: Estado agrupado
+        department: Departamento
     FREE: Libre
     DELIVERED: Servido
     ON_PREPARATION: En preparación

src/pages/Order/Card/OrderLines.vue

@@ -213,9 +213,9 @@ async function handleConfirm() {
             type: 'positive',
         });
         router.push({
-            name: 'TicketList',
+            name: 'TicketSale',
             query: {
-                table: JSON.stringify({ clientFk: descriptorData.store.data.clientFk }),
+                table: JSON.stringify({ id: route.params.id }),
             },
         });
     }

src/pages/Order/Card/OrderVolume.vue

@@ -71,9 +71,11 @@ onMounted(async () => (stateStore.rightDrawer = false));
         auto-load
     />
     <QCard v-if="volumeSummary" class="order-volume-summary q-pa-lg">
-        <VnLv :label="t('total')" :value="`${volumeSummary?.totalVolume} m³`" />
         <VnLv 
-            :label="t('boxes')"
+        :label="`${t('total')}: `" 
+        :value="`${volumeSummary?.totalVolume} m³`" />
+        <VnLv
+            :label="`${t('boxes')}: `"
             :value="`${dashIfEmpty(volumeSummary?.totalBoxes)} U`"
         />
     </QCard>
@@ -111,12 +113,12 @@ onMounted(async () => (stateStore.rightDrawer = false));
     </VnTable>
 </template>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .order-volume-summary {
     .vn-label-value {
         display: flex;
         justify-content: flex-end;
-        gap: 2%;
+        gap: 0.5%;
 
         .label {
             color: var(--vn-label-color);

src/pages/Order/OrderList.vue

@@ -1,20 +1,22 @@
 <script setup>
-import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { computed, ref, onMounted } from 'vue';
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
-import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
+import { toDateTimeFormat } from 'src/filters/date';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useRoute } from 'vue-router';
+
+import axios from 'axios';
+import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
+import OrderSearchbar from './Card/OrderSearchbar.vue';
+import OrderFilter from './Card/OrderFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import OrderSearchbar from './Card/OrderSearchbar.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import OrderFilter from './Card/OrderFilter.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
-import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
-import { toDateTimeFormat } from 'src/filters/date';
-import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -171,9 +173,9 @@ const getDateColor = (date) => {
     today.setHours(0, 0, 0, 0);
     const timeTicket = new Date(date);
     timeTicket.setHours(0, 0, 0, 0);
-    const comparation = today - timeTicket;
+    const difference = today - timeTicket;
-    if (comparation == 0) return 'bg-warning';
+    if (difference == 0) return 'bg-warning';
-    if (comparation < 0) return 'bg-success';
+    if (difference < 0) return 'bg-success';
 };
 </script>
 <template>
@@ -201,8 +203,8 @@ const getDateColor = (date) => {
             },
         }"
         :user-params="{ showEmpty: false }"
-        :right-search="false"
         :columns="columns"
+        :right-search="false"
         redirect="order"
     >
         <template #column-clientFk="{ row }">

src/pages/Route/RouteList.vue

@@ -26,7 +26,7 @@ const routeFilter = {
 };
 const columns = computed(() => [
     {
-        align: 'left',
+        align: 'right',
         isId: true,
         name: 'id',
         label: 'Id',

src/pages/Shelving/Card/ShelvingSummary.vue

@@ -43,7 +43,7 @@ const filter = {
             data-key="ShelvingSummary"
         >
             <template #header="{ entity }">
-                <div>{{ entity.code }}</div>
+                <div>{{ entity.id }} - {{ entity.code }}</div>
             </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">

src/pages/Shelving/ShelvingList.vue

@@ -1,8 +1,6 @@
 <script setup>
 import VnPaginate from 'components/ui/VnPaginate.vue';
-import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
 import CardList from 'components/ui/CardList.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import { useRouter } from 'vue-router';
@@ -12,7 +10,6 @@ import ShelvingSearchbar from 'pages/Shelving/Card/ShelvingSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -20,8 +17,6 @@ const filter = {
     include: [{ relation: 'parking' }],
 };
 
-onMounted(() => (stateStore.rightDrawer = true));
-
 function navigate(id) {
     router.push({ path: `/shelving/${id}` });
 }

src/pages/Supplier/Card/SupplierAccounts.vue

@@ -14,10 +14,10 @@ import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 import { useQuasar } from 'quasar';
 
-const quasar = useQuasar();
-const { notify } = useNotify();
-const route = useRoute();
 const { t } = useI18n();
+const { notify } = useNotify();
+const quasar = useQuasar();
+const route = useRoute();
 
 const bankEntitiesRef = ref(null);
 const supplier = ref(null);

src/pages/Supplier/Card/SupplierBasicData.vue

@@ -6,9 +6,11 @@ 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';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
 const { t } = useI18n();
+const arrayData = useArrayData();
 const companySizes = [
     { id: 'small', name: t('globals.small'), size: '1-5' },
     { id: 'medium', name: t('globals.medium'), size: '6-50' },
@@ -22,6 +24,7 @@ const companySizes = [
         model="supplier"
         auto-load
         :clear-store-on-unmount="false"
+        @on-data-saved="arrayData.fetch({})"
     >
         <template #form="{ data, validate }">
             <VnRow>

src/pages/Supplier/Card/SupplierDescriptor.vue

@@ -9,7 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import { toDateString } from 'src/filters';
 import useCardDescription from 'src/composables/useCardDescription';
 import { getUrl } from 'src/composables/getUrl';
-import { useState } from 'src/composables/useState';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const $props = defineProps({
     id: {
@@ -26,7 +26,7 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 const url = ref();
-const state = useState();
+const arrayData = useArrayData();
 
 const filter = {
     fields: [
@@ -77,7 +77,7 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
 
-const supplier = computed(() => state.get('supplier'));
+const supplier = computed(() => arrayData.store.data);
 
 const getEntryQueryParams = (supplier) => {
     if (!supplier) return null;

src/pages/Supplier/Card/SupplierSummary.vue

@@ -39,9 +39,10 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
         :url="`Suppliers/${entityId}/getSummary`"
         @on-fetch="(data) => setData(data)"
         data-key="SupplierSummary"
+        module-name="Supplier"
     >
         <template #header>
-            <span>{{ supplier.name }} - {{ supplier.id }}</span>
+            <span>{{ supplier.id }} - {{ supplier.name }}</span>
         </template>
 
         <template #body>

src/pages/Supplier/SupplierList.vue

@@ -14,7 +14,10 @@ const columns = computed(() => [
         align: 'left',
         label: t('globals.id'),
         name: 'id',
-        isTitle: true,
+        isId: true,
+        chip: {
+            condition: () => true,
+        },
     },
     {
         align: 'left',
@@ -24,6 +27,7 @@ const columns = computed(() => [
         columnFilter: {
             name: 'search',
         },
+        isTitle: true,
     },
     {
         align: 'left',
@@ -32,6 +36,7 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -40,6 +45,7 @@ const columns = computed(() => [
         columnFilter: {
             name: 'search',
         },
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -119,7 +125,6 @@ const columns = computed(() => [
         :right-search="false"
         order="id ASC"
         :columns="columns"
-        auto-load
     />
 </template>