From f60670cb87958d2c9012ad156a8ae40e45eb526a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 8 Apr 2024 10:49:53 +0200
Subject: [PATCH 01/32] refs #7172 change vnselectfilter

---
 src/pages/Claim/Card/ClaimBasicData.vue | 36 ++++++++++++++++++-------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index c7c5ab8a2..aad003031 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -40,11 +40,7 @@ const workers = ref([]);
 const workersCopy = ref([]);
 const claimStates = ref([]);
 const claimStatesCopy = ref([]);
-
-function setWorkers(data) {
-    workers.value = data;
-    workersCopy.value = data;
-}
+const workersOptions = ref([]);
 
 function setClaimStates(data) {
     claimStates.value = data;
@@ -89,8 +85,9 @@ const statesFilter = {
     <FetchData
         url="Workers/activeWithInheritedRole"
         :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="setWorkers"
+        @on-fetch="(data) => (workersOptions = data)"
         auto-load
+        limit="30"
     />
     <FetchData url="ClaimStates" @on-fetch="setClaimStates" auto-load />
     <FormModel
@@ -118,7 +115,7 @@ const statesFilter = {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QSelect
+                    <!-- <QSelect
                         v-model="data.workerFk"
                         :options="workers"
                         option-value="id"
@@ -140,7 +137,28 @@ const statesFilter = {
                                 />
                             </QAvatar>
                         </template>
-                    </QSelect>
+                    </QSelect> -->
+                    <VnSelectFilter
+                        :label="t('claim.basicData.assignedTo')"
+                        v-model="data.workerFk"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        auto-load
+                        @filter="(value, update) => filter(value, update, workerFilter)"
+                        :rules="validate('claim.claimStateFk')"
+                    >
+                        <template #before>
+                            <QAvatar color="orange">
+                                <QImg
+                                    v-if="data.workerFk"
+                                    :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
+                                    spinner-color="white"
+                                />
+                            </QAvatar>
+                        </template>
+                    </VnSelectFilter>
                 </div>
                 <div class="col">
                     <QSelect

From 904f647a5b6dd7f2a533b3c5eb41f2aa9d50fbff Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 10 Apr 2024 14:16:20 +0200
Subject: [PATCH 02/32] refs #7172 fix vnSelectFilter

---
 src/pages/Claim/Card/ClaimBasicData.vue | 47 +------------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index aad003031..26175dab9 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -36,8 +36,6 @@ const claimFilter = {
     ],
 };
 
-const workers = ref([]);
-const workersCopy = ref([]);
 const claimStates = ref([]);
 const claimStatesCopy = ref([]);
 const workersOptions = ref([]);
@@ -47,25 +45,6 @@ function setClaimStates(data) {
     claimStatesCopy.value = data;
 }
 
-const workerFilter = {
-    options: workers,
-    filterFn: (options, value) => {
-        const search = value.toLowerCase();
-
-        if (value === '') return workersCopy.value;
-
-        return options.value.filter((row) => {
-            const id = row.id;
-            const name = row.name.toLowerCase();
-
-            const idMatches = id == search;
-            const nameMatches = name.indexOf(search) > -1;
-
-            return idMatches || nameMatches;
-        });
-    },
-};
-
 const statesFilter = {
     options: claimStates,
     filterFn: (options, value) => {
@@ -87,7 +66,6 @@ const statesFilter = {
         :filter="{ where: { role: 'salesPerson' } }"
         @on-fetch="(data) => (workersOptions = data)"
         auto-load
-        limit="30"
     />
     <FetchData url="ClaimStates" @on-fetch="setClaimStates" auto-load />
     <FormModel
@@ -115,29 +93,6 @@ const statesFilter = {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <!-- <QSelect
-                        v-model="data.workerFk"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        :label="t('claim.basicData.assignedTo')"
-                        map-options
-                        use-input
-                        @filter="(value, update) => filter(value, update, workerFilter)"
-                        :rules="validate('claim.claimStateFk')"
-                        :input-debounce="0"
-                    >
-                        <template #before>
-                            <QAvatar color="orange">
-                                <QImg
-                                    v-if="data.workerFk"
-                                    :src="`/api/Images/user/160x160/${data.workerFk}/download?access_token=${token}`"
-                                    spinner-color="white"
-                                />
-                            </QAvatar>
-                        </template>
-                    </QSelect> -->
                     <VnSelectFilter
                         :label="t('claim.basicData.assignedTo')"
                         v-model="data.workerFk"
@@ -146,7 +101,7 @@ const statesFilter = {
                         option-label="name"
                         emit-value
                         auto-load
-                        @filter="(value, update) => filter(value, update, workerFilter)"
+                        :virtual-scroll-slice-size="workersOptions.length"
                         :rules="validate('claim.claimStateFk')"
                     >
                         <template #before>

From fb26219354a5767fa11141c8fa5bda5fc42dded8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 19 Apr 2024 12:09:04 +0200
Subject: [PATCH 03/32] refs #7190 feat: useTokenConfig

---
 src/composables/useState.js       | 12 ++++++++++++
 src/composables/useTokenConfig.js | 26 ++++++++++++++++++++++++++
 src/i18n/locale/en.yml            |  1 +
 src/i18n/locale/es.yml            |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 src/composables/useTokenConfig.js

diff --git a/src/composables/useState.js b/src/composables/useState.js
index e0b742a73..e671d41bd 100644
--- a/src/composables/useState.js
+++ b/src/composables/useState.js
@@ -13,6 +13,7 @@ const user = ref({
 });
 
 const roles = ref([]);
+const tokenConfig = ref({});
 const drawer = ref(true);
 const headerMounted = ref(false);
 
@@ -52,6 +53,15 @@ export function useState() {
     function setRoles(data) {
         roles.value = data;
     }
+    function getTokenConfig() {
+        return computed(() => {
+            return tokenConfig.value;
+        });
+    }
+
+    function setTokenConfig(data) {
+        tokenConfig.value = data;
+    }
 
     function set(name, data) {
         state.value[name] = ref(data);
@@ -70,6 +80,8 @@ export function useState() {
         setUser,
         getRoles,
         setRoles,
+        getTokenConfig,
+        setTokenConfig,
         set,
         get,
         unset,
diff --git a/src/composables/useTokenConfig.js b/src/composables/useTokenConfig.js
new file mode 100644
index 000000000..3119a6aa6
--- /dev/null
+++ b/src/composables/useTokenConfig.js
@@ -0,0 +1,26 @@
+import axios from 'axios';
+import { useState } from './useState';
+import useNotify from './useNotify';
+
+export function useTokenConfig() {
+    const state = useState();
+    const { notify } = useNotify();
+
+    async function fetch() {
+        try {
+            const tokenConfig = await axios.get('AccessTokenConfigs/findOne', {
+                filter: { fields: ['renewInterval', 'renewPeriod'] },
+            });
+            if (!tokenConfig) return;
+            state.setTokenConfig(tokenConfig);
+            return tokenConfig;
+        } catch (error) {
+            notify('errors.tokenConfig', 'negative');
+            console.error('Error fetching token config:', error);
+        }
+    }
+
+    return {
+        fetch,
+    };
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index db34b393c..bcdc6dca1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -96,6 +96,7 @@ errors:
     statusBadGateway: It seems that the server has fall down
     statusGatewayTimeout: Could not contact the server
     userConfig: Error fetching user config
+    tokenConfig: Error fetching token config
     writeRequest: The requested operation could not be completed
 login:
     title: Login
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index cb5876dd3..73eb70e60 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -96,6 +96,7 @@ errors:
     statusBadGateway: Parece ser que el servidor ha caído
     statusGatewayTimeout: No se ha podido contactar con el servidor
     userConfig: Error al obtener configuración de usuario
+    tokenConfig: Error al obtener configuración de token
     writeRequest: No se pudo completar la operación solicitada
 login:
     title: Inicio de sesión

From aecea5f273110c90d820c728d402b9b911f71836 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 19 Apr 2024 12:26:43 +0200
Subject: [PATCH 04/32] refs #7190 feat: renewToken

---
 src/composables/useSession.js     | 48 ++++++++++++++++++++++++++++++-
 src/composables/useTokenConfig.js |  3 ++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 8583e10d4..b4c5e4abb 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -3,11 +3,13 @@ import { useRole } from './useRole';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
 import useNotify from './useNotify';
+import { useTokenConfig } from './useTokenConfig';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';
 
 export function useSession() {
     const { notify } = useNotify();
+    let isCheckingToken = false;
 
     function getToken() {
         const localToken = localStorage.getItem(TOKEN);
@@ -23,9 +25,12 @@ export function useSession() {
     }
 
     function setToken(data) {
-        const storage = data.keepLogin ? localStorage : sessionStorage;
+        let keepLogin = data.keepLogin ?? sessionStorage.getItem('keepLogin');
+        if (!keepLogin) keepLogin = false;
+        const storage = keepLogin ? localStorage : sessionStorage;
         storage.setItem(TOKEN, data.token);
         storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);
+        sessionStorage.setItem('keepLogin', keepLogin);
     }
     async function destroyToken(url, storage, key) {
         if (storage.getItem(key)) {
@@ -59,6 +64,8 @@ export function useSession() {
             lang: '',
             darkMode: null,
         });
+
+        stopRenewer();
     }
 
     async function login(token, tokenMultimedia, keepLogin) {
@@ -66,6 +73,9 @@ export function useSession() {
 
         await useRole().fetch();
         await useUserConfig().fetch();
+        await useTokenConfig().fetch();
+
+        await checkValidity();
     }
 
     function isLoggedIn() {
@@ -75,6 +85,42 @@ export function useSession() {
         return !!(localToken || sessionToken);
     }
 
+    function stopRenewer() {
+        clearInterval(this.intervalId);
+    }
+
+    async function renewToken() {
+        const _token = getToken();
+        const token = await axios.post('VnUsers/renewToken', {
+            headers: { Authorization: _token },
+        });
+        const _tokenMultimedia = getTokenMultimedia();
+        const tokenMultimedia = await axios.post('VnUsers/renewToken', {
+            headers: { Authorization: _tokenMultimedia },
+        });
+        setToken({ token, tokenMultimedia });
+    }
+
+    async function checkValidity() {
+        const { getTokenConfig } = useState();
+
+        const tokenConfig = getTokenConfig();
+        const created = +localStorage.getItem('created');
+        const ttl = localStorage.getItem('ttl');
+
+        if (isCheckingToken || !created) return;
+        isCheckingToken = true;
+
+        const renewPeriodInSeconds = Math.min(ttl, tokenConfig.value.renewPeriod) * 1000;
+        const maxDate = created + renewPeriodInSeconds;
+        const now = new Date();
+
+        if (now.getTime() <= maxDate) return (isCheckingToken = false);
+
+        await renewToken();
+        isCheckingToken = false;
+    }
+
     return {
         getToken,
         getTokenMultimedia,
diff --git a/src/composables/useTokenConfig.js b/src/composables/useTokenConfig.js
index 3119a6aa6..afe7a5272 100644
--- a/src/composables/useTokenConfig.js
+++ b/src/composables/useTokenConfig.js
@@ -8,6 +8,9 @@ export function useTokenConfig() {
 
     async function fetch() {
         try {
+            let tokenConfigState = state.getTokenConfig();
+            if (tokenConfigState) return tokenConfigState;
+
             const tokenConfig = await axios.get('AccessTokenConfigs/findOne', {
                 filter: { fields: ['renewInterval', 'renewPeriod'] },
             });

From 2b24e18f755c135ae7f94e284fcf58d0cdba1b98 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 22 Apr 2024 07:37:35 +0200
Subject: [PATCH 05/32] FEAT: SETiNTERVAL WITH RENEWpERIOD

---
 src/composables/useSession.js     | 68 +++++++++++++++++++++++--------
 src/composables/useTokenConfig.js | 12 +++---
 src/pages/Login/LoginMain.vue     |  8 +++-
 src/router/index.js               |  2 +
 4 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index b4c5e4abb..f308bf3e2 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -10,6 +10,7 @@ const TOKEN = 'token';
 export function useSession() {
     const { notify } = useNotify();
     let isCheckingToken = false;
+    let intervalId = null;
 
     function getToken() {
         const localToken = localStorage.getItem(TOKEN);
@@ -24,14 +25,25 @@ export function useSession() {
         return localTokenMultimedia || sessionTokenMultimedia || '';
     }
 
-    function setToken(data) {
-        let keepLogin = data.keepLogin ?? sessionStorage.getItem('keepLogin');
-        if (!keepLogin) keepLogin = false;
+    function setSession(data) {
+        let keepLogin = data.keepLogin;
         const storage = keepLogin ? localStorage : sessionStorage;
         storage.setItem(TOKEN, data.token);
         storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);
+        storage.setItem('created', data.created);
+        storage.setItem('ttl', data.ttl);
         sessionStorage.setItem('keepLogin', keepLogin);
     }
+
+    function keepLogin() {
+        return sessionStorage.getItem('keepLogin');
+    }
+
+    function setToken({ token, tokenMultimedia }) {
+        const storage = keepLogin() ? localStorage : sessionStorage;
+        storage.setItem(TOKEN, token);
+        storage.setItem(TOKEN_MULTIMEDIA, tokenMultimedia);
+    }
     async function destroyToken(url, storage, key) {
         if (storage.getItem(key)) {
             try {
@@ -50,11 +62,15 @@ export function useSession() {
             tokenMultimedia: 'Accounts/logout',
             token: 'VnUsers/logout',
         };
+        const storage = keepLogin() ? localStorage : sessionStorage;
+
         for (const [key, url] of Object.entries(tokens)) {
-            await destroyToken(url, localStorage, key);
-            await destroyToken(url, sessionStorage, key);
+            await destroyToken(url, storage, key);
         }
 
+        localStorage.clear();
+        sessionStorage.clear();
+
         const { setUser } = useState();
 
         setUser({
@@ -68,25 +84,33 @@ export function useSession() {
         stopRenewer();
     }
 
-    async function login(token, tokenMultimedia, keepLogin) {
-        setToken({ token, tokenMultimedia, keepLogin });
+    async function login(data) {
+        setSession(data);
 
         await useRole().fetch();
         await useUserConfig().fetch();
         await useTokenConfig().fetch();
-
-        await checkValidity();
+        startInterval();
     }
 
     function isLoggedIn() {
         const localToken = localStorage.getItem(TOKEN);
         const sessionToken = sessionStorage.getItem(TOKEN);
-
+        startInterval();
         return !!(localToken || sessionToken);
     }
 
+    function startInterval() {
+        stopRenewer();
+        const renewPeriod = +sessionStorage.getItem('renewPeriod');
+        if (!renewPeriod) return;
+        intervalId = setInterval(() => checkValidity(), renewPeriod * 1000);
+        // JUST FOR TEST
+        // checkValidity();
+    }
+
     function stopRenewer() {
-        clearInterval(this.intervalId);
+        clearInterval(intervalId);
     }
 
     async function renewToken() {
@@ -98,24 +122,32 @@ export function useSession() {
         const tokenMultimedia = await axios.post('VnUsers/renewToken', {
             headers: { Authorization: _tokenMultimedia },
         });
-        setToken({ token, tokenMultimedia });
+        setToken({ token: token.data.id, tokenMultimedia: tokenMultimedia.data.id });
     }
 
     async function checkValidity() {
         const { getTokenConfig } = useState();
 
-        const tokenConfig = getTokenConfig();
-        const created = +localStorage.getItem('created');
-        const ttl = localStorage.getItem('ttl');
+        const tokenConfig = getTokenConfig() ?? sessionStorage.getItem('tokenConfig');
+        const storage = keepLogin() ? localStorage : sessionStorage;
+
+        const created = +storage.getItem('created');
+        const ttl = +storage.getItem('ttl');
 
         if (isCheckingToken || !created) return;
         isCheckingToken = true;
 
         const renewPeriodInSeconds = Math.min(ttl, tokenConfig.value.renewPeriod) * 1000;
-        const maxDate = created + renewPeriodInSeconds;
-        const now = new Date();
 
-        if (now.getTime() <= maxDate) return (isCheckingToken = false);
+        const maxDate = created + renewPeriodInSeconds;
+        const now = new Date().getTime();
+
+        //COMMENT THIS IF JUST FOR TEST
+        if (isNaN(renewPeriodInSeconds) || now <= maxDate) {
+            console.error('Token not renewed');
+            return (isCheckingToken = false);
+        }
+        console.error('Token renewed');
 
         await renewToken();
         isCheckingToken = false;
diff --git a/src/composables/useTokenConfig.js b/src/composables/useTokenConfig.js
index afe7a5272..600122199 100644
--- a/src/composables/useTokenConfig.js
+++ b/src/composables/useTokenConfig.js
@@ -8,15 +8,13 @@ export function useTokenConfig() {
 
     async function fetch() {
         try {
-            let tokenConfigState = state.getTokenConfig();
-            if (tokenConfigState) return tokenConfigState;
-
-            const tokenConfig = await axios.get('AccessTokenConfigs/findOne', {
+            const { data } = await axios.get('AccessTokenConfigs/findOne', {
                 filter: { fields: ['renewInterval', 'renewPeriod'] },
             });
-            if (!tokenConfig) return;
-            state.setTokenConfig(tokenConfig);
-            return tokenConfig;
+            if (!data) return;
+            state.setTokenConfig(data);
+            sessionStorage.setItem('renewPeriod', data.renewPeriod);
+            return data;
         } catch (error) {
             notify('errors.tokenConfig', 'negative');
             console.error('Error fetching token config:', error);
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index fcde51edf..5a3490f50 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -38,7 +38,13 @@ async function onSubmit() {
 
         if (!multimediaToken) return;
 
-        await session.login(data.token, multimediaToken.id, keepLogin.value);
+        const login = {
+            ...data,
+            created: Date.now(),
+            tokenMultimedia: multimediaToken.id,
+            keepLogin: keepLogin.value,
+        };
+        await session.login(login);
 
         quasar.notify({
             message: t('login.loginSuccess'),
diff --git a/src/router/index.js b/src/router/index.js
index 3e442f0e6..7a0aedcae 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -12,6 +12,7 @@ import { useSession } from 'src/composables/useSession';
 import { useRole } from 'src/composables/useRole';
 import { useUserConfig } from 'src/composables/useUserConfig';
 import { toLowerCamel } from 'src/filters';
+import { useTokenConfig } from 'src/composables/useTokenConfig';
 
 const state = useState();
 const session = useSession();
@@ -55,6 +56,7 @@ export default route(function (/* { store, ssrContext } */) {
             if (stateRoles.length === 0) {
                 await useRole().fetch();
                 await useUserConfig().fetch();
+                await useTokenConfig().fetch();
             }
             const matches = to.matched;
             const hasRequiredRoles = matches.every((route) => {

From 78561c5f42e1660333c28a85618fbc199f2390b8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 22 Apr 2024 08:34:38 -0300
Subject: [PATCH 06/32] Item types

---
 src/i18n/locale/en.yml                        |  19 ++++
 src/i18n/locale/es.yml                        |  24 +++++
 src/pages/Item/ItemTypeCreate.vue             |  91 ++++++++++++++++
 src/pages/Item/ItemTypeList.vue               |  86 +++++++++++++++
 src/pages/ItemType/Card/ItemTypeBasicData.vue |  79 ++++++++++++++
 src/pages/ItemType/Card/ItemTypeCard.vue      |  26 +++++
 .../ItemType/Card/ItemTypeDescriptor.vue      |  82 ++++++++++++++
 src/pages/ItemType/Card/ItemTypeSummary.vue   | 102 ++++++++++++++++++
 src/router/modules/index.js                   |   2 +
 src/router/modules/item.js                    |  21 +++-
 src/router/modules/itemType.js                |  45 ++++++++
 src/router/routes.js                          |   2 +
 12 files changed, 577 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Item/ItemTypeCreate.vue
 create mode 100644 src/pages/Item/ItemTypeList.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeBasicData.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeCard.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeDescriptor.vue
 create mode 100644 src/pages/ItemType/Card/ItemTypeSummary.vue
 create mode 100644 src/router/modules/itemType.js

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3ac3d18a0..2962bbe44 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1119,6 +1119,8 @@ item:
         tags: Tags
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        itemTypeCreate: New item type
+        family: Item Type
     descriptor:
         item: Item
         buyer: Buyer
@@ -1153,6 +1155,23 @@ item:
         type: Type
         intrastat: Intrastat
         origin: Origin
+itemType:
+    pageTitles:
+        itemType: Item type
+        basicData: Basic data
+        summary: Summary
+    shared:
+        code: Code
+        name: Name
+        worker: Worker
+        category: Category
+        temperature: Temperature
+    summary:
+        id: id
+        life: Life
+        promo: Promo
+        itemPackingType: Item packing type
+        isUnconventionalSize: Is unconventional size
 components:
     topbar: {}
     userPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4ecbcdbc0..d52240bf4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1118,6 +1118,8 @@ item:
         tags: Etiquetas
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
+        itemTypeCreate: Nueva familia
+        family: Familia
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -1152,6 +1154,28 @@ item:
         type: Tipo
         intrastat: Intrastat
         origin: Origen
+itemType:
+    pageTitles:
+        itemType: Familia
+        basicData: Datos básicos
+        summary: Resumen
+    shared:
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        category: Reino
+        temperature: Temperatura
+    summary:
+        id: id
+        code: Código
+        name: Nombre
+        worker: Trabajador
+        category: Reino
+        temperature: Temperatura
+        life: Vida
+        promo: Promoción
+        itemPackingType: Tipo de embalaje
+        isUnconventionalSize: Es de tamaño no convencional
 components:
     topbar: {}
     userPanel:
diff --git a/src/pages/Item/ItemTypeCreate.vue b/src/pages/Item/ItemTypeCreate.vue
new file mode 100644
index 000000000..3540fc5af
--- /dev/null
+++ b/src/pages/Item/ItemTypeCreate.vue
@@ -0,0 +1,91 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+
+const newItemTypeForm = reactive({});
+
+const workersOptions = ref([]);
+const categoriesOptions = ref([]);
+const temperaturesOptions = ref([]);
+
+const redirectToItemTypeBasicData = (_, { id }) => {
+    router.push({ name: 'ItemTypeBasicData', params: { id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="Workers"
+        @on-fetch="(data) => (workersOptions = data)"
+        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
+        auto-load
+    />
+    <FetchData
+        url="ItemCategories"
+        @on-fetch="(data) => (categoriesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['id', 'name'] }"
+        auto-load
+    />
+    <FetchData
+        url="Temperatures"
+        @on-fetch="(data) => (temperaturesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['code', 'name'] }"
+        auto-load
+    />
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            url-create="ItemTypes"
+            model="itemTypeCreate"
+            :form-initial-data="newItemTypeForm"
+            observe-form-changes
+            @on-data-saved="redirectToItemTypeBasicData"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
+                    <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        v-model="data.workerFk"
+                        :label="t('itemType.shared.worker')"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="firstName"
+                        hide-selected
+                    />
+                    <VnSelectFilter
+                        v-model="data.categoryFk"
+                        :label="t('itemType.shared.category')"
+                        :options="categoriesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        v-model="data.temperatureFk"
+                        :label="t('itemType.shared.temperature')"
+                        :options="temperaturesOptions"
+                        option-value="code"
+                        option-label="name"
+                        hide-selected
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
new file mode 100644
index 000000000..b0b4de540
--- /dev/null
+++ b/src/pages/Item/ItemTypeList.vue
@@ -0,0 +1,86 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+
+const stateStore = useStateStore();
+const router = useRouter();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+
+const redirectToItemTypeSummary = (id) => {
+    router.push({ name: 'ItemTypeSummary', params: { id } });
+};
+
+const redirectToCreateView = () => {
+    router.push({ name: 'ItemTypeCreate' });
+};
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="ItemTypeList"
+                url="ItemTypes"
+                custom-route-redirect-name="ItemTypeSummary"
+                :label="t('Search item type')"
+                :info="t('Search itemType by id, name or code')"
+            />
+        </Teleport>
+    </template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="ItemTypeList"
+                url="ItemTypes"
+                :order="['name']"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.code"
+                        @click="redirectToItemTypeSummary(row.id)"
+                        :id="row.id"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('Name')" :value="row.name" />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, ItemTypeSummary)"
+                                color="primary"
+                                type="submit"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+    <QPageSticky :offset="[20, 20]">
+        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+        <QTooltip>
+            {{ t('New item type') }}
+        </QTooltip>
+    </QPageSticky>
+</template>
+
+<i18n>
+es:
+    New item type: Nueva familia
+    Name: Nombre
+    Search item type: Buscar familia
+    Search itemType by id, name or code: Buscar familia por id, nombre o código
+</i18n>
diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
new file mode 100644
index 000000000..ff2719896
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -0,0 +1,79 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const workersOptions = ref([]);
+const categoriesOptions = ref([]);
+const temperaturesOptions = ref([]);
+</script>
+<template>
+    <FetchData
+        url="Workers"
+        @on-fetch="(data) => (workersOptions = data)"
+        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
+        auto-load
+    />
+    <FetchData
+        url="ItemCategories"
+        @on-fetch="(data) => (categoriesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['id', 'name'] }"
+        auto-load
+    />
+    <FetchData
+        url="Temperatures"
+        @on-fetch="(data) => (temperaturesOptions = data)"
+        :filter="{ order: 'name ASC', fields: ['code', 'name'] }"
+        auto-load
+    />
+    <FormModel
+        :url="`ItemTypes/${route.params.id}`"
+        :url-update="`ItemTypes/${route.params.id}`"
+        model="itemTypeBasicData"
+        auto-load
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
+                <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelectFilter
+                    v-model="data.workerFk"
+                    :label="t('itemType.shared.worker')"
+                    :options="workersOptions"
+                    option-value="id"
+                    option-label="firstName"
+                    hide-selected
+                />
+                <VnSelectFilter
+                    v-model="data.categoryFk"
+                    :label="t('itemType.shared.category')"
+                    :options="categoriesOptions"
+                    option-value="id"
+                    option-label="name"
+                    hide-selected
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelectFilter
+                    v-model="data.temperatureFk"
+                    :label="t('itemType.shared.temperature')"
+                    :options="temperaturesOptions"
+                    option-value="code"
+                    option-label="name"
+                    hide-selected
+                />
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/ItemType/Card/ItemTypeCard.vue b/src/pages/ItemType/Card/ItemTypeCard.vue
new file mode 100644
index 000000000..bff91de06
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeCard.vue
@@ -0,0 +1,26 @@
+<script setup>
+import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <ItemTypeDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <div class="q-pa-md column items-center">
+                <RouterView></RouterView>
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
new file mode 100644
index 000000000..cb0cb333b
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
@@ -0,0 +1,82 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import useCardDescription from 'src/composables/useCardDescription';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const { t } = useI18n();
+
+const itemTypeFilter = {
+    include: [
+        { relation: 'worker' },
+        { relation: 'category' },
+        { relation: 'itemPackingType' },
+        { relation: 'temperature' },
+    ],
+};
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
+</script>
+
+<template>
+    <CardDescriptor
+        module="ItemType"
+        :url="`ItemTypes/${entityId}`"
+        :filter="itemTypeFilter"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        @on-fetch="setData"
+        data-key="entry"
+    >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                size="sm"
+                icon="vn:item"
+                color="white"
+                :to="{ name: 'ItemTypeList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('itemType.shared.code')" :value="entity.code" />
+            <VnLv :label="t('itemType.shared.name')" :value="entity.name" />
+            <VnLv
+                :label="t('itemType.shared.worker')"
+                :value="entity.worker?.firstName"
+            />
+            <VnLv :label="t('itemType.shared.category')" :value="entity.category?.name" />
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+es:
+    Go to module index: Ir al índice del módulo
+</i18n>
diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue
new file mode 100644
index 000000000..b71b2acf5
--- /dev/null
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@@ -0,0 +1,102 @@
+<script setup>
+import { ref, computed, onUpdated } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+onUpdated(() => summaryRef.value.fetch());
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const itemTypeFilter = {
+    include: [
+        { relation: 'worker' },
+        { relation: 'category' },
+        { relation: 'itemPackingType' },
+        { relation: 'temperature' },
+    ],
+};
+
+const entityId = computed(() => $props.id || route.params.id);
+const summaryRef = ref();
+const itemType = ref();
+
+async function setItemTypeData(data) {
+    if (data) itemType.value = data;
+}
+</script>
+
+<template>
+    <CardSummary
+        ref="summaryRef"
+        :url="`ItemTypes/${entityId}`"
+        data-key="ItemTypeSummary"
+        :filter="itemTypeFilter"
+        @on-fetch="(data) => setItemTypeData(data)"
+        class="full-width"
+    >
+        <template #header-left>
+            <router-link
+                v-if="route.name !== 'ItemTypeSummary'"
+                :to="{ name: 'ItemTypeSummary', params: { id: entityId } }"
+                class="header link"
+            >
+                <QIcon name="open_in_new" color="white" size="sm" />
+            </router-link>
+        </template>
+        <template #header>
+            <span>
+                {{ itemType.id }} - {{ itemType.name }} -
+                {{ itemType.worker?.firstName }}
+                {{ itemType.worker?.lastName }}
+            </span>
+        </template>
+        <template #body>
+            <QCard class="vn-one">
+                <router-link
+                    :to="{ name: 'ItemTypeBasicData', params: { id: entityId } }"
+                    class="header header-link"
+                >
+                    {{ t('globals.summary.basicData') }}
+                    <QIcon name="open_in_new" />
+                </router-link>
+                <VnLv :label="t('itemType.summary.id')" :value="itemType.id" />
+                <VnLv :label="t('itemType.shared.code')" :value="itemType.code" />
+                <VnLv :label="t('itemType.shared.name')" :value="itemType.name" />
+                <VnLv
+                    :label="t('itemType.shared.worker')"
+                    :value="itemType.worker?.firstName"
+                />
+                <VnLv
+                    :label="t('itemType.shared.category')"
+                    :value="itemType.category?.name"
+                />
+                <VnLv
+                    :label="t('itemType.shared.temperature')"
+                    :value="itemType.temperature?.name"
+                />
+                <VnLv :label="t('itemType.summary.life')" :value="itemType.life" />
+                <VnLv :label="t('itemType.summary.promo')" :value="itemType.promo" />
+                <VnLv
+                    :label="t('itemType.summary.itemPackingType')"
+                    :value="itemType.itemPackingType?.description"
+                />
+                <VnLv
+                    :label="t('itemType.summary.isUnconventionalSize')"
+                    :value="itemType.isUnconventionalSize"
+                />
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 302ba7fe0..0b9d10d98 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -15,6 +15,7 @@ import Department from './department';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
+import ItemType from './itemType';
 
 export default [
     Item,
@@ -34,4 +35,5 @@ export default [
     Entry,
     roadmap,
     Parking,
+    ItemType,
 ];
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 41f3ec92a..17e9b7673 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ItemMain' },
     menus: {
-        main: ['ItemList', 'WasteBreakdown'],
+        main: ['ItemList', 'WasteBreakdown', 'ItemTypeList'],
         card: ['ItemBasicData'],
     },
     children: [
@@ -33,7 +33,7 @@ export default {
                     path: 'create',
                     name: 'ItemCreate',
                     meta: {
-                        title: 'create',
+                        title: 'itemCreate',
                     },
                     component: () => import('src/pages/Item/ItemCreate.vue'),
                 },
@@ -50,6 +50,23 @@ export default {
                             'https://grafana.verdnatura.es/d/TTNXQAxVk';
                     },
                 },
+                {
+                    path: 'item-type-list',
+                    name: 'ItemTypeList',
+                    meta: {
+                        title: 'family',
+                        icon: 'contact_support',
+                    },
+                    component: () => import('src/pages/Item/ItemTypeList.vue'),
+                },
+                {
+                    path: 'item-type-list/create',
+                    name: 'ItemTypeCreate',
+                    meta: {
+                        title: 'itemTypeCreate',
+                    },
+                    component: () => import('src/pages/Item/ItemTypeCreate.vue'),
+                },
             ],
         },
         {
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
new file mode 100644
index 000000000..0d966c32c
--- /dev/null
+++ b/src/router/modules/itemType.js
@@ -0,0 +1,45 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/item-type',
+    name: 'ItemType',
+    meta: {
+        title: 'itemType',
+        icon: 'contact_support',
+    },
+    component: RouterView,
+    redirect: { name: 'ItemTypeCard' },
+    menus: {
+        main: [],
+        card: ['ItemTypeBasicData'],
+    },
+    children: [
+        {
+            name: 'ItemTypeCard',
+            path: ':id',
+            component: () => import('src/pages/ItemType/Card/ItemTypeCard.vue'),
+            redirect: { name: 'ItemTypeSummary' },
+            children: [
+                {
+                    name: 'ItemTypeSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                    },
+                    component: () =>
+                        import('src/pages/ItemType/Card/ItemTypeSummary.vue'),
+                },
+                {
+                    name: 'ItemTypeBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/ItemType/Card/ItemTypeBasicData.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/routes.js b/src/router/routes.js
index 51e726a62..198f1d8f2 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -10,6 +10,7 @@ import supplier from './modules/Supplier';
 import route from './modules/route';
 import travel from './modules/travel';
 import department from './modules/department';
+import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
@@ -71,6 +72,7 @@ const routes = [
             roadmap,
             entry,
             parking,
+            ItemType,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',

From 6018d51642165a13e97ab9bb480d8686bcb62872 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Apr 2024 07:56:07 +0200
Subject: [PATCH 07/32] perf: #7190 remove comments

---
 src/composables/useSession.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index f308bf3e2..bd3532816 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -90,6 +90,7 @@ export function useSession() {
         await useRole().fetch();
         await useUserConfig().fetch();
         await useTokenConfig().fetch();
+
         startInterval();
     }
 
@@ -105,8 +106,6 @@ export function useSession() {
         const renewPeriod = +sessionStorage.getItem('renewPeriod');
         if (!renewPeriod) return;
         intervalId = setInterval(() => checkValidity(), renewPeriod * 1000);
-        // JUST FOR TEST
-        // checkValidity();
     }
 
     function stopRenewer() {
@@ -144,10 +143,8 @@ export function useSession() {
 
         //COMMENT THIS IF JUST FOR TEST
         if (isNaN(renewPeriodInSeconds) || now <= maxDate) {
-            console.error('Token not renewed');
             return (isCheckingToken = false);
         }
-        console.error('Token renewed');
 
         await renewToken();
         isCheckingToken = false;

From 04fe9330d45e97a4ec470abaf088245657ee1840 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Apr 2024 08:03:09 +0200
Subject: [PATCH 08/32] fix: #7190 tests

---
 .../__tests__/composables/useSession.spec.js       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index f9f3dcb80..8feb5e571 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -96,7 +96,11 @@ describe('session', () => {
             const expectedTokenMultimedia = 'mySessionTokenMultimedia';
             const keepLogin = false;
 
-            await session.login(expectedToken,expectedTokenMultimedia, keepLogin);
+            await session.login({
+                token: expectedToken,
+                tokenMultimedia: expectedTokenMultimedia,
+                keepLogin,
+            });
 
             const roles = state.getRoles();
             const localToken = localStorage.getItem('token');
@@ -106,7 +110,7 @@ describe('session', () => {
             expect(localToken).toBeNull();
             expect(sessionToken).toEqual(expectedToken);
 
-           await session.destroy(); // this clears token and user for any other test
+            await session.destroy(); // this clears token and user for any other test
         });
 
         it('should fetch the user roles and then set token in the localStorage', async () => {
@@ -119,7 +123,11 @@ describe('session', () => {
             const expectedTokenMultimedia = 'myLocalTokenMultimedia';
             const keepLogin = true;
 
-            await session.login(expectedToken, expectedTokenMultimedia, keepLogin);
+            await session.login({
+                token: expectedToken,
+                tokenMultimedia: expectedTokenMultimedia,
+                keepLogin,
+            });
 
             const roles = state.getRoles();
             const localToken = localStorage.getItem('token');

From 42fe189e9f6b222cb6a1c81d916dfd82cbec5601 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 23 Apr 2024 16:45:28 -0300
Subject: [PATCH 09/32] Add module name in Item router file

---
 src/router/modules/item.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 17e9b7673..70d49c56c 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'items',
         icon: 'vn:item',
+        moduleName: 'Item',
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },

From a555d11663650f94f64a0619fbdb458f3a2b480e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Apr 2024 12:15:12 +0200
Subject: [PATCH 10/32] fix: #7190 test

---
 src/composables/useSession.js                 |   3 +
 src/composables/useTokenConfig.js             |   1 +
 .../__tests__/composables/useSession.spec.js  | 197 ++++++++++++------
 .../composables/useTokenConfig.spec.js        |  31 +++
 4 files changed, 167 insertions(+), 65 deletions(-)
 create mode 100644 test/vitest/__tests__/composables/useTokenConfig.spec.js

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index bd3532816..3b38cdad6 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -157,5 +157,8 @@ export function useSession() {
         destroy,
         login,
         isLoggedIn,
+        checkValidity,
+        setSession,
+        renewToken,
     };
 }
diff --git a/src/composables/useTokenConfig.js b/src/composables/useTokenConfig.js
index 600122199..5cf1b34ee 100644
--- a/src/composables/useTokenConfig.js
+++ b/src/composables/useTokenConfig.js
@@ -23,5 +23,6 @@ export function useTokenConfig() {
 
     return {
         fetch,
+        state,
     };
 }
diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 8feb5e571..2292859a9 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -1,5 +1,5 @@
-import { vi, describe, expect, it } from 'vitest';
-import { axios } from 'app/test/vitest/helper';
+import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
+import { axios, flushPromises } from 'app/test/vitest/helper';
 import { useSession } from 'composables/useSession';
 import { useState } from 'composables/useState';
 
@@ -63,81 +63,148 @@ describe('session', () => {
         });
     });
 
-    describe('login', () => {
-        const expectedUser = {
-            id: 999,
-            name: `T'Challa`,
-            nickname: 'Black Panther',
-            lang: 'en',
-            userConfig: {
-                darkMode: false,
-            },
-        };
-        const rolesData = [
-            {
-                role: {
-                    name: 'salesPerson',
+    describe(
+        'login',
+        () => {
+            const expectedUser = {
+                id: 999,
+                name: `T'Challa`,
+                nickname: 'Black Panther',
+                lang: 'en',
+                userConfig: {
+                    darkMode: false,
                 },
-            },
-            {
-                role: {
-                    name: 'admin',
+            };
+            const rolesData = [
+                {
+                    role: {
+                        name: 'salesPerson',
+                    },
                 },
-            },
-        ];
+                {
+                    role: {
+                        name: 'admin',
+                    },
+                },
+            ];
 
-        it('should fetch the user roles and then set token in the sessionStorage', async () => {
-            const expectedRoles = ['salesPerson', 'admin'];
-            vi.spyOn(axios, 'get').mockResolvedValue({
-                data: { roles: rolesData, user: expectedUser },
+            it('should fetch the user roles and then set token in the sessionStorage', async () => {
+                const expectedRoles = ['salesPerson', 'admin'];
+                vi.spyOn(axios, 'get').mockResolvedValue({
+                    data: { roles: rolesData, user: expectedUser },
+                });
+
+                const expectedToken = 'mySessionToken';
+                const expectedTokenMultimedia = 'mySessionTokenMultimedia';
+                const keepLogin = false;
+
+                await session.login({
+                    token: expectedToken,
+                    tokenMultimedia: expectedTokenMultimedia,
+                    keepLogin,
+                });
+
+                const roles = state.getRoles();
+                const localToken = localStorage.getItem('token');
+                const sessionToken = sessionStorage.getItem('token');
+
+                expect(roles.value).toEqual(expectedRoles);
+                expect(localToken).toBeNull();
+                expect(sessionToken).toEqual(expectedToken);
+
+                await session.destroy(); // this clears token and user for any other test
             });
 
-            const expectedToken = 'mySessionToken';
-            const expectedTokenMultimedia = 'mySessionTokenMultimedia';
-            const keepLogin = false;
+            it('should fetch the user roles and then set token in the localStorage', async () => {
+                const expectedRoles = ['salesPerson', 'admin'];
+                vi.spyOn(axios, 'get').mockResolvedValue({
+                    data: { roles: rolesData, user: expectedUser },
+                });
 
-            await session.login({
-                token: expectedToken,
-                tokenMultimedia: expectedTokenMultimedia,
-                keepLogin,
+                const expectedToken = 'myLocalToken';
+                const expectedTokenMultimedia = 'myLocalTokenMultimedia';
+                const keepLogin = true;
+
+                await session.login({
+                    token: expectedToken,
+                    tokenMultimedia: expectedTokenMultimedia,
+                    keepLogin,
+                });
+
+                const roles = state.getRoles();
+                const localToken = localStorage.getItem('token');
+                const sessionToken = sessionStorage.getItem('token');
+
+                expect(roles.value).toEqual(expectedRoles);
+                expect(localToken).toEqual(expectedToken);
+                expect(sessionToken).toBeNull();
+
+                await session.destroy(); // this clears token and user for any other test
             });
+        },
+        {}
+    );
 
-            const roles = state.getRoles();
-            const localToken = localStorage.getItem('token');
-            const sessionToken = sessionStorage.getItem('token');
-
-            expect(roles.value).toEqual(expectedRoles);
-            expect(localToken).toBeNull();
-            expect(sessionToken).toEqual(expectedToken);
-
-            await session.destroy(); // this clears token and user for any other test
+    describe('RenewToken', () => {
+        const expectedToken = 'myToken';
+        const expectedTokenMultimedia = 'myTokenMultimedia';
+        const currentDate = new Date();
+        beforeAll(() => {
+            const tokenConfig = {
+                id: 1,
+                renewPeriod: 21600,
+                courtesyTime: 60,
+                renewInterval: 300,
+            };
+            state.setTokenConfig(tokenConfig);
+            sessionStorage.setItem('renewPeriod', 1);
         });
-
-        it('should fetch the user roles and then set token in the localStorage', async () => {
-            const expectedRoles = ['salesPerson', 'admin'];
-            vi.spyOn(axios, 'get').mockResolvedValue({
-                data: { roles: rolesData, user: expectedUser },
-            });
-
-            const expectedToken = 'myLocalToken';
-            const expectedTokenMultimedia = 'myLocalTokenMultimedia';
-            const keepLogin = true;
-
-            await session.login({
+        it('NOT Should renewToken', async () => {
+            const data = {
                 token: expectedToken,
                 tokenMultimedia: expectedTokenMultimedia,
-                keepLogin,
-            });
+                keepLogin: false,
+                ttl: 1,
+                created: Date.now(),
+            };
+            session.setSession(data);
+            expect(sessionStorage.getItem('keepLogin')).toBeFalsy();
+            expect(sessionStorage.getItem('created')).toBeDefined();
+            expect(sessionStorage.getItem('ttl')).toEqual(1);
+            await session.checkValidity();
+            expect(sessionStorage.getItem('token')).toEqual(expectedToken);
+            expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
+                expectedTokenMultimedia
+            );
+        });
+        it('Should renewToken', async () => {
+            currentDate.setMinutes(currentDate.getMinutes() - 100);
+            const data = {
+                token: expectedToken,
+                tokenMultimedia: expectedTokenMultimedia,
+                keepLogin: false,
+                ttl: 1,
+                created: currentDate,
+            };
+            session.setSession(data);
 
-            const roles = state.getRoles();
-            const localToken = localStorage.getItem('token');
-            const sessionToken = sessionStorage.getItem('token');
-
-            expect(roles.value).toEqual(expectedRoles);
-            expect(localToken).toEqual(expectedToken);
-            expect(sessionToken).toBeNull();
-
-            await session.destroy(); // this clears token and user for any other test
+            vi.spyOn(axios, 'post')
+                .mockResolvedValueOnce({
+                    data: { id: '' },
+                })
+                .mockResolvedValueOnce({
+                    data: {
+                        id: '',
+                    },
+                });
+            expect(sessionStorage.getItem('keepLogin')).toBeFalsy();
+            expect(sessionStorage.getItem('created')).toBeDefined();
+            expect(sessionStorage.getItem('ttl')).toEqual(1);
+            await session.checkValidity();
+            expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
+            expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
+                expectedTokenMultimedia
+            );
         });
     });
 });
diff --git a/test/vitest/__tests__/composables/useTokenConfig.spec.js b/test/vitest/__tests__/composables/useTokenConfig.spec.js
new file mode 100644
index 000000000..a25a4abb1
--- /dev/null
+++ b/test/vitest/__tests__/composables/useTokenConfig.spec.js
@@ -0,0 +1,31 @@
+import { vi, describe, expect, it } from 'vitest';
+import { axios, flushPromises } from 'app/test/vitest/helper';
+import { useTokenConfig } from 'composables/useTokenConfig';
+const tokenConfig = useTokenConfig();
+
+describe('useTokenConfig', () => {
+    describe('fetch', () => {
+        it('should call setTokenConfig of the state with the expected data', async () => {
+            const data = {
+                id: 1,
+                renewPeriod: 21600,
+                courtesyTime: 60,
+                renewInterval: 300,
+            };
+            vi.spyOn(axios, 'get').mockResolvedValueOnce({
+                data,
+            });
+
+            vi.spyOn(tokenConfig.state, 'setTokenConfig');
+
+            tokenConfig.fetch();
+
+            await flushPromises();
+
+            expect(tokenConfig.state.setTokenConfig).toHaveBeenCalledWith(data);
+
+            const renewPeriod = sessionStorage.getItem('renewPeriod');
+            expect(renewPeriod).toEqual(data.renewPeriod);
+        });
+    });
+});

From e6c9a692f54b610016d32b68db20e1c42185bf6c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Apr 2024 14:33:10 +0200
Subject: [PATCH 11/32] feat moduleName

---
 src/router/modules/department.js | 1 +
 src/router/modules/itemType.js   | 1 +
 src/router/modules/roadmap.js    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/router/modules/department.js b/src/router/modules/department.js
index aaffc3460..dfd5e64ba 100644
--- a/src/router/modules/department.js
+++ b/src/router/modules/department.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'department',
         icon: 'vn:greuge',
+        moduleName: 'Department',
     },
     component: RouterView,
     redirect: { name: 'DepartmentCard' },
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 0d966c32c..32bd63690 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'itemType',
         icon: 'contact_support',
+        moduleName: 'ItemType',
     },
     component: RouterView,
     redirect: { name: 'ItemTypeCard' },
diff --git a/src/router/modules/roadmap.js b/src/router/modules/roadmap.js
index 02edf94be..6b2aa6a13 100644
--- a/src/router/modules/roadmap.js
+++ b/src/router/modules/roadmap.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'roadmap',
         icon: 'vn:troncales',
+        moduleName: 'Roadmap',
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },

From e1f50f5daf3d017c6b8a04470822f061368b1340 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Apr 2024 15:05:10 +0200
Subject: [PATCH 12/32] fix: minorchanges

---
 src/i18n/locale/es.yml                      | 2 +-
 src/pages/ItemType/Card/ItemTypeSummary.vue | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6d2e5c8c2..6634b6f07 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1234,7 +1234,7 @@ itemType:
         life: Vida
         promo: Promoción
         itemPackingType: Tipo de embalaje
-        isUnconventionalSize: Es de tamaño no convencional
+        isUnconventionalSize: Es de tamaño poco convencional
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue
index b71b2acf5..393675a30 100644
--- a/src/pages/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@@ -93,6 +93,7 @@ async function setItemTypeData(data) {
                     :value="itemType.itemPackingType?.description"
                 />
                 <VnLv
+                    class="large-label"
                     :label="t('itemType.summary.isUnconventionalSize')"
                     :value="itemType.isUnconventionalSize"
                 />
@@ -100,3 +101,9 @@ async function setItemTypeData(data) {
         </template>
     </CardSummary>
 </template>
+
+<style lang="scss">
+.large-label > div.label {
+    width: 15em !important;
+}
+</style>

From 127567898da40f416db6d3fcc3da7231dba59a3d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 13:27:58 +0200
Subject: [PATCH 13/32] fix: add filter panel

---
 src/pages/Item/ItemTypeList.vue       | 22 +++++++++++-
 src/pages/ItemType/ItemTypeFilter.vue | 49 +++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/ItemType/ItemTypeFilter.vue

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index b0b4de540..5b106916d 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -6,6 +6,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
+import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
@@ -31,12 +32,31 @@ const redirectToCreateView = () => {
             <VnSearchbar
                 data-key="ItemTypeList"
                 url="ItemTypes"
-                custom-route-redirect-name="ItemTypeSummary"
                 :label="t('Search item type')"
                 :info="t('Search itemType by id, name or code')"
             />
         </Teleport>
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
     </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ItemTypeFilter data-key="ItemTypes" />
+        </QScrollArea>
+    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
new file mode 100644
index 000000000..33238545f
--- /dev/null
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -0,0 +1,49 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+const { t } = useI18n();
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        name: Name
+        code: Code
+es:
+    params:
+        name: Nombre
+        code: Código
+    Name: Nombre
+    Code: Código
+</i18n>

From 76cd79173cabe0996c03a982b8773c5bd8df107e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Apr 2024 13:50:11 +0200
Subject: [PATCH 14/32] refs #7172 fix select

---
 src/pages/Claim/Card/ClaimBasicData.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index f6feae4ba..adb9b4c08 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -108,7 +108,7 @@ const statesFilter = {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('claim.basicData.assignedTo')"
                         v-model="data.workerFk"
                         :options="workersOptions"
@@ -128,7 +128,7 @@ const statesFilter = {
                                 />
                             </QAvatar>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
                     <QSelect

From c1ed4ab03280b8125c92e8587e9a8bd4ca626abd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 14:49:54 +0200
Subject: [PATCH 15/32] fix: add exprBuilder

---
 src/components/ui/VnFilterPanel.vue   |  3 ++-
 src/components/ui/VnSearchbar.vue     |  2 ++
 src/pages/Item/ItemTypeList.vue       | 17 +++++++++++++++--
 src/pages/ItemType/ItemTypeFilter.vue |  8 +++++++-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 96d097191..cde48e9b3 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -145,7 +145,8 @@ const customTags = computed(() =>
 );
 
 async function remove(key) {
-    userParams.value[key] = null;
+    // userParams.value[key] = null;
+    if (userParams.value[key]) delete userParams.value[key];
     await search();
     emit('remove', key);
 }
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index fc8475ace..da8d43c95 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -81,8 +81,10 @@ async function search() {
     const staticParams = Object.entries(store.userParams).filter(
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
+    // const filter =props?.where? { where: JSON.parse(props.where) }: {}
     await arrayData.applyFilter({
         params: {
+            // filter ,
             ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 5b106916d..1e21c1719 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -24,6 +24,17 @@ const redirectToItemTypeSummary = (id) => {
 const redirectToCreateView = () => {
     router.push({ name: 'ItemTypeCreate' });
 };
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+        case 'code':
+        case 'search':
+            return {
+                name: { like: `%${value}%` },
+                code: { like: `%${value}%` },
+            };
+    }
+};
 </script>
 
 <template>
@@ -32,8 +43,10 @@ const redirectToCreateView = () => {
             <VnSearchbar
                 data-key="ItemTypeList"
                 url="ItemTypes"
-                :label="t('Search item type')"
+                :label="t('Search item  type')"
+                :redirect="false"
                 :info="t('Search itemType by id, name or code')"
+                :expr-builder="exprBuilder"
             />
         </Teleport>
         <Teleport to="#actions-append">
@@ -54,7 +67,7 @@ const redirectToCreateView = () => {
     </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <ItemTypeFilter data-key="ItemTypes" />
+            <ItemTypeFilter data-key="ItemTypeList" :expr-builder="exprBuilder" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
index 33238545f..2a86795c2 100644
--- a/src/pages/ItemType/ItemTypeFilter.vue
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -10,10 +10,16 @@ const props = defineProps({
         required: true,
     },
 });
+
+const emit = defineEmits(['search']);
 </script>
 
 <template>
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        @search="emit('search')"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>

From 0d50944c2d9b79da840deac5621e70dc1b64d29a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 15:24:44 +0200
Subject: [PATCH 16/32] fix: add exprBuilder

---
 src/components/ui/VnFilterPanel.vue   | 20 +++++++++++++++++++-
 src/pages/ItemType/ItemTypeFilter.vue | 14 ++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cde48e9b3..cd5a3caf1 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -81,6 +81,8 @@ const isLoading = ref(false);
 async function search() {
     isLoading.value = true;
     const params = { ...userParams.value };
+    if (Object.entries(params).length > 0) store.exprBuilder = props.exprBuilder;
+
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
@@ -144,9 +146,25 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
+watch(tags, (now, before) => {
+    if (now.length < before.length) {
+        const beforeMap = before.map(({ label }) => label);
+        const nowMap = now.map(({ label }) => label);
+        const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
+        remove(key ?? beforeMap[0]);
+    }
+    console.error('');
+});
+
 async function remove(key) {
     // userParams.value[key] = null;
-    if (userParams.value[key]) delete userParams.value[key];
+    delete userParams.value[key];
+    if (Object.entries(userParams.value).length === 0) {
+        store.exprBuilder = null;
+        delete store.filter.where;
+    } else {
+        store.exprBuilder = props.exprBuilder;
+    }
     await search();
     emit('remove', key);
 }
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
index 2a86795c2..176fca22a 100644
--- a/src/pages/ItemType/ItemTypeFilter.vue
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -29,12 +29,22 @@ const emit = defineEmits(['search']);
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                    <VnInput
+                        @update:model-value="emit('search')"
+                        :label="t('Name')"
+                        v-model="params.name"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
+                    <VnInput
+                        @update:model-value="emit('search')"
+                        v-model="params.code"
+                        :label="t('Code')"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
         </template>

From a03049a721a580afd127be354b47e6aa3addb25f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 17:26:18 +0200
Subject: [PATCH 17/32] fix: poc

---
 src/components/ui/VnFilterPanel.vue   | 47 +++++++++++++++++----------
 src/pages/Item/ItemTypeList.vue       | 15 +++------
 src/pages/ItemType/ItemTypeFilter.vue | 14 ++------
 3 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cd5a3caf1..94b64c0db 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -78,11 +78,23 @@ watch(
 );
 
 const isLoading = ref(false);
+function eliminarPropiedadesNull(objeto) {
+    for (let clave in objeto) {
+        if (objeto[clave] === null) {
+            delete objeto[clave];
+        }
+    }
+    return objeto;
+}
+
 async function search() {
     isLoading.value = true;
+    const objetoSinNull = eliminarPropiedadesNull(userParams.value);
+    userParams.value = objetoSinNull;
     const params = { ...userParams.value };
     if (Object.entries(params).length > 0) store.exprBuilder = props.exprBuilder;
-
+    else delete store.filter.where;
+    store.userParams = userParams.value;
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
@@ -146,25 +158,26 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
-watch(tags, (now, before) => {
-    if (now.length < before.length) {
-        const beforeMap = before.map(({ label }) => label);
-        const nowMap = now.map(({ label }) => label);
-        const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
-        remove(key ?? beforeMap[0]);
-    }
-    console.error('');
-});
+// watch(tags, (now, before) => {
+//     if (now.length < before.length) {
+//         const beforeMap = before.map(({ label }) => label);
+//         const nowMap = now.map(({ label }) => label);
+//         const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
+//         remove(key ?? beforeMap[0]);
+//     }
+//     console.error('');
+// });
 
 async function remove(key) {
     // userParams.value[key] = null;
-    delete userParams.value[key];
-    if (Object.entries(userParams.value).length === 0) {
-        store.exprBuilder = null;
-        delete store.filter.where;
-    } else {
-        store.exprBuilder = props.exprBuilder;
-    }
+    if (userParams.value[key]) delete userParams.value[key];
+    // if (Object.entries(userParams.value).length === 0) {
+    //     store.exprBuilder = null;
+    //     delete store.filter.where;
+    // }
+    // else {
+    //     store.exprBuilder = props.exprBuilder;
+    // }
     await search();
     emit('remove', key);
 }
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 1e21c1719..6e31cdd25 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -24,17 +24,10 @@ const redirectToItemTypeSummary = (id) => {
 const redirectToCreateView = () => {
     router.push({ name: 'ItemTypeCreate' });
 };
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-        case 'code':
-        case 'search':
-            return {
-                name: { like: `%${value}%` },
-                code: { like: `%${value}%` },
-            };
-    }
-};
+const exprBuilder = (param, value) => ({
+    name: { like: `%${value}%` },
+    code: { like: `%${value}%` },
+});
 </script>
 
 <template>
diff --git a/src/pages/ItemType/ItemTypeFilter.vue b/src/pages/ItemType/ItemTypeFilter.vue
index 176fca22a..2a86795c2 100644
--- a/src/pages/ItemType/ItemTypeFilter.vue
+++ b/src/pages/ItemType/ItemTypeFilter.vue
@@ -29,22 +29,12 @@ const emit = defineEmits(['search']);
         <template #body="{ params }">
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        @update:model-value="emit('search')"
-                        :label="t('Name')"
-                        v-model="params.name"
-                        is-outlined
-                    />
+                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        @update:model-value="emit('search')"
-                        v-model="params.code"
-                        :label="t('Code')"
-                        is-outlined
-                    />
+                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
                 </QItemSection>
             </QItem>
         </template>

From 955e196882d536d1a245a46716b6e11571d2a67e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 17:43:57 +0200
Subject: [PATCH 18/32] fix: filterPanelbug

---
 src/components/ui/VnFilterPanel.vue | 35 ++---------------------------
 src/pages/Item/ItemTypeList.vue     |  3 ++-
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 94b64c0db..eb0bbbe66 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -78,23 +78,10 @@ watch(
 );
 
 const isLoading = ref(false);
-function eliminarPropiedadesNull(objeto) {
-    for (let clave in objeto) {
-        if (objeto[clave] === null) {
-            delete objeto[clave];
-        }
-    }
-    return objeto;
-}
-
 async function search() {
+    store.filter.where = {};
     isLoading.value = true;
-    const objetoSinNull = eliminarPropiedadesNull(userParams.value);
-    userParams.value = objetoSinNull;
     const params = { ...userParams.value };
-    if (Object.entries(params).length > 0) store.exprBuilder = props.exprBuilder;
-    else delete store.filter.where;
-    store.userParams = userParams.value;
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
@@ -158,26 +145,8 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
-// watch(tags, (now, before) => {
-//     if (now.length < before.length) {
-//         const beforeMap = before.map(({ label }) => label);
-//         const nowMap = now.map(({ label }) => label);
-//         const key = beforeMap.filter((elemento) => !nowMap.includes(elemento))[0];
-//         remove(key ?? beforeMap[0]);
-//     }
-//     console.error('');
-// });
-
 async function remove(key) {
-    // userParams.value[key] = null;
-    if (userParams.value[key]) delete userParams.value[key];
-    // if (Object.entries(userParams.value).length === 0) {
-    //     store.exprBuilder = null;
-    //     delete store.filter.where;
-    // }
-    // else {
-    //     store.exprBuilder = props.exprBuilder;
-    // }
+    userParams.value[key] = null;
     await search();
     emit('remove', key);
 }
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 6e31cdd25..17d1c0044 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -60,7 +60,7 @@ const exprBuilder = (param, value) => ({
     </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <ItemTypeFilter data-key="ItemTypeList" :expr-builder="exprBuilder" />
+            <ItemTypeFilter data-key="ItemTypeList" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
@@ -70,6 +70,7 @@ const exprBuilder = (param, value) => ({
                 url="ItemTypes"
                 :order="['name']"
                 auto-load
+                :expr-builder="exprBuilder"
             >
                 <template #body="{ rows }">
                     <CardList

From 322ad816b9b5387c3a11c86ea55dbbe1dcbb2269 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 28 Apr 2024 19:37:44 -0300
Subject: [PATCH 19/32] item diary

---
 src/pages/Item/Card/ItemDiary.vue | 291 +++++++++++++++++++++++++++++-
 src/router/modules/item.js        |   6 +-
 2 files changed, 293 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 21249349f..ef4c7b993 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -1 +1,290 @@
-<template>Item diary (CREAR CUANDO SE DESARROLLE EL MODULO DE ITEMS)</template>
+<script setup>
+import { onMounted, computed, onUnmounted, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import FetchData from 'components/FetchData.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { toDateFormat } from 'src/filters/date.js';
+import { dashIfEmpty } from 'src/filters';
+import { date } from 'quasar';
+import { useState } from 'src/composables/useState';
+
+const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
+const state = useState();
+
+const user = state.getUser();
+const today = ref(Date.vnNew());
+const warehousesOptions = ref([]);
+const itemBalancesRef = ref(null);
+const itemsBalanceFilter = reactive({
+    where: { itemFk: route.params.id, warehouseFk: null, date: null },
+});
+const itemBalances = ref([]);
+const warehouseFk = ref(null);
+const _showWhatsBeforeInventory = ref(false);
+
+const columns = computed(() => [
+    {
+        name: 'claim',
+        align: 'left',
+        field: 'itemFk',
+    },
+    {
+        label: t('Date'),
+        name: 'date',
+        field: 'shipped',
+        align: 'left',
+    },
+    {
+        label: t('Id'),
+        name: 'id',
+        align: 'left',
+    },
+    {
+        label: t('State'),
+        field: 'stateName',
+        name: 'state',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('Reference'),
+        field: 'reference',
+        name: 'reference',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+
+    {
+        label: t('Client'),
+        name: 'client',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('In'),
+        field: 'invalue',
+        name: 'in',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('Out'),
+        field: 'out',
+        name: 'out',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('Balance'),
+        name: 'balance',
+        align: 'left',
+    },
+]);
+
+const showWhatsBeforeInventory = computed({
+    get: () => _showWhatsBeforeInventory.value,
+    set: (val) => {
+        _showWhatsBeforeInventory.value = val;
+        if (!val) itemsBalanceFilter.where.date = null;
+        else itemsBalanceFilter.where.date = new Date();
+    },
+});
+
+const fetchItemBalances = async () => await itemBalancesRef.value.fetch();
+
+const getBadgeAttrs = (_date) => {
+    const isSameDate = date.isSameDate(today.value, _date);
+    const attrs = {
+        'text-color': isSameDate ? 'black' : 'white',
+        color: isSameDate ? 'warning' : 'transparent',
+    };
+    return attrs;
+};
+
+const getIdDescriptor = (row) => {
+    let descriptor = EntryDescriptorProxy;
+    if (row.isTicket) descriptor = TicketDescriptorProxy;
+    return descriptor;
+};
+
+onMounted(async () => {
+    today.value.setHours(0, 0, 0, 0);
+    if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
+    else if (user.value) warehouseFk.value = user.value.warehouseFk;
+    itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
+    await fetchItemBalances();
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        ref="itemBalancesRef"
+        url="Items/getBalance"
+        :filter="itemsBalanceFilter"
+        @on-fetch="(data) => (itemBalances = data)"
+    />
+    <FetchData
+        url="Warehouses"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        auto-load
+        @on-fetch="(data) => (warehousesOptions = data)"
+    />
+    <QToolbar class="justify-end">
+        <div id="st-data" class="row">
+            <VnSelect
+                :label="t('Warehouse')"
+                :options="warehousesOptions"
+                hide-selected
+                option-label="name"
+                option-value="id"
+                dense
+                v-model="itemsBalanceFilter.where.warehouseFk"
+                @update:model-value="fetchItemBalances"
+                class="q-mr-lg"
+            />
+            <QCheckbox
+                :label="t(`Show what's before the inventory`)"
+                v-model="showWhatsBeforeInventory"
+                @update:model-value="fetchItemBalances"
+                class="q-mr-lg"
+            />
+            <VnInputDate
+                v-if="showWhatsBeforeInventory"
+                :label="t('Since')"
+                dense
+                v-model="itemsBalanceFilter.where.date"
+                @update:model-value="fetchItemBalances"
+            />
+        </div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :rows="itemBalances"
+            :columns="columns"
+            class="full-width q-mt-md"
+            :no-data-label="t('globals.noResults')"
+        >
+            <template #body-cell-claim="{ row }">
+                <QTd @click.stop>
+                    <QBtn
+                        v-show="row.claimFk"
+                        flat
+                        color="primary"
+                        :to="{ name: 'ClaimSummary', params: { id: row.claimFk } }"
+                        icon="vn:claims"
+                        dense
+                    >
+                        <QTooltip> {{ t('Claim') }}: {{ row.claimFk }} </QTooltip>
+                    </QBtn>
+                </QTd>
+            </template>
+            <template #body-cell-date="{ row }">
+                <QTd @click.stop>
+                    <QBadge
+                        v-bind="getBadgeAttrs(row.shipped)"
+                        class="q-ma-none"
+                        dense
+                        style="font-size: 14px"
+                    >
+                        {{ toDateFormat(row.shipped) }}
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-id="{ row }">
+                <QTd @click.stop>
+                    <component
+                        :is="getIdDescriptor(row)"
+                        :id="row.origin"
+                        class="q-ma-none"
+                        dense
+                        style="font-size: 14px"
+                    >
+                        {{ row.origin }}
+                    </component>
+                    <span class="link">{{ row.origin }}</span>
+                </QTd>
+            </template>
+            <template #body-cell-client="{ row }">
+                <QTd @click.stop>
+                    <QBadge
+                        :color="row.highlighted ? 'warning' : 'transparent'"
+                        :text-color="row.highlighted ? 'black' : 'white'"
+                        dense
+                        style="font-size: 14px"
+                    >
+                        <span v-if="row.isTicket" class="link">
+                            {{ dashIfEmpty(row.name) }}
+                            <CustomerDescriptorProxy :id="row.clientFk" />
+                        </span>
+                        <span v-else>{{ dashIfEmpty(row.name) }}</span>
+                    </QBadge>
+                </QTd>
+            </template>
+            <template #body-cell-in="{ row }">
+                <QTd @click.stop>
+                    <span :class="{ 'is-in': row.invalue }">
+                        {{ dashIfEmpty(row.invalue) }}
+                    </span>
+                </QTd>
+            </template>
+            <template #body-cell-balance="{ row }">
+                <QTd @click.stop>
+                    <QBadge
+                        class="balance-negative"
+                        :color="
+                            row.lineFk == row.lastPreparedLineFk
+                                ? 'grey-13'
+                                : 'transparent'
+                        "
+                        :text-color="
+                            row.lineFk == row.lastPreparedLineFk
+                                ? 'black'
+                                : row.balance < 0
+                                ? 'negative'
+                                : ''
+                        "
+                        dense
+                        style="font-size: 14px"
+                    >
+                        <span>{{ dashIfEmpty(row.balance) }}</span>
+                    </QBadge>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.is-in {
+    color: $positive;
+}
+</style>
+
+<i18n>
+es:
+    Date: Fecha
+    Id: Id
+    State: Estado
+    Reference: Referencia
+    Client: Cliente
+    In: Entrada
+    Out: Salida
+    Balance: Balance
+    Claim: Reclamación
+    Show what's before the inventory: Mostrar lo anterior al inventario
+    Since: Desde
+</i18n>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index bc1e72a94..729cfd30c 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -134,8 +134,8 @@ export default {
                     path: 'diary',
                     name: 'ItemDiary',
                     meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
+                        title: 'diary',
+                        icon: 'vn:transaction',
                     },
                     component: () => import('src/pages/Item/Card/ItemDiary.vue'),
                 },
@@ -144,7 +144,7 @@ export default {
                     name: 'ItemLog',
                     meta: {
                         title: 'log',
-                        icon: 'history',
+                        icon: 'vn:History',
                     },
                     component: () => import('src/pages/Item/Card/ItemLog.vue'),
                 },

From e3237ee4f1f3747cf4288e045bbc8d73526099be Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 29 Apr 2024 09:35:57 +0200
Subject: [PATCH 20/32] refs #7172 refact VnSelect

---
 src/components/common/VnSelect.vue      | 1 +
 src/pages/Claim/Card/ClaimBasicData.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 480d36e4f..76e7cd81f 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -169,6 +169,7 @@ watch(modelValue, (newValue) => {
         ref="vnSelectRef"
         :class="{ required: $attrs.required }"
         :rules="$attrs.required ? [requiredFieldRule] : null"
+        virtual-scroll-slice-size
     >
         <template v-if="isClearable" #append>
             <QIcon
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index adb9b4c08..2cd8aa260 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -116,7 +116,7 @@ const statesFilter = {
                         option-label="name"
                         emit-value
                         auto-load
-                        :virtual-scroll-slice-size="workersOptions.length"
+                        virtual-scroll-slice-size="workersOptions.length"
                         :rules="validate('claim.claimStateFk')"
                     >
                         <template #before>

From a78c920ec8a6aa5765fb38080e20a4b055a81610 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 29 Apr 2024 09:49:29 +0200
Subject: [PATCH 21/32] refs #7172 fix VnSelect

---
 src/components/common/VnSelect.vue      | 2 +-
 src/pages/Claim/Card/ClaimBasicData.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 76e7cd81f..05c74f00a 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -169,7 +169,7 @@ watch(modelValue, (newValue) => {
         ref="vnSelectRef"
         :class="{ required: $attrs.required }"
         :rules="$attrs.required ? [requiredFieldRule] : null"
-        virtual-scroll-slice-size
+        virtual-scroll-slice-size="options.length"
     >
         <template v-if="isClearable" #append>
             <QIcon
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 2cd8aa260..99ea30fda 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -116,7 +116,6 @@ const statesFilter = {
                         option-label="name"
                         emit-value
                         auto-load
-                        virtual-scroll-slice-size="workersOptions.length"
                         :rules="validate('claim.claimStateFk')"
                     >
                         <template #before>

From 19fcacebc9969bdec3107bffcd2cc78a0bdad4bc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:12:19 +0200
Subject: [PATCH 22/32] perf: VnSearchbar

---
 src/components/ui/VnSearchbar.vue | 1 +
 src/router/modules/itemType.js    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index da8d43c95..344267ef7 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -108,6 +108,7 @@ async function search() {
     let targetUrl;
 
     if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
+    if (path.endsWith('-list')) targetUrl = path.replace('-list', `/${targetId}/summary`);
     else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
 
     await router.push({ path: targetUrl });
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 32bd63690..3609b6688 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -1,7 +1,7 @@
 import { RouterView } from 'vue-router';
 
 export default {
-    path: '/item-type',
+    path: '/item/item-type',
     name: 'ItemType',
     meta: {
         title: 'itemType',

From bdc5d7210f460909c6d3162732e49fe7ec6e28c8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:12:37 +0200
Subject: [PATCH 23/32] fix: remove redirect

---
 src/pages/Item/ItemTypeList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 17d1c0044..e362c6726 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -37,7 +37,6 @@ const exprBuilder = (param, value) => ({
                 data-key="ItemTypeList"
                 url="ItemTypes"
                 :label="t('Search item  type')"
-                :redirect="false"
                 :info="t('Search itemType by id, name or code')"
                 :expr-builder="exprBuilder"
             />

From 8c3d32ec8621a939f70cff216bfac81650cbfcd5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:12:50 +0200
Subject: [PATCH 24/32] fix: remove VnFilterPanel inside Summary

---
 src/pages/Shelving/Card/ShelvingSummary.vue | 47 ++++-----------------
 1 file changed, 8 insertions(+), 39 deletions(-)

diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 49470719e..649799b00 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -20,14 +20,14 @@ const router = useRouter();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
-const isDialog = Boolean($props.id);
-const hideRightDrawer = () => {
-    if (!isDialog) {
-        stateStore.rightDrawer = false;
-    }
-};
-onMounted(hideRightDrawer);
-onUnmounted(hideRightDrawer);
+const isDialog = false;
+// const hideRightDrawer = () => {
+//     if (!isDialog) {
+//         stateStore.rightDrawer = false;
+//     }
+// };
+// onMounted(hideRightDrawer);
+// onUnmounted(hideRightDrawer);
 const filter = {
     include: [
         {
@@ -46,23 +46,6 @@ const filter = {
 </script>
 
 <template>
-    <template v-if="!isDialog && stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <div class="q-pa-md">
         <CardSummary ref="summary" :url="`Shelvings/${entityId}`" :filter="filter">
             <template #header="{ entity }">
@@ -102,18 +85,4 @@ const filter = {
             </template>
         </CardSummary>
     </div>
-    <QDrawer
-        v-if="!isDialog"
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        show-if-above
-    >
-        <QScrollArea class="fit text-grey-8">
-            <ShelvingFilter
-                data-key="ShelvingList"
-                @search="router.push({ name: 'ShelvingList' })"
-            />
-        </QScrollArea>
-    </QDrawer>
 </template>

From 34c8874468fbb062117c5ee2ce1c7eaf0628cb3a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 10:17:18 +0200
Subject: [PATCH 25/32] fix: i18n

---
 src/i18n/locale/es.yml          | 2 +-
 src/pages/Item/ItemTypeList.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 9bafd7067..fc96adbf8 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1220,7 +1220,7 @@ item:
         achieved: 'Conseguido'
         concept: 'Concepto'
         state: 'Estado'
-itemType:
+item/itemType:
     pageTitles:
         itemType: Familia
         basicData: Datos básicos
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index e362c6726..c92385295 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -36,7 +36,7 @@ const exprBuilder = (param, value) => ({
             <VnSearchbar
                 data-key="ItemTypeList"
                 url="ItemTypes"
-                :label="t('Search item  type')"
+                :label="t('Search item type')"
                 :info="t('Search itemType by id, name or code')"
                 :expr-builder="exprBuilder"
             />

From 6c69c44dfdbf93c4b1527599136f9e5a2a4ebf25 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 08:33:38 +0000
Subject: [PATCH 26/32] remove comment

---
 src/composables/useSession.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 3b38cdad6..56bce0279 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -141,7 +141,6 @@ export function useSession() {
         const maxDate = created + renewPeriodInSeconds;
         const now = new Date().getTime();
 
-        //COMMENT THIS IF JUST FOR TEST
         if (isNaN(renewPeriodInSeconds) || now <= maxDate) {
             return (isCheckingToken = false);
         }

From 2f55272df77a8a0fe949d2f8588eb635b36f469c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:23:50 +0200
Subject: [PATCH 27/32] fix: WorkerDescriptor

---
 src/i18n/locale/en.yml                        | 14 +-------
 src/i18n/locale/es.yml                        | 17 ----------
 src/pages/Item/ItemTypeCreate.vue             |  8 ++---
 src/pages/ItemType/Card/ItemTypeBasicData.vue | 18 +++++------
 .../ItemType/Card/ItemTypeDescriptor.vue      | 17 ++++++----
 src/pages/ItemType/Card/ItemTypeSummary.vue   | 32 +++++++++----------
 src/pages/ItemType/locale/en.yml              | 12 +++++++
 src/pages/ItemType/locale/es.yml              | 17 ++++++++++
 8 files changed, 69 insertions(+), 66 deletions(-)
 create mode 100644 src/pages/ItemType/locale/en.yml
 create mode 100644 src/pages/ItemType/locale/es.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 482c0dc7d..2b71195d1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1221,23 +1221,11 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
-itemType:
+item/itemType:
     pageTitles:
         itemType: Item type
         basicData: Basic data
         summary: Summary
-    shared:
-        code: Code
-        name: Name
-        worker: Worker
-        category: Category
-        temperature: Temperature
-    summary:
-        id: id
-        life: Life
-        promo: Promo
-        itemPackingType: Item packing type
-        isUnconventionalSize: Is unconventional size
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fc96adbf8..d1823b387 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1225,23 +1225,6 @@ item/itemType:
         itemType: Familia
         basicData: Datos básicos
         summary: Resumen
-    shared:
-        code: Código
-        name: Nombre
-        worker: Trabajador
-        category: Reino
-        temperature: Temperatura
-    summary:
-        id: id
-        code: Código
-        name: Nombre
-        worker: Trabajador
-        category: Reino
-        temperature: Temperatura
-        life: Vida
-        promo: Promoción
-        itemPackingType: Tipo de embalaje
-        isUnconventionalSize: Es de tamaño poco convencional
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/Item/ItemTypeCreate.vue b/src/pages/Item/ItemTypeCreate.vue
index 3540fc5af..af3dc34ea 100644
--- a/src/pages/Item/ItemTypeCreate.vue
+++ b/src/pages/Item/ItemTypeCreate.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -58,7 +58,7 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                     <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="data.workerFk"
                         :label="t('itemType.shared.worker')"
                         :options="workersOptions"
@@ -66,7 +66,7 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                         option-label="firstName"
                         hide-selected
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="data.categoryFk"
                         :label="t('itemType.shared.category')"
                         :options="categoriesOptions"
@@ -76,7 +76,7 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                     />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="data.temperatureFk"
                         :label="t('itemType.shared.temperature')"
                         :options="temperaturesOptions"
diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
index ff2719896..0bdfab951 100644
--- a/src/pages/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -43,21 +43,21 @@ const temperaturesOptions = ref([]);
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.code" :label="t('itemType.shared.code')" />
-                <VnInput v-model="data.name" :label="t('itemType.shared.name')" />
+                <VnInput v-model="data.code" :label="t('shared.code')" />
+                <VnInput v-model="data.name" :label="t('shared.name')" />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.workerFk"
-                    :label="t('itemType.shared.worker')"
+                    :label="t('shared.worker')"
                     :options="workersOptions"
                     option-value="id"
                     option-label="firstName"
                     hide-selected
                 />
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.categoryFk"
-                    :label="t('itemType.shared.category')"
+                    :label="t('shared.category')"
                     :options="categoriesOptions"
                     option-value="id"
                     option-label="name"
@@ -65,9 +65,9 @@ const temperaturesOptions = ref([]);
                 />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.temperatureFk"
-                    :label="t('itemType.shared.temperature')"
+                    :label="t('shared.temperature')"
                     :options="temperaturesOptions"
                     option-value="code"
                     option-label="name"
diff --git a/src/pages/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
index cb0cb333b..e565a791b 100644
--- a/src/pages/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
@@ -5,6 +5,7 @@ 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';
 
@@ -65,13 +66,15 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
             </QBtn>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('itemType.shared.code')" :value="entity.code" />
-            <VnLv :label="t('itemType.shared.name')" :value="entity.name" />
-            <VnLv
-                :label="t('itemType.shared.worker')"
-                :value="entity.worker?.firstName"
-            />
-            <VnLv :label="t('itemType.shared.category')" :value="entity.category?.name" />
+            <VnLv :label="t('shared.code')" :value="entity.code" />
+            <VnLv :label="t('shared.name')" :value="entity.name" />
+            <VnLv :label="t('shared.worker')">
+                <template #value>
+                    <span class="link">{{ entity.worker?.firstName }}</span>
+                    <WorkerDescriptorProxy :id="entity.worker?.id" />
+                </template>
+            </VnLv>
+            <VnLv :label="t('shared.category')" :value="entity.category?.name" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/ItemType/Card/ItemTypeSummary.vue b/src/pages/ItemType/Card/ItemTypeSummary.vue
index 393675a30..62d1c74ab 100644
--- a/src/pages/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/ItemType/Card/ItemTypeSummary.vue
@@ -2,6 +2,7 @@
 import { ref, computed, onUpdated } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
@@ -71,30 +72,29 @@ async function setItemTypeData(data) {
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" />
                 </router-link>
-                <VnLv :label="t('itemType.summary.id')" :value="itemType.id" />
-                <VnLv :label="t('itemType.shared.code')" :value="itemType.code" />
-                <VnLv :label="t('itemType.shared.name')" :value="itemType.name" />
+                <VnLv :label="t('summary.id')" :value="itemType.id" />
+                <VnLv :label="t('shared.code')" :value="itemType.code" />
+                <VnLv :label="t('shared.name')" :value="itemType.name" />
+                <VnLv :label="t('shared.worker')">
+                    <template #value>
+                        <span class="link">{{ itemType.worker?.firstName }}</span>
+                        <WorkerDescriptorProxy :id="itemType.worker?.id" />
+                    </template>
+                </VnLv>
+                <VnLv :label="t('shared.category')" :value="itemType.category?.name" />
                 <VnLv
-                    :label="t('itemType.shared.worker')"
-                    :value="itemType.worker?.firstName"
-                />
-                <VnLv
-                    :label="t('itemType.shared.category')"
-                    :value="itemType.category?.name"
-                />
-                <VnLv
-                    :label="t('itemType.shared.temperature')"
+                    :label="t('shared.temperature')"
                     :value="itemType.temperature?.name"
                 />
-                <VnLv :label="t('itemType.summary.life')" :value="itemType.life" />
-                <VnLv :label="t('itemType.summary.promo')" :value="itemType.promo" />
+                <VnLv :label="t('summary.life')" :value="itemType.life" />
+                <VnLv :label="t('summary.promo')" :value="itemType.promo" />
                 <VnLv
-                    :label="t('itemType.summary.itemPackingType')"
+                    :label="t('summary.itemPackingType')"
                     :value="itemType.itemPackingType?.description"
                 />
                 <VnLv
                     class="large-label"
-                    :label="t('itemType.summary.isUnconventionalSize')"
+                    :label="t('summary.isUnconventionalSize')"
                     :value="itemType.isUnconventionalSize"
                 />
             </QCard>
diff --git a/src/pages/ItemType/locale/en.yml b/src/pages/ItemType/locale/en.yml
new file mode 100644
index 000000000..7889418ea
--- /dev/null
+++ b/src/pages/ItemType/locale/en.yml
@@ -0,0 +1,12 @@
+shared:
+    code: Code
+    name: Name
+    worker: Worker
+    category: Category
+    temperature: Temperature
+summary:
+    id: id
+    life: Life
+    promo: Promo
+    itemPackingType: Item packing type
+    isUnconventionalSize: Is unconventional size
diff --git a/src/pages/ItemType/locale/es.yml b/src/pages/ItemType/locale/es.yml
new file mode 100644
index 000000000..9a94dceb6
--- /dev/null
+++ b/src/pages/ItemType/locale/es.yml
@@ -0,0 +1,17 @@
+shared:
+    code: Código
+    name: Nombre
+    worker: Trabajador
+    category: Reino
+    temperature: Temperatura
+summary:
+    id: id
+    code: Código
+    name: Nombre
+    worker: Trabajador
+    category: Reino
+    temperature: Temperatura
+    life: Vida
+    promo: Promoción
+    itemPackingType: Tipo de embalaje
+    isUnconventionalSize: Es de tamaño poco convencional

From 7e2ec588c5e0eef9f435fb5f43e8db1cdedc89f9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:24:20 +0200
Subject: [PATCH 28/32] fix: remove Warning

---
 src/components/ui/VnUserLink.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index 47287c12b..33836550a 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -1,6 +1,5 @@
 <script setup>
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import { useI18n } from 'vue-i18n';
 
 const $props = defineProps({

From 0fff6cd446f22d4410b830d21c8f13399f71822a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:46:33 +0200
Subject: [PATCH 29/32] perf: VnCard

---
 src/pages/ItemType/Card/ItemTypeCard.vue | 28 ++++++------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/pages/ItemType/Card/ItemTypeCard.vue b/src/pages/ItemType/Card/ItemTypeCard.vue
index bff91de06..cb8adf7f6 100644
--- a/src/pages/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/ItemType/Card/ItemTypeCard.vue
@@ -1,26 +1,12 @@
 <script setup>
+import VnCard from 'components/common/VnCard.vue';
+
 import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-
-const stateStore = useStateStore();
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <ItemTypeDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div class="q-pa-md column items-center">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="ItemTypeSummary"
+        base-url="ItemTypes"
+        :descriptor="ItemTypeDescriptor"
+    />
 </template>

From 761bc7724f3eba14137f3e51fc979f5eea8eeb20 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 29 Apr 2024 11:46:40 +0200
Subject: [PATCH 30/32] fix: redirect

---
 src/router/modules/itemType.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 3609b6688..8064c41ff 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -9,7 +9,7 @@ export default {
         moduleName: 'ItemType',
     },
     component: RouterView,
-    redirect: { name: 'ItemTypeCard' },
+    redirect: { name: 'ItemTypeList' },
     menus: {
         main: [],
         card: ['ItemTypeBasicData'],

From 6276c433d13b9afea9e3e2726bd0dda469bdc14e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 29 Apr 2024 08:23:29 -0300
Subject: [PATCH 31/32] Fix exprBuilder

---
 src/pages/Item/ItemTypeList.vue | 38 +++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 17d1c0044..c6557dc79 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -24,10 +24,40 @@ const redirectToItemTypeSummary = (id) => {
 const redirectToCreateView = () => {
     router.push({ name: 'ItemTypeCreate' });
 };
-const exprBuilder = (param, value) => ({
-    name: { like: `%${value}%` },
-    code: { like: `%${value}%` },
-});
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        or: [
+                            {
+                                name: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                            {
+                                code: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                        ],
+                    };
+                }
+            }
+    }
+};
 </script>
 
 <template>

From ccac3a54f96fff7f88f13ece50774bd1428d6f98 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 29 Apr 2024 17:39:37 -0300
Subject: [PATCH 32/32] move translations

---
 src/pages/Item/Card/ItemDiary.vue | 41 +++++++++++--------------------
 src/pages/Item/locale/en.yml      | 13 ++++++++++
 src/pages/Item/locale/es.yml      | 13 ++++++++++
 3 files changed, 40 insertions(+), 27 deletions(-)
 create mode 100644 src/pages/Item/locale/en.yml
 create mode 100644 src/pages/Item/locale/es.yml

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index ef4c7b993..c2687e0fd 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -39,25 +39,25 @@ const columns = computed(() => [
         field: 'itemFk',
     },
     {
-        label: t('Date'),
+        label: t('itemDiary.date'),
         name: 'date',
         field: 'shipped',
         align: 'left',
     },
     {
-        label: t('Id'),
+        label: t('itemDiary.id'),
         name: 'id',
         align: 'left',
     },
     {
-        label: t('State'),
+        label: t('itemDiary.state'),
         field: 'stateName',
         name: 'state',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('Reference'),
+        label: t('itemDiary.reference'),
         field: 'reference',
         name: 'reference',
         align: 'left',
@@ -65,27 +65,27 @@ const columns = computed(() => [
     },
 
     {
-        label: t('Client'),
+        label: t('itemDiary.client'),
         name: 'client',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('In'),
+        label: t('itemDiary.in'),
         field: 'invalue',
         name: 'in',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('Out'),
+        label: t('itemDiary.out'),
         field: 'out',
         name: 'out',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('Balance'),
+        label: t('itemDiary.balance'),
         name: 'balance',
         align: 'left',
     },
@@ -144,7 +144,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     <QToolbar class="justify-end">
         <div id="st-data" class="row">
             <VnSelect
-                :label="t('Warehouse')"
+                :label="t('itemDiary.warehouse')"
                 :options="warehousesOptions"
                 hide-selected
                 option-label="name"
@@ -155,14 +155,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 class="q-mr-lg"
             />
             <QCheckbox
-                :label="t(`Show what's before the inventory`)"
+                :label="t('itemDiary.showBefore')"
                 v-model="showWhatsBeforeInventory"
                 @update:model-value="fetchItemBalances"
                 class="q-mr-lg"
             />
             <VnInputDate
                 v-if="showWhatsBeforeInventory"
-                :label="t('Since')"
+                :label="t('itemDiary.since')"
                 dense
                 v-model="itemsBalanceFilter.where.date"
                 @update:model-value="fetchItemBalances"
@@ -188,7 +188,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         icon="vn:claims"
                         dense
                     >
-                        <QTooltip> {{ t('Claim') }}: {{ row.claimFk }} </QTooltip>
+                        <QTooltip>
+                            {{ t('itemDiary.claim') }}: {{ row.claimFk }}
+                        </QTooltip>
                     </QBtn>
                 </QTd>
             </template>
@@ -273,18 +275,3 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     color: $positive;
 }
 </style>
-
-<i18n>
-es:
-    Date: Fecha
-    Id: Id
-    State: Estado
-    Reference: Referencia
-    Client: Cliente
-    In: Entrada
-    Out: Salida
-    Balance: Balance
-    Claim: Reclamación
-    Show what's before the inventory: Mostrar lo anterior al inventario
-    Since: Desde
-</i18n>
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
new file mode 100644
index 000000000..ec3b134e8
--- /dev/null
+++ b/src/pages/Item/locale/en.yml
@@ -0,0 +1,13 @@
+itemDiary:
+    date: Date
+    id: Id
+    state: State
+    reference: Reference
+    client: Client
+    in: In
+    out: Out
+    balance: Balance
+    claim: Claim
+    showBefore: Show what's before the inventory
+    since: Since
+    warehouse: Warehouse
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
new file mode 100644
index 000000000..4f76313fa
--- /dev/null
+++ b/src/pages/Item/locale/es.yml
@@ -0,0 +1,13 @@
+itemDiary:
+    date: Fecha
+    id: Id
+    state: Estado
+    reference: Referencia
+    client: Cliente
+    in: Entrada
+    out: Salida
+    balance: Balance
+    claim: Reclamación
+    showBefore: Mostrar lo anterior al inventario
+    since: Desde
+    warehouse: Almacén