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] 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"