From 34e92d130a4ae6294bfb66431415d48eeffaef56 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 12 Jun 2024 14:31:18 +0200
Subject: [PATCH] refs #7366 fix basic-data

---
 src/pages/Travel/Card/TravelBasicData.vue     |  2 +-
 src/pages/Travel/Card/TravelCard.vue          | 35 ++++++++++++++++++-
 src/pages/Travel/Card/TravelDescriptor.vue    | 12 ++-----
 .../Travel/Card/TravelDescriptorMenuItems.vue |  2 +-
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index f4e97c239..1eb9bbc0f 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -24,7 +24,7 @@ const agenciesOptions = ref([]);
     <FormModel
         :url="`Travels/${route.params.id}`"
         :url-update="`Travels/${route.params.id}`"
-        model="travel"
+        model="Travel"
         auto-load
     >
         <template #form="{ data }">
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 1d591f064..bf7e6d57a 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,7 +1,40 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import TravelDescriptor from './TravelDescriptor.vue';
+
+const filter = {
+    fields: [
+        'id',
+        'ref',
+        'shipped',
+        'landed',
+        'totalEntries',
+        'warehouseInFk',
+        'warehouseOutFk',
+        'cargoSupplierFk',
+        'agencyModeFk',
+    ],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['name'],
+            },
+        },
+        {
+            relation: 'warehouseOut',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+};
 </script>
 <template>
-    <VnCard data-key="Travel" base-url="Travels" :descriptor="TravelDescriptor" />
+    <VnCard
+        data-key="Travel"
+        :filter="filter"
+        base-url="Travels"
+        :descriptor="TravelDescriptor"
+    />
 </template>
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index c7501b1d4..975beb9ab 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -52,23 +52,15 @@ const filter = {
 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="Travel"
         :url="`Travels/${entityId}`"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        title="ref"
         :filter="filter"
-        @on-fetch="setData"
-        data-key="travelData"
+        data-key="Travel"
     >
         <template #header-extra-action>
             <QBtn
diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
index 33becef57..1bb80ff01 100644
--- a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -36,7 +36,7 @@ const cloneTravelWithEntries = async () => {
     try {
         const { data } = await axios.post(`Travels/${$props.travel.id}/cloneWithEntries`);
         notify('globals.dataSaved', 'positive');
-        router.push({ name: 'TravelBasicData', params: { data } });
+        router.push({ name: 'TravelBasicData', params: { id: data.id } });
     } catch (err) {
         console.err('Error cloning travel with entries');
     }