From 565ec15589dbd2235b1be953d468609c9ed0eeac Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 14 Nov 2024 17:30:54 +0100
Subject: [PATCH 01/68] feat: refs #6919 improve vn-card logic

---
 src/components/common/VnCard.vue              | 18 ++++++------------
 src/pages/Account/Alias/Card/AliasCard.vue    |  2 +-
 src/pages/Claim/Card/ClaimCard.vue            |  2 +-
 src/pages/Customer/Card/CustomerCard.vue      |  2 +-
 src/pages/Department/Card/DepartmentCard.vue  |  2 +-
 src/pages/Entry/Card/EntryCard.vue            |  2 +-
 src/pages/InvoiceIn/Card/InvoiceInCard.vue    |  2 +-
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue  |  2 +-
 src/pages/Item/Card/ItemCard.vue              |  2 +-
 src/pages/Item/ItemType/Card/ItemTypeCard.vue |  2 +-
 src/pages/Order/Card/OrderCard.vue            |  2 +-
 src/pages/Parking/Card/ParkingCard.vue        |  2 +-
 src/pages/Route/Agency/Card/AgencyCard.vue    |  2 +-
 src/pages/Route/Card/RouteCard.vue            |  2 +-
 src/pages/Route/Roadmap/RoadmapCard.vue       |  2 +-
 src/pages/Shelving/Card/ShelvingCard.vue      |  2 +-
 src/pages/Supplier/Card/SupplierCard.vue      |  2 +-
 src/pages/Ticket/Card/TicketCard.vue          |  2 +-
 src/pages/Travel/Card/TravelCard.vue          |  2 +-
 src/pages/Wagon/Card/WagonCard.vue            |  2 +-
 src/pages/Worker/Card/WorkerCard.vue          |  3 ++-
 src/pages/Zone/Card/ZoneCard.vue              |  2 +-
 22 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 0d80f43ce..c030cbe32 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -10,11 +10,11 @@ import LeftMenu from 'components/LeftMenu.vue';
 import RightMenu from 'components/common/RightMenu.vue';
 const props = defineProps({
     dataKey: { type: String, required: true },
-    baseUrl: { type: String, default: undefined },
-    customUrl: { type: String, default: undefined },
+    url: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
+    idInWhere: { type: Boolean, default: false },
     searchDataKey: { type: String, default: undefined },
     searchbarProps: { type: Object, default: undefined },
     redirectOnError: { type: Boolean, default: false },
@@ -23,24 +23,18 @@ const props = defineProps({
 const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
-const url = computed(() => {
-    if (props.baseUrl) {
-        return `${props.baseUrl}/${route.params.id}`;
-    }
-    return props.customUrl;
-});
 const searchRightDataKey = computed(() => {
     if (!props.searchDataKey) return route.name;
     return props.searchDataKey;
 });
 const arrayData = useArrayData(props.dataKey, {
-    url: url.value,
+    url: props.url,
     filter: props.filter,
 });
 
 onBeforeMount(async () => {
     try {
-        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+        if (props.idInWhere) arrayData.store.filter.where = { id: route.params.id };
         await arrayData.fetch({ append: false, updateRouter: false });
     } catch {
         const { matched: matches } = router.currentRoute.value;
@@ -49,10 +43,10 @@ onBeforeMount(async () => {
     }
 });
 
-if (props.baseUrl) {
+if (!props.idInWhere) {
     onBeforeRouteUpdate(async (to, from) => {
         if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
+            arrayData.store.url = `${props.url}/${to.params.id}`;
             await arrayData.fetch({ append: false, updateRouter: false });
         }
     });
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
index 65951b3bf..b9676df49 100644
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@@ -8,7 +8,7 @@ const { t } = useI18n();
 <template>
     <VnCard
         data-key="Alias"
-        base-url="MailAliases"
+        url="MailAliases"
         :descriptor="AliasDescriptor"
         search-data-key="AccountAliasList"
         :searchbar-props="{
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 3642dc0d0..0a3b1cccc 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -7,7 +7,7 @@ import filter from './ClaimFilter.js';
 <template>
     <VnCard
         data-key="Claim"
-        base-url="Claims"
+        url="Claims"
         :descriptor="ClaimDescriptor"
         :filter-panel="ClaimFilter"
         search-data-key="ClaimList"
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 139917d05..28da34dda 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -12,7 +12,7 @@ const routeName = computed(() => route.name);
 <template>
     <VnCard
         data-key="Client"
-        base-url="Clients"
+        url="Clients"
         :descriptor="CustomerDescriptor"
         :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Department/Card/DepartmentCard.vue
index 21247ca5a..21e016473 100644
--- a/src/pages/Department/Card/DepartmentCard.vue
+++ b/src/pages/Department/Card/DepartmentCard.vue
@@ -7,7 +7,7 @@ import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue
         class="q-pa-md column items-center"
         v-bind="{ ...$attrs }"
         data-key="Department"
-        base-url="Departments"
+        url="Departments"
         :descriptor="DepartmentDescriptor"
     />
 </template>
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 3f2596338..07aa4fc39 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -7,7 +7,7 @@ import filter from './EntryFilter.js';
 <template>
     <VnCard
         data-key="Entry"
-        base-url="Entries"
+        url="Entries"
         :filter="filter"
         :descriptor="EntryDescriptor"
         :filter-panel="EntryFilter"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index b16183e52..af6843016 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -45,7 +45,7 @@ onBeforeRouteUpdate(async (to) => await setRectificative(to));
 <template>
     <VnCard
         data-key="InvoiceIn"
-        base-url="InvoiceIns"
+        url="InvoiceIns"
         :filter="filter"
         :descriptor="InvoiceInDescriptor"
         :filter-panel="InvoiceInFilter"
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index 17b4216da..0c3cca093 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -6,7 +6,7 @@ import InvoiceOutFilter from '../InvoiceOutFilter.vue';
 <template>
     <VnCard
         data-key="InvoiceOut"
-        base-url="InvoiceOuts"
+        url="InvoiceOuts"
         :descriptor="InvoiceOutDescriptor"
         :filter-panel="InvoiceOutFilter"
         search-data-key="InvoiceOutList"
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 2412f2bf9..7a8a5e518 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -6,7 +6,7 @@ import ItemListFilter from '../ItemListFilter.vue';
 <template>
     <VnCard
         data-key="Item"
-        base-url="Items"
+        url="Items"
         :descriptor="ItemDescriptor"
         :filter-panel="ItemListFilter"
         search-data-key="ItemList"
diff --git a/src/pages/Item/ItemType/Card/ItemTypeCard.vue b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
index 0a2706a07..c3df40807 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
@@ -7,7 +7,7 @@ import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 <template>
     <VnCard
         data-key="ItemTypeSummary"
-        base-url="ItemTypes"
+        url="ItemTypes"
         :descriptor="ItemTypeDescriptor"
         :filter-panel="ItemTypeFilter"
         search-data-key="ItemTypeList"
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 67c0f1de5..c0a2de80a 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -26,7 +26,7 @@ const customFilterPanel = computed(() => {
 <template>
     <VnCard
         data-key="Order"
-        base-url="Orders"
+        url="Orders"
         :descriptor="OrderDescriptor"
         :filter-panel="customFilterPanel"
         :search-data-key="customRouteRedirectName"
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 337106986..5debd28b5 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -6,7 +6,7 @@ import ParkingFilter from 'pages/Parking/ParkingFilter.vue';
 <template>
     <VnCard
         data-key="Parking"
-        base-url="Parkings"
+        url="Parkings"
         :descriptor="ParkingDescriptor"
         :filter-panel="ParkingFilter"
         search-data-key="ParkingList"
diff --git a/src/pages/Route/Agency/Card/AgencyCard.vue b/src/pages/Route/Agency/Card/AgencyCard.vue
index 9935fc6eb..435c89fec 100644
--- a/src/pages/Route/Agency/Card/AgencyCard.vue
+++ b/src/pages/Route/Agency/Card/AgencyCard.vue
@@ -5,7 +5,7 @@ import VnCard from 'components/common/VnCard.vue';
 <template>
     <VnCard
         data-key="Agency"
-        base-url="Agencies"
+        url="Agencies"
         :descriptor="AgencyDescriptor"
         search-data-key="AgencyList"
         :searchbar-props="{
diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index 461f2d95e..d8f42185c 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -7,7 +7,7 @@ import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 <template>
     <VnCard
         data-key="Route"
-        base-url="Routes"
+        url="Routes"
         :descriptor="RouteDescriptor"
         :filter-panel="RouteFilter"
         search-data-key="RouteList"
diff --git a/src/pages/Route/Roadmap/RoadmapCard.vue b/src/pages/Route/Roadmap/RoadmapCard.vue
index 148d16ac9..e744114a5 100644
--- a/src/pages/Route/Roadmap/RoadmapCard.vue
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@@ -6,7 +6,7 @@ import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
 <template>
     <VnCard
         data-key="Roadmap"
-        base-url="Roadmaps"
+        url="Roadmaps"
         :descriptor="RoadmapDescriptor"
         :filter-panel="RoadmapFilter"
         search-data-key="RoadmapList"
diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index a501a7a99..e67866a39 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -7,7 +7,7 @@ import ShelvingSearchbar from './ShelvingSearchbar.vue';
 <template>
     <VnCard
         data-key="Shelving"
-        base-url="Shelvings"
+        url="Shelvings"
         :descriptor="ShelvingDescriptor"
         :filter-panel="ShelvingFilter"
         search-data-key="ShelvingList"
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index 594026d18..d3057bbe4 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -6,7 +6,7 @@ import SupplierListFilter from '../SupplierListFilter.vue';
 <template>
     <VnCard
         data-key="Supplier"
-        base-url="Suppliers"
+        url="Suppliers"
         :descriptor="SupplierDescriptor"
         :filter-panel="SupplierListFilter"
         search-data-key="SupplierList"
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 73b6f5543..191e02cd2 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -10,7 +10,7 @@ const { t } = useI18n();
 <template>
     <VnCard
         data-key="Ticket"
-        base-url="Tickets"
+        url="Tickets"
         :filter-panel="TicketFilter"
         :descriptor="TicketDescriptor"
         search-data-key="TicketList"
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 44bd9d430..b5eb6e37e 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -33,7 +33,7 @@ const filter = {
 <template>
     <VnCard
         data-key="Travel"
-        base-url="Travels"
+        url="Travels"
         search-data-key="TravelList"
         :filter="filter"
         :descriptor="TravelDescriptor"
diff --git a/src/pages/Wagon/Card/WagonCard.vue b/src/pages/Wagon/Card/WagonCard.vue
index ed6c83778..644a30ffa 100644
--- a/src/pages/Wagon/Card/WagonCard.vue
+++ b/src/pages/Wagon/Card/WagonCard.vue
@@ -2,5 +2,5 @@
 import VnCard from 'components/common/VnCard.vue';
 </script>
 <template>
-    <VnCard data-key="Wagon" base-url="Wagons" />
+    <VnCard data-key="Wagon" url="Wagons" />
 </template>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 428731a5c..c87699212 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -6,7 +6,8 @@ import WorkerFilter from '../WorkerFilter.vue';
 <template>
     <VnCard
         data-key="Worker"
-        custom-url="Workers/summary"
+        url="Workers/summary"
+        :id-in-where="true"
         :descriptor="WorkerDescriptor"
         :filter-panel="WorkerFilter"
         search-data-key="WorkerList"
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index d61c61abf..f2c5c17b9 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -20,7 +20,7 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
 <template>
     <VnCard
         data-key="zone"
-        base-url="Zones"
+        url="Zones"
         :descriptor="ZoneDescriptor"
         :filter-panel="ZoneFilterPanel"
         :search-data-key="notIsLocations('ZoneList', 'ZoneLocations')"

From 84f22cfeb880bda24c72343e3f08c3a6e6386f2d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 10:06:19 +0100
Subject: [PATCH 02/68] feat: refs #6919 replace url id wip

---
 src/components/common/VnCard.vue               | 6 +++++-
 src/pages/Customer/Card/CustomerCard.vue       | 2 +-
 src/pages/Customer/Card/CustomerDescriptor.vue | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index c030cbe32..21e4cfb3e 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -46,7 +46,11 @@ onBeforeMount(async () => {
 if (!props.idInWhere) {
     onBeforeRouteUpdate(async (to, from) => {
         if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.url}/${to.params.id}`;
+            const regex = /(\/\d+)/;
+            arrayData.store.url = !regex.test(props.url)
+                ? `${props.url}/${to.params.id}`
+                : props.url.replace(regex, `/${to.params.id}`);
+
             await arrayData.fetch({ append: false, updateRouter: false });
         }
     });
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 28da34dda..56cbefa63 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -12,7 +12,7 @@ const routeName = computed(() => route.name);
 <template>
     <VnCard
         data-key="Client"
-        url="Clients"
+        :url="`Clients/${$route.params.id}/getCard`"
         :descriptor="CustomerDescriptor"
         :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index e46d2cb29..85ba35f57 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -47,7 +47,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
         :subtitle="data.subtitle"
         @on-fetch="setData"
         :summary="$props.summary"
-        data-key="customer"
+        data-key="Client"
     >
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />

From fec9ef25bfa4deec22e01aa633f3359335fab997 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 11:14:19 +0100
Subject: [PATCH 03/68] fix: refs #6919 reactivity

---
 src/components/common/VnCard.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 21e4cfb3e..504dd809f 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -23,6 +23,7 @@ const props = defineProps({
 const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
+const regex = /(\/\d+)/;
 const searchRightDataKey = computed(() => {
     if (!props.searchDataKey) return route.name;
     return props.searchDataKey;
@@ -35,6 +36,9 @@ const arrayData = useArrayData(props.dataKey, {
 onBeforeMount(async () => {
     try {
         if (props.idInWhere) arrayData.store.filter.where = { id: route.params.id };
+        else if (!regex.test(props.url))
+            arrayData.store.url = `${props.url}/${route.params.id}`;
+
         await arrayData.fetch({ append: false, updateRouter: false });
     } catch {
         const { matched: matches } = router.currentRoute.value;
@@ -46,7 +50,6 @@ onBeforeMount(async () => {
 if (!props.idInWhere) {
     onBeforeRouteUpdate(async (to, from) => {
         if (to.params.id !== from.params.id) {
-            const regex = /(\/\d+)/;
             arrayData.store.url = !regex.test(props.url)
                 ? `${props.url}/${to.params.id}`
                 : props.url.replace(regex, `/${to.params.id}`);

From 94c8f538ea776812ff265f81662e8ed5598f1e3d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 11:38:51 +0100
Subject: [PATCH 04/68] feat: refs #6919 sync customer

---
 src/pages/Customer/Card/CustomerBasicData.vue | 2 +-
 src/pages/Customer/Card/CustomerCard.vue      | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index a77d2f865..0d636056d 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -43,7 +43,7 @@ const exprBuilder = (param, value) => {
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
-    <FormModel :url="`Clients/${route.params.id}`" auto-load model="customer">
+    <FormModel auto-load model="Client" :url-update="`Clients/${$route.params.id}`">
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 56cbefa63..6e79b31a9 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,20 +1,14 @@
 <script setup>
-import { computed } from 'vue';
-import { useRoute } from 'vue-router';
-
 import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 import CustomerFilter from '../CustomerFilter.vue';
-const route = useRoute();
-
-const routeName = computed(() => route.name);
 </script>
 <template>
     <VnCard
         data-key="Client"
         :url="`Clients/${$route.params.id}/getCard`"
         :descriptor="CustomerDescriptor"
-        :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
+        :filter-panel="$route.name != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
         :searchbar-props="{
             url: 'Clients/filter',

From 0f48b6fa4d6e105bdb94aa37a3d313748f805a4e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 11:49:58 +0100
Subject: [PATCH 05/68] refactor: refs #6919 drop useless code

---
 src/pages/Account/Card/AccountDescriptor.vue   |  6 +-----
 src/pages/Claim/Card/ClaimDescriptor.vue       |  3 ---
 src/pages/Customer/Card/CustomerDescriptor.vue |  7 -------
 .../Department/Card/DepartmentDescriptor.vue   | 18 ------------------
 4 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 3156f8e1e..c57d89db9 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
@@ -22,8 +21,6 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.nickname, entity.id));
 
 const filter = {
     where: { id: entityId },
@@ -46,8 +43,7 @@ const hasAccount = ref(false);
         module="Account"
         @on-fetch="setData"
         data-key="AccountId"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        title="nickname"
     >
         <template #menu>
             <AccountDescriptorMenu :has-account="hasAccount" />
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 02b63dd8e..244d10811 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -8,7 +8,6 @@ import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import { getUrl } from 'src/composables/getUrl';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
@@ -39,10 +38,8 @@ const STATE_COLOR = {
 function stateColor(code) {
     return STATE_COLOR[code];
 }
-const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity?.client?.name, entity.id);
     state.set('ClaimDescriptor', entity);
 };
 onMounted(async () => {
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 85ba35f57..b224db706 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -5,8 +5,6 @@ import { useI18n } from 'vue-i18n';
 
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 
-import useCardDescription from 'src/composables/useCardDescription';
-
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
@@ -34,17 +32,12 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
 </script>
 
 <template>
     <CardDescriptor
         module="Customer"
         :url="`Clients/${entityId}/getCard`"
-        :title="data.title"
-        :subtitle="data.subtitle"
         @on-fetch="setData"
         :summary="$props.summary"
         data-key="Client"
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
index e914f6af6..fe0f37183 100644
--- a/src/pages/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -5,7 +5,6 @@ import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -32,15 +31,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const department = ref();
-
-const data = ref(useCardDescription());
-
-const setData = (entity) => {
-    if (!entity) return;
-    data.value = useCardDescription(entity.name, entity.id);
-};
-
 const removeDepartment = async () => {
     try {
         await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
@@ -58,16 +48,8 @@ const { openConfirmationModal } = useVnConfirm();
         ref="DepartmentDescriptorRef"
         module="Department"
         :url="`Departments/${entityId}`"
-        :title="data.title"
-        :subtitle="data.subtitle"
         :summary="$props.summary"
         :to-module="{ name: 'WorkerDepartment' }"
-        @on-fetch="
-            (data) => {
-                department = data;
-                setData(data);
-            }
-        "
         data-key="department"
     >
         <template #menu="{}">

From 00b7883aed5e89695a0e625d5d763e5a8aa762cf Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 11:54:27 +0100
Subject: [PATCH 06/68] feat: refs #6919 sync department

---
 .../Department/Card/DepartmentBasicData.vue   | 35 +++++++------------
 .../Department/Card/DepartmentDescriptor.vue  |  2 +-
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 07bccd971..fa8371d6a 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -1,26 +1,15 @@
 <script setup>
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-
-const route = useRoute();
-const { t } = useI18n();
 </script>
 <template>
-    <FormModel
-        :url="`Departments/${route.params.id}`"
-        model="department"
-        auto-load
-        class="full-width"
-    >
+    <FormModel model="Department" auto-load class="full-width">
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('globals.name')"
+                    :label="$t('globals.name')"
                     v-model="data.name"
                     :rules="validate('globals.name')"
                     clearable
@@ -28,28 +17,28 @@ const { t } = useI18n();
                 />
                 <VnInput
                     v-model="data.code"
-                    :label="t('globals.code')"
+                    :label="$t('globals.code')"
                     :rules="validate('globals.code')"
                     clearable
                 />
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('department.chat')"
+                    :label="$t('department.chat')"
                     v-model="data.chatName"
                     :rules="validate('department.chat')"
                     clearable
                 />
                 <VnInput
                     v-model="data.notificationEmail"
-                    :label="t('globals.params.email')"
+                    :label="$t('globals.params.email')"
                     :rules="validate('globals.params.email')"
                     clearable
                 />
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('department.bossDepartment')"
+                    :label="$t('department.bossDepartment')"
                     v-model="data.workerFk"
                     url="Workers/search"
                     option-value="id"
@@ -59,7 +48,7 @@ const { t } = useI18n();
                     :rules="validate('department.workerFk')"
                 />
                 <VnSelect
-                    :label="t('department.selfConsumptionCustomer')"
+                    :label="$t('department.selfConsumptionCustomer')"
                     v-model="data.clientFk"
                     url="Clients"
                     option-value="id"
@@ -71,11 +60,11 @@ const { t } = useI18n();
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('department.telework')"
+                    :label="$t('department.telework')"
                     v-model="data.isTeleworking"
                 />
                 <QCheckbox
-                    :label="t('department.notifyOnErrors')"
+                    :label="$t('department.notifyOnErrors')"
                     v-model="data.hasToMistake"
                     :false-value="0"
                     :true-value="1"
@@ -83,17 +72,17 @@ const { t } = useI18n();
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('department.worksInProduction')"
+                    :label="$t('department.worksInProduction')"
                     v-model="data.isProduction"
                 />
                 <QCheckbox
-                    :label="t('department.hasToRefill')"
+                    :label="$t('department.hasToRefill')"
                     v-model="data.hasToRefill"
                 />
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('department.hasToSendMail')"
+                    :label="$t('department.hasToSendMail')"
                     v-model="data.hasToSendMail"
                 />
             </VnRow>
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
index fe0f37183..c136b03e9 100644
--- a/src/pages/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -50,7 +50,7 @@ const { openConfirmationModal } = useVnConfirm();
         :url="`Departments/${entityId}`"
         :summary="$props.summary"
         :to-module="{ name: 'WorkerDepartment' }"
-        data-key="department"
+        data-key="Department"
     >
         <template #menu="{}">
             <QItem

From 8af09d46ed311e90897ed76b117f3e7cb84f911e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 12:33:47 +0100
Subject: [PATCH 07/68] feat: refs #6919 sync invoice out

---
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue  |  2 ++
 .../InvoiceOut/Card/InvoiceOutDescriptor.vue  | 27 +++----------------
 src/pages/InvoiceOut/Card/InvoiceOutFilter.js | 16 +++++++++++
 3 files changed, 21 insertions(+), 24 deletions(-)
 create mode 100644 src/pages/InvoiceOut/Card/InvoiceOutFilter.js

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index 0c3cca093..82bb66409 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -2,11 +2,13 @@
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
 import InvoiceOutFilter from '../InvoiceOutFilter.vue';
+import filter from './InvoiceOutFilter.js';
 </script>
 <template>
     <VnCard
         data-key="InvoiceOut"
         url="InvoiceOuts"
+        :filter="filter"
         :descriptor="InvoiceOutDescriptor"
         :filter-panel="InvoiceOutFilter"
         search-data-key="InvoiceOutList"
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index 2b60948dd..ecce7738f 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -8,8 +8,8 @@ import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy
 import VnLv from 'src/components/ui/VnLv.vue';
 import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
 
-import useCardDescription from 'src/composables/useCardDescription';
 import { toCurrency, toDate } from 'src/filters';
+import filter from './InvoiceOutFilter.js';
 
 const $props = defineProps({
     id: {
@@ -26,30 +26,11 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const filter = {
-    include: [
-        {
-            relation: 'company',
-            scope: {
-                fields: ['id', 'code'],
-            },
-        },
-        {
-            relation: 'client',
-            scope: {
-                fields: ['id', 'name', 'email'],
-            },
-        },
-    ],
-};
-
 const descriptor = ref();
 
 function ticketFilter(invoice) {
     return JSON.stringify({ refFk: invoice.ref });
 }
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.id));
 </script>
 
 <template>
@@ -58,10 +39,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         module="InvoiceOut"
         :url="`InvoiceOuts/${entityId}`"
         :filter="filter"
-        :title="data.title"
-        :subtitle="data.subtitle"
-        @on-fetch="setData"
-        data-key="invoiceOutData"
+        title="ref"
+        data-key="InvoiceOut"
     >
         <template #menu="{ entity, menuRef }">
             <InvoiceOutDescriptorMenu :invoice-out-data="entity" :menu-ref="menuRef" />
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutFilter.js b/src/pages/InvoiceOut/Card/InvoiceOutFilter.js
new file mode 100644
index 000000000..48b20faf6
--- /dev/null
+++ b/src/pages/InvoiceOut/Card/InvoiceOutFilter.js
@@ -0,0 +1,16 @@
+export default {
+    include: [
+        {
+            relation: 'company',
+            scope: {
+                fields: ['id', 'code'],
+            },
+        },
+        {
+            relation: 'client',
+            scope: {
+                fields: ['id', 'name', 'email'],
+            },
+        },
+    ],
+};

From f20660839aa94189900848fe67af5dc99ec6df5a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 12:45:22 +0100
Subject: [PATCH 08/68] feat: refs #6919 sync item

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 2 +-
 src/pages/Item/Card/ItemBasicData.vue          | 3 +--
 src/pages/Item/Card/ItemCard.vue               | 2 +-
 src/pages/Item/Card/ItemDescriptor.vue         | 7 +------
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index b224db706..2b41e19b1 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
diff --git a/src/pages/Item/Card/ItemBasicData.vue b/src/pages/Item/Card/ItemBasicData.vue
index 1b0342668..24d0c8b32 100644
--- a/src/pages/Item/Card/ItemBasicData.vue
+++ b/src/pages/Item/Card/ItemBasicData.vue
@@ -54,9 +54,8 @@ const onIntrastatCreated = (response, formData) => {
         auto-load
     />
     <FormModel
-        :url="`Items/${route.params.id}`"
         :url-update="`Items/${route.params.id}`"
-        model="item"
+        model="Item"
         auto-load
         :clear-store-on-unmount="false"
     >
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 7a8a5e518..52cfabdef 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -6,7 +6,7 @@ import ItemListFilter from '../ItemListFilter.vue';
 <template>
     <VnCard
         data-key="Item"
-        url="Items"
+        :url="`Items/${$route.params.id}/getCard`"
         :descriptor="ItemDescriptor"
         :filter-panel="ItemListFilter"
         search-data-key="ItemList"
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index c51b320b5..2d6838b70 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -8,7 +8,6 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import RegularizeStockForm from 'components/RegularizeStockForm.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
@@ -58,10 +57,8 @@ onMounted(async () => {
     mounted.value = true;
 });
 
-const data = ref(useCardDescription());
 const setData = async (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.name, entity.id);
     await updateStock();
 };
 
@@ -97,10 +94,8 @@ const openRegularizeStockForm = () => {
 
 <template>
     <CardDescriptor
-        data-key="ItemData"
+        data-key="Item"
         module="Item"
-        :title="data.title"
-        :subtitle="data.subtitle"
         :summary="$props.summary"
         :url="`Items/${entityId}/getCard`"
         @on-fetch="setData"

From c2e4380f1897e69e626473ae05373f3ac9c19f6a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 13:01:47 +0100
Subject: [PATCH 09/68] feat: refs #6919 sync item-type

---
 .../Item/ItemType/Card/ItemTypeBasicData.vue  |  7 +---
 src/pages/Item/ItemType/Card/ItemTypeCard.vue |  4 ++-
 .../Item/ItemType/Card/ItemTypeDescriptor.vue | 34 +++++--------------
 .../Item/ItemType/Card/ItemTypeFilter.js      |  8 +++++
 .../Item/ItemType/Card/ItemTypeSummary.vue    | 15 ++------
 5 files changed, 23 insertions(+), 45 deletions(-)
 create mode 100644 src/pages/Item/ItemType/Card/ItemTypeFilter.js

diff --git a/src/pages/Item/ItemType/Card/ItemTypeBasicData.vue b/src/pages/Item/ItemType/Card/ItemTypeBasicData.vue
index 1a4a7c9f3..612982383 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeBasicData.vue
@@ -40,12 +40,7 @@ const itemPackingTypesOptions = ref([]);
         }"
         auto-load
     />
-    <FormModel
-        :url="`ItemTypes/${route.params.id}`"
-        :url-update="`ItemTypes/${route.params.id}`"
-        model="itemTypeBasicData"
-        auto-load
-    >
+    <FormModel :url-update="`ItemTypes/${route.params.id}`" model="ItemType" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.code" :label="t('shared.code')" />
diff --git a/src/pages/Item/ItemType/Card/ItemTypeCard.vue b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
index c3df40807..3e72550d3 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
@@ -3,11 +3,13 @@ import VnCard from 'components/common/VnCard.vue';
 import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
 import ItemTypeFilter from 'src/pages/Item/ItemType/ItemTypeFilter.vue';
 import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
+import filter from './ItemTypeFilter.js';
 </script>
 <template>
     <VnCard
-        data-key="ItemTypeSummary"
+        data-key="ItemType"
         url="ItemTypes"
+        :filter="filter"
         :descriptor="ItemTypeDescriptor"
         :filter-panel="ItemTypeFilter"
         search-data-key="ItemTypeList"
diff --git a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
index cd12fc238..6f4b4ee2d 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
@@ -1,13 +1,11 @@
 <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 WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-
-import useCardDescription from 'src/composables/useCardDescription';
+import filter from './ItemTypeFilter.js';
 
 const $props = defineProps({
     id: {
@@ -22,45 +20,29 @@ const $props = defineProps({
 });
 
 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"
+        :filter="filter"
+        title="code"
+        data-key="ItemType"
     >
         <template #body="{ entity }">
-            <VnLv :label="t('shared.code')" :value="entity.code" />
-            <VnLv :label="t('shared.name')" :value="entity.name" />
-            <VnLv :label="t('shared.worker')">
+            <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" />
+            <VnLv :label="$t('shared.category')" :value="entity.category?.name" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Item/ItemType/Card/ItemTypeFilter.js b/src/pages/Item/ItemType/Card/ItemTypeFilter.js
new file mode 100644
index 000000000..5651d368d
--- /dev/null
+++ b/src/pages/Item/ItemType/Card/ItemTypeFilter.js
@@ -0,0 +1,8 @@
+export default {
+    include: [
+        { relation: 'worker' },
+        { relation: 'category' },
+        { relation: 'itemPackingType' },
+        { relation: 'temperature' },
+    ],
+};
diff --git a/src/pages/Item/ItemType/Card/ItemTypeSummary.vue b/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
index c51d59e13..b936e99ea 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeSummary.vue
@@ -3,7 +3,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 filter from './ItemTypeFilter.js';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
@@ -21,15 +21,6 @@ const $props = defineProps({
     },
 });
 
-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();
@@ -43,8 +34,8 @@ async function setItemTypeData(data) {
     <CardSummary
         ref="summaryRef"
         :url="`ItemTypes/${entityId}`"
-        data-key="ItemTypeSummary"
-        :filter="itemTypeFilter"
+        data-key="ItemType"
+        :filter="filter"
         @on-fetch="(data) => setItemTypeData(data)"
         class="full-width"
     >

From 3477b24c93f54c9fefd0a3500ede68d43bf68fe4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 16:03:30 +0100
Subject: [PATCH 10/68] feat: refs #6919 sync order

---
 src/pages/Order/Card/OrderBasicData.vue  |  6 ++--
 src/pages/Order/Card/OrderCard.vue       |  3 ++
 src/pages/Order/Card/OrderDescriptor.vue | 39 +++---------------------
 src/pages/Order/Card/OrderFilter.js      | 26 ++++++++++++++++
 4 files changed, 35 insertions(+), 39 deletions(-)
 create mode 100644 src/pages/Order/Card/OrderFilter.js

diff --git a/src/pages/Order/Card/OrderBasicData.vue b/src/pages/Order/Card/OrderBasicData.vue
index dc8d1a429..9ee1e8539 100644
--- a/src/pages/Order/Card/OrderBasicData.vue
+++ b/src/pages/Order/Card/OrderBasicData.vue
@@ -14,7 +14,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 const { t } = useI18n();
 const route = useRoute();
 const state = useState();
-const ORDER_MODEL = 'order';
 
 const isNew = Boolean(!route.params.id);
 const clientList = ref([]);
@@ -33,7 +32,7 @@ const fetchAddressList = async (addressId) => {
         });
         addressList.value = data;
         if (addressList.value?.length === 1) {
-            state.get(ORDER_MODEL).addressFk = addressList.value[0].id;
+            state.get('Order').addressFk = addressList.value[0].id;
         }
     } catch (err) {
         console.error(`Error fetching addresses`, err);
@@ -105,9 +104,8 @@ const onClientChange = async (clientId) => {
     <VnSubToolbar v-if="isNew" />
     <div class="q-pa-md">
         <FormModel
-            :url="`Orders/${route.params.id}`"
             :url-update="`Orders/${route.params.id}/updateBasicData`"
-            :model="ORDER_MODEL"
+            model="Order"
             :filter="orderFilter"
             @on-fetch="fetchOrderDetails"
             auto-load
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index c0a2de80a..597633c89 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -6,6 +6,8 @@ import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
 import OrderFilter from './OrderFilter.vue';
 import OrderSearchbar from './OrderSearchbar.vue';
 import OrderCatalogFilter from './OrderCatalogFilter.vue';
+import filter from './OrderFilter.js';
+
 const config = {
     OrderCatalog: OrderCatalogFilter,
 };
@@ -27,6 +29,7 @@ const customFilterPanel = computed(() => {
     <VnCard
         data-key="Order"
         url="Orders"
+        :filter="filter"
         :descriptor="OrderDescriptor"
         :filter-panel="customFilterPanel"
         :search-data-key="customRouteRedirectName"
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 138fcc40f..e163122f3 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -4,8 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency, toDate } from 'src/filters';
 import { useState } from 'src/composables/useState';
-import useCardDescription from 'src/composables/useCardDescription';
-
+import filter from './OrderFilter.js';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import FetchData from 'components/FetchData.vue';
@@ -25,45 +24,16 @@ const $props = defineProps({
 const route = useRoute();
 const state = useState();
 const { t } = useI18n();
-const data = ref(useCardDescription());
 const getTotalRef = ref();
 
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const filter = {
-    include: [
-        { relation: 'agencyMode', scope: { fields: ['name'] } },
-        {
-            relation: 'address',
-            scope: { fields: ['nickname'] },
-        },
-        { relation: 'rows', scope: { fields: ['id'] } },
-        {
-            relation: 'client',
-            scope: {
-                fields: [
-                    'salesPersonFk',
-                    'name',
-                    'isActive',
-                    'isFreezed',
-                    'isTaxDataChecked',
-                ],
-                include: {
-                    relation: 'salesPersonUser',
-                    scope: { fields: ['id', 'name'] },
-                },
-            },
-        },
-    ],
-};
-
 const setData = (entity) => {
     if (!entity) return;
     getTotalRef.value && getTotalRef.value.fetch();
-    data.value = useCardDescription(entity?.client?.name, entity?.id);
-    state.set('orderData', entity);
+    state.set('Order', entity);
 };
 
 const getConfirmationValue = (isConfirmed) => {
@@ -84,10 +54,9 @@ const total = ref(null);
         :url="`Orders/${entityId}`"
         :filter="filter"
         module="Order"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        title="client.name"
         @on-fetch="setData"
-        data-key="orderData"
+        data-key="Order"
     >
         <template #menu="{ entity }">
             <OrderDescriptorMenu :order="entity" />
diff --git a/src/pages/Order/Card/OrderFilter.js b/src/pages/Order/Card/OrderFilter.js
new file mode 100644
index 000000000..3e521b92c
--- /dev/null
+++ b/src/pages/Order/Card/OrderFilter.js
@@ -0,0 +1,26 @@
+export default {
+    include: [
+        { relation: 'agencyMode', scope: { fields: ['name'] } },
+        {
+            relation: 'address',
+            scope: { fields: ['nickname'] },
+        },
+        { relation: 'rows', scope: { fields: ['id'] } },
+        {
+            relation: 'client',
+            scope: {
+                fields: [
+                    'salesPersonFk',
+                    'name',
+                    'isActive',
+                    'isFreezed',
+                    'isTaxDataChecked',
+                ],
+                include: {
+                    relation: 'salesPersonUser',
+                    scope: { fields: ['id', 'name'] },
+                },
+            },
+        },
+    ],
+};

From 4ecc8c213e53836876c10f5832f34ed6f8983897 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 16:22:16 +0100
Subject: [PATCH 11/68] feat: refs #6919 sync parking

---
 src/pages/Parking/Card/ParkingBasicData.vue  | 27 ++++++++------------
 src/pages/Parking/Card/ParkingCard.vue       |  4 +++
 src/pages/Parking/Card/ParkingDescriptor.vue | 15 +++--------
 src/pages/Parking/Card/ParkingFilter.js      |  4 +++
 src/pages/Parking/ParkingExprBuilder.js      | 10 ++++++++
 src/pages/Parking/ParkingList.vue            | 13 +---------
 6 files changed, 33 insertions(+), 40 deletions(-)
 create mode 100644 src/pages/Parking/Card/ParkingFilter.js
 create mode 100644 src/pages/Parking/ParkingExprBuilder.js

diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index 8e3433a5b..fcc9dbd24 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -1,23 +1,13 @@
 <script setup>
-import { ref, computed } from 'vue';
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const { t } = useI18n();
-const route = useRoute();
-const parkingId = computed(() => route.params?.id || null);
 const sectors = ref([]);
 const sectorFilter = { fields: ['id', 'description'] };
-
-const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: sectorFilter }],
-};
 </script>
 <template>
     <FetchData
@@ -27,22 +17,25 @@ const filter = {
         @on-fetch="(data) => (sectors = data)"
         auto-load
     />
-    <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter" auto-load>
+    <FormModel model="Parking" auto-load>
         <template #form="{ data }">
             <VnRow>
-                <VnInput v-model="data.code" :label="t('globals.code')" />
-                <VnInput v-model="data.pickingOrder" :label="t('parking.pickingOrder')" />
+                <VnInput v-model="data.code" :label="$t('globals.code')" />
+                <VnInput
+                    v-model="data.pickingOrder"
+                    :label="$t('parking.pickingOrder')"
+                />
             </VnRow>
             <VnRow>
-                <VnInput v-model="data.row" :label="t('parking.row')" />
-                <VnInput v-model="data.column" :label="t('parking.column')" />
+                <VnInput v-model="data.row" :label="$t('parking.row')" />
+                <VnInput v-model="data.column" :label="$t('parking.column')" />
             </VnRow>
             <VnRow>
                 <VnSelect
                     v-model="data.sectorFk"
                     option-value="id"
                     option-label="description"
-                    :label="t('parking.sector')"
+                    :label="$t('parking.sector')"
                     :options="sectors"
                     use-input
                     input-debounce="0"
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 5debd28b5..6985dc55d 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -2,18 +2,22 @@
 import VnCard from 'components/common/VnCard.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
 import ParkingFilter from 'pages/Parking/ParkingFilter.vue';
+import filter from './ParkingFilter.js';
+import exprBuilder from '../ParkingExprBuilder.js';
 </script>
 <template>
     <VnCard
         data-key="Parking"
         url="Parkings"
         :descriptor="ParkingDescriptor"
+        :filter="filter"
         :filter-panel="ParkingFilter"
         search-data-key="ParkingList"
         :searchbar-props="{
             url: 'Parkings',
             label: 'parking.searchBar.label',
             info: 'parking.searchBar.info',
+            exprBuilder,
         }"
     />
 </template>
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
index d36ea16fc..0b7642c1c 100644
--- a/src/pages/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -1,10 +1,9 @@
 <script setup>
 import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
-
+import filter from './ParkingFilter.js';
 const props = defineProps({
     id: {
         type: Number,
@@ -13,14 +12,8 @@ const props = defineProps({
     },
 });
 
-const { t } = useI18n();
 const route = useRoute();
 const entityId = computed(() => props.id || route.params.id);
-
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
 </script>
 <template>
     <CardDescriptor
@@ -32,9 +25,9 @@ const filter = {
         :to-module="{ name: 'ParkingList' }"
     >
         <template #body="{ entity }">
-            <VnLv :label="t('globals.code')" :value="entity.code" />
-            <VnLv :label="t('parking.pickingOrder')" :value="entity.pickingOrder" />
-            <VnLv :label="t('parking.sector')" :value="entity.sector?.description" />
+            <VnLv :label="$t('globals.code')" :value="entity.code" />
+            <VnLv :label="$t('parking.pickingOrder')" :value="entity.pickingOrder" />
+            <VnLv :label="$t('parking.sector')" :value="entity.sector?.description" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Parking/Card/ParkingFilter.js b/src/pages/Parking/Card/ParkingFilter.js
new file mode 100644
index 000000000..fd1855c45
--- /dev/null
+++ b/src/pages/Parking/Card/ParkingFilter.js
@@ -0,0 +1,4 @@
+export default {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
diff --git a/src/pages/Parking/ParkingExprBuilder.js b/src/pages/Parking/ParkingExprBuilder.js
new file mode 100644
index 000000000..16d2262c8
--- /dev/null
+++ b/src/pages/Parking/ParkingExprBuilder.js
@@ -0,0 +1,10 @@
+export default (param, value) => {
+    switch (param) {
+        case 'code':
+            return { [param]: { like: `%${value}%` } };
+        case 'sectorFk':
+            return { [param]: value };
+        case 'search':
+            return { or: [{ code: { like: `%${value}%` } }, { id: value }] };
+    }
+};
diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 109613383..12a93c97b 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -11,6 +11,7 @@ import VnLv from 'components/ui/VnLv.vue';
 import ParkingFilter from './ParkingFilter.vue';
 import ParkingSummary from './Card/ParkingSummary.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import exprBuilder from './ParkingExprBuilder.js';
 
 const stateStore = useStateStore();
 const { push } = useRouter();
@@ -23,19 +24,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
 };
-
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'code':
-            return { [param]: { like: `%${value}%` } };
-        case 'sectorFk':
-            return { [param]: value };
-        case 'search':
-            return { or: [{ code: { like: `%${value}%` } }, { id: value }] };
-    }
-}
 </script>
-
 <template>
     <template>
         <VnSearchbar

From 1c86c874e04b849ff8c2b06d0122dfdecc9ce7f2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 16:59:02 +0100
Subject: [PATCH 12/68] feat: refs #6919 sync account wip

---
 src/pages/Account/AccountExprBuilder.js      | 18 ++++++++++
 src/pages/Account/AccountList.vue            | 20 ++---------
 src/pages/Account/Card/AccountBasicData.vue  | 36 +++++---------------
 src/pages/Account/Card/AccountCard.vue       | 16 +++++----
 src/pages/Account/Card/AccountDescriptor.vue | 13 ++-----
 src/pages/Account/Card/AccountFilter.js      | 13 +++++++
 6 files changed, 53 insertions(+), 63 deletions(-)
 create mode 100644 src/pages/Account/AccountExprBuilder.js
 create mode 100644 src/pages/Account/Card/AccountFilter.js

diff --git a/src/pages/Account/AccountExprBuilder.js b/src/pages/Account/AccountExprBuilder.js
new file mode 100644
index 000000000..6497a9d30
--- /dev/null
+++ b/src/pages/Account/AccountExprBuilder.js
@@ -0,0 +1,18 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'nickname':
+            return { [param]: { like: `%${value}%` } };
+        case 'roleFk':
+            return { [param]: value };
+    }
+};
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 9e7f1b10a..0195da0cd 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -7,6 +7,8 @@ import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import AccountFilter from './AccountFilter.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import exprBuilder from './AccountExprBuilder.js';
+
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -82,24 +84,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : {
-                      or: [
-                          { name: { like: `%${value}%` } },
-                          { nickname: { like: `%${value}%` } },
-                      ],
-                  };
-        case 'name':
-        case 'nickname':
-            return { [param]: { like: `%${value}%` } };
-        case 'roleFk':
-            return { [param]: value };
-    }
-};
 </script>
 
 <template>
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index e6c9da6fe..094641707 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -1,46 +1,26 @@
 <script setup>
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import { ref, watch } from 'vue';
-
-const route = useRoute();
-const { t } = useI18n();
-const formModelRef = ref(null);
-
-const accountFilter = {
-    where: { id: route.params.id },
-    fields: ['id', 'email', 'nickname', 'name', 'accountStateFk', 'packages', 'pickup'],
-    include: [],
-};
-
-watch(
-    () => route.params.id,
-    () => formModelRef.value.reset()
-);
 </script>
 <template>
     <FormModel
         ref="formModelRef"
-        url="VnUsers/preview"
-        :url-update="`VnUsers/${route.params.id}/update-user`"
-        :filter="accountFilter"
-        model="Accounts"
+        :url-update="`VnUsers/${$route.params.id}/update-user`"
+        model="Account"
         auto-load
-        @on-data-saved="formModelRef.fetch()"
+        @on-data-saved="$refs.formModelRef.fetch()"
     >
         <template #form="{ data }">
             <div class="q-gutter-y-sm">
-                <VnInput v-model="data.name" :label="t('account.card.nickname')" />
-                <VnInput v-model="data.nickname" :label="t('account.card.alias')" />
-                <VnInput v-model="data.email" :label="t('globals.params.email')" />
+                <VnInput v-model="data.name" :label="$t('account.card.nickname')" />
+                <VnInput v-model="data.nickname" :label="$t('account.card.alias')" />
+                <VnInput v-model="data.email" :label="$t('globals.params.email')" />
                 <VnSelect
                     url="Languages"
                     v-model="data.lang"
-                    :label="t('account.card.lang')"
+                    :label="$t('account.card.lang')"
                     option-value="code"
                     option-label="code"
                 />
@@ -49,7 +29,7 @@ watch(
                     table="user"
                     column="twoFactor"
                     v-model="data.twoFactor"
-                    :label="t('account.card.twoFactor')"
+                    :label="$t('account.card.twoFactor')"
                     option-value="code"
                     option-label="code"
                 />
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index 119a7fd07..b252b2074 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -1,20 +1,22 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import VnCard from 'components/common/VnCard.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
-
-const { t } = useI18n();
+import exprBuilder from '../AccountExprBuilder.js';
+import filter from './AccountFilter.js';
 </script>
-
 <template>
     <VnCard
+        url="VnUsers/preview"
+        :id-in-where="true"
         data-key="Account"
+        :filter="filter"
         :descriptor="AccountDescriptor"
-        search-data-key="AccountList"
+        search-data-key="AccountUsers"
         :searchbar-props="{
             url: 'VnUsers/preview',
-            label: t('account.search'),
-            info: t('account.searchInfo'),
+            label: $t('account.search'),
+            info: $t('account.searchInfo'),
+            exprBuilder,
         }"
     />
 </template>
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index c57d89db9..270b0d65b 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -7,7 +7,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
-
+import filter from './AccountFilter.js';
 const $props = defineProps({
     id: {
         type: Number,
@@ -21,12 +21,6 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const filter = {
-    where: { id: entityId },
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
 const hasAccount = ref(false);
 </script>
 
@@ -41,8 +35,7 @@ const hasAccount = ref(false);
         :url="`VnUsers/preview`"
         :filter="filter"
         module="Account"
-        @on-fetch="setData"
-        data-key="AccountId"
+        data-key="Account"
         title="nickname"
     >
         <template #menu>
@@ -69,7 +62,7 @@ const hasAccount = ref(false);
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('account.card.nickname')" :value="entity.name" />
-            <VnLv :label="t('account.card.role')" :value="entity.role.name" />
+            <VnLv :label="t('account.card.role')" :value="entity.role?.name" />
         </template>
         <template #actions="{ entity }">
             <QCardActions class="q-gutter-x-md">
diff --git a/src/pages/Account/Card/AccountFilter.js b/src/pages/Account/Card/AccountFilter.js
new file mode 100644
index 000000000..e0825a6e6
--- /dev/null
+++ b/src/pages/Account/Card/AccountFilter.js
@@ -0,0 +1,13 @@
+export default {
+    fields: [
+        'id',
+        'email',
+        'nickname',
+        'name',
+        'accountStateFk',
+        'packages',
+        'pickup',
+        'role',
+    ],
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};

From 7962dbc26a97a315d7f64f3d324972bebcda4ed8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Nov 2024 17:27:16 +0100
Subject: [PATCH 13/68] feat: refs #6919 sync route

---
 src/pages/Route/Card/RouteCard.vue       |  2 +
 src/pages/Route/Card/RouteDescriptor.vue | 65 +++---------------------
 src/pages/Route/Card/RouteFilter.js      | 41 +++++++++++++++
 src/pages/Route/Card/RouteForm.vue       | 46 ++---------------
 4 files changed, 54 insertions(+), 100 deletions(-)
 create mode 100644 src/pages/Route/Card/RouteFilter.js

diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index d8f42185c..f58388a98 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -3,11 +3,13 @@ import VnCard from 'components/common/VnCard.vue';
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
 import RouteFilter from './RouteFilter.vue';
 import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import filter from './RouteFilter.js';
 </script>
 <template>
     <VnCard
         data-key="Route"
         url="Routes"
+        :filter="filter"
         :descriptor="RouteDescriptor"
         :filter-panel="RouteFilter"
         search-data-key="RouteList"
diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index cbabaf648..769ca867c 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -1,10 +1,8 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import useCardDescription from 'composables/useCardDescription';
 import { dashIfEmpty, toDate } from 'src/filters';
 import RouteDescriptorMenu from 'pages/Route/Card/RouteDescriptorMenu.vue';
 
@@ -17,77 +15,30 @@ const $props = defineProps({
 });
 
 const route = useRoute();
-const { t } = useI18n();
 
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const filter = {
-    fields: [
-        'id',
-        'workerFk',
-        'agencyModeFk',
-        'created',
-        'm3',
-        'warehouseFk',
-        'description',
-        'vehicleFk',
-        'kmStart',
-        'kmEnd',
-        'started',
-        'finished',
-        'cost',
-        'zoneFk',
-        'isOk',
-    ],
-    include: [
-        { relation: 'agencyMode', scope: { fields: ['id', 'name'] } },
-        {
-            relation: 'vehicle',
-            scope: { fields: ['id', 'm3'] },
-        },
-        { relation: 'zone', scope: { fields: ['id', 'name'] } },
-        {
-            relation: 'worker',
-            scope: {
-                fields: ['id'],
-                include: {
-                    relation: 'user',
-                    scope: {
-                        fields: ['id'],
-                        include: { relation: 'emailUser', scope: { fields: ['email'] } },
-                    },
-                },
-            },
-        },
-    ],
-};
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
 </script>
-
 <template>
     <CardDescriptor
         module="Route"
         :url="`Routes/${entityId}`"
         :filter="filter"
-        :title="data.title"
-        :subtitle="data.subtitle"
-        data-key="routeData"
-        @on-fetch="setData"
+        :title="null"
+        data-key="Route"
     >
         <template #body="{ entity }">
-            <VnLv :label="t('Date')" :value="toDate(entity?.created)" />
-            <VnLv :label="t('Agency')" :value="entity?.agencyMode?.name" />
-            <VnLv :label="t('Zone')" :value="entity?.zone?.name" />
+            <VnLv :label="$t('Date')" :value="toDate(entity?.created)" />
+            <VnLv :label="$t('Agency')" :value="entity?.agencyMode?.name" />
+            <VnLv :label="$t('Zone')" :value="entity?.zone?.name" />
             <VnLv
-                :label="t('Volume')"
+                :label="$t('Volume')"
                 :value="`${dashIfEmpty(entity?.m3)} / ${dashIfEmpty(
                     entity?.vehicle?.m3
                 )} m³`"
             />
-            <VnLv :label="t('Description')" :value="entity?.description" />
+            <VnLv :label="$t('Description')" :value="entity?.description" />
         </template>
         <template #menu="{ entity }">
             <RouteDescriptorMenu :route="entity" />
diff --git a/src/pages/Route/Card/RouteFilter.js b/src/pages/Route/Card/RouteFilter.js
new file mode 100644
index 000000000..16d200c99
--- /dev/null
+++ b/src/pages/Route/Card/RouteFilter.js
@@ -0,0 +1,41 @@
+export default {
+    fields: [
+        'code',
+        'id',
+        'workerFk',
+        'agencyModeFk',
+        'created',
+        'm3',
+        'warehouseFk',
+        'description',
+        'vehicleFk',
+        'kmStart',
+        'kmEnd',
+        'started',
+        'finished',
+        'cost',
+        'zoneFk',
+        'isOk',
+    ],
+    include: [
+        { relation: 'agencyMode', scope: { fields: ['id', 'name'] } },
+        {
+            relation: 'vehicle',
+            scope: { fields: ['id', 'm3'] },
+        },
+        { relation: 'zone', scope: { fields: ['id', 'name'] } },
+        {
+            relation: 'worker',
+            scope: {
+                fields: ['id'],
+                include: {
+                    relation: 'user',
+                    scope: {
+                        fields: ['id'],
+                        include: { relation: 'emailUser', scope: { fields: ['email'] } },
+                    },
+                },
+            },
+        },
+    ],
+};
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 8c89718fa..e7bece1a1 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -11,6 +11,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
 import VnInputTime from 'components/common/VnInputTime.vue';
+import filter from './RouteFilter.js';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -27,46 +28,6 @@ const defaultInitialData = {
 };
 const maxDistance = ref();
 
-const routeFilter = {
-    fields: [
-        'id',
-        'workerFk',
-        'agencyModeFk',
-        'created',
-        'm3',
-        'warehouseFk',
-        'description',
-        'vehicleFk',
-        'kmStart',
-        'kmEnd',
-        'started',
-        'finished',
-        'cost',
-        'zoneFk',
-        'isOk',
-    ],
-    include: [
-        { relation: 'agencyMode', scope: { fields: ['id', 'name'] } },
-        {
-            relation: 'vehicle',
-            scope: { fields: ['id', 'm3'] },
-        },
-        { relation: 'zone', scope: { fields: ['id', 'name'] } },
-        {
-            relation: 'worker',
-            scope: {
-                fields: ['id'],
-                include: {
-                    relation: 'user',
-                    scope: {
-                        fields: ['id'],
-                        include: { relation: 'emailUser', scope: { fields: ['email'] } },
-                    },
-                },
-            },
-        },
-    ],
-};
 const onSave = (data, response) => {
     if (isNew) {
         axios.post(`Routes/${response?.id}/updateWorkCenter`);
@@ -83,11 +44,10 @@ const onSave = (data, response) => {
         sort-by="id ASC"
     />
     <FormModel
-        :url="isNew ? null : `Routes/${route.params?.id}`"
         :url-create="isNew ? 'Routes' : null"
         :observe-form-changes="!isNew"
-        :filter="routeFilter"
-        model="route"
+        :filter="filter"
+        model="Route"
         :auto-load="!isNew"
         :form-initial-data="isNew ? defaultInitialData : null"
         @on-data-saved="onSave"

From 02a1554b21874c428260eafe233d6120b85ea567 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 18 Nov 2024 11:24:39 +0100
Subject: [PATCH 14/68] feat: refs #6919 sync role

---
 src/components/FormModel.vue                   | 13 +++++++++++--
 src/components/common/VnCard.vue               | 18 ++++++++----------
 src/pages/Account/Role/AccountExprBuilder.js   | 16 ++++++++++++++++
 src/pages/Account/Role/AccountRoles.vue        | 18 +-----------------
 src/pages/Account/Role/Card/RoleBasicData.vue  | 14 +++-----------
 src/pages/Account/Role/Card/RoleCard.vue       | 13 +++++++------
 src/pages/Account/Role/Card/RoleDescriptor.vue | 17 ++++-------------
 src/pages/Account/Role/Card/RoleSummary.vue    |  9 +++------
 8 files changed, 53 insertions(+), 65 deletions(-)
 create mode 100644 src/pages/Account/Role/AccountExprBuilder.js

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index c668769e5..733a7e3a0 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -131,7 +131,13 @@ onMounted(async () => {
 
     if (!$props.formInitialData) {
         if ($props.autoLoad && $props.url) await fetch();
-        else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
+        else if (arrayData.store.data)
+            updateAndEmit(
+                'onFetch',
+                Array.isArray(arrayData.store.data)
+                    ? arrayData.store.data[0]
+                    : arrayData.store.data
+            );
     }
     if ($props.observeFormChanges) {
         watch(
@@ -151,7 +157,10 @@ onMounted(async () => {
 if (!$props.url)
     watch(
         () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', val)
+        (val) => {
+            if (Array.isArray(val)) val = val[0] ?? {};
+            updateAndEmit('onFetch', val);
+        }
     );
 
 watch(
diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 504dd809f..c37b25675 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -47,17 +47,15 @@ onBeforeMount(async () => {
     }
 });
 
-if (!props.idInWhere) {
-    onBeforeRouteUpdate(async (to, from) => {
-        if (to.params.id !== from.params.id) {
-            arrayData.store.url = !regex.test(props.url)
-                ? `${props.url}/${to.params.id}`
-                : props.url.replace(regex, `/${to.params.id}`);
+onBeforeRouteUpdate(async (to, from) => {
+    if (to.params.id !== from.params.id) {
+        arrayData.store.url = !regex.test(props.url)
+            ? `${props.url}/${to.params.id}`
+            : props.url.replace(regex, `/${to.params.id}`);
 
-            await arrayData.fetch({ append: false, updateRouter: false });
-        }
-    });
-}
+        await arrayData.fetch({ append: false, updateRouter: false });
+    }
+});
 </script>
 <template>
     <QDrawer
diff --git a/src/pages/Account/Role/AccountExprBuilder.js b/src/pages/Account/Role/AccountExprBuilder.js
new file mode 100644
index 000000000..cc4fab399
--- /dev/null
+++ b/src/pages/Account/Role/AccountExprBuilder.js
@@ -0,0 +1,16 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'description':
+            return { [param]: { like: `%${value}%` } };
+    }
+};
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index 5398485e3..78478e3c1 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -6,6 +6,7 @@ import { useRoute } from 'vue-router';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RoleSummary from './Card/RoleSummary.vue';
+import exprBuilder from './AccountExprBuilder.js';
 const route = useRoute();
 const { t } = useI18n();
 const $props = defineProps({
@@ -62,24 +63,7 @@ const columns = computed(() => [
         ],
     },
 ]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : {
-                      or: [
-                          { name: { like: `%${value}%` } },
-                          { nickname: { like: `%${value}%` } },
-                      ],
-                  };
-        case 'name':
-        case 'description':
-            return { [param]: { like: `%${value}%` } };
-    }
-};
 </script>
-
 <template>
     <VnSearchbar
         data-key="Roles"
diff --git a/src/pages/Account/Role/Card/RoleBasicData.vue b/src/pages/Account/Role/Card/RoleBasicData.vue
index 1de9ff387..de70b0fb6 100644
--- a/src/pages/Account/Role/Card/RoleBasicData.vue
+++ b/src/pages/Account/Role/Card/RoleBasicData.vue
@@ -1,24 +1,16 @@
 <script setup>
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-const route = useRoute();
-const { t } = useI18n();
 </script>
 <template>
-    <FormModel :url="`VnRoles/${route.params.id}`" model="VnRole" auto-load>
+    <FormModel model="Role" auto-load>
         <template #form="{ data }">
             <VnRow>
-                <div class="col">
-                    <VnInput v-model="data.name" :label="t('globals.name')" />
-                </div>
+                <VnInput v-model="data.name" :label="$t('globals.name')" />
             </VnRow>
             <VnRow>
-                <div class="col">
-                    <VnInput v-model="data.description" :label="t('role.description')" />
-                </div>
+                <VnInput v-model="data.description" :label="$t('role.description')" />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index 35f9a1f27..c481bf800 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -1,20 +1,21 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import VnCard from 'components/common/VnCard.vue';
 import RoleDescriptor from './RoleDescriptor.vue';
-
-const { t } = useI18n();
+import exprBuilder from '../AccountExprBuilder.js';
 </script>
 <template>
     <VnCard
+        url="VnRoles"
+        :id-in-where="true"
         data-key="Role"
         :descriptor="RoleDescriptor"
-        search-data-key="AccountRoles"
+        search-data-key="Roles"
         :searchbar-props="{
             url: 'VnRoles',
-            label: t('role.searchRoles'),
-            info: t('role.searchInfo'),
+            label: $t('role.searchRoles'),
+            info: $t('role.searchInfo'),
             searchUrl: 'table',
+            exprBuilder,
         }"
     />
 </template>
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index af018565a..a31ffbfea 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -1,10 +1,9 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 const $props = defineProps({
@@ -26,11 +25,6 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
-const filter = {
-    where: { id: entityId },
-};
 const removeRole = async () => {
     try {
         await axios.delete(`VnRoles/${entityId.value}`);
@@ -43,13 +37,10 @@ const removeRole = async () => {
 
 <template>
     <CardDescriptor
-        :url="`VnRoles/${entityId}`"
-        :filter="filter"
+        url="VnRoles"
+        :filter="{ where: { id: entityId } }"
         module="Role"
-        @on-fetch="setData"
-        data-key="accountData"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        data-key="Role"
         :summary="$props.summary"
     >
         <template #menu>
diff --git a/src/pages/Account/Role/Card/RoleSummary.vue b/src/pages/Account/Role/Card/RoleSummary.vue
index fef85f919..83b90a710 100644
--- a/src/pages/Account/Role/Card/RoleSummary.vue
+++ b/src/pages/Account/Role/Card/RoleSummary.vue
@@ -19,18 +19,15 @@ const $props = defineProps({
 const { store } = useArrayData('Role');
 const role = ref(store.data);
 const entityId = computed(() => $props.id || route.params.id);
-const filter = {
-    where: { id: entityId },
-};
 </script>
 
 <template>
     <CardSummary
         ref="summary"
-        :url="`VnRoles`"
-        :filter="filter"
+        url="VnRoles"
+        :filter="{ where: { id: entityId } }"
         @on-fetch="(data) => (role = data)"
-        data-key="RoleSummary"
+        data-key="Role"
     >
         <template #header> {{ role.id }} - {{ role.name }} </template>
         <template #body>

From dcd681b6569f4bf35c206950138bd894c7c28c50 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 18 Nov 2024 16:10:04 +0100
Subject: [PATCH 15/68] feat: refs #6919 sync account

---
 src/components/common/VnCard.vue          | 7 +++----
 src/pages/Account/AccountList.vue         | 5 ++---
 src/pages/Account/Card/AccountCard.vue    | 3 +++
 src/pages/Account/Card/AccountSummary.vue | 6 +-----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index c37b25675..7b1205b8e 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -49,11 +49,10 @@ onBeforeMount(async () => {
 
 onBeforeRouteUpdate(async (to, from) => {
     if (to.params.id !== from.params.id) {
-        arrayData.store.url = !regex.test(props.url)
-            ? `${props.url}/${to.params.id}`
-            : props.url.replace(regex, `/${to.params.id}`);
+        if (props.idInWhere) arrayData.store.filter.where = { id: to.params.id };
+        else arrayData.store.url = `${props.url}/${to.params.id}`;
 
-        await arrayData.fetch({ append: false, updateRouter: false });
+        await arrayData.fetch({ updateRouter: false });
     }
 });
 </script>
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 0195da0cd..9a60e2ebc 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -8,13 +8,12 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import AccountFilter from './AccountFilter.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import exprBuilder from './AccountExprBuilder.js';
+import filter from './Card/AccountFilter.js';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
-const filter = {
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
+
 const columns = computed(() => [
     {
         align: 'left',
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index b252b2074..ea9f903d4 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -17,6 +17,9 @@ import filter from './AccountFilter.js';
             label: $t('account.search'),
             info: $t('account.searchInfo'),
             exprBuilder,
+            filter: {
+                include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+            },
         }"
     />
 </template>
diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue
index 5a21e18a5..38fe2e3f9 100644
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@@ -7,6 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
+import filter from './AccountFilter.js';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -21,11 +22,6 @@ const { store } = useArrayData('Account');
 const account = ref(store.data);
 
 const entityId = computed(() => $props.id || route.params.id);
-const filter = {
-    where: { id: entityId },
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
 </script>
 
 <template>

From 617af7b7cb700c7cd29e0c326cc5577353bd80f0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 18 Nov 2024 16:38:58 +0100
Subject: [PATCH 16/68] feat: refs #6919 sync alias

---
 src/pages/Account/AccountAliasList.vue        | 10 +---------
 src/pages/Account/Alias/AliasExprBuilder.js   |  8 ++++++++
 src/pages/Account/Alias/Card/AliasCard.vue    |  8 ++++----
 .../Account/Alias/Card/AliasDescriptor.vue    | 10 ++--------
 src/pages/Account/Alias/Card/AliasSummary.vue | 19 ++++++-------------
 5 files changed, 21 insertions(+), 34 deletions(-)
 create mode 100644 src/pages/Account/Alias/AliasExprBuilder.js

diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
index c67283297..e2072dfa0 100644
--- a/src/pages/Account/AccountAliasList.vue
+++ b/src/pages/Account/AccountAliasList.vue
@@ -4,19 +4,11 @@ import { ref, computed } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
-
+import exprBuilder from './Alias/AliasExprBuilder.js';
 const tableRef = ref();
 const { t } = useI18n();
 const stateStore = useStateStore();
 
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : { alias: { like: `%${value}%` } };
-    }
-};
 const columns = computed(() => [
     {
         align: 'left',
diff --git a/src/pages/Account/Alias/AliasExprBuilder.js b/src/pages/Account/Alias/AliasExprBuilder.js
new file mode 100644
index 000000000..f7a5a104c
--- /dev/null
+++ b/src/pages/Account/Alias/AliasExprBuilder.js
@@ -0,0 +1,8 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : { alias: { like: `%${value}%` } };
+    }
+};
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
index b9676df49..49c4e06b9 100644
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@@ -1,8 +1,7 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import VnCard from 'components/common/VnCard.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
-const { t } = useI18n();
+import exprBuilder from '../AliasExprBuilder.js';
 </script>
 
 <template>
@@ -13,9 +12,10 @@ const { t } = useI18n();
         search-data-key="AccountAliasList"
         :searchbar-props="{
             url: 'MailAliases',
-            info: t('mailAlias.searchInfo'),
-            label: t('mailAlias.search'),
+            info: $t('mailAlias.searchInfo'),
+            label: $t('mailAlias.search'),
             searchUrl: 'table',
+            exprBuilder,
         }"
     />
 </template>
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
index 713cecf75..619e5098b 100644
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -7,7 +7,6 @@ import { useQuasar } from 'quasar';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
-import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -29,9 +28,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
-
 const removeAlias = () => {
     quasar
         .dialog({
@@ -60,10 +56,8 @@ const removeAlias = () => {
         ref="descriptor"
         :url="`MailAliases/${entityId}`"
         module="Alias"
-        @on-fetch="setData"
-        data-key="aliasData"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        data-key="Alias"
+        title="alias"
     >
         <template #menu>
             <QItem v-ripple clickable @click="removeAlias()">
diff --git a/src/pages/Account/Alias/Card/AliasSummary.vue b/src/pages/Account/Alias/Card/AliasSummary.vue
index 1f76fe7c2..b4b9abd25 100644
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@@ -1,13 +1,11 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
-import { useArrayData } from 'src/composables/useArrayData';
-
 const route = useRoute();
 const { t } = useI18n();
 
@@ -18,20 +16,15 @@ const $props = defineProps({
     },
 });
 
-const { store } = useArrayData('Alias');
-const alias = ref(store.data);
 const entityId = computed(() => $props.id || route.params.id);
 </script>
 
 <template>
-    <CardSummary
-        ref="summary"
-        :url="`MailAliases/${entityId}`"
-        @on-fetch="(data) => (alias = data)"
-        data-key="MailAliasesSummary"
-    >
-        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
-        <template #body>
+    <CardSummary ref="summary" :url="`MailAliases/${entityId}`" data-key="Alias">
+        <template #header="{ entity: alias }">
+            {{ alias.id }} - {{ alias.alias }}
+        </template>
+        <template #body="{ entity: alias }">
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
                     <router-link

From 96e9d1a00af5ed29578a2f4d398bf1b2662d6b3c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 18 Nov 2024 17:13:42 +0100
Subject: [PATCH 17/68] feat: refs #6919 sync shelving

---
 src/pages/Shelving/Card/ShelvingCard.vue      |  2 ++
 .../Shelving/Card/ShelvingDescriptor.vue      | 29 +++------------
 src/pages/Shelving/Card/ShelvingFilter.js     | 15 ++++++++
 src/pages/Shelving/Card/ShelvingForm.vue      | 32 ++++-------------
 src/pages/Shelving/Card/ShelvingSearchbar.vue |  8 ++---
 src/pages/Shelving/Card/ShelvingSummary.vue   | 36 ++++++-------------
 src/pages/Shelving/ShelvingExprBuilder.js     | 10 ++++++
 src/pages/Shelving/ShelvingList.vue           | 24 ++++---------
 8 files changed, 59 insertions(+), 97 deletions(-)
 create mode 100644 src/pages/Shelving/Card/ShelvingFilter.js
 create mode 100644 src/pages/Shelving/ShelvingExprBuilder.js

diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index e67866a39..f36e6e0da 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -3,11 +3,13 @@ import VnCard from 'components/common/VnCard.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
 import ShelvingFilter from './ShelvingFilter.vue';
 import ShelvingSearchbar from './ShelvingSearchbar.vue';
+import filter from './ShelvingFilter.js';
 </script>
 <template>
     <VnCard
         data-key="Shelving"
         url="Shelvings"
+        :filter="filter"
         :descriptor="ShelvingDescriptor"
         :filter-panel="ShelvingFilter"
         search-data-key="ShelvingList"
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index b1ff4a8ae..9d491e36e 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -1,12 +1,12 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import useCardDescription from 'composables/useCardDescription';
 import ShelvingDescriptorMenu from 'pages/Shelving/Card/ShelvingDescriptorMenu.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
+import filter from './ShelvingFilter.js';
 
 const $props = defineProps({
     id: {
@@ -22,35 +22,14 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const filter = {
-    include: [
-        {
-            relation: 'worker',
-            scope: {
-                fields: ['id'],
-                include: {
-                    relation: 'user',
-                    scope: { fields: ['nickname'] },
-                },
-            },
-        },
-        { relation: 'parking' },
-    ],
-};
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
 </script>
-
 <template>
     <CardDescriptor
         module="Shelving"
         :url="`Shelvings/${entityId}`"
         :filter="filter"
-        :title="data.title"
-        :subtitle="data.subtitle"
-        data-key="Shelvings"
-        @on-fetch="setData"
+        title="code"
+        data-key="Shelving"
     >
         <template #body="{ entity }">
             <VnLv :label="t('globals.code')" :value="entity.code" />
diff --git a/src/pages/Shelving/Card/ShelvingFilter.js b/src/pages/Shelving/Card/ShelvingFilter.js
new file mode 100644
index 000000000..e302e1b9c
--- /dev/null
+++ b/src/pages/Shelving/Card/ShelvingFilter.js
@@ -0,0 +1,15 @@
+export default {
+    include: [
+        {
+            relation: 'worker',
+            scope: {
+                fields: ['id'],
+                include: {
+                    relation: 'user',
+                    scope: { fields: ['nickname'] },
+                },
+            },
+        },
+        { relation: 'parking' },
+    ],
+};
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index 3bbd94a0a..078058342 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import { computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
@@ -7,8 +6,8 @@ import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import filter from './ShelvingFilter.js';
 
-const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 const entityId = computed(() => route.params.id ?? null);
@@ -20,22 +19,6 @@ const defaultInitialData = {
     isRecyclable: false,
 };
 
-const shelvingFilter = {
-    include: [
-        {
-            relation: 'worker',
-            scope: {
-                fields: ['id'],
-                include: {
-                    relation: 'user',
-                    scope: { fields: ['nickname'] },
-                },
-            },
-        },
-        { relation: 'parking' },
-    ],
-};
-
 const onSave = (shelving, newShelving) => {
     if (isNew) {
         router.push({ name: 'ShelvingBasicData', params: { id: newShelving?.id } });
@@ -45,11 +28,10 @@ const onSave = (shelving, newShelving) => {
 <template>
     <VnSubToolbar v-if="isNew" />
     <FormModel
-        :url="isNew ? null : `Shelvings/${entityId}`"
         :url-create="isNew ? 'Shelvings' : null"
         :observe-form-changes="!isNew"
-        :filter="shelvingFilter"
-        model="shelving"
+        :filter="filter"
+        model="Shelving"
         :auto-load="!isNew"
         :form-initial-data="isNew ? defaultInitialData : null"
         @on-data-saved="onSave"
@@ -58,7 +40,7 @@ const onSave = (shelving, newShelving) => {
             <VnRow>
                 <VnInput
                     v-model="data.code"
-                    :label="t('globals.code')"
+                    :label="$t('globals.code')"
                     :rules="validate('Shelving.code')"
                 />
                 <VnSelect
@@ -68,7 +50,7 @@ const onSave = (shelving, newShelving) => {
                     option-label="code"
                     :filter-options="['id', 'code']"
                     :fields="['id', 'code']"
-                    :label="t('shelving.list.parking')"
+                    :label="$t('shelving.list.parking')"
                     :rules="validate('Shelving.parkingFk')"
                 />
             </VnRow>
@@ -76,12 +58,12 @@ const onSave = (shelving, newShelving) => {
                 <VnInput
                     v-model="data.priority"
                     type="number"
-                    :label="t('shelving.list.priority')"
+                    :label="$t('shelving.list.priority')"
                     :rules="validate('Shelving.priority')"
                 />
                 <QCheckbox
                     v-model="data.isRecyclable"
-                    :label="t('shelving.summary.recyclable')"
+                    :label="$t('shelving.summary.recyclable')"
                     :rules="validate('Shelving.isRecyclable')"
                 />
             </VnRow>
diff --git a/src/pages/Shelving/Card/ShelvingSearchbar.vue b/src/pages/Shelving/Card/ShelvingSearchbar.vue
index bfc8ad4f5..741b11663 100644
--- a/src/pages/Shelving/Card/ShelvingSearchbar.vue
+++ b/src/pages/Shelving/Card/ShelvingSearchbar.vue
@@ -1,15 +1,15 @@
 <script setup>
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import {useI18n} from "vue-i18n";
-const { t } = useI18n();
+import exprBuilder from '../ShelvingExprBuilder.js';
 </script>
 
 <template>
     <VnSearchbar
         data-key="ShelvingList"
         url="Shelvings"
-        :label="t('Search shelving')"
-        :info="t('You can search by shelving reference')"
+        :label="$t('Search shelving')"
+        :info="$t('You can search by shelving reference')"
+        :expr-builder="exprBuilder"
     />
 </template>
 
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index db7ac34f5..b6bfce8ab 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -1,10 +1,10 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
+import filter from './ShelvingFilter.js';
 
 const $props = defineProps({
     id: {
@@ -13,25 +13,8 @@ const $props = defineProps({
     },
 });
 const route = useRoute();
-const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
-
-const filter = {
-    include: [
-        {
-            relation: 'worker',
-            scope: {
-                fields: ['id'],
-                include: {
-                    relation: 'user',
-                    scope: { fields: ['nickname'] },
-                },
-            },
-        },
-        { relation: 'parking' },
-    ],
-};
 </script>
 
 <template>
@@ -40,7 +23,7 @@ const filter = {
             ref="summary"
             :url="`Shelvings/${entityId}`"
             :filter="filter"
-            data-key="ShelvingSummary"
+            data-key="Shelving"
         >
             <template #header="{ entity }">
                 <div>{{ entity.code }}</div>
@@ -51,16 +34,19 @@ const filter = {
                         class="header header-link"
                         :to="{ name: 'ShelvingBasicData', params: { id: entityId } }"
                     >
-                        {{ t('globals.pageTitles.basicData') }}
+                        {{ $t('globals.pageTitles.basicData') }}
                         <QIcon name="open_in_new" />
                     </RouterLink>
-                    <VnLv :label="t('globals.code')" :value="entity.code" />
+                    <VnLv :label="$t('globals.code')" :value="entity.code" />
                     <VnLv
-                        :label="t('shelving.list.parking')"
+                        :label="$t('shelving.list.parking')"
                         :value="entity.parking?.code"
                     />
-                    <VnLv :label="t('shelving.list.priority')" :value="entity.priority" />
-                    <VnLv v-if="entity.worker" :label="t('globals.worker')">
+                    <VnLv
+                        :label="$t('shelving.list.priority')"
+                        :value="entity.priority"
+                    />
+                    <VnLv v-if="entity.worker" :label="$t('globals.worker')">
                         <template #value>
                             <VnUserLink
                                 :name="entity.worker?.user?.nickname"
@@ -69,7 +55,7 @@ const filter = {
                         </template>
                     </VnLv>
                     <VnLv
-                        :label="t('shelving.summary.recyclable')"
+                        :label="$t('shelving.summary.recyclable')"
                         :value="entity.isRecyclable"
                     />
                 </QCard>
diff --git a/src/pages/Shelving/ShelvingExprBuilder.js b/src/pages/Shelving/ShelvingExprBuilder.js
new file mode 100644
index 000000000..b9aad8a71
--- /dev/null
+++ b/src/pages/Shelving/ShelvingExprBuilder.js
@@ -0,0 +1,10 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return { code: { like: `%${value}%` } };
+        case 'parkingFk':
+        case 'userFk':
+        case 'isRecyclable':
+            return { [param]: value };
+    }
+};
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index d29f6ff15..c49b913b0 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -1,7 +1,6 @@
 <script setup>
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
-import { useI18n } from 'vue-i18n';
 import { onMounted, onUnmounted } from 'vue';
 import CardList from 'components/ui/CardList.vue';
 import VnLv from 'components/ui/VnLv.vue';
@@ -11,10 +10,10 @@ import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
 import ShelvingSearchbar from 'pages/Shelving/Card/ShelvingSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import exprBuilder from './ShelvingExprBuilder.js';
 
 const stateStore = useStateStore();
 const router = useRouter();
-const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const filter = {
     include: [{ relation: 'parking' }],
@@ -26,17 +25,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 function navigate(id) {
     router.push({ path: `/shelving/${id}` });
 }
-
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'search':
-            return { code: { like: `%${value}%` } };
-        case 'parkingFk':
-        case 'userFk':
-        case 'isRecyclable':
-            return { [param]: value };
-    }
-}
 </script>
 
 <template>
@@ -65,18 +53,18 @@ function exprBuilder(param, value) {
                     >
                         <template #list-items>
                             <VnLv
-                                :label="t('shelving.list.parking')"
-                                :title-label="t('shelving.list.parking')"
+                                :label="$t('shelving.list.parking')"
+                                :title-label="$t('shelving.list.parking')"
                                 :value="row.parking?.code"
                             />
                             <VnLv
-                                :label="t('shelving.list.priority')"
+                                :label="$t('shelving.list.priority')"
                                 :value="row?.priority"
                             />
                         </template>
                         <template #actions>
                             <QBtn
-                                :label="t('components.smartCard.openSummary')"
+                                :label="$t('components.smartCard.openSummary')"
                                 @click.stop="viewSummary(row.id, ShelvingSummary)"
                                 color="primary"
                             />
@@ -89,7 +77,7 @@ function exprBuilder(param, value) {
             <RouterLink :to="{ name: 'ShelvingCreate' }">
                 <QBtn fab icon="add" color="primary" shortcut="+" />
                 <QTooltip>
-                    {{ t('shelving.list.newShelving') }}
+                    {{ $t('shelving.list.newShelving') }}
                 </QTooltip>
             </RouterLink>
         </QPageSticky>

From 96e7bf78c59ab0dc0cad367ff137f51274cb05ec Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 18 Nov 2024 17:30:23 +0100
Subject: [PATCH 18/68] feat: refs #6919 sync supplier

---
 src/pages/Supplier/Card/SupplierBasicData.vue |  3 +-
 src/pages/Supplier/Card/SupplierCard.vue      |  2 +
 .../Supplier/Card/SupplierDescriptor.vue      | 48 +------------------
 src/pages/Supplier/Card/SupplierFilter.js     | 35 ++++++++++++++
 4 files changed, 40 insertions(+), 48 deletions(-)
 create mode 100644 src/pages/Supplier/Card/SupplierFilter.js

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index a6031e985..7179bf0f4 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -16,9 +16,8 @@ const companySizes = [
 </script>
 <template>
     <FormModel
-        :url="`Suppliers/${route.params.id}`"
         :url-update="`Suppliers/${route.params.id}`"
-        model="supplier"
+        model="Supplier"
         auto-load
         :clear-store-on-unmount="false"
     >
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index d3057bbe4..ce5f743e1 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -2,11 +2,13 @@
 import VnCard from 'components/common/VnCard.vue';
 import SupplierDescriptor from './SupplierDescriptor.vue';
 import SupplierListFilter from '../SupplierListFilter.vue';
+import filter from './SupplierFilter.js';
 </script>
 <template>
     <VnCard
         data-key="Supplier"
         url="Suppliers"
+        :filter="filter"
         :descriptor="SupplierDescriptor"
         :filter-panel="SupplierListFilter"
         search-data-key="SupplierList"
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 0fbe03c99..e27eb8937 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -7,9 +7,9 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { toDateString } from 'src/filters';
-import useCardDescription from 'src/composables/useCardDescription';
 import { getUrl } from 'src/composables/getUrl';
 import { useState } from 'src/composables/useState';
+import filter from './SupplierFilter.js';
 
 const $props = defineProps({
     id: {
@@ -28,42 +28,6 @@ const { t } = useI18n();
 const url = ref();
 const state = useState();
 
-const filter = {
-    fields: [
-        'id',
-        'name',
-        'nickname',
-        'nif',
-        'payMethodFk',
-        'payDemFk',
-        'payDay',
-        'isActive',
-        'isSerious',
-        'isTrucker',
-        'account',
-    ],
-    include: [
-        {
-            relation: 'payMethod',
-            scope: {
-                fields: ['id', 'name'],
-            },
-        },
-        {
-            relation: 'payDem',
-            scope: {
-                fields: ['id', 'payDem'],
-            },
-        },
-        {
-            relation: 'client',
-            scope: {
-                fields: ['id', 'fi'],
-            },
-        },
-    ],
-};
-
 onMounted(async () => {
     url.value = await getUrl('');
 });
@@ -72,11 +36,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const data = ref(useCardDescription());
-const setData = (entity) => {
-    data.value = useCardDescription(entity.ref, entity.id);
-};
-
 const supplier = computed(() => state.get('supplier'));
 
 const getEntryQueryParams = (supplier) => {
@@ -105,11 +64,8 @@ const getEntryQueryParams = (supplier) => {
     <CardDescriptor
         module="Supplier"
         :url="`Suppliers/${entityId}`"
-        :title="data.title"
-        :subtitle="data.subtitle"
         :filter="filter"
-        @on-fetch="setData"
-        data-key="supplierDescriptor"
+        data-key="Supplier"
         :summary="$props.summary"
     >
         <template #body="{ entity }">
diff --git a/src/pages/Supplier/Card/SupplierFilter.js b/src/pages/Supplier/Card/SupplierFilter.js
new file mode 100644
index 000000000..3ce5c3de2
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierFilter.js
@@ -0,0 +1,35 @@
+export default {
+    fields: [
+        'id',
+        'name',
+        'nickname',
+        'nif',
+        'payMethodFk',
+        'payDemFk',
+        'payDay',
+        'isActive',
+        'isSerious',
+        'isTrucker',
+        'account',
+    ],
+    include: [
+        {
+            relation: 'payMethod',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+        {
+            relation: 'payDem',
+            scope: {
+                fields: ['id', 'payDem'],
+            },
+        },
+        {
+            relation: 'client',
+            scope: {
+                fields: ['id', 'fi'],
+            },
+        },
+    ],
+};

From efcf3be585f055227b55ef297d39221db6cfc284 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 10:11:33 +0100
Subject: [PATCH 19/68] feat: refs #6919 sync ticket

---
 .../Card/BasicData/TicketBasicDataView.vue    | 123 ++++++------------
 src/pages/Ticket/Card/TicketCard.vue          |  10 +-
 src/pages/Ticket/Card/TicketDescriptor.vue    |  84 +-----------
 src/pages/Ticket/Card/TicketFilter.js         |  72 ++++++++++
 4 files changed, 121 insertions(+), 168 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketFilter.js

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index 851593bff..d0eb161d4 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -1,7 +1,7 @@
 <script setup>
-import { ref, onBeforeMount } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 
 import TicketBasicData from './TicketBasicData.vue';
 import TicketBasicDataForm from './TicketBasicDataForm.vue';
@@ -9,104 +9,69 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const { notify } = useNotify();
-const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
 const stepperRef = ref(null);
 const { openConfirmationModal } = useVnConfirm();
 
 const step = ref(1);
-const formData = ref({});
-const initialDataLoaded = ref(false);
 const haveNegatives = ref(false);
 
-const ticketFilter = {
-    include: [
-        { relation: 'address' },
-        {
-            relation: 'client',
-            scope: {
-                fields: [
-                    'salesPersonFk',
-                    'name',
-                    'isActive',
-                    'isFreezed',
-                    'isTaxDataChecked',
-                    'credit',
-                    'email',
-                    'phone',
-                    'mobile',
-                    'hasElectronicInvoice',
-                ],
-                include: {
-                    relation: 'salesPersonUser',
-                    scope: { fields: ['id', 'name'] },
-                },
-            },
-        },
-        { relation: 'invoiceOut' },
-    ],
-};
-
-const getTicketData = async () => {
-    const params = { filter: JSON.stringify(ticketFilter) };
-    const { data } = await axios.get(`tickets/${route.params.id}`, { params });
-    formData.value = data;
-    initialDataLoaded.value = true;
-};
+const ticket = computed(() => useArrayData('Ticket').store?.data);
 
 const isFormInvalid = () => {
     return (
-        !formData.value.clientFk ||
-        !formData.value.addressFk ||
-        !formData.value.agencyModeFk ||
-        !formData.value.companyFk ||
-        !formData.value.shipped ||
-        !formData.value.landed ||
-        !formData.value.zoneFk
+        !ticket.value.clientFk ||
+        !ticket.value.addressFk ||
+        !ticket.value.agencyModeFk ||
+        !ticket.value.companyFk ||
+        !ticket.value.shipped ||
+        !ticket.value.landed ||
+        !ticket.value.zoneFk
     );
 };
 
 const getPriceDifference = async () => {
     const params = {
-        landed: formData.value.landed,
-        addressId: formData.value.addressFk,
-        agencyModeId: formData.value.agencyModeFk,
-        zoneId: formData.value.zoneFk,
-        warehouseId: formData.value.warehouseFk,
-        shipped: formData.value.shipped,
+        landed: ticket.value.landed,
+        addressId: ticket.value.addressFk,
+        agencyModeId: ticket.value.agencyModeFk,
+        zoneId: ticket.value.zoneFk,
+        warehouseId: ticket.value.warehouseFk,
+        shipped: ticket.value.shipped,
     };
     const { data } = await axios.post(
-        `tickets/${formData.value.id}/priceDifference`,
+        `tickets/${ticket.value.id}/priceDifference`,
         params
     );
-    formData.value.sale = data;
+    ticket.value.sale = data;
 };
 
 const submit = async () => {
-    if (!formData.value.option) return notify(t('basicData.chooseAnOption'), 'negative');
+    if (!ticket.value.option) return notify(t('basicData.chooseAnOption'), 'negative');
 
     const params = {
-        clientFk: formData.value.clientFk,
-        nickname: formData.value.nickname,
-        agencyModeFk: formData.value.agencyModeFk,
-        addressFk: formData.value.addressFk,
-        zoneFk: formData.value.zoneFk,
-        warehouseFk: formData.value.warehouseFk,
-        companyFk: formData.value.companyFk,
-        shipped: formData.value.shipped,
-        landed: formData.value.landed,
-        isDeleted: formData.value.isDeleted,
-        option: formData.value.option,
-        isWithoutNegatives: formData.value.withoutNegatives,
-        withWarningAccept: formData.value.withWarningAccept,
+        clientFk: ticket.value.clientFk,
+        nickname: ticket.value.nickname,
+        agencyModeFk: ticket.value.agencyModeFk,
+        addressFk: ticket.value.addressFk,
+        zoneFk: ticket.value.zoneFk,
+        warehouseFk: ticket.value.warehouseFk,
+        companyFk: ticket.value.companyFk,
+        shipped: ticket.value.shipped,
+        landed: ticket.value.landed,
+        isDeleted: ticket.value.isDeleted,
+        option: ticket.value.option,
+        isWithoutNegatives: ticket.value.withoutNegatives,
+        withWarningAccept: ticket.value.withWarningAccept,
         keepPrice: false,
     };
 
     const { data } = await axios.post(
-        `tickets/${formData.value.id}/componentUpdate`,
+        `tickets/${ticket.value.id}/componentUpdate`,
         params
     );
 
@@ -118,7 +83,7 @@ const submit = async () => {
 };
 
 const submitWithNegatives = async () => {
-    formData.value.withWarningAccept = true;
+    ticket.value.withWarningAccept = true;
     submit();
 };
 
@@ -130,7 +95,7 @@ const onNextStep = async () => {
         await getPriceDifference();
         stepperRef.value.next();
     } else if (step.value === 2) {
-        if (haveNegatives.value && !formData.value.withoutNegatives)
+        if (haveNegatives.value && !ticket.value.withoutNegatives)
             openConfirmationModal(
                 t('basicData.negativesConfirmTitle'),
                 t('basicData.negativesConfirmMessage'),
@@ -139,10 +104,8 @@ const onNextStep = async () => {
         else submit();
     }
 };
-
-onBeforeMount(async () => await getTicketData());
 </script>
-<template>
+<template v-if="ticket">
     <QStepper
         v-model="step"
         ref="stepperRef"
@@ -155,18 +118,10 @@ onBeforeMount(async () => await getTicketData());
         }"
     >
         <QStep :name="1" :title="t('globals.pageTitles.basicData')" :done="step > 1">
-            <TicketBasicDataForm
-                v-if="initialDataLoaded"
-                @update-form="($event) => (formData = $event)"
-                v-model="formData"
-            />
+            <TicketBasicDataForm v-if="ticket" v-model="ticket" />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">
-            <TicketBasicData
-                :form-data="formData"
-                v-model:haveNegatives="haveNegatives"
-                @update-form="($event) => (formData = $event)"
-            />
+            <TicketBasicData :form-data="ticket" v-model:haveNegatives="haveNegatives" />
         </QStep>
         <template #navigation>
             <QStepperNavigation class="flex justify-between">
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 191e02cd2..e6fc52bc7 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,23 +1,21 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-
 import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketFilter from '../TicketFilter.vue';
-
-const { t } = useI18n();
+import filter from './TicketFilter.js';
 </script>
 <template>
     <VnCard
         data-key="Ticket"
         url="Tickets"
+        :filter="filter"
         :filter-panel="TicketFilter"
         :descriptor="TicketDescriptor"
         search-data-key="TicketList"
         :searchbar-props="{
             url: 'Tickets/filter',
-            label: t('card.search'),
-            info: t('card.searchInfo'),
+            label: $t('card.search'),
+            info: $t('card.searchInfo'),
         }"
     />
 </template>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index f8ffb43ed..da4b70f08 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -9,7 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import { toDateTimeFormat } from 'src/filters/date';
-
+import filter from './TicketFilter.js';
 const $props = defineProps({
     id: {
         type: Number,
@@ -25,78 +25,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const filter = {
-    include: [
-        {
-            relation: 'address',
-            scope: {
-                fields: ['id', 'name', 'mobile', 'phone', 'incotermsFk'],
-            },
-        },
-        {
-            relation: 'client',
-            scope: {
-                fields: [
-                    'id',
-                    'name',
-                    'salesPersonFk',
-                    'phone',
-                    'mobile',
-                    'email',
-                    'isActive',
-                    'isFreezed',
-                    'isTaxDataChecked',
-                    'hasElectronicInvoice',
-                ],
-                include: [
-                    {
-                        relation: 'user',
-                        scope: {
-                            fields: ['id', 'lang'],
-                        },
-                    },
-                    { relation: 'salesPersonUser' },
-                ],
-            },
-        },
-        {
-            relation: 'ticketState',
-            scope: {
-                include: { relation: 'state' },
-            },
-        },
-        {
-            relation: 'warehouse',
-            scope: {
-                fields: ['id', 'name'],
-            },
-        },
-        {
-            relation: 'agencyMode',
-            scope: {
-                fields: ['id', 'name'],
-            },
-        },
-        {
-            relation: 'zone',
-            scope: {
-                fields: [
-                    'agencyModeFk',
-                    'bonus',
-                    'hour',
-                    'id',
-                    'isVolumetric',
-                    'itemMaxSize',
-                    'm3Max',
-                    'name',
-                    'price',
-                    'travelingDays',
-                ],
-            },
-        },
-    ],
-};
-
 const data = ref(useCardDescription());
 
 function ticketFilter(ticket) {
@@ -111,7 +39,7 @@ function ticketFilter(ticket) {
         :filter="filter"
         :title="data.title"
         :subtitle="data.subtitle"
-        data-key="ticketData"
+        data-key="Ticket"
     >
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />
@@ -158,7 +86,7 @@ function ticketFilter(ticket) {
         <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-xs">
                 <QIcon
-                    v-if="entity.client.isActive == false"
+                    v-if="entity.client?.isActive == false"
                     name="vn:disabled"
                     size="xs"
                     color="primary"
@@ -166,7 +94,7 @@ function ticketFilter(ticket) {
                     <QTooltip>{{ t('Client inactive') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="entity.client.isFreezed == true"
+                    v-if="entity.client?.isFreezed == true"
                     name="vn:frozen"
                     size="xs"
                     color="primary"
@@ -174,7 +102,7 @@ function ticketFilter(ticket) {
                     <QTooltip>{{ t('Client Frozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="entity.problem.includes('hasRisk')"
+                    v-if="entity.problem?.includes('hasRisk')"
                     name="vn:risk"
                     size="xs"
                     color="primary"
@@ -182,7 +110,7 @@ function ticketFilter(ticket) {
                     <QTooltip>{{ t('Client has debt') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="entity.client.isTaxDataChecked == false"
+                    v-if="entity.client?.isTaxDataChecked == false"
                     name="vn:no036"
                     size="xs"
                     color="primary"
diff --git a/src/pages/Ticket/Card/TicketFilter.js b/src/pages/Ticket/Card/TicketFilter.js
new file mode 100644
index 000000000..7846f1658
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketFilter.js
@@ -0,0 +1,72 @@
+export default {
+    include: [
+        {
+            relation: 'address',
+            scope: {
+                fields: ['id', 'name', 'mobile', 'phone', 'incotermsFk'],
+            },
+        },
+        {
+            relation: 'client',
+            scope: {
+                fields: [
+                    'id',
+                    'name',
+                    'salesPersonFk',
+                    'phone',
+                    'mobile',
+                    'email',
+                    'isActive',
+                    'isFreezed',
+                    'isTaxDataChecked',
+                    'hasElectronicInvoice',
+                    'credit',
+                ],
+                include: [
+                    {
+                        relation: 'user',
+                        scope: {
+                            fields: ['id', 'lang'],
+                        },
+                    },
+                    { relation: 'salesPersonUser' },
+                ],
+            },
+        },
+        {
+            relation: 'ticketState',
+            scope: {
+                include: { relation: 'state' },
+            },
+        },
+        {
+            relation: 'warehouse',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+        {
+            relation: 'agencyMode',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+        {
+            relation: 'zone',
+            scope: {
+                fields: [
+                    'agencyModeFk',
+                    'bonus',
+                    'hour',
+                    'id',
+                    'isVolumetric',
+                    'itemMaxSize',
+                    'm3Max',
+                    'name',
+                    'price',
+                    'travelingDays',
+                ],
+            },
+        },
+    ],
+};

From fc247ae413b2458d6bf772b1e87cc8eb2a97c712 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 11:07:14 +0100
Subject: [PATCH 20/68] feat: refs #6919 sync worker

---
 src/pages/Worker/Card/WorkerBasicData.vue  | 9 ++++-----
 src/pages/Worker/Card/WorkerDescriptor.vue | 7 +++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 6a13e3f39..8efe89b87 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -18,10 +18,11 @@ const maritalStatus = [
     { code: 'S', name: t('Single') },
 ];
 const advancedSummary = ref({});
-
+const route = useRoute();
 onBeforeMount(async () => {
-    advancedSummary.value =
-        (await useAdvancedSummary('Workers', +useRoute().params.id)) ?? {};
+    console.log('route.params.id', route.params.id);
+    advancedSummary.value = (await useAdvancedSummary('Workers', route.params.id)) ?? {};
+    console.log('advancedSummary.value: ', advancedSummary.value);
 });
 </script>
 <template>
@@ -38,8 +39,6 @@ onBeforeMount(async () => {
         auto-load
     />
     <FormModel
-        :filter="{ where: { id: +$route.params.id } }"
-        url="Workers/summary"
         :url-update="`Workers/${$route.params.id}`"
         auto-load
         model="Worker"
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 9112d1d00..6e4d7f027 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -20,7 +20,7 @@ const $props = defineProps({
     dataKey: {
         type: String,
         required: false,
-        default: 'workerData',
+        default: 'Worker',
     },
 });
 const image = ref(null);
@@ -71,8 +71,7 @@ const handlePhotoUpdated = (evt = false) => {
         ref="cardDescriptorRef"
         module="Worker"
         :data-key="dataKey"
-        url="Workers/descriptor"
-        :filter="{ where: { id: entityId } }"
+        url="Workers/summary"
         title="user.nickname"
         @on-fetch="getIsExcluded"
     >
@@ -182,7 +181,7 @@ const handlePhotoUpdated = (evt = false) => {
                 <QBtn
                     :to="{
                         name: 'AccountCard',
-                        params: { id: entity.user.id },
+                        params: { id: entity.user?.id },
                     }"
                     size="md"
                     icon="face"

From 51b3283ff781407d9a55a5cd96c9a4f86e87a81d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 11:22:32 +0100
Subject: [PATCH 21/68] feat: refs #6919 sync zone

---
 src/pages/Zone/Card/ZoneBasicData.vue  |  2 +-
 src/pages/Zone/Card/ZoneCard.vue       | 10 +++---
 src/pages/Zone/Card/ZoneDescriptor.vue | 43 +++++---------------------
 src/pages/Zone/Card/ZoneFilter.js      | 10 ++++++
 src/pages/Zone/Card/ZoneSummary.vue    | 18 ++---------
 5 files changed, 27 insertions(+), 56 deletions(-)
 create mode 100644 src/pages/Zone/Card/ZoneFilter.js

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 535f2393d..d459546e1 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -29,7 +29,7 @@ const agencyOptions = ref([]);
         url="AgencyModes/isActive"
     />
 
-    <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">
+    <FormModel auto-load model="Zone">
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput :label="t('Name')" clearable v-model="data.name" />
diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 44af586f8..407cf9442 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -1,13 +1,12 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { computed } from 'vue';
 
 import VnCard from 'components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
 import ZoneFilterPanel from '../ZoneFilterPanel.vue';
+import filter from './ZoneFilter.js';
 
-const { t } = useI18n();
 const route = useRoute();
 const routeName = computed(() => route.name);
 
@@ -19,16 +18,17 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
 
 <template>
     <VnCard
-        data-key="zone"
+        data-key="Zone"
         :url="notIsLocations('Zones', undefined)"
         :descriptor="ZoneDescriptor"
+        :filter="filter"
         :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
         :search-data-key="notIsLocations('ZoneList', undefined)"
         :custom-url="`Zones/${route.params?.id}/getLeaves`"
         :searchbar-props="{
             url: notIsLocations('Zones', 'ZoneLocations'),
-            label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),
-            info: t('list.searchInfo'),
+            label: notIsLocations($t('list.searchZone'), $t('list.searchLocation')),
+            info: $t('list.searchInfo'),
             whereFilter: notIsLocations((value) => {
                 return /^\d+$/.test(value)
                     ? { id: value }
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index f991818fb..49237a02b 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -1,15 +1,14 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { toTimeFormat } from 'src/filters/date';
 import { toCurrency } from 'filters/index';
 
-import useCardDescription from 'src/composables/useCardDescription';
 import ZoneDescriptorMenuItems from './ZoneDescriptorMenuItems.vue';
+import filter from './ZoneFilter.js';
 
 const $props = defineProps({
     id: {
@@ -20,53 +19,27 @@ const $props = defineProps({
 });
 
 const route = useRoute();
-const { t } = useI18n();
-
-const filter = {
-    include: [
-        {
-            relation: 'agencyMode',
-            scope: {
-                fields: ['name', 'id'],
-            },
-        },
-    ],
-};
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const data = ref(useCardDescription());
-const setData = (entity) => {
-    data.value = useCardDescription(entity.ref, entity.id);
-};
 </script>
 
 <template>
     <CardDescriptor
         module="Zone"
         :url="`Zones/${entityId}`"
-        :title="data.title"
-        :subtitle="data.subtitle"
         :filter="filter"
-        @on-fetch="setData"
-        data-key="zoneData"
+        data-key="Zone"
     >
         <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('list.agency')" :value="entity.agencyMode.name" />
-            <VnLv :label="t('zone.closing')" :value="toTimeFormat(entity.hour)" />
-            <VnLv :label="t('zone.travelingDays')" :value="entity.travelingDays" />
-            <VnLv :label="t('list.price')" :value="toCurrency(entity.price)" />
-            <VnLv :label="t('zone.bonus')" :value="toCurrency(entity.bonus)" />
+            <VnLv :label="$t('list.agency')" :value="entity.agencyMode?.name" />
+            <VnLv :label="$t('zone.closing')" :value="toTimeFormat(entity.hour)" />
+            <VnLv :label="$t('zone.travelingDays')" :value="entity.travelingDays" />
+            <VnLv :label="$t('list.price')" :value="toCurrency(entity.price)" />
+            <VnLv :label="$t('zone.bonus')" :value="toCurrency(entity.bonus)" />
         </template>
     </CardDescriptor>
 </template>
-
-<i18n>
-es:
-    Go to module index: Ir al índice del módulo
-</i18n>
diff --git a/src/pages/Zone/Card/ZoneFilter.js b/src/pages/Zone/Card/ZoneFilter.js
new file mode 100644
index 000000000..3298c7c8a
--- /dev/null
+++ b/src/pages/Zone/Card/ZoneFilter.js
@@ -0,0 +1,10 @@
+export default {
+    include: [
+        {
+            relation: 'agencyMode',
+            scope: {
+                fields: ['name', 'id'],
+            },
+        },
+    ],
+};
diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index 384ee1fe9..831f2e25d 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -11,6 +11,7 @@ import { getUrl } from 'src/composables/getUrl';
 import { toCurrency } from 'filters/index';
 import { toTimeFormat } from 'src/filters/date';
 import axios from 'axios';
+import filter from './ZoneFilter.js';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -25,19 +26,6 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const zoneUrl = ref();
 
-const filter = computed(() => {
-    const filter = {
-        include: {
-            relation: 'agencyMode',
-            fields: ['name'],
-        },
-        where: {
-            id: entityId,
-        },
-    };
-    return filter;
-});
-
 const columns = computed(() => [
     {
         label: t('list.name'),
@@ -71,9 +59,9 @@ onMounted(async () => {
 
 <template>
     <CardSummary
-        data-key="ZoneSummary"
+        data-key="Zone"
         ref="summary"
-        url="Zones/findOne"
+        :url="`Zones/${entityId}`"
         :filter="filter"
     >
         <template #header="{ entity }">

From 06b61a52f6f9c9d4fbe5334af5da2fc076d6a4d6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 11:24:14 +0100
Subject: [PATCH 22/68] chore: refs #6919 drop useless code

---
 src/pages/Zone/Card/ZoneBasicData.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index d459546e1..87ff2e994 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { ref } from 'vue';
 import FetchData from 'components/FetchData.vue';
@@ -10,7 +9,6 @@ import { QCheckbox } from 'quasar';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const route = useRoute();
 const { t } = useI18n();
 
 const agencyFilter = {

From 386f2e31264cfef2b55e05276f9cfe5c879fa15b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 12:15:58 +0100
Subject: [PATCH 23/68] feat: refs #6919 sync account summary

---
 src/pages/Account/Card/AccountSummary.vue | 26 ++++++-----------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue
index 38fe2e3f9..c480a5391 100644
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@@ -1,16 +1,12 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-
-import { useArrayData } from 'src/composables/useArrayData';
 import filter from './AccountFilter.js';
 
 const route = useRoute();
-const { t } = useI18n();
 
 const $props = defineProps({
     id: {
@@ -18,34 +14,26 @@ const $props = defineProps({
         default: 0,
     },
 });
-const { store } = useArrayData('Account');
-const account = ref(store.data);
 
 const entityId = computed(() => $props.id || route.params.id);
 </script>
 
 <template>
-    <CardSummary
-        data-key="AccountSummary"
-        ref="AccountSummary"
-        url="VnUsers/preview"
-        :filter="filter"
-        @on-fetch="(data) => (account = data)"
-    >
-        <template #header>{{ account.id }} - {{ account.nickname }}</template>
-        <template #body>
+    <CardSummary data-key="Account" url="VnUsers/preview" :filter="filter">
+        <template #header="{ entity }">{{ entity.id }} - {{ entity.nickname }}</template>
+        <template #body="{ entity }">
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
                     <router-link
                         :to="{ name: 'AccountBasicData', params: { id: entityId } }"
                         class="header header-link"
                     >
-                        {{ t('globals.pageTitles.basicData') }}
+                        {{ $t('globals.pageTitles.basicData') }}
                         <QIcon name="open_in_new" />
                     </router-link>
                 </QCardSection>
-                <VnLv :label="t('account.card.nickname')" :value="account.name" />
-                <VnLv :label="t('account.card.role')" :value="account.role.name" />
+                <VnLv :label="$t('account.card.nickname')" :value="entity.name" />
+                <VnLv :label="$t('account.card.role')" :value="entity.role?.name" />
             </QCard>
         </template>
     </CardSummary>

From 43fc2e2312da2a12be6a1c488f5a9f4081c56909 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 Jan 2025 16:18:59 +0100
Subject: [PATCH 24/68] refactor: refs #6919 update model naming and default
 values in Ticket components

---
 src/pages/Ticket/Card/BasicData/TicketBasicData.vue     | 2 +-
 src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue | 9 +++++----
 src/pages/Ticket/Card/TicketCard.vue                    | 8 +++++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
index c6a85c287..44f2bf7fb 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicData.vue
@@ -10,7 +10,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { toCurrency } from 'filters/index';
 import { useRole } from 'src/composables/useRole';
 
-const haveNegatives = defineModel('haveNegatives', { type: Boolean, required: true });
+const haveNegatives = defineModel('have-negatives', { type: Boolean, required: true });
 const formData = defineModel({ type: Object, required: true });
 
 const stateStore = useStateStore();
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index d0eb161d4..ef2eb75d6 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -18,7 +18,7 @@ const stepperRef = ref(null);
 const { openConfirmationModal } = useVnConfirm();
 
 const step = ref(1);
-const haveNegatives = ref(false);
+const haveNegatives = ref(true);
 
 const ticket = computed(() => useArrayData('Ticket').store?.data);
 
@@ -105,8 +105,9 @@ const onNextStep = async () => {
     }
 };
 </script>
-<template v-if="ticket">
+<template>
     <QStepper
+        v-if="ticket"
         v-model="step"
         ref="stepperRef"
         color="primary"
@@ -118,10 +119,10 @@ const onNextStep = async () => {
         }"
     >
         <QStep :name="1" :title="t('globals.pageTitles.basicData')" :done="step > 1">
-            <TicketBasicDataForm v-if="ticket" v-model="ticket" />
+            <TicketBasicDataForm v-model="ticket" />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">
-            <TicketBasicData :form-data="ticket" v-model:haveNegatives="haveNegatives" />
+            <TicketBasicData v-model="ticket" v-model:have-negatives="haveNegatives" />
         </QStep>
         <template #navigation>
             <QStepperNavigation class="flex justify-between">
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 6886a8e57..d860271a2 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,7 +1,13 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
+import filter from './TicketFilter.js';
 </script>
 <template>
-    <VnCardBeta data-key="Ticket" base-url="Tickets" :descriptor="TicketDescriptor" />
+    <VnCardBeta
+        data-key="Ticket"
+        base-url="Tickets"
+        :descriptor="TicketDescriptor"
+        :filter="filter"
+    />
 </template>

From d5733898710ebec9faf0e80974a50ee34e77a88e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 Jan 2025 10:20:36 +0100
Subject: [PATCH 25/68] feat: refs #6919 add oneRecord option to data store and
 update related components

---
 src/components/FormModel.vue                  |  9 +----
 src/components/common/VnCardBeta.vue          | 37 +++++++++----------
 src/components/ui/CardDescriptor.vue          |  5 ++-
 src/components/ui/CardSummary.vue             |  5 ++-
 src/composables/useArrayData.js               | 15 ++++++--
 src/pages/Account/Card/AccountBasicData.vue   |  8 +---
 src/pages/Account/Card/AccountCard.vue        | 19 +++++++++-
 src/pages/Account/Card/AccountDescriptor.vue  | 13 ++-----
 src/pages/Account/Card/AccountFilter.js       | 10 -----
 src/pages/Account/Card/AccountSummary.vue     | 18 +++------
 src/pages/Account/Role/AccountRoles.vue       |  2 +-
 src/pages/Account/Role/Card/RoleCard.vue      |  2 +-
 ...countExprBuilder.js => RoleExprBuilder.js} |  0
 src/pages/Worker/Card/WorkerCard.vue          |  3 +-
 src/stores/useArrayDataStore.js               |  2 +
 15 files changed, 70 insertions(+), 78 deletions(-)
 rename src/pages/Account/Role/{AccountExprBuilder.js => RoleExprBuilder.js} (100%)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 6cdfe0320..b4da85d15 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -136,13 +136,7 @@ onMounted(async () => {
 
     if (!$props.formInitialData) {
         if ($props.autoLoad && $props.url) await fetch();
-        else if (arrayData.store.data)
-            updateAndEmit(
-                'onFetch',
-                Array.isArray(arrayData.store.data)
-                    ? arrayData.store.data[0]
-                    : arrayData.store.data
-            );
+        else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
     }
     if ($props.observeFormChanges) {
         watch(
@@ -163,7 +157,6 @@ if (!$props.url)
     watch(
         () => arrayData.store.data,
         (val) => {
-            if (Array.isArray(val)) val = val[0] ?? {};
             updateAndEmit('onFetch', val);
         }
     );
diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 349956be9..a3cf17697 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount, computed } from 'vue';
+import { onBeforeMount } from 'vue';
 import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
@@ -9,8 +9,8 @@ import VnSubToolbar from '../ui/VnSubToolbar.vue';
 
 const props = defineProps({
     dataKey: { type: String, required: true },
-    baseUrl: { type: String, default: undefined },
-    customUrl: { type: String, default: undefined },
+    url: { type: String, default: undefined },
+    idInWhere: { type: Boolean, default: false },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
@@ -22,21 +22,20 @@ const props = defineProps({
 const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
-const url = computed(() => {
-    if (props.baseUrl) {
-        return `${props.baseUrl}/${route.params.id}`;
-    }
-    return props.customUrl;
-});
+const regex = /(\/\d+)/;
 
 const arrayData = useArrayData(props.dataKey, {
-    url: url.value,
+    url: props.url,
     filter: props.filter,
+    oneRecord: true,
 });
 
 onBeforeMount(async () => {
     try {
-        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+        if (props.idInWhere) arrayData.store.filter.where = { id: route.params.id };
+        else if (!regex.test(props.url))
+            arrayData.store.url = `${props.url}/${route.params.id}`;
+        console.log('fetching data', arrayData.store.url, route.params.id);
         await arrayData.fetch({ append: false, updateRouter: false });
     } catch {
         const { matched: matches } = router.currentRoute.value;
@@ -45,14 +44,14 @@ onBeforeMount(async () => {
     }
 });
 
-if (props.baseUrl) {
-    onBeforeRouteUpdate(async (to, from) => {
-        if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
-            await arrayData.fetch({ append: false, updateRouter: false });
-        }
-    });
-}
+onBeforeRouteUpdate(async (to, from) => {
+    if (to.params.id !== from.params.id) {
+        if (props.idInWhere) arrayData.store.filter.where = { id: to.params.id };
+        else arrayData.store.url = `${props.url}/${to.params.id}`;
+        console.log('fetching data', arrayData.store.url, to.params.id);
+        await arrayData.fetch({ updateRouter: false });
+    }
+});
 </script>
 <template>
     <Teleport to="#left-panel" v-if="stateStore.isHeaderMounted()">
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index f4c0091d2..cd90380a3 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -55,10 +55,11 @@ onBeforeMount(async () => {
         url: $props.url,
         filter: $props.filter,
         skip: 0,
+        oneRecord: true,
     });
     store = arrayData.store;
     entity = computed(() => {
-        const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+        const data = store.data ?? {};
         if (data) emit('onFetch', data);
         return data;
     });
@@ -80,7 +81,7 @@ async function getData() {
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
         state.set($props.dataKey, data);
-        emit('onFetch', Array.isArray(data) ? data[0] : data);
+        emit('onFetch', data);
     } finally {
         isLoading.value = false;
     }
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 8395dfd73..0f561cfdb 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -35,9 +35,10 @@ const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
     skip: 0,
+    oneRecord: true,
 });
 const { store } = arrayData;
-const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+const entity = computed(() => store.data);
 const isLoading = ref(false);
 
 const stateStore = useStateStore();
@@ -60,7 +61,7 @@ async function fetch() {
     store.filter = props.filter ?? {};
     isLoading.value = true;
     const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-    emit('onFetch', Array.isArray(data) ? data[0] : data);
+    emit('onFetch', data);
     isLoading.value = false;
 }
 </script>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 1f4234a00..313c4089d 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -54,6 +54,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             'navigate',
             'mapKey',
             'keepData',
+            'oneRecord',
         ];
         if (typeof userOptions === 'object') {
             for (const option in userOptions) {
@@ -104,13 +105,17 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         store.hasMoreData = limit && response.data.length >= limit;
 
-        processData(response.data, { map: !!store.mapKey, append });
+        processData(response.data, {
+            map: !!store.mapKey,
+            append,
+            oneRecord: store.oneRecord,
+        });
         if (!append && !isDialogOpened()) updateRouter && updateStateParams();
 
         store.isLoading = false;
         canceller = null;
 
-        return response;
+        return store.data;
     }
 
     function destroy() {
@@ -296,7 +301,11 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         return { filter, params, limit: filter.limit };
     }
 
-    function processData(data, { map = true, append = true }) {
+    function processData(data, { map = true, append = true, oneRecord = false }) {
+        if (oneRecord) {
+            store.data = Array.isArray(data) ? data[0] : data;
+            return;
+        }
         if (!append) {
             store.data = [];
             store.map = new Map();
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index 094641707..393f9eb80 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -5,13 +5,7 @@ import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 </script>
 <template>
-    <FormModel
-        ref="formModelRef"
-        :url-update="`VnUsers/${$route.params.id}/update-user`"
-        model="Account"
-        auto-load
-        @on-data-saved="$refs.formModelRef.fetch()"
-    >
+    <FormModel :url-update="`VnUsers/${$route.params.id}/update-user`" model="Account">
         <template #form="{ data }">
             <div class="q-gutter-y-sm">
                 <VnInput v-model="data.name" :label="$t('account.card.nickname')" />
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index 9e39b42e5..a6705f451 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -1,7 +1,24 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
+import exprBuilder from '../AccountExprBuilder.js';
+import filter from './AccountFilter.js';
 </script>
 <template>
-    <VnCardBeta data-key="AccountId" :descriptor="AccountDescriptor" />
+    <VnCardBeta
+        url="VnUsers/preview"
+        :id-in-where="true"
+        data-key="Account"
+        :descriptor="AccountDescriptor"
+        :filter="filter"
+        :searchbar-props="{
+            url: 'VnUsers/preview',
+            label: $t('account.search'),
+            info: $t('account.searchInfo'),
+            exprBuilder,
+            filter: {
+                include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+            },
+        }"
+    />
 </template>
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 4f090c918..6b1687746 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -8,19 +8,12 @@ import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
 import filter from './AccountFilter.js';
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
+
+const $props = defineProps({ id: { type: Number, default: null } });
 
 const route = useRoute();
 const { t } = useI18n();
-const entityId = computed(() => {
-    return $props.id || route.params.id;
-});
+const entityId = computed(() => $props.id || route.params.id);
 const hasAccount = ref(false);
 </script>
 
diff --git a/src/pages/Account/Card/AccountFilter.js b/src/pages/Account/Card/AccountFilter.js
index e0825a6e6..017876564 100644
--- a/src/pages/Account/Card/AccountFilter.js
+++ b/src/pages/Account/Card/AccountFilter.js
@@ -1,13 +1,3 @@
 export default {
-    fields: [
-        'id',
-        'email',
-        'nickname',
-        'name',
-        'accountStateFk',
-        'packages',
-        'pickup',
-        'role',
-    ],
     include: { relation: 'role', scope: { fields: ['id', 'name'] } },
 };
diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue
index cc05d773a..ecfe60da6 100644
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@@ -1,33 +1,25 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import filter from './AccountFilter.js';
 
+const $props = defineProps({ id: { type: Number, default: 0 } });
+
 const route = useRoute();
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-
 const entityId = computed(() => $props.id || route.params.id);
 </script>
 
 <template>
     <CardSummary
-        data-key="AccountId"
+        data-key="Account"
         ref="AccountSummary"
         url="VnUsers/preview"
         :filter="filter"
-        @on-fetch="(data) => (account = data)"
     >
-        <template #header>{{ account.id }} - {{ account.nickname }}</template>
-        <template #body>
+        <template #header="{ entity }">{{ entity.id }} - {{ entity.nickname }}</template>
+        <template #body="{ entity }">
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
                     <router-link
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index 212174e28..02f5400c6 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -5,7 +5,7 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import { useRoute } from 'vue-router';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RoleSummary from './Card/RoleSummary.vue';
-import exprBuilder from './AccountExprBuilder.js';
+import exprBuilder from './RoleExprBuilder.js';
 import VnSection from 'src/components/common/VnSection.vue';
 
 const route = useRoute();
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index 7664deca8..5b4db0a8b 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -3,5 +3,5 @@ import VnCardBeta from 'components/common/VnCardBeta.vue';
 import RoleDescriptor from './RoleDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Role" :descriptor="RoleDescriptor" />
+    <VnCardBeta data-key="Role" :id-in-where="true" :descriptor="RoleDescriptor" />
 </template>
diff --git a/src/pages/Account/Role/AccountExprBuilder.js b/src/pages/Account/Role/RoleExprBuilder.js
similarity index 100%
rename from src/pages/Account/Role/AccountExprBuilder.js
rename to src/pages/Account/Role/RoleExprBuilder.js
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 5e04b8434..3b7a62025 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -5,7 +5,8 @@ import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 <template>
     <VnCardBeta
         data-key="Worker"
-        custom-url="Workers/summary"
+        url="Workers/summary"
+        :id-in-where="true"
         :descriptor="WorkerDescriptor"
     />
 </template>
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index 8d62fdb4a..b6a904dc8 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -19,6 +19,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         page: 1,
         mapKey: 'id',
         keepData: false,
+        oneRecord: false,
     };
 
     function get(key) {
@@ -62,5 +63,6 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         clear,
         reset,
         resetPagination,
+        state,
     };
 });

From 618d3582566ed7a92a417ad07b1a22c370d6f4b6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 Jan 2025 10:46:21 +0100
Subject: [PATCH 26/68] fix: refs #6919 roles

---
 src/pages/Account/Role/Card/RoleCard.vue    |  7 ++++++-
 src/pages/Account/Role/Card/RoleSummary.vue | 16 ++++++----------
 src/router/modules/account/roleCard.js      |  1 +
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index 5b4db0a8b..ef5b9db04 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -3,5 +3,10 @@ import VnCardBeta from 'components/common/VnCardBeta.vue';
 import RoleDescriptor from './RoleDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Role" :id-in-where="true" :descriptor="RoleDescriptor" />
+    <VnCardBeta
+        url="VnRoles"
+        data-key="Role"
+        :id-in-where="true"
+        :descriptor="RoleDescriptor"
+    />
 </template>
diff --git a/src/pages/Account/Role/Card/RoleSummary.vue b/src/pages/Account/Role/Card/RoleSummary.vue
index 83b90a710..410f90b17 100644
--- a/src/pages/Account/Role/Card/RoleSummary.vue
+++ b/src/pages/Account/Role/Card/RoleSummary.vue
@@ -1,10 +1,9 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -16,8 +15,6 @@ const $props = defineProps({
     },
 });
 
-const { store } = useArrayData('Role');
-const role = ref(store.data);
 const entityId = computed(() => $props.id || route.params.id);
 </script>
 
@@ -26,11 +23,10 @@ const entityId = computed(() => $props.id || route.params.id);
         ref="summary"
         url="VnRoles"
         :filter="{ where: { id: entityId } }"
-        @on-fetch="(data) => (role = data)"
         data-key="Role"
     >
-        <template #header> {{ role.id }} - {{ role.name }} </template>
-        <template #body>
+        <template #header="{ entity }"> {{ entity.id }} - {{ entity.name }} </template>
+        <template #body="{ entity }">
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
                     <a
@@ -41,9 +37,9 @@ const entityId = computed(() => $props.id || route.params.id);
                         <QIcon name="open_in_new" />
                     </a>
                 </QCardSection>
-                <VnLv :label="t('role.id')" :value="role.id" />
-                <VnLv :label="t('globals.name')" :value="role.name" />
-                <VnLv :label="t('role.description')" :value="role.description" />
+                <VnLv :label="t('role.id')" :value="entity.id" />
+                <VnLv :label="t('globals.name')" :value="entity.name" />
+                <VnLv :label="t('role.description')" :value="entity.description" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/router/modules/account/roleCard.js b/src/router/modules/account/roleCard.js
index c36ce71b9..f8100071f 100644
--- a/src/router/modules/account/roleCard.js
+++ b/src/router/modules/account/roleCard.js
@@ -4,6 +4,7 @@ export default {
     component: () => import('src/pages/Account/Role/Card/RoleCard.vue'),
     redirect: { name: 'RoleSummary' },
     meta: {
+        moduleName: 'Role',
         menu: ['RoleBasicData', 'SubRoles', 'InheritedRoles', 'RoleLog'],
     },
     children: [

From 7f8c8b07c47d0ec28ce570d030a990871cf4bc30 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 Jan 2025 10:49:41 +0100
Subject: [PATCH 27/68] fix: refs #6919 alias

---
 src/pages/Account/AccountAliasList.vue  | 10 +---------
 src/router/modules/account/aliasCard.js |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
index f6016fb6c..19682286c 100644
--- a/src/pages/Account/AccountAliasList.vue
+++ b/src/pages/Account/AccountAliasList.vue
@@ -3,6 +3,7 @@ import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import exprBuilder from './Alias/AliasExprBuilder';
 
 const tableRef = ref();
 const { t } = useI18n();
@@ -31,15 +32,6 @@ const columns = computed(() => [
         create: true,
     },
 ]);
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : { alias: { like: `%${value}%` } };
-    }
-};
 </script>
 
 <template>
diff --git a/src/router/modules/account/aliasCard.js b/src/router/modules/account/aliasCard.js
index cbbd31e51..a5b00f44b 100644
--- a/src/router/modules/account/aliasCard.js
+++ b/src/router/modules/account/aliasCard.js
@@ -3,7 +3,7 @@ export default {
     path: ':id',
     component: () => import('src/pages/Account/Alias/Card/AliasCard.vue'),
     redirect: { name: 'AliasSummary' },
-    meta: { menu: ['AliasBasicData', 'AliasUsers'] },
+    meta: { moduleName: 'Alias', menu: ['AliasBasicData', 'AliasUsers'] },
     children: [
         {
             name: 'AliasSummary',

From 69a32231e2d071a7dd97242ae0af3d76f486cb65 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 Jan 2025 10:52:57 +0100
Subject: [PATCH 28/68] refactor: refs #6919 simplify watch

---
 src/components/FormModel.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index b4da85d15..ea1ea53f2 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -156,9 +156,7 @@ onMounted(async () => {
 if (!$props.url)
     watch(
         () => arrayData.store.data,
-        (val) => {
-            updateAndEmit('onFetch', val);
-        }
+        (val) => updateAndEmit('onFetch', val)
     );
 
 watch(

From 9ebb7b85b2ccebdbd1d9a09d4eb4c5341045306f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 Jan 2025 10:55:38 +0100
Subject: [PATCH 29/68] feat: refs #6919 add oneRecord opt

---
 src/components/common/VnCard.vue     | 1 +
 src/components/common/VnCardBeta.vue | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 7b1205b8e..89e3e56fd 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -31,6 +31,7 @@ const searchRightDataKey = computed(() => {
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
+    oneRecord: true,
 });
 
 onBeforeMount(async () => {
diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index a3cf17697..35d64af34 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -35,7 +35,6 @@ onBeforeMount(async () => {
         if (props.idInWhere) arrayData.store.filter.where = { id: route.params.id };
         else if (!regex.test(props.url))
             arrayData.store.url = `${props.url}/${route.params.id}`;
-        console.log('fetching data', arrayData.store.url, route.params.id);
         await arrayData.fetch({ append: false, updateRouter: false });
     } catch {
         const { matched: matches } = router.currentRoute.value;

From 52e1cfc8287512abd27ea692e093082ac16247f4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 Jan 2025 10:56:40 +0100
Subject: [PATCH 30/68] chore: refs #6919 remove console logs

---
 src/components/common/VnCardBeta.vue      | 1 -
 src/pages/Worker/Card/WorkerBasicData.vue | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 35d64af34..9c2cd1a22 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -47,7 +47,6 @@ onBeforeRouteUpdate(async (to, from) => {
     if (to.params.id !== from.params.id) {
         if (props.idInWhere) arrayData.store.filter.where = { id: to.params.id };
         else arrayData.store.url = `${props.url}/${to.params.id}`;
-        console.log('fetching data', arrayData.store.url, to.params.id);
         await arrayData.fetch({ updateRouter: false });
     }
 });
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 8efe89b87..9d743f874 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -20,9 +20,7 @@ const maritalStatus = [
 const advancedSummary = ref({});
 const route = useRoute();
 onBeforeMount(async () => {
-    console.log('route.params.id', route.params.id);
     advancedSummary.value = (await useAdvancedSummary('Workers', route.params.id)) ?? {};
-    console.log('advancedSummary.value: ', advancedSummary.value);
 });
 </script>
 <template>

From 74dd49ffe059c510da047d5514e3f04d6e610f77 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 Jan 2025 11:47:41 +0100
Subject: [PATCH 31/68] feat: refs #6919 add customUrl prop to VnCard for
 dynamic URL handling

---
 src/components/common/VnCard.vue         | 19 +++++++++++++------
 src/pages/Customer/Card/CustomerCard.vue |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 89e3e56fd..004607914 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -11,6 +11,7 @@ import RightMenu from 'components/common/RightMenu.vue';
 const props = defineProps({
     dataKey: { type: String, required: true },
     url: { type: String, default: undefined },
+    customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
@@ -28,17 +29,20 @@ const searchRightDataKey = computed(() => {
     if (!props.searchDataKey) return route.name;
     return props.searchDataKey;
 });
+
+const url = computed(() => props.url || props.customUrl);
 const arrayData = useArrayData(props.dataKey, {
-    url: props.url,
+    url: url.value,
     filter: props.filter,
     oneRecord: true,
 });
 
 onBeforeMount(async () => {
     try {
-        if (props.idInWhere) arrayData.store.filter.where = { id: route.params.id };
-        else if (!regex.test(props.url))
-            arrayData.store.url = `${props.url}/${route.params.id}`;
+        const id = route.params.id;
+        if (props.idInWhere) arrayData.store.filter.where = { id };
+        else if (props.customUrl) arrayData.store.url = url.value;
+        else if (!regex.test(url.value)) arrayData.store.url = `${url.value}/${id}`;
 
         await arrayData.fetch({ append: false, updateRouter: false });
     } catch {
@@ -50,8 +54,11 @@ onBeforeMount(async () => {
 
 onBeforeRouteUpdate(async (to, from) => {
     if (to.params.id !== from.params.id) {
-        if (props.idInWhere) arrayData.store.filter.where = { id: to.params.id };
-        else arrayData.store.url = `${props.url}/${to.params.id}`;
+        const id = to.params.id;
+        if (props.idInWhere) arrayData.store.filter.where = { id };
+        else if (props.customUrl)
+            arrayData.store.url = url.value.replace(regex, `/${id}`);
+        else arrayData.store.url = `${url.value}/${id}`;
 
         await arrayData.fetch({ updateRouter: false });
     }
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 6e79b31a9..af1231f14 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -6,7 +6,7 @@ import CustomerFilter from '../CustomerFilter.vue';
 <template>
     <VnCard
         data-key="Client"
-        :url="`Clients/${$route.params.id}/getCard`"
+        :custom-url="`Clients/${$route.params.id}/getCard`"
         :descriptor="CustomerDescriptor"
         :filter-panel="$route.name != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"

From 8c77f6fe407056eb0c67fb0e2f4ab6c5030d4700 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 8 Jan 2025 11:58:19 +0100
Subject: [PATCH 32/68] refactor: refs #6919 update data-key and state
 references to use 'Customer'

---
 src/pages/Customer/Card/CustomerBasicData.vue  |  1 +
 src/pages/Customer/Card/CustomerCard.vue       |  2 +-
 src/pages/Customer/Card/CustomerDescriptor.vue | 12 ++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 046172049..0681ba892 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -57,6 +57,7 @@ function onBeforeSave(formData, originalData) {
         :url-update="`Clients/${route.params.id}`"
         auto-load
         :mapper="onBeforeSave"
+        module="Customer"
     >
         <template #form="{ data, validate }">
             <VnRow>
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index af1231f14..92b015098 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -5,7 +5,7 @@ import CustomerFilter from '../CustomerFilter.vue';
 </script>
 <template>
     <VnCard
-        data-key="Client"
+        data-key="Customer"
         :custom-url="`Clients/${$route.params.id}/getCard`"
         :descriptor="CustomerDescriptor"
         :filter-panel="$route.name != 'CustomerConsumption' && CustomerFilter"
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 19718ff28..07c713e51 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -17,7 +17,7 @@ const state = useState();
 const customer = ref();
 
 onMounted(async () => {
-    customer.value = state.get('customer');
+    customer.value = state.get('Customer');
     if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
 });
 
@@ -54,7 +54,7 @@ const debtWarning = computed(() => {
         module="Customer"
         :url="`Clients/${entityId}/getCard`"
         :summary="$props.summary"
-        data-key="Client"
+        data-key="Customer"
         @on-fetch="setData"
     >
         <template #menu="{ entity }">
@@ -63,7 +63,7 @@ const debtWarning = computed(() => {
         <template #body="{ entity }">
             <VnLv
                 :label="t('customer.summary.payMethod')"
-                :value="entity.payMethod.name"
+                :value="entity.payMethod?.name"
             />
 
             <VnLv
@@ -92,7 +92,7 @@ const debtWarning = computed(() => {
             </VnLv>
             <VnLv
                 :label="t('customer.extendedList.tableVisibleColumns.businessTypeFk')"
-                :value="entity.businessType.description"
+                :value="entity.businessType?.description"
             />
         </template>
         <template #icons>
@@ -150,13 +150,13 @@ const debtWarning = computed(() => {
                         <br />
                         {{
                             t('unpaidDated', {
-                                dated: toDate(customer.unpaid.dated),
+                                dated: toDate(customer.unpaid?.dated),
                             })
                         }}
                         <br />
                         {{
                             t('unpaidAmount', {
-                                amount: toCurrency(customer.unpaid.amount),
+                                amount: toCurrency(customer.unpaid?.amount),
                             })
                         }}
                     </QTooltip>

From 2462b5f38e3d86f2b67f39c5f41aae9627ea7603 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 10:59:34 +0100
Subject: [PATCH 33/68] fix: refs #6919 customer

---
 src/pages/Customer/Card/CustomerBasicData.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 0681ba892..36ec4763e 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -57,7 +57,7 @@ function onBeforeSave(formData, originalData) {
         :url-update="`Clients/${route.params.id}`"
         auto-load
         :mapper="onBeforeSave"
-        module="Customer"
+        model="Customer"
     >
         <template #form="{ data, validate }">
             <VnRow>

From d23eb052f403d2b06d424045cd2f2b26a497af80 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 11:01:48 +0100
Subject: [PATCH 34/68] feat: refs #6919 add customUrl prop to VnCardBeta for
 flexible URL handling

---
 src/components/common/VnCardBeta.vue | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 9c2cd1a22..cecb6516e 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount } from 'vue';
+import { onBeforeMount, computed } from 'vue';
 import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
@@ -10,6 +10,7 @@ import VnSubToolbar from '../ui/VnSubToolbar.vue';
 const props = defineProps({
     dataKey: { type: String, required: true },
     url: { type: String, default: undefined },
+    customUrl: { type: String, default: undefined },
     idInWhere: { type: Boolean, default: false },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
@@ -24,6 +25,7 @@ const route = useRoute();
 const router = useRouter();
 const regex = /(\/\d+)/;
 
+const url = computed(() => props.url || props.customUrl);
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
@@ -32,9 +34,11 @@ const arrayData = useArrayData(props.dataKey, {
 
 onBeforeMount(async () => {
     try {
-        if (props.idInWhere) arrayData.store.filter.where = { id: route.params.id };
-        else if (!regex.test(props.url))
-            arrayData.store.url = `${props.url}/${route.params.id}`;
+        const id = route.params.id;
+        if (props.idInWhere) arrayData.store.filter.where = { id };
+        else if (props.customUrl) arrayData.store.url = url.value;
+        else if (!regex.test(url.value)) arrayData.store.url = `${url.value}/${id}`;
+
         await arrayData.fetch({ append: false, updateRouter: false });
     } catch {
         const { matched: matches } = router.currentRoute.value;
@@ -45,8 +49,12 @@ onBeforeMount(async () => {
 
 onBeforeRouteUpdate(async (to, from) => {
     if (to.params.id !== from.params.id) {
-        if (props.idInWhere) arrayData.store.filter.where = { id: to.params.id };
-        else arrayData.store.url = `${props.url}/${to.params.id}`;
+        const id = to.params.id;
+        if (props.idInWhere) arrayData.store.filter.where = { id };
+        else if (props.customUrl)
+            arrayData.store.url = url.value.replace(regex, `/${id}`);
+        else arrayData.store.url = `${url.value}/${id}`;
+
         await arrayData.fetch({ updateRouter: false });
     }
 });

From 39f0873fb816f6e8e9a6e2fac62da37bc06fd340 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 12:41:24 +0100
Subject: [PATCH 35/68] refactor: refs #6919 simplify WorkerBasicData component
 by removing unused imports and optimizing data fetching

---
 src/pages/Worker/Card/WorkerBasicData.vue | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 9d743f874..fcf0f0369 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -1,6 +1,5 @@
 <script setup>
-import { ref, onBeforeMount } from 'vue';
-import { useRoute } from 'vue-router';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -11,17 +10,13 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
 
 const { t } = useI18n();
+const form = ref();
 const educationLevels = ref([]);
 const countries = ref([]);
 const maritalStatus = [
     { code: 'M', name: t('Married') },
     { code: 'S', name: t('Single') },
 ];
-const advancedSummary = ref({});
-const route = useRoute();
-onBeforeMount(async () => {
-    advancedSummary.value = (await useAdvancedSummary('Workers', route.params.id)) ?? {};
-});
 </script>
 <template>
     <FetchData
@@ -37,12 +32,15 @@ onBeforeMount(async () => {
         auto-load
     />
     <FormModel
+        ref="form"
         :url-update="`Workers/${$route.params.id}`"
         auto-load
         model="Worker"
         @on-fetch="
             async (data) => {
-                Object.assign(data, advancedSummary);
+                Object.assign(data, (await useAdvancedSummary('Workers', data.id)) ?? {});
+                await $nextTick();
+                if (form) form.hasChanges = false;
             }
         "
     >

From 622c875dc553ec60ad98e5d525bbe7549b51e5b2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 15:57:12 +0100
Subject: [PATCH 36/68] fix: refs #6919 department

---
 src/pages/Department/Card/DepartmentBasicData.vue | 2 +-
 src/pages/Department/Card/DepartmentSummary.vue   | 2 +-
 src/router/modules/worker.js                      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 58048b549..66210be7b 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -39,7 +39,7 @@ import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
             </VnRow>
             <VnRow>
                 <VnSelectWorker
-                    :label="t('department.bossDepartment')"
+                    :label="$t('department.bossDepartment')"
                     v-model="data.workerFk"
                     :rules="validate('department.bossDepartment')"
                 />
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
index d41f8622b..49c46b236 100644
--- a/src/pages/Department/Card/DepartmentSummary.vue
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -27,7 +27,7 @@ onMounted(async () => {
 
 <template>
     <CardSummary
-        data-key="DepartmentSummary"
+        data-key="Department"
         ref="summary"
         :url="`Departments/${entityId}`"
         class="full-width"
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index e9fb0c4f1..d8db7df0c 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -194,6 +194,7 @@ const departmentCard = {
     component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
     redirect: { name: 'DepartmentSummary' },
     meta: {
+        moduleName: 'Department',
         menu: ['DepartmentBasicData'],
     },
     children: [

From ad8618a51badc0059e0cd2979d728724710f4a5d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 16:27:11 +0100
Subject: [PATCH 37/68] fix: refs #6919 arrayData

---
 src/composables/useArrayData.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 00e6e694c..1683f73e7 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -117,7 +117,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             oneRecord: store.oneRecord,
         });
 
-        return store.data;
+        return response;
     }
 
     function destroy() {

From b7f2a320c733181f0a01aedeed67a7bbfcca7873 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 16:36:27 +0100
Subject: [PATCH 38/68] fix: refs #6919 item

---
 src/pages/Item/Card/ItemCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 52cfabdef..79d4240bc 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -6,7 +6,7 @@ import ItemListFilter from '../ItemListFilter.vue';
 <template>
     <VnCard
         data-key="Item"
-        :url="`Items/${$route.params.id}/getCard`"
+        :custom-url="`Items/${$route.params.id}/getCard`"
         :descriptor="ItemDescriptor"
         :filter-panel="ItemListFilter"
         search-data-key="ItemList"

From 9e06a48841ccfb2e5d4a66f500d4882a74d910ec Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 17:10:21 +0100
Subject: [PATCH 39/68] refactor: refs #6919 fine tunning vnCard

---
 src/components/common/VnCard.vue         | 31 ++++++++-------------
 src/components/common/VnCardBeta.vue     | 35 ++++++++----------------
 src/pages/Customer/Card/CustomerCard.vue |  2 +-
 src/pages/Item/Card/ItemCard.vue         |  2 +-
 4 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 004607914..064f85337 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -11,7 +11,6 @@ import RightMenu from 'components/common/RightMenu.vue';
 const props = defineProps({
     dataKey: { type: String, required: true },
     url: { type: String, default: undefined },
-    customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
@@ -24,27 +23,20 @@ const props = defineProps({
 const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
-const regex = /(\/\d+)/;
 const searchRightDataKey = computed(() => {
     if (!props.searchDataKey) return route.name;
     return props.searchDataKey;
 });
 
-const url = computed(() => props.url || props.customUrl);
 const arrayData = useArrayData(props.dataKey, {
-    url: url.value,
+    url: props.url,
     filter: props.filter,
     oneRecord: true,
 });
 
 onBeforeMount(async () => {
     try {
-        const id = route.params.id;
-        if (props.idInWhere) arrayData.store.filter.where = { id };
-        else if (props.customUrl) arrayData.store.url = url.value;
-        else if (!regex.test(url.value)) arrayData.store.url = `${url.value}/${id}`;
-
-        await arrayData.fetch({ append: false, updateRouter: false });
+        await fetchData(route.params.id);
     } catch {
         const { matched: matches } = router.currentRoute.value;
         const { path } = matches.at(-1);
@@ -53,16 +45,15 @@ onBeforeMount(async () => {
 });
 
 onBeforeRouteUpdate(async (to, from) => {
-    if (to.params.id !== from.params.id) {
-        const id = to.params.id;
-        if (props.idInWhere) arrayData.store.filter.where = { id };
-        else if (props.customUrl)
-            arrayData.store.url = url.value.replace(regex, `/${id}`);
-        else arrayData.store.url = `${url.value}/${id}`;
-
-        await arrayData.fetch({ updateRouter: false });
-    }
+    const id = to.params.id;
+    if (id !== from.params.id) await fetchData(id, true);
 });
+
+async function fetchData(id, append = false) {
+    if (props.idInWhere) arrayData.store.filter.where = { id };
+    else arrayData.store.url = props.url.replace(/(\/\d+)/, `/${id}`);
+    await arrayData.fetch({ append, updateRouter: false });
+}
 </script>
 <template>
     <QDrawer
@@ -89,7 +80,7 @@ onBeforeRouteUpdate(async (to, from) => {
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="route.path" />
+                <RouterView :key="$route.path" />
             </div>
         </QPage>
     </QPageContainer>
diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index cecb6516e..f5aa34189 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -1,6 +1,6 @@
 <script setup>
-import { onBeforeMount, computed } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { onBeforeMount } from 'vue';
+import { useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
@@ -10,7 +10,6 @@ import VnSubToolbar from '../ui/VnSubToolbar.vue';
 const props = defineProps({
     dataKey: { type: String, required: true },
     url: { type: String, default: undefined },
-    customUrl: { type: String, default: undefined },
     idInWhere: { type: Boolean, default: false },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
@@ -21,11 +20,7 @@ const props = defineProps({
 });
 
 const stateStore = useStateStore();
-const route = useRoute();
 const router = useRouter();
-const regex = /(\/\d+)/;
-
-const url = computed(() => props.url || props.customUrl);
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
@@ -34,12 +29,7 @@ const arrayData = useArrayData(props.dataKey, {
 
 onBeforeMount(async () => {
     try {
-        const id = route.params.id;
-        if (props.idInWhere) arrayData.store.filter.where = { id };
-        else if (props.customUrl) arrayData.store.url = url.value;
-        else if (!regex.test(url.value)) arrayData.store.url = `${url.value}/${id}`;
-
-        await arrayData.fetch({ append: false, updateRouter: false });
+        await fetchData(router.currentRoute.value.params.id);
     } catch {
         const { matched: matches } = router.currentRoute.value;
         const { path } = matches.at(-1);
@@ -48,16 +38,15 @@ onBeforeMount(async () => {
 });
 
 onBeforeRouteUpdate(async (to, from) => {
-    if (to.params.id !== from.params.id) {
-        const id = to.params.id;
-        if (props.idInWhere) arrayData.store.filter.where = { id };
-        else if (props.customUrl)
-            arrayData.store.url = url.value.replace(regex, `/${id}`);
-        else arrayData.store.url = `${url.value}/${id}`;
-
-        await arrayData.fetch({ updateRouter: false });
-    }
+    const id = to.params.id;
+    if (id !== from.params.id) await fetchData(id, true);
 });
+
+async function fetchData(id, append = false) {
+    if (props.idInWhere) arrayData.store.filter.where = { id };
+    else arrayData.store.url = props.url.replace(/(\/\d+)/, `/${id}`);
+    await arrayData.fetch({ append, updateRouter: false });
+}
 </script>
 <template>
     <Teleport to="#left-panel" v-if="stateStore.isHeaderMounted()">
@@ -67,6 +56,6 @@ onBeforeRouteUpdate(async (to, from) => {
     </Teleport>
     <VnSubToolbar />
     <div :class="[useCardSize(), $attrs.class]">
-        <RouterView :key="route.path" />
+        <RouterView :key="$route.path" />
     </div>
 </template>
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 92b015098..c7de9946e 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -6,7 +6,7 @@ import CustomerFilter from '../CustomerFilter.vue';
 <template>
     <VnCard
         data-key="Customer"
-        :custom-url="`Clients/${$route.params.id}/getCard`"
+        :url="`Clients/${$route.params.id}/getCard`"
         :descriptor="CustomerDescriptor"
         :filter-panel="$route.name != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 79d4240bc..52cfabdef 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -6,7 +6,7 @@ import ItemListFilter from '../ItemListFilter.vue';
 <template>
     <VnCard
         data-key="Item"
-        :custom-url="`Items/${$route.params.id}/getCard`"
+        :url="`Items/${$route.params.id}/getCard`"
         :descriptor="ItemDescriptor"
         :filter-panel="ItemListFilter"
         search-data-key="ItemList"

From a46d3affde8574c1ab1eddd7ed6fbeaa76b061c7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 17:11:55 +0100
Subject: [PATCH 40/68] refactor: refs #6919 fine tunning vnCard

---
 src/components/common/VnCardBeta.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index f5aa34189..0afd1c211 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -28,10 +28,11 @@ const arrayData = useArrayData(props.dataKey, {
 });
 
 onBeforeMount(async () => {
+    const route = router.currentRoute.value;
     try {
-        await fetchData(router.currentRoute.value.params.id);
+        await fetchData(route.params.id);
     } catch {
-        const { matched: matches } = router.currentRoute.value;
+        const { matched: matches } = route;
         const { path } = matches.at(-1);
         router.push({ path: path.replace(/:id.*/, '') });
     }

From 9084d918c04c284f2f80dd13b31dc2becf35ec4d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 17:32:57 +0100
Subject: [PATCH 41/68] fix: refs #6919 arrayData

---
 src/components/common/VnCard.vue     | 10 ++++++----
 src/components/common/VnCardBeta.vue | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 064f85337..cf98a0ab2 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -36,7 +36,7 @@ const arrayData = useArrayData(props.dataKey, {
 
 onBeforeMount(async () => {
     try {
-        await fetchData(route.params.id);
+        await fetch(route.params.id);
     } catch {
         const { matched: matches } = router.currentRoute.value;
         const { path } = matches.at(-1);
@@ -46,12 +46,14 @@ onBeforeMount(async () => {
 
 onBeforeRouteUpdate(async (to, from) => {
     const id = to.params.id;
-    if (id !== from.params.id) await fetchData(id, true);
+    if (id !== from.params.id) await fetch(id, true);
 });
 
-async function fetchData(id, append = false) {
+async function fetch(id, append = false) {
+    const regex = /\/(\d+)/;
     if (props.idInWhere) arrayData.store.filter.where = { id };
-    else arrayData.store.url = props.url.replace(/(\/\d+)/, `/${id}`);
+    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
+    else arrayData.store.url = props.url.replace(regex, `/${id}`);
     await arrayData.fetch({ append, updateRouter: false });
 }
 </script>
diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 0afd1c211..23a45974f 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -30,7 +30,7 @@ const arrayData = useArrayData(props.dataKey, {
 onBeforeMount(async () => {
     const route = router.currentRoute.value;
     try {
-        await fetchData(route.params.id);
+        await fetch(route.params.id);
     } catch {
         const { matched: matches } = route;
         const { path } = matches.at(-1);
@@ -40,12 +40,14 @@ onBeforeMount(async () => {
 
 onBeforeRouteUpdate(async (to, from) => {
     const id = to.params.id;
-    if (id !== from.params.id) await fetchData(id, true);
+    if (id !== from.params.id) await fetch(id, true);
 });
 
-async function fetchData(id, append = false) {
+async function fetch(id, append = false) {
+    const regex = /\/(\d+)/;
     if (props.idInWhere) arrayData.store.filter.where = { id };
-    else arrayData.store.url = props.url.replace(/(\/\d+)/, `/${id}`);
+    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
+    else arrayData.store.url = props.url.replace(regex, `/${id}`);
     await arrayData.fetch({ append, updateRouter: false });
 }
 </script>

From caa50a16ceffd4eb9a9e129ccda4be5bb86b0a91 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 18:05:39 +0100
Subject: [PATCH 42/68] feat: refs #6919 sync basicdata agency

---
 src/pages/Route/Agency/Card/AgencyBasicData.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Route/Agency/Card/AgencyBasicData.vue b/src/pages/Route/Agency/Card/AgencyBasicData.vue
index 599058b3e..4270b136c 100644
--- a/src/pages/Route/Agency/Card/AgencyBasicData.vue
+++ b/src/pages/Route/Agency/Card/AgencyBasicData.vue
@@ -21,7 +21,7 @@ const warehouses = ref([]);
         @on-fetch="(data) => (warehouses = data)"
         auto-load
     />
-    <FormModel :url="`Agencies/${routeId}`" model="agency" auto-load>
+    <FormModel :update-url="`Agencies/${routeId}`" model="Agency" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.name" :label="t('globals.name')" />

From 67b29c5d2467f2aa9b14d52621394f920bb3d52d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 9 Jan 2025 18:27:29 +0100
Subject: [PATCH 43/68] fix: refs #6919 roadmap

---
 src/pages/Route/Roadmap/RoadmapBasicData.vue  | 10 ++++------
 src/pages/Route/Roadmap/RoadmapCard.vue       |  2 ++
 src/pages/Route/Roadmap/RoadmapDescriptor.vue | 12 +++---------
 src/pages/Route/Roadmap/RoadmapFilter.js      |  3 +++
 src/pages/Route/Roadmap/RoadmapSummary.vue    |  3 +--
 5 files changed, 13 insertions(+), 17 deletions(-)
 create mode 100644 src/pages/Route/Roadmap/RoadmapFilter.js

diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index eeefaca2c..794569a8d 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
@@ -12,10 +12,9 @@ import { ref } from 'vue';
 
 const { t } = useI18n();
 const router = useRouter();
-const route = useRoute();
 
 const supplierList = ref([]);
-const filter = { include: [{ relation: 'supplier' }] };
+
 const onSave = (data, response) => {
     router.push({ name: 'RoadmapSummary', params: { id: response?.id } });
 };
@@ -30,10 +29,9 @@ const onSave = (data, response) => {
         @on-fetch="(data) => (supplierList = data)"
     />
     <FormModel
-        :url="`Roadmaps/${route.params?.id}`"
+        :update-url="`Roadmaps/${$route.params?.id}`"
         observe-form-changes
-        :filter="filter"
-        model="roadmap"
+        model="Roadmap"
         auto-load
         @on-data-saved="onSave"
     >
diff --git a/src/pages/Route/Roadmap/RoadmapCard.vue b/src/pages/Route/Roadmap/RoadmapCard.vue
index e744114a5..256058848 100644
--- a/src/pages/Route/Roadmap/RoadmapCard.vue
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
 import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
+import filter from './RoadmapFilter.js';
 </script>
 <template>
     <VnCard
@@ -9,6 +10,7 @@ import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
         url="Roadmaps"
         :descriptor="RoadmapDescriptor"
         :filter-panel="RoadmapFilter"
+        :filter="filter"
         search-data-key="RoadmapList"
         :searchbar-props="{
             url: 'Roadmaps',
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 788173688..179dc6581 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -1,13 +1,13 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import useCardDescription from 'composables/useCardDescription';
 import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import RoadmapDescriptorMenu from 'pages/Route/Roadmap/RoadmapDescriptorMenu.vue';
+import filter from 'pages/Route/Roadmap/RoadmapFilter.js';
 
 const $props = defineProps({
     id: {
@@ -23,10 +23,6 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const filter = { include: [{ relation: 'supplier' }] };
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
 </script>
 
 <template>
@@ -34,10 +30,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         module="Roadmap"
         :url="`Roadmaps/${entityId}`"
         :filter="filter"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        title="code"
         data-key="Roadmap"
-        @on-fetch="setData"
     >
         <template #body="{ entity }">
             <VnLv :label="t('Roadmap')" :value="entity?.name" />
diff --git a/src/pages/Route/Roadmap/RoadmapFilter.js b/src/pages/Route/Roadmap/RoadmapFilter.js
new file mode 100644
index 000000000..0ae890363
--- /dev/null
+++ b/src/pages/Route/Roadmap/RoadmapFilter.js
@@ -0,0 +1,3 @@
+export default {
+    include: [{ relation: 'supplier' }],
+};
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 3fb36b4f7..b6ab19ad7 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -66,7 +66,6 @@ const filter = {
             },
         },
     ],
-    where: { id: entityId },
 };
 </script>
 
@@ -75,7 +74,7 @@ const filter = {
         <CardSummary
             data-key="RoadmapSummary"
             ref="summary"
-            :url="`Roadmaps`"
+            :url="`Roadmaps/${entityId}`"
             :filter="filter"
         >
             <template #header-left>

From 74f151800d89113d961365cef089359289c2d457 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 10 Jan 2025 11:37:12 +0100
Subject: [PATCH 44/68] chore: refs #6919 drop state

---
 src/stores/useArrayDataStore.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index b6a904dc8..b3996d1e3 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -63,6 +63,5 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         clear,
         reset,
         resetPagination,
-        state,
     };
 });

From 3a8808452d60b275933b3fedc5e254693e114e16 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 10 Jan 2025 11:44:06 +0100
Subject: [PATCH 45/68] fix: refs #6919 ticket

---
 src/pages/Ticket/Card/TicketCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index d860271a2..e22d5799a 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -6,7 +6,7 @@ import filter from './TicketFilter.js';
 <template>
     <VnCardBeta
         data-key="Ticket"
-        base-url="Tickets"
+        url="Tickets"
         :descriptor="TicketDescriptor"
         :filter="filter"
     />

From ccb558f4e90ade522e99e7f67a08358e14d6f309 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 10 Jan 2025 17:29:31 +0100
Subject: [PATCH 46/68] refactor: refs #6919 update reload default value and
 extract InvoiceIn filter to a separate file

---
 src/components/FormModel.vue                  |  2 +-
 src/pages/Claim/Card/ClaimBasicData.vue       |  1 -
 src/pages/Claim/Card/ClaimDescriptor.vue      |  8 +----
 src/pages/InvoiceIn/Card/InvoiceInCard.vue    | 35 +------------------
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    | 28 ++-------------
 src/pages/InvoiceIn/Card/InvoiceInFilter.js   | 33 +++++++++++++++++
 6 files changed, 38 insertions(+), 69 deletions(-)
 create mode 100644 src/pages/InvoiceIn/Card/InvoiceInFilter.js

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index ea1ea53f2..c23598a99 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -84,7 +84,7 @@ const $props = defineProps({
     },
     reload: {
         type: Boolean,
-        default: false,
+        default: true,
     },
     defaultTrim: {
         type: Boolean,
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 63b0b7c0d..67034da1a 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -28,7 +28,6 @@ const workersOptions = ref([]);
         model="Claim"
         :url-update="`Claims/updateClaim/${route.params.id}`"
         auto-load
-        :reload="true"
     >
         <template #form="{ data, validate }">
             <VnRow>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 244d10811..f55b0c48b 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -3,7 +3,6 @@ import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDateHourMinSec, toPercentage } from 'src/filters';
-import { useState } from 'src/composables/useState';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
@@ -22,7 +21,6 @@ const $props = defineProps({
 });
 
 const route = useRoute();
-const state = useState();
 const { t } = useI18n();
 const salixUrl = ref();
 const entityId = computed(() => {
@@ -38,10 +36,7 @@ const STATE_COLOR = {
 function stateColor(code) {
     return STATE_COLOR[code];
 }
-const setData = (entity) => {
-    if (!entity) return;
-    state.set('ClaimDescriptor', entity);
-};
+
 onMounted(async () => {
     salixUrl.value = await getUrl('');
 });
@@ -53,7 +48,6 @@ onMounted(async () => {
         :filter="filter"
         module="Claim"
         title="client.name"
-        @on-fetch="setData"
         data-key="Claim"
     >
         <template #menu="{ entity }">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index af6843016..a13589909 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -5,40 +5,7 @@ import InvoiceInFilter from '../InvoiceInFilter.vue';
 import InvoiceInSearchbar from '../InvoiceInSearchbar.vue';
 import { onBeforeRouteUpdate } from 'vue-router';
 import { setRectificative } from '../composables/setRectificative';
-
-const filter = {
-    include: [
-        {
-            relation: 'supplier',
-            scope: {
-                include: {
-                    relation: 'contacts',
-                    scope: { where: { email: { neq: null } } },
-                },
-            },
-        },
-        { relation: 'invoiceInDueDay' },
-        { relation: 'company' },
-        { relation: 'currency' },
-        {
-            relation: 'dms',
-            scope: {
-                fields: [
-                    'dmsTypeFk',
-                    'reference',
-                    'hardCopyNumber',
-                    'workerFk',
-                    'description',
-                    'hasFile',
-                    'file',
-                    'created',
-                    'companyFk',
-                    'warehouseFk',
-                ],
-            },
-        },
-    ],
-};
+import filter from './InvoiceInFilter.js';
 
 onBeforeRouteUpdate(async (to) => await setRectificative(to));
 </script>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index cb8a45833..c2d9ca562 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -17,6 +17,7 @@ import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceInToBook from '../InvoiceInToBook.vue';
+import filter from './InvoiceInFilter.js';
 
 const $props = defineProps({ id: { type: Number, default: null } });
 
@@ -55,32 +56,7 @@ const actions = {
     sendPdf: { cb: sendPdfInvoiceConfirmation },
     correct: { cb: () => correctionDialogRef.value.show() },
 };
-const filter = {
-    include: [
-        {
-            relation: 'supplier',
-            scope: {
-                include: {
-                    relation: 'contacts',
-                    scope: {
-                        where: {
-                            email: { neq: null },
-                        },
-                    },
-                },
-            },
-        },
-        {
-            relation: 'invoiceInDueDay',
-        },
-        {
-            relation: 'company',
-        },
-        {
-            relation: 'currency',
-        },
-    ],
-};
+
 const invoiceInCorrection = reactive({ correcting: [], corrected: null });
 const routes = reactive({
     getSupplier: (id) => {
diff --git a/src/pages/InvoiceIn/Card/InvoiceInFilter.js b/src/pages/InvoiceIn/Card/InvoiceInFilter.js
new file mode 100644
index 000000000..6df8b5830
--- /dev/null
+++ b/src/pages/InvoiceIn/Card/InvoiceInFilter.js
@@ -0,0 +1,33 @@
+export default {
+    include: [
+        {
+            relation: 'supplier',
+            scope: {
+                include: {
+                    relation: 'contacts',
+                    scope: { where: { email: { neq: null } } },
+                },
+            },
+        },
+        { relation: 'invoiceInDueDay' },
+        { relation: 'company' },
+        { relation: 'currency' },
+        {
+            relation: 'dms',
+            scope: {
+                fields: [
+                    'dmsTypeFk',
+                    'reference',
+                    'hardCopyNumber',
+                    'workerFk',
+                    'description',
+                    'hasFile',
+                    'file',
+                    'created',
+                    'companyFk',
+                    'warehouseFk',
+                ],
+            },
+        },
+    ],
+};

From 285ba4ef7b84cee3a4de6ddee14b83e25e782f9b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 Jan 2025 10:41:23 +0100
Subject: [PATCH 47/68] fix: refs #6919 data-key descriptor

---
 src/pages/Account/Card/AccountDescriptorMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index aa49dabe8..dbf04da6c 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -21,7 +21,7 @@ const $props = defineProps({
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 const { notify } = useNotify();
-const account = computed(() => useArrayData('AccountId').store.data[0]);
+const account = computed(() => useArrayData('Account').store.data);
 
 onMounted(async () => {
     account.value.hasAccount = await useHasAccount($props.entityId);

From e98cc7a92ab473898b9ddb8e0e2e96f518f41d4a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 Jan 2025 10:59:54 +0100
Subject: [PATCH 48/68] feat: refs #6919 keep filter

---
 src/components/common/VnCard.vue     | 2 +-
 src/components/common/VnCardBeta.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index cf98a0ab2..44002c22a 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -30,7 +30,7 @@ const searchRightDataKey = computed(() => {
 
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
-    filter: props.filter,
+    userFilter: props.filter,
     oneRecord: true,
 });
 
diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 23a45974f..d2bed6257 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -23,7 +23,7 @@ const stateStore = useStateStore();
 const router = useRouter();
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
-    filter: props.filter,
+    userFilter: props.filter,
     oneRecord: true,
 });
 

From ae137e824422f664f2f97b1be7a82d36f60c0c97 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 Jan 2025 13:25:42 +0100
Subject: [PATCH 49/68] fix: refs #6919 update model references

---
 src/components/ui/VnLinkPhone.vue               | 2 +-
 src/pages/Customer/Card/CustomerBillingData.vue | 2 +-
 src/pages/Customer/Card/CustomerFiscalData.vue  | 2 +-
 src/pages/Customer/Card/CustomerWebAccess.vue   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index c5d5df394..a9e9bc0fc 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -30,7 +30,7 @@ onBeforeMount(async () => {
             .data;
         if (!channel) channel = defaultChannel;
 
-        phone.value = await parsePhone(props.phoneNumber, props.country.toLowerCase());
+        phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
         config[
             type
         ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 48f729e29..33a7262e0 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -28,7 +28,7 @@ const getBankEntities = (data, formData) => {
 </script>
 
 <template>
-    <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="customer">
+    <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="Customer">
         <template #form="{ data, validate }">
             <VnRow>
                 <VnSelect
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index aff7deda4..c2439d017 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -35,7 +35,7 @@ function handleLocation(data, location) {
     <FormModel
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
         auto-load
-        model="customer"
+        model="Customer"
     >
         <template #form="{ data, validate }">
             <VnRow>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 3c4106846..809f10918 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -27,7 +27,7 @@ async function hasCustomerRole() {
     <FormModel
         :url-update="`Clients/${route.params.id}/updateUser`"
         :filter="filter"
-        model="customer"
+        model="Customer"
         :mapper="
             ({ account }) => {
                 const { name, email, active } = account;

From 011344b761b91545f585c6a01577a148a31b9fd3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 Jan 2025 16:20:09 +0100
Subject: [PATCH 50/68] fix: refs #6919  use right data-key

---
 src/pages/Ticket/Card/TicketComponents.vue | 2 +-
 src/pages/Ticket/Card/TicketExpedition.vue | 2 +-
 src/pages/Ticket/Card/TicketSale.vue       | 2 +-
 src/pages/Ticket/Card/TicketSummary.vue    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 64815752a..d99e895c2 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -20,7 +20,7 @@ const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const salesRef = ref(null);
-const arrayData = useArrayData('ticketData');
+const arrayData = useArrayData('Ticket');
 const { store } = arrayData;
 
 const ticketData = computed(() => store.data);
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 166e86978..f8084ff2f 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -40,7 +40,7 @@ const expeditionsFilter = computed(() => ({
     order: ['created DESC'],
 }));
 
-const ticketArrayData = useArrayData('ticketData');
+const ticketArrayData = useArrayData('Ticket');
 const ticketStore = ticketArrayData.store;
 const ticketData = computed(() => ticketStore.data);
 
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 8aa785c74..070751613 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -35,7 +35,7 @@ const { openConfirmationModal } = useVnConfirm();
 const editPriceProxyRef = ref(null);
 const stateBtnDropdownRef = ref(null);
 const quasar = useQuasar();
-const arrayData = useArrayData('ticketData');
+const arrayData = useArrayData('Ticket');
 const { store } = arrayData;
 const selectedRows = ref([]);
 const hasSelectedRows = computed(() => selectedRows.value.length > 0);
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 2c6e34864..59240213e 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -42,7 +42,7 @@ const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
 const stateBtnDropdownRef = ref();
-const descriptorData = useArrayData('ticketData');
+const descriptorData = useArrayData('Ticket');
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';

From ee00f7f5b5a9c8e2d87e70b559acc58914eb74e5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 Jan 2025 16:25:15 +0100
Subject: [PATCH 51/68] fix: refs #6919 use same data-key

---
 src/components/CreateBankEntityForm.vue                 | 2 +-
 src/pages/Customer/components/CustomerSamplesCreate.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 2da3aa994..7c4b94a6a 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -14,7 +14,7 @@ const { t } = useI18n();
 const bicInputRef = ref(null);
 const state = useState();
 
-const customer = computed(() => state.get('customer'));
+const customer = computed(() => state.get('Customer'));
 
 const countriesFilter = {
     fields: ['id', 'name', 'code'],
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 665e136e4..88eb24c45 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -39,7 +39,7 @@ const optionsSamplesVisible = ref([]);
 const sampleType = ref({ hasPreview: false });
 const initialData = reactive({});
 const entityId = computed(() => route.params.id);
-const customer = computed(() => state.get('customer'));
+const customer = computed(() => state.get('Customer'));
 const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [

From 58d2c21e5bf4f014e8a8d42a6096c919892cc777 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 Jan 2025 16:28:35 +0100
Subject: [PATCH 52/68] fix: refs #6919 use same data-key

---
 src/pages/Order/Card/OrderCatalogItemDialog.vue | 4 ++--
 src/pages/Order/Card/OrderLines.vue             | 2 +-
 src/pages/Order/Card/OrderSummary.vue           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 163b036eb..be35750a9 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -20,7 +20,7 @@ const props = defineProps({
 });
 const state = useState();
 
-const orderData = computed(() => state.get('orderData'));
+const orderData = computed(() => state.get('Order'));
 
 const prices = ref((props.item.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const isLoading = ref(false);
@@ -44,7 +44,7 @@ const addToOrder = async () => {
 
     state.set('orderTotal', orderTotal);
     const rows = orderData.value.rows.push(...items) || [];
-    state.set('orderData', {
+    state.set('Order', {
         ...orderData.value,
         rows,
     });
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 6093addb5..196328c65 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -22,7 +22,7 @@ const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
-const descriptorData = useArrayData('orderData');
+const descriptorData = useArrayData('Order');
 const componentKey = ref(0);
 const tableLinesRef = ref();
 const order = ref();
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index a289688e4..a4bdb2881 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -27,7 +27,7 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const summary = ref();
 const quasar = useQuasar();
-const descriptorData = useArrayData('orderData');
+const descriptorData = useArrayData('Order');
 const detailsColumns = ref([
     {
         name: 'item',

From 6c3a271ee222e35a15adec10e1ca697527dc9383 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 13 Jan 2025 16:46:26 +0100
Subject: [PATCH 53/68] fix: refs #6919 use same data-key

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 65fbf4b43..faa5a2c95 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -63,7 +63,7 @@ const selectedCalendarDates = ref([]);
 // Date formateada para bindear al componente QDate
 const selectedDateFormatted = ref(toDateString(defaultDate.value));
 
-const arrayData = useArrayData('workerData');
+const arrayData = useArrayData('Worker');
 const acl = useAcl();
 const selectedDateYear = computed(() => moment(selectedDate.value).isoWeekYear());
 const worker = computed(() => arrayData.store?.data);

From 1d80d75e6a039c4550fa0ec92e286652f8ee512d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 28 Jan 2025 18:01:20 +0100
Subject: [PATCH 54/68] fix: refs #6919 refactor FormModel component state
 management and data handling

---
 src/components/FormModel.vue | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

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

From cc193ce160722c911ca0339e418858ce71de9f69 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 28 Jan 2025 18:12:32 +0100
Subject: [PATCH 55/68] refactor: refs #6919 update translation keys in
 ItemTypeCard and ShelvingList components

---
 src/pages/Item/ItemType/Card/ItemTypeCard.vue       |  2 --
 src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue | 11 +++++++----
 src/pages/Shelving/ShelvingList.vue                 | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/pages/Item/ItemType/Card/ItemTypeCard.vue b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
index 3f4f7a99e..84e810de5 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
@@ -1,8 +1,6 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
-import ItemTypeFilter from 'src/pages/Item/ItemType/ItemTypeFilter.vue';
-import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 import filter from './ItemTypeFilter.js';
 </script>
 
diff --git a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
index caf4e39cb..0f71ad1f1 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
@@ -33,15 +33,18 @@ const entityId = computed(() => {
         data-key="ItemType"
     >
         <template #body="{ entity }">
-            <VnLv :label="$t('shared.code')" :value="entity.code" />
-            <VnLv :label="$t('shared.name')" :value="entity.name" />
-            <VnLv :label="$t('shared.worker')">
+            <VnLv :label="$t('itemType.shared.code')" :value="entity.code" />
+            <VnLv :label="$t('itemType.shared.name')" :value="entity.name" />
+            <VnLv :label="$t('itemType.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" />
+            <VnLv
+                :label="$t('itemType.shared.category')"
+                :value="entity.category?.name"
+            />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index f68c10960..8a5211807 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -50,18 +50,18 @@ function navigate(id) {
                             >
                                 <template #list-items>
                                     <VnLv
-                                        :label="t('shelving.list.parking')"
-                                        :title-label="t('shelving.list.parking')"
+                                        :label="$t('shelving.list.parking')"
+                                        :title-label="$t('shelving.list.parking')"
                                         :value="row.parking?.code"
                                     />
                                     <VnLv
-                                        :label="t('shelving.list.priority')"
+                                        :label="$t('shelving.list.priority')"
                                         :value="row?.priority"
                                     />
                                 </template>
                                 <template #actions>
                                     <QBtn
-                                        :label="t('components.smartCard.openSummary')"
+                                        :label="$t('components.smartCard.openSummary')"
                                         @click.stop="viewSummary(row.id, ShelvingSummary)"
                                         color="primary"
                                     />
@@ -74,7 +74,7 @@ function navigate(id) {
                     <RouterLink :to="{ name: 'ShelvingCreate' }">
                         <QBtn fab icon="add" color="primary" shortcut="+" />
                         <QTooltip>
-                            {{ t('shelving.list.newShelving') }}
+                            {{ $t('shelving.list.newShelving') }}
                         </QTooltip>
                     </RouterLink>
                 </QPageSticky>

From a167c983d71e837ad15fc36e3ea0bbc4ecf6b1c9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 28 Jan 2025 18:22:11 +0100
Subject: [PATCH 56/68] fix: refs #6919 reset form data correctly in FormModel
 component

---
 src/components/FormModel.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 59dbeeea3..59141d374 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -241,6 +241,7 @@ async function saveAndGo() {
 }
 
 function reset() {
+    formData.value = JSON.parse(JSON.stringify(originalData.value));
     updateAndEmit('onFetch', originalData.value);
     if ($props.observeFormChanges) {
         hasChanges.value = false;

From 53aff479e6fd4c304cef8e1be7a320d936fdc9d2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 28 Jan 2025 18:32:56 +0100
Subject: [PATCH 57/68] refactor: refs #6919 update imports in
 CustomerDescriptor component to include onMounted lifecycle hook

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 7c5b97a3f..f7e19444e 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 

From ffcf52a490edd3277ac00fbc61020bd934020d94 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 14:45:29 +0100
Subject: [PATCH 58/68] fix: refs #6919 remove unnecessary title attribute from
 TicketDescriptor component

---
 src/pages/Ticket/Card/TicketDescriptor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 1d05359e0..dfe39b809 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -38,7 +38,6 @@ function ticketFilter(ticket) {
         module="Ticket"
         :url="`Tickets/${entityId}`"
         :filter="filter"
-        title="ref"
         data-key="Ticket"
         :summary="$props.summary"
         width="lg-width"

From b083dada832cdf64c5b17edfc35dfbd2660e8391 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 16:25:43 +0100
Subject: [PATCH 59/68] refactor: refs #6919 replace userFilter prop with
 filter in multiple components

---
 src/components/common/VnCardBeta.vue         |  3 +-
 src/pages/Claim/Card/ClaimCard.vue           |  1 -
 src/pages/Entry/Card/EntryCard.vue           |  2 +-
 src/pages/InvoiceIn/Card/InvoiceInCard.vue   |  2 +-
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue |  1 -
 src/pages/Order/Card/OrderCard.vue           |  1 +
 src/pages/Route/Agency/Card/AgencyCard.vue   |  2 +-
 src/pages/Route/Roadmap/RoadmapCard.vue      |  2 +-
 src/pages/Shelving/Card/ShelvingCard.vue     |  1 -
 src/pages/Supplier/Card/SupplierCard.vue     |  2 --
 src/pages/Travel/Card/TravelCard.vue         | 34 ++------------------
 11 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 3a6acdb54..d2bed6257 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -12,7 +12,6 @@ const props = defineProps({
     url: { type: String, default: undefined },
     idInWhere: { type: Boolean, default: false },
     filter: { type: Object, default: () => {} },
-    userFilter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
@@ -24,7 +23,7 @@ const stateStore = useStateStore();
 const router = useRouter();
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
-    userFilter: props.userFilter,
+    userFilter: props.filter,
     oneRecord: true,
 });
 
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index f8388402f..05f3b53a8 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -8,7 +8,6 @@ import filter from './ClaimFilter.js';
         data-key="Claim"
         url="Claims"
         :descriptor="ClaimDescriptor"
-        :filter-panel="ClaimFilter"
         search-data-key="ClaimList"
         :filter="filter"
     />
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 132205c64..be82289f4 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -8,6 +8,6 @@ import filter from './EntryFilter.js';
         data-key="Entry"
         url="Entries"
         :descriptor="EntryDescriptor"
-        :user-filter="filter"
+        :filter="filter"
     />
 </template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 6be7d0486..34cc26437 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -13,6 +13,6 @@ onBeforeRouteUpdate(async (to) => await setRectificative(to));
         data-key="InvoiceIn"
         url="InvoiceIns"
         :descriptor="InvoiceInDescriptor"
-        :user-filter="filter"
+        :filter="filter"
     />
 </template>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index 3809bb1b8..a50c9d247 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -1,7 +1,6 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import VnCardBeta from 'components/common/VnCardBeta.vue';
-import InvoiceOutFilter from '../InvoiceOutFilter.vue';
 import filter from './InvoiceOutFilter.js';
 </script>
 <template>
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 32c1308a2..ad5c73a87 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -1,6 +1,7 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
+import filter from './OrderFilter.js';
 </script>
 
 <template>
diff --git a/src/pages/Route/Agency/Card/AgencyCard.vue b/src/pages/Route/Agency/Card/AgencyCard.vue
index 35685790a..7dc31f8ba 100644
--- a/src/pages/Route/Agency/Card/AgencyCard.vue
+++ b/src/pages/Route/Agency/Card/AgencyCard.vue
@@ -3,5 +3,5 @@ import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
 import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Agency" base-url="Agencies" :descriptor="AgencyDescriptor" />
+    <VnCardBeta data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
 </template>
diff --git a/src/pages/Route/Roadmap/RoadmapCard.vue b/src/pages/Route/Roadmap/RoadmapCard.vue
index 0b81de673..48ba516a1 100644
--- a/src/pages/Route/Roadmap/RoadmapCard.vue
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@@ -3,5 +3,5 @@ import VnCardBeta from 'components/common/VnCardBeta.vue';
 import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Roadmap" base-url="Roadmaps" :descriptor="RoadmapDescriptor" />
+    <VnCardBeta data-key="Roadmap" url="Roadmaps" :descriptor="RoadmapDescriptor" />
 </template>
diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index 701b98243..9e0ac8ad2 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -1,7 +1,6 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
-import ShelvingFilter from './ShelvingFilter.vue';
 import filter from './ShelvingFilter.js';
 </script>
 
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index ce5f743e1..eec7e0a91 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -1,7 +1,6 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import SupplierDescriptor from './SupplierDescriptor.vue';
-import SupplierListFilter from '../SupplierListFilter.vue';
 import filter from './SupplierFilter.js';
 </script>
 <template>
@@ -10,7 +9,6 @@ import filter from './SupplierFilter.js';
         url="Suppliers"
         :filter="filter"
         :descriptor="SupplierDescriptor"
-        :filter-panel="SupplierListFilter"
         search-data-key="SupplierList"
         :searchbar-props="{
             url: 'Suppliers/filter',
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 96027ac13..cb09eafd6 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,43 +1,13 @@
 <script setup>
 import TravelDescriptor from './TravelDescriptor.vue';
 import VnCardBeta from 'src/components/common/VnCardBeta.vue';
-
-const userFilter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-        'isRaid',
-        'isDelivered',
-        'isReceived',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
+import filter from './TravelFilter.js';
 </script>
 <template>
     <VnCardBeta
         data-key="Travel"
         url="Travels"
         :descriptor="TravelDescriptor"
-        :user-filter="userFilter"
+        :filter="filter"
     />
 </template>

From d4a93484c4cdc5c35b9aa47b5581f6a067f21a2c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 16:34:21 +0100
Subject: [PATCH 60/68] fix: refs #6919 update import statement for RouteFilter
 to include file extension

---
 src/pages/Route/Card/RouteDescriptor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index 860951256..a8c6cc18b 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -5,7 +5,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import { dashIfEmpty, toDate } from 'src/filters';
 import RouteDescriptorMenu from 'pages/Route/Card/RouteDescriptorMenu.vue';
-import filter from './RouteFilter';
+import filter from './RouteFilter.js';
 
 const $props = defineProps({
     id: {

From ca7ae30991a489f112b2d8b2f6275ef254dd848e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 16:43:02 +0100
Subject: [PATCH 61/68] refactor: refs #6919 remove unnecessary title attribute
 from RoadmapDescriptor component

---
 src/pages/Route/Roadmap/RoadmapDescriptor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 179dc6581..1f1e6d6ff 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -30,7 +30,6 @@ const entityId = computed(() => {
         module="Roadmap"
         :url="`Roadmaps/${entityId}`"
         :filter="filter"
-        title="code"
         data-key="Roadmap"
     >
         <template #body="{ entity }">

From f26290a9523304460ac7e1c4b76caac564aab490 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 16:47:55 +0100
Subject: [PATCH 62/68] chore: refs #6919 remove unused searchbar-props

---
 src/pages/Account/Alias/Card/AliasCard.vue |  8 --------
 src/pages/Account/Card/AccountCard.vue     | 10 ----------
 2 files changed, 18 deletions(-)

diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
index e583b9ce2..f37bd7d0f 100644
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@@ -1,7 +1,6 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
-import exprBuilder from '../AliasExprBuilder.js';
 </script>
 
 <template>
@@ -10,12 +9,5 @@ import exprBuilder from '../AliasExprBuilder.js';
         url="MailAliases"
         :descriptor="AliasDescriptor"
         search-data-key="AccountAliasList"
-        :searchbar-props="{
-            url: 'MailAliases',
-            info: $t('mailAlias.searchInfo'),
-            label: $t('mailAlias.search'),
-            searchUrl: 'table',
-            exprBuilder,
-        }"
     />
 </template>
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index a6705f451..a5037e301 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -1,7 +1,6 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
-import exprBuilder from '../AccountExprBuilder.js';
 import filter from './AccountFilter.js';
 </script>
 <template>
@@ -11,14 +10,5 @@ import filter from './AccountFilter.js';
         data-key="Account"
         :descriptor="AccountDescriptor"
         :filter="filter"
-        :searchbar-props="{
-            url: 'VnUsers/preview',
-            label: $t('account.search'),
-            info: $t('account.searchInfo'),
-            exprBuilder,
-            filter: {
-                include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-            },
-        }"
     />
 </template>

From d5373ecbd63402dae6658354b304f8134ca50c06 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 17:28:03 +0100
Subject: [PATCH 63/68] test: refs #6919 fix tests

---
 src/components/__tests__/FormModel.spec.js      | 5 +++--
 src/components/ui/__tests__/CardSummary.spec.js | 9 ++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/components/__tests__/FormModel.spec.js b/src/components/__tests__/FormModel.spec.js
index e35684bc3..17812f146 100644
--- a/src/components/__tests__/FormModel.spec.js
+++ b/src/components/__tests__/FormModel.spec.js
@@ -93,7 +93,7 @@ describe('FormModel', () => {
 
         it('should call axios.patch with the right data', async () => {
             const spy = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
-            const { vm } = mount({ propsData: { url, model, formInitialData } });
+            const { vm } = mount({ propsData: { url, model } });
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             await vm.save();
@@ -106,6 +106,7 @@ describe('FormModel', () => {
             const { vm } = mount({
                 propsData: { url, model, formInitialData, urlCreate: 'mockUrlCreate' },
             });
+            await vm.$nextTick();
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             await vm.save();
@@ -119,7 +120,7 @@ describe('FormModel', () => {
             });
             const spyPatch = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
             const spySaveFn = vi.spyOn(vm.$props, 'saveFn');
-
+            await vm.$nextTick();
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             await vm.save();
diff --git a/src/components/ui/__tests__/CardSummary.spec.js b/src/components/ui/__tests__/CardSummary.spec.js
index 411ebf9bb..89c2a4482 100644
--- a/src/components/ui/__tests__/CardSummary.spec.js
+++ b/src/components/ui/__tests__/CardSummary.spec.js
@@ -56,11 +56,6 @@ describe('CardSummary', () => {
         expect(vm.entity).toEqual({ id: 1, name: 'Entity 1' });
     });
 
-    it('should handle empty data gracefully', () => {
-        vm.store.data = [];
-        expect(vm.entity).toBeUndefined();
-    });
-
     it('should respond to prop changes and refetch data', async () => {
         const newUrl = 'CardSummary/35';
         const newKey = 'cardSummaryKey/35';
@@ -72,7 +67,7 @@ describe('CardSummary', () => {
         expect(vm.store.filter).toEqual({ key: newKey });
     });
 
-    it('should return true if route path ends with /summary' , () => {
+    it('should return true if route path ends with /summary', () => {
         expect(vm.isSummary).toBe(true);
     });
-});
\ No newline at end of file
+});

From 78da5f5393626eb100207fad4b2befb378e653e2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 17:29:36 +0100
Subject: [PATCH 64/68] test: refs #6919 fix tests

---
 src/components/ui/__tests__/CardSummary.spec.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/ui/__tests__/CardSummary.spec.js b/src/components/ui/__tests__/CardSummary.spec.js
index 89c2a4482..2f7f90882 100644
--- a/src/components/ui/__tests__/CardSummary.spec.js
+++ b/src/components/ui/__tests__/CardSummary.spec.js
@@ -51,11 +51,6 @@ describe('CardSummary', () => {
         expect(vm.store.filter).toEqual('cardFilter');
     });
 
-    it('should compute entity correctly from store data', () => {
-        vm.store.data = [{ id: 1, name: 'Entity 1' }];
-        expect(vm.entity).toEqual({ id: 1, name: 'Entity 1' });
-    });
-
     it('should respond to prop changes and refetch data', async () => {
         const newUrl = 'CardSummary/35';
         const newKey = 'cardSummaryKey/35';

From 169389b5b80695fa15ac68ac5891d7d41a43e55f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 17:51:18 +0100
Subject: [PATCH 65/68] test: refs #6919 fix typos in useArrayData tests and
 add new test cases for single record handling

---
 .../__tests__/useArrayData.spec.js            | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

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

From 58ec845402f8427e45131c7f597572486adeaa25 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 17:57:52 +0100
Subject: [PATCH 66/68] fix: refs #6919 test

---
 .../integration/zone/zoneBasicData.spec.js       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/zone/zoneBasicData.spec.js b/test/cypress/integration/zone/zoneBasicData.spec.js
index 95a075fb3..70ded3f79 100644
--- a/test/cypress/integration/zone/zoneBasicData.spec.js
+++ b/test/cypress/integration/zone/zoneBasicData.spec.js
@@ -1,5 +1,6 @@
 describe('ZoneBasicData', () => {
     const priceBasicData = '[data-cy="Price_input"]';
+    const saveBtn = '.q-btn-group > .q-btn--standard';
 
     beforeEach(() => {
         cy.viewport(1280, 720);
@@ -8,20 +9,27 @@ describe('ZoneBasicData', () => {
     });
 
     it('should throw an error if the name is empty', () => {
-        cy.get('[data-cy="zone-basic-data-name"] input').type('{selectall}{backspace}');
-        cy.get('.q-btn-group > .q-btn--standard').click();
+        cy.intercept('GET', /\/api\/Zones\/4./).as('zone');
+
+        cy.wait('@zone').then(() => {
+            cy.get('[data-cy="zone-basic-data-name"] input').type(
+                '{selectall}{backspace}',
+            );
+        });
+
+        cy.get(saveBtn).click();
         cy.checkNotification("can't be blank");
     });
 
     it('should throw an error if the price is empty', () => {
         cy.get(priceBasicData).clear();
-        cy.get('.q-btn-group > .q-btn--standard').click();
+        cy.get(saveBtn).click();
         cy.checkNotification('cannot be blank');
     });
 
     it("should edit the basicData's zone", () => {
         cy.get('.q-card > :nth-child(1)').type(' modified');
-        cy.get('.q-btn-group > .q-btn--standard').click();
+        cy.get(saveBtn).click();
         cy.checkNotification('Data saved');
     });
 });

From 311a40deefb516736914f535fa6a9a3dc9c4aaf4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 18:36:09 +0100
Subject: [PATCH 67/68] fix: refs #6919 test

---
 test/cypress/integration/route/agency/agencyWorkCenter.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
index e28caea7c..82ec6626d 100644
--- a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@@ -15,6 +15,7 @@ describe('AgencyWorkCenter', () => {
 
         // expect error when duplicate
         cy.get(createButton).click();
+        cy.selectOption(workCenterCombobox, 'workCenterOne');
         cy.get('[data-cy="FormModelPopup_save"]').click();
         cy.checkNotification('This workCenter is already assigned to this agency');
         cy.get('[data-cy="FormModelPopup_cancel"]').click();

From 4d23c9f24b63e7c8f6e15cd9807b9cff8c9bffe9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 31 Jan 2025 10:29:47 +0100
Subject: [PATCH 68/68] fix: refs #6919 tests #8316

---
 test/cypress/integration/parking/parkingBasicData.spec.js | 6 +++---
 test/cypress/integration/parking/parkingList.spec.js      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/parking/parkingBasicData.spec.js b/test/cypress/integration/parking/parkingBasicData.spec.js
index b5633992c..f64f23ec8 100644
--- a/test/cypress/integration/parking/parkingBasicData.spec.js
+++ b/test/cypress/integration/parking/parkingBasicData.spec.js
@@ -5,7 +5,7 @@ describe('ParkingBasicData', () => {
     const sectorOpt = '.q-menu .q-item';
     beforeEach(() => {
         cy.login('developer');
-        cy.visit(`/#/parking/1/basic-data`);
+        cy.visit(`/#/shelving/parking/1/basic-data`);
     });
 
     it('should edit the code and sector', () => {
@@ -13,11 +13,11 @@ describe('ParkingBasicData', () => {
         cy.get(sectorOpt).click();
 
         cy.get(codeInput).eq(0).clear();
-        cy.get(codeInput).eq(0).type(123);
+        cy.get(codeInput).eq(0).type('900-001');
 
         cy.saveCard();
 
         cy.get(sectorSelect).should('have.value', 'Second sector');
-        cy.get(codeInput).should('have.value', 123);
+        cy.get(codeInput).should('have.value', '900-001');
     });
 });
diff --git a/test/cypress/integration/parking/parkingList.spec.js b/test/cypress/integration/parking/parkingList.spec.js
index f1efaa375..8b7152ca4 100644
--- a/test/cypress/integration/parking/parkingList.spec.js
+++ b/test/cypress/integration/parking/parkingList.spec.js
@@ -11,7 +11,7 @@ describe('ParkingList', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit(`/#/parking/list`);
+        cy.visit(`/#/shelving/parking/list`);
     });
 
     it('should redirect on clicking a parking', () => {