From da295685a36c38958f289235294d7e9aa5b67843 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 13 Feb 2025 10:38:30 +0100
Subject: [PATCH 1/4] fix: refs #8227 warmfix

---
 src/pages/Route/Card/RouteDescriptor.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index 14d966362..cdbd95ddc 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -38,7 +38,6 @@ const filter = {
         'started',
         'finished',
         'cost',
-        'zoneFk',
         'isOk',
     ],
     include: [
@@ -47,7 +46,13 @@ const filter = {
             relation: 'vehicle',
             scope: { fields: ['id', 'm3'] },
         },
-        { relation: 'zone', scope: { fields: ['id', 'name'] } },
+        {
+            relation: 'ticket',
+            scope: {
+                fields: ['id', 'name', 'routeFk'],
+                include: { relation: 'route', scope: { fields: ['id', 'name'] } },
+            },
+        },
         {
             relation: 'worker',
             scope: {
@@ -81,11 +86,11 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         <template #body="{ entity }">
             <VnLv :label="t('Date')" :value="toDate(entity?.dated)" />
             <VnLv :label="t('Agency')" :value="entity?.agencyMode?.name" />
-            <VnLv :label="t('Zone')" :value="entity?.zone?.name" />
+            <VnLv :label="t('Zone')" :value="entity?.ticket?.route?.name" />
             <VnLv
                 :label="t('Volume')"
                 :value="`${dashIfEmpty(entity?.m3)} / ${dashIfEmpty(
-                    entity?.vehicle?.m3
+                    entity?.vehicle?.m3,
                 )} m³`"
             />
             <VnLv :label="t('Description')" :value="entity?.description" />

From d8559f9b18a861331defeecc1b2b29943f6edecb Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 13 Feb 2025 13:17:49 +0100
Subject: [PATCH 2/4] fix: refs #8227 fix front descriptor, Form

---
 src/pages/Route/Card/RouteDescriptor.vue | 32 +++++++++++++++++++-----
 src/pages/Route/Card/RouteForm.vue       |  9 +++++--
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index cdbd95ddc..47ee8064f 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
@@ -7,7 +7,7 @@ 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';
-
+import axios from 'axios';
 const $props = defineProps({
     id: {
         type: Number,
@@ -18,10 +18,27 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-
+const zone = ref();
+const zoneId = ref();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+const getZone = async () => {
+    const filter = {
+        where: { routeFk: $props.id ? $props.id : route.params.id },
+    };
+    const { data } = await axios.get('Tickets/findOne', {
+        params: {
+            filter: JSON.stringify(filter),
+        },
+    });
+    console.log(data);
+    zoneId.value = data.zoneFk;
+    console.log('zone: ', zoneId.value);
+    const { data: zoneData } = await axios.get(`Zones/${zoneId.value}`);
+    zone.value = zoneData.name;
+    console.log('zone: ', zone.value);
+};
 
 const filter = {
     fields: [
@@ -49,8 +66,8 @@ const filter = {
         {
             relation: 'ticket',
             scope: {
-                fields: ['id', 'name', 'routeFk'],
-                include: { relation: 'route', scope: { fields: ['id', 'name'] } },
+                fields: ['id', 'name', 'zoneFk'],
+                include: { relation: 'zone', scope: { fields: ['id', 'name'] } },
             },
         },
         {
@@ -70,6 +87,9 @@ const filter = {
 };
 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity.code, entity.id));
+onMounted(async () => {
+    getZone();
+});
 </script>
 
 <template>
@@ -86,7 +106,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         <template #body="{ entity }">
             <VnLv :label="t('Date')" :value="toDate(entity?.dated)" />
             <VnLv :label="t('Agency')" :value="entity?.agencyMode?.name" />
-            <VnLv :label="t('Zone')" :value="entity?.ticket?.route?.name" />
+            <VnLv :label="t('Zone')" :value="zone" />
             <VnLv
                 :label="t('Volume')"
                 :value="`${dashIfEmpty(entity?.m3)} / ${dashIfEmpty(
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 9bf0a2f4e..633ff44bc 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -43,7 +43,6 @@ const routeFilter = {
         'started',
         'finished',
         'cost',
-        'zoneFk',
         'isOk',
     ],
     include: [
@@ -52,7 +51,13 @@ const routeFilter = {
             relation: 'vehicle',
             scope: { fields: ['id', 'm3'] },
         },
-        { relation: 'zone', scope: { fields: ['id', 'name'] } },
+        {
+            relation: 'ticket',
+            scope: {
+                fields: ['id', 'name', 'zoneFk'],
+                include: { relation: 'zone', scope: { fields: ['id', 'name'] } },
+            },
+        },
         {
             relation: 'worker',
             scope: {

From 2b68267be5448b95d9fefbe3f9fbfa6b6c083c9d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 13 Feb 2025 13:22:49 +0100
Subject: [PATCH 3/4] fix: refs #8227 clean pr

---
 src/pages/Route/Card/RouteDescriptor.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index 47ee8064f..68c08b821 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -32,12 +32,9 @@ const getZone = async () => {
             filter: JSON.stringify(filter),
         },
     });
-    console.log(data);
     zoneId.value = data.zoneFk;
-    console.log('zone: ', zoneId.value);
     const { data: zoneData } = await axios.get(`Zones/${zoneId.value}`);
     zone.value = zoneData.name;
-    console.log('zone: ', zone.value);
 };
 
 const filter = {

From d3e4b32bee076dcad0a1db06210c0ff9cc8843d2 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 14 Feb 2025 12:32:32 +0100
Subject: [PATCH 4/4] fix: refs #8172 Remove unused row and column fields from
 ParkingBasicData

---
 src/pages/Parking/Card/ParkingBasicData.vue | 6 +-----
 src/pages/Parking/locale/en.yml             | 2 --
 src/pages/Parking/locale/es.yml             | 2 --
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index 8e3433a5b..550a0684e 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -15,7 +15,7 @@ const sectors = ref([]);
 const sectorFilter = { fields: ['id', 'description'] };
 
 const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    fields: ['sectorFk', 'code', 'pickingOrder'],
     include: [{ relation: 'sector', scope: sectorFilter }],
 };
 </script>
@@ -33,10 +33,6 @@ const filter = {
                 <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')" />
-            </VnRow>
             <VnRow>
                 <VnSelect
                     v-model="data.sectorFk"
diff --git a/src/pages/Parking/locale/en.yml b/src/pages/Parking/locale/en.yml
index 72caba408..2076f38b4 100644
--- a/src/pages/Parking/locale/en.yml
+++ b/src/pages/Parking/locale/en.yml
@@ -1,7 +1,5 @@
 parking:
     pickingOrder: Picking order
     sector: Sector
-    row: Row
-    column: Column
     search: Search parking
     searchInfo: You can search by parking code
\ No newline at end of file
diff --git a/src/pages/Parking/locale/es.yml b/src/pages/Parking/locale/es.yml
index ab23182a1..17fe3af53 100644
--- a/src/pages/Parking/locale/es.yml
+++ b/src/pages/Parking/locale/es.yml
@@ -1,7 +1,5 @@
 parking:
     pickingOrder: Orden de recogida
-    row: Fila
     sector: Sector
-    column: Columna
     search: Buscar parking
     searchInfo: Puedes buscar por código de parking
\ No newline at end of file