From a39c827579e3049faa6e4cd98fb7ae23a241fe35 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 31 May 2024 13:23:16 +0200
Subject: [PATCH 01/10] refs #7366 fix url

---
 src/pages/Travel/Card/TravelSummary.vue | 28 ++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 7fc92e7b6..330b080a5 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -222,6 +222,8 @@ async function setTravelData(travelData) {
         console.error(`Error setting travel data`, err);
     }
 }
+
+const getLink = (param) => `#/travel/${entityId.value}/${param}`;
 </script>
 
 <template>
@@ -255,6 +257,12 @@ async function setTravelData(travelData) {
 
         <template #body>
             <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <VnTitle
+                        :url="getLink('basic-data')"
+                        :text="t('travel.pageTitles.basicData')"
+                    />
+                </QCardSection>
                 <VnLv :label="t('globals.shipped')" :value="toDate(travel.shipped)" />
                 <VnLv
                     :label="t('globals.wareHouseOut')"
@@ -267,6 +275,12 @@ async function setTravelData(travelData) {
                 />
             </QCard>
             <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <VnTitle
+                        :url="getLink('basic-data')"
+                        :text="t('travel.pageTitles.basicData')"
+                    />
+                </QCardSection>
                 <VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" />
                 <VnLv
                     :label="t('globals.wareHouseIn')"
@@ -279,6 +293,12 @@ async function setTravelData(travelData) {
                 />
             </QCard>
             <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <VnTitle
+                        :url="getLink('basic-data')"
+                        :text="t('travel.pageTitles.basicData')"
+                    />
+                </QCardSection>
                 <VnLv :label="t('globals.agency')" :value="travel.agency?.name" />
                 <VnLv :label="t('globals.reference')" :value="travel.ref" />
                 <VnLv label="m³" :value="travel.m3" />
@@ -301,12 +321,18 @@ async function setTravelData(travelData) {
                     </template>
                     <template #body-cell-isConfirmed="{ col, value }">
                         <QTd>
+                            {{ entity }}
                             <QIcon
                                 v-if="col.name === 'isConfirmed'"
                                 :name="value ? 'check' : 'close'"
-                                :color="value ? 'positive' : 'negative'"
                                 size="sm"
                             />
+                            <!-- <QCheckbox
+                                v-if="col.name === 'isConfirmed'"
+                                :label="t('travel.summary.received')"
+                                v-model="travel.isConfirmed"
+                                :disable="true"
+                            /> -->
                         </QTd>
                     </template>
                     <template #body-cell-id="{ col, value }">

From 221ed7c5347042a8d3b660f77c7e9116d702ecb9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 31 May 2024 14:02:32 +0200
Subject: [PATCH 02/10] feat(TravelSummary): isConfirmed checkbox

---
 src/pages/Travel/Card/TravelSummary.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 330b080a5..98ace30b0 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -319,20 +319,16 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                             </QTh>
                         </QTr>
                     </template>
-                    <template #body-cell-isConfirmed="{ col, value }">
+                    <template #body-cell-isConfirmed="{ col, row }">
                         <QTd>
-                            {{ entity }}
-                            <QIcon
-                                v-if="col.name === 'isConfirmed'"
-                                :name="value ? 'check' : 'close'"
-                                size="sm"
-                            />
-                            <!-- <QCheckbox
+                            <QCheckbox
                                 v-if="col.name === 'isConfirmed'"
                                 :label="t('travel.summary.received')"
-                                v-model="travel.isConfirmed"
+                                :true-value="1"
+                                :false-value="0"
+                                v-model="row[col.name]"
                                 :disable="true"
-                            /> -->
+                            />
                         </QTd>
                     </template>
                     <template #body-cell-id="{ col, value }">

From 0d25c1b66b8a900412457d9eb0c794abef1bd7c7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 3 Jun 2024 11:27:44 +0200
Subject: [PATCH 03/10] refs #7366 fix travel

---
 .../Travel/Card/TravelDescriptorMenuItems.vue      |  1 +
 src/pages/Travel/Card/TravelSummary.vue            | 14 +-------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
index 17b9333ca..ab1de5b3e 100644
--- a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -36,6 +36,7 @@ const cloneTravelWithEntries = () => {
     try {
         axios.post(`Travels/${$props.travel.id}/cloneWithEntries`);
         notify('globals.dataSaved', 'positive');
+        redirectToCreateView();
     } catch (err) {
         console.err('Error cloning travel with entries');
     }
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 98ace30b0..fc45f8466 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -242,18 +242,6 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
         <template #header>
             <span>{{ travel.ref }} - {{ travel.id }}</span>
         </template>
-        <template #header-right>
-            <QBtn color="white" dense flat icon="more_vert" round size="md">
-                <QTooltip>
-                    {{ t('components.cardDescriptor.moreOptions') }}
-                </QTooltip>
-                <QMenu>
-                    <QList>
-                        <TravelDescriptorMenuItems :travel="travel" />
-                    </QList>
-                </QMenu>
-            </QBtn>
-        </template>
 
         <template #body>
             <QCard class="vn-one">
@@ -304,7 +292,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <VnLv label="m³" :value="travel.m3" />
                 <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
             </QCard>
-            <QCard class="full-width" v-if="entriesTableRows.length > 0">
+            <QCard class="full-width">
                 <VnTitle :text="t('travel.summary.entries')" />
                 <QTable
                     :rows="entriesTableRows"

From 06ddcc50309b1d994e17c95cec9a5502780b32d3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 4 Jun 2024 15:55:30 +0200
Subject: [PATCH 04/10] refs #7366 fix travel

---
 src/components/FormModel.vue                  |  4 ++--
 .../Travel/Card/TravelDescriptorMenuItems.vue |  6 ++---
 src/pages/Travel/TravelCreate.vue             | 24 ++++++-------------
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 03f75477d..3100b9f43 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -117,8 +117,8 @@ onMounted(async () => {
     state.set($props.model, $props.formInitialData);
 
     if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch();
-    else if (arrayData.store.data) updateAndEmit(arrayData.store.data, 'onFetch');
-
+    else if (arrayData.store.data && !$props.formInitialData)
+        updateAndEmit(arrayData.store.data, 'onFetch');
     if ($props.observeFormChanges) {
         watch(
             () => formData.value,
diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
index ab1de5b3e..9309f8686 100644
--- a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -32,11 +32,11 @@ const cloneTravel = () => {
     redirectToCreateView(stringifiedTravelData);
 };
 
-const cloneTravelWithEntries = () => {
+const cloneTravelWithEntries = async () => {
     try {
-        axios.post(`Travels/${$props.travel.id}/cloneWithEntries`);
+        const { id } = await axios.post(`Travels/${$props.travel.id}/cloneWithEntries`);
         notify('globals.dataSaved', 'positive');
-        redirectToCreateView();
+        router.push({ name: 'TravelBasicData', params: { id } });
     } catch (err) {
         console.err('Error cloning travel with entries');
     }
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 53c8d402d..5f61f3c74 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -15,33 +15,23 @@ const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
-const newTravelForm = reactive({
-    ref: null,
-    agencyModeFk: null,
-    shipped: null,
-    landed: null,
-    warehouseOutFk: null,
-    warehouseInFk: null,
-});
-
 const agenciesOptions = ref([]);
 const warehousesOptions = ref([]);
 const viewAction = ref();
 
+const newTravelForm = ref({});
 onBeforeMount(() => {
-    // Esto nos permite decirle a FormModel si queremos observar los cambios o no
-    // Ya que si queremos clonar queremos que nos permita guardar inmediatamente sin realizar cambios en el form
     viewAction.value = route.query.travelData ? 'clone' : 'create';
 
     if (route.query.travelData) {
         const travelData = JSON.parse(route.query.travelData);
-        for (let key in newTravelForm) {
-            newTravelForm[key] = travelData[key];
-        }
+
+        newTravelForm.value = { ...newTravelForm.value, ...travelData };
+        delete newTravelForm.value.id;
     }
 });
 
-const redirectToTravelBasicData = (_, { id }) => {
+const redirectToTravelBasicData = ({ id }) => {
     router.push({ name: 'TravelBasicData', params: { id } });
 };
 </script>
@@ -60,8 +50,8 @@ const redirectToTravelBasicData = (_, { id }) => {
     <QPage>
         <VnSubToolbar />
         <FormModel
-            url-update="Travels"
-            model="travel"
+            url-create="Travels"
+            model="travelCreate"
             :form-initial-data="newTravelForm"
             :observe-form-changes="viewAction === 'create'"
             @on-data-saved="redirectToTravelBasicData"

From 313395ef7c59a9afd02438defcae4a9190d5e7c0 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 11 Jun 2024 09:06:09 +0200
Subject: [PATCH 05/10] refs #7366 fix travelMigration

---
 src/components/FormModel.vue                        | 7 ++++---
 src/pages/Travel/Card/TravelDescriptorMenuItems.vue | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 4fda3e822..9e934b45f 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -116,9 +116,10 @@ onMounted(async () => {
     // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
     state.set($props.model, $props.formInitialData);
 
-    if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch();
-    else if (arrayData.store.data && !$props.formInitialData)
-        updateAndEmit(arrayData.store.data, 'onFetch');
+    if (!$props.formInitialData) {
+        if ($props.autoLoad && $props.url) await fetch();
+        else if (arrayData.store.data) updateAndEmit(arrayData.store.data, 'onFetch');
+    }
     if ($props.observeFormChanges) {
         watch(
             () => formData.value,
diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
index 9309f8686..33becef57 100644
--- a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -34,9 +34,9 @@ const cloneTravel = () => {
 
 const cloneTravelWithEntries = async () => {
     try {
-        const { id } = await axios.post(`Travels/${$props.travel.id}/cloneWithEntries`);
+        const { data } = await axios.post(`Travels/${$props.travel.id}/cloneWithEntries`);
         notify('globals.dataSaved', 'positive');
-        router.push({ name: 'TravelBasicData', params: { id } });
+        router.push({ name: 'TravelBasicData', params: { data } });
     } catch (err) {
         console.err('Error cloning travel with entries');
     }

From 8e9656f96a1b804b9543edad857cab5099036ea0 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 11 Jun 2024 09:10:25 +0200
Subject: [PATCH 06/10] refs #7366 remove warning

---
 src/pages/Travel/Card/TravelSummary.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index fc45f8466..91b36f0cf 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -8,7 +8,6 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
 import FetchData from 'src/components/FetchData.vue';
-import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
 
 import { toDate, toCurrency } from 'src/filters';
 import axios from 'axios';

From b0e4dc99b0cf6b217c026a3b7c179a1f595c74e6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 12 Jun 2024 08:47:32 -0300
Subject: [PATCH 07/10] Fix worker department create modal did not open

---
 src/pages/Worker/CreateDepartmentChild.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Worker/CreateDepartmentChild.vue b/src/pages/Worker/CreateDepartmentChild.vue
index 1f1b1335b..bde2b480a 100644
--- a/src/pages/Worker/CreateDepartmentChild.vue
+++ b/src/pages/Worker/CreateDepartmentChild.vue
@@ -40,6 +40,7 @@ onMounted(() => {
 
 <template>
     <FormModel
+        model="createDepartmentChild"
         :form-initial-data="departmentChildData"
         :observe-form-changes="false"
         :default-actions="false"

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 08/10] 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');
     }

From 648546888d92d8146d7448ab2115a99ca6646f61 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 13 Jun 2024 14:56:19 +0200
Subject: [PATCH 09/10] fix: DeleteDepartment VnConfirm

---
 src/pages/Worker/WorkerDepartmentTree.vue | 36 ++++++++++++-----------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/pages/Worker/WorkerDepartmentTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue
index 34340b019..392539c86 100644
--- a/src/pages/Worker/WorkerDepartmentTree.vue
+++ b/src/pages/Worker/WorkerDepartmentTree.vue
@@ -6,12 +6,11 @@ import { useQuasar } from 'quasar';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import CreateDepartmentChild from './CreateDepartmentChild.vue';
 import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
 import { useRouter } from 'vue-router';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
 
 const quasar = useQuasar();
 const { t } = useI18n();
-const { notify } = useNotify();
 const state = useState();
 const router = useRouter();
 
@@ -62,25 +61,28 @@ const removeNode = (node) => {
     const { id, parentFk } = node;
     quasar
         .dialog({
-            title: t('Are you sure you want to delete it?'),
-            message: t('Delete department'),
-            ok: {
-                push: true,
-                color: 'primary',
+            component: VnConfirm,
+            componentProps: {
+                title: t('Are you sure you want to delete it?'),
+                message: t('Delete department'),
+                promise: () => remove(id),
             },
-            cancel: true,
         })
-        .onOk(async () => {
-            try {
-                await axios.post(`/Departments/${id}/removeChild`, id);
-                notify(t('department.departmentRemoved'), 'positive');
-                await fetchNodeLeaves(parentFk);
-            } catch (err) {
-                console.error('Error removing department');
-            }
-        });
+        .onOk(async () => await fetchNodeLeaves(parentFk));
 };
 
+async function remove(id) {
+    try {
+        await axios.post(`/Departments/${id}/removeChild`, { id });
+        quasar.notify({
+            message: t('department.departmentRemoved'),
+            type: 'positive',
+        });
+    } catch (err) {
+        console.error('Error removing department');
+    }
+}
+
 const showCreateNodeForm = (nodeId) => {
     showCreateNodeFormVal.value = true;
     creationNodeSelectedId.value = nodeId;

From f4b7d34a7fe7ca6ef611806b2545827af06d1123 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 17 Jun 2024 08:39:39 +0200
Subject: [PATCH 10/10] refs #7366 fix redirect

---
 src/pages/Travel/TravelCreate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 5f61f3c74..0c734a367 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -31,7 +31,7 @@ onBeforeMount(() => {
     }
 });
 
-const redirectToTravelBasicData = ({ id }) => {
+const redirectToTravelBasicData = (_, { id }) => {
     router.push({ name: 'TravelBasicData', params: { id } });
 };
 </script>