From 89f3c3f9548dc53b1cff487a7f500c85d9ae1694 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 19 Feb 2025 15:24:02 +0100
Subject: [PATCH 01/10] fix: refs #8616 update binding syntax for is-editable
 prop in AgencyList.vue

---
 src/pages/Route/Agency/AgencyList.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
index 5c2904bf3..6ce41cfde 100644
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -82,11 +82,10 @@ const columns = computed(() => [
             <VnTable
                 :data-key
                 :columns="columns"
-                is-editable="false"
+                :is-editable="false"
                 :right-search="false"
                 :use-model="true"
                 redirect="route/agency"
-                default-mode="card"
             />
         </template>
     </VnSection>

From bb928a0c763d0a6a191e2573b164268dd7c2c386 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 20 Feb 2025 08:53:37 +0100
Subject: [PATCH 02/10] refactor: refs #8616 update routing components for
 AgencyList and RouteRoadmap in route.js

---
 src/pages/Route/Agency/AgencyList.vue |  1 +
 src/router/modules/route.js           | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
index 6ce41cfde..26849a593 100644
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -86,6 +86,7 @@ const columns = computed(() => [
                 :right-search="false"
                 :use-model="true"
                 redirect="route/agency"
+                default-mode="card"
             />
         </template>
     </VnSection>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 835324d20..c84795a98 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -220,7 +220,6 @@ export default {
                     path: '',
                     name: 'RouteIndexMain',
                     redirect: { name: 'RouteList' },
-                    component: () => import('src/pages/Route/RouteList.vue'),
                     children: [
                         {
                             name: 'RouteList',
@@ -229,6 +228,7 @@ export default {
                                 title: 'list',
                                 icon: 'view_list',
                             },
+                            component: () => import('src/pages/Route/RouteList.vue'),
                         },
                         routeCard,
                     ],
@@ -268,7 +268,6 @@ export default {
                         title: 'RouteRoadmap',
                         icon: 'vn:troncales',
                     },
-                    component: () => import('src/pages/Route/RouteRoadmap.vue'),
                     children: [
                         {
                             name: 'RoadmapList',
@@ -277,6 +276,7 @@ export default {
                                 title: 'list',
                                 icon: 'view_list',
                             },
+                            component: () => import('src/pages/Route/RouteRoadmap.vue'),
                         },
                         roadmapCard,
                     ],
@@ -298,7 +298,6 @@ export default {
                         title: 'agency',
                         icon: 'garage_home',
                     },
-                    component: () => import('src/pages/Route/Agency/AgencyList.vue'),
                     children: [
                         {
                             name: 'AgencyList',
@@ -307,6 +306,8 @@ export default {
                                 title: 'list',
                                 icon: 'view_list',
                             },
+                            component: () =>
+                                import('src/pages/Route/Agency/AgencyList.vue'),
                         },
                         agencyCard,
                     ],
@@ -319,7 +320,6 @@ export default {
                         title: 'vehicle',
                         icon: 'directions_car',
                     },
-                    component: () => import('src/pages/Route/Vehicle/VehicleList.vue'),
                     children: [
                         {
                             path: 'list',
@@ -328,6 +328,8 @@ export default {
                                 title: 'vehicleList',
                                 icon: 'directions_car',
                             },
+                            component: () =>
+                                import('src/pages/Route/Vehicle/VehicleList.vue'),
                         },
                         vehicleCard,
                     ],

From 9fa21cbaff07285435ffb3df2ea8f51c9c418d8e Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 20 Feb 2025 09:08:53 +0100
Subject: [PATCH 03/10] fix: refs #8616 add conditional for
 SupplierDescriptorProxy and bind attributes in CardDescriptor

---
 src/components/ui/CardDescriptor.vue            | 2 +-
 src/pages/Route/Vehicle/Card/VehicleSummary.vue | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 6f122ecd2..14fd4d14d 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -120,7 +120,7 @@ const toModule = computed(() =>
 </script>
 
 <template>
-    <div class="descriptor">
+    <div class="descriptor" v-bind="$attrs">
         <template v-if="entity && !isLoading">
             <div class="header bg-primary q-pa-sm justify-between">
                 <slot name="header-extra-action"
diff --git a/src/pages/Route/Vehicle/Card/VehicleSummary.vue b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
index 981870cb2..0d5e8cdd2 100644
--- a/src/pages/Route/Vehicle/Card/VehicleSummary.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
@@ -49,7 +49,10 @@ const links = {
                             <template #value>
                                 <span class="link">
                                     {{ entity.supplier?.name }}
-                                    <SupplierDescriptorProxy :id="entity.supplierFk" />
+                                    <SupplierDescriptorProxy
+                                        v-if="entity.supplierFk"
+                                        :id="entity.supplierFk"
+                                    />
                                 </span>
                             </template>
                         </VnLv>
@@ -58,6 +61,7 @@ const links = {
                                 <span class="link">
                                     {{ entity.supplierCooler?.name }}
                                     <SupplierDescriptorProxy
+                                        v-if="entity.supplierCoolerFk"
                                         :id="entity.supplierCoolerFk"
                                     />
                                 </span>

From 891380dc97b88c4935b9c469856d419bad967f05 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 20 Feb 2025 10:00:33 +0100
Subject: [PATCH 04/10] fix: refs #8616 remove redundant v-on binding from
 QCheckbox in VnCheckbox.vue

---
 src/components/common/VnCheckbox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnCheckbox.vue b/src/components/common/VnCheckbox.vue
index 27131d45e..94e91328b 100644
--- a/src/components/common/VnCheckbox.vue
+++ b/src/components/common/VnCheckbox.vue
@@ -27,7 +27,7 @@ const checkboxModel = computed({
 </script>
 <template>
     <div>
-        <QCheckbox v-bind="$attrs" v-on="$attrs" v-model="checkboxModel" />
+        <QCheckbox v-bind="$attrs" v-model="checkboxModel" />
         <QIcon
             v-if="info"
             v-bind="$attrs"

From 2d6284c8d967edaf8bc9fef91e0585be1f69d2ec Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 27 Feb 2025 09:59:27 +0100
Subject: [PATCH 05/10] feat: refs #8616 add VnCheckbox component to VnFilter
 and update prop types in VnFilterPanel and VnSearchbar

---
 src/components/VnTable/VnFilter.vue | 3 ++-
 src/components/ui/VnFilterPanel.vue | 2 +-
 src/components/ui/VnSearchbar.vue   | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 2dad8fe52..c6d68e486 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -6,6 +6,7 @@ import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
+import VnCheckbox from 'components/common/VnCheckbox.vue';
 import VnColumn from 'components/VnTable/VnColumn.vue';
 
 const $props = defineProps({
@@ -107,7 +108,7 @@ const components = {
         },
     },
     checkbox: {
-        component: markRaw(QCheckbox),
+        component: markRaw(VnCheckbox),
         event: updateEvent,
         attrs: {
             class: $props.showTitle ? 'q-py-sm' : 'q-px-md q-py-xs fit',
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index d6b525dc8..93e3a57f2 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -54,7 +54,7 @@ const $props = defineProps({
         default: 'table',
     },
     redirect: {
-        type: Boolean,
+        type: [String, Boolean],
         default: true,
     },
     arrayData: {
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 30e4135e2..d7d8d20ba 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -33,6 +33,10 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     filter: {
         type: Object,
         default: null,

From acc254d2985141ba6f7dc0e3144a1fd57d91e5fa Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 27 Feb 2025 10:13:20 +0100
Subject: [PATCH 06/10] refactor: refs #8616 integrate VnSelectWorker component
 in RouteList and optimize format functions

---
 src/pages/Route/RouteList.vue | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 9dad8ba22..ed2624a23 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toHour } from 'src/filters';
@@ -8,6 +8,7 @@ import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -38,17 +39,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'workerFk',
         label: t('route.Worker'),
-        component: 'select',
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            useLike: false,
-            optionFilter: 'firstName',
-            find: {
-                value: 'workerFk',
-                label: 'workerUserName',
-            },
-        },
+        component: markRaw(VnSelectWorker),
         create: true,
         cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
@@ -97,7 +88,7 @@ const columns = computed(() => [
         label: t('route.hourStarted'),
         cardVisible: true,
         columnFilter: false,
-        format: (row) => toHour(row.started),
+        format: ({ started }) => toHour(started),
     },
     {
         align: 'left',
@@ -105,7 +96,7 @@ const columns = computed(() => [
         label: t('route.hourFinished'),
         cardVisible: true,
         columnFilter: false,
-        format: (row) => toHour(row.started),
+        format: ({ finished }) => toHour(finished),
     },
     {
         align: 'left',

From 04a3209da9deacedce24a8db0feb43004e0a7371 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 27 Feb 2025 10:18:52 +0100
Subject: [PATCH 07/10] fix: refs #8616 update FormModel prop from 'update-url'
 to 'url-update' in Agency and RoadMap BasicData

---
 src/pages/Route/Agency/Card/AgencyBasicData.vue | 2 +-
 src/pages/Route/Roadmap/RoadmapBasicData.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Route/Agency/Card/AgencyBasicData.vue b/src/pages/Route/Agency/Card/AgencyBasicData.vue
index 4270b136c..4f8f17163 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 :update-url="`Agencies/${routeId}`" model="Agency" auto-load>
+    <FormModel :url-update="`Agencies/${routeId}`" model="Agency" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.name" :label="t('globals.name')" />
diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index a9e6059c3..3e9b8df6c 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -17,7 +17,7 @@ const onSave = (data, response) => {
 </script>
 <template>
     <FormModel
-        :update-url="`Roadmaps/${$route.params?.id}`"
+        :url-update="`Roadmaps/${$route.params?.id}`"
         :url="`Roadmaps/${$route.params?.id}`"
         observe-form-changes
         model="Roadmap"

From 9d6c29ddafecbbebc77c305cc9b356a1e3b33f90 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 27 Feb 2025 10:47:24 +0100
Subject: [PATCH 08/10] refactor: refs #8616 integrate summary dialog and
 update navigation in Agency and Vehicle components

---
 src/pages/Route/Agency/AgencyList.vue           |  6 +++++-
 src/pages/Route/Agency/Card/AgencySummary.vue   |  7 ++++---
 src/pages/Route/Card/RouteSummary.vue           |  4 ++--
 src/pages/Route/Vehicle/Card/VehicleSummary.vue | 17 +++++++++++------
 src/pages/Route/Vehicle/VehicleList.vue         |  1 +
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
index 26849a593..c4aec6cbb 100644
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -2,10 +2,13 @@
 import { computed } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import AgencySummary from 'pages/Route/Agency/Card/AgencySummary.vue';
 
 const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const dataKey = 'AgencyList';
 function navigate(id) {
@@ -60,7 +63,8 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'preview',
-                action: (row) => navigate(row.id),
+                action: (row) => viewSummary(row?.id, AgencySummary),
+                isPrimary: true,
             },
         ],
     },
diff --git a/src/pages/Route/Agency/Card/AgencySummary.vue b/src/pages/Route/Agency/Card/AgencySummary.vue
index 71a6d1066..c74e5df7d 100644
--- a/src/pages/Route/Agency/Card/AgencySummary.vue
+++ b/src/pages/Route/Agency/Card/AgencySummary.vue
@@ -7,19 +7,20 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
+const route = useRoute();
 const $props = defineProps({ id: { type: Number, default: 0 } });
 const { t } = useI18n();
-const entityId = computed(() => $props.id || useRoute().params.id);
+const entityId = computed(() => $props.id || route.params.id);
 </script>
 
 <template>
     <div class="q-pa-md">
-        <CardSummary :url="`Agencies/${entityId}`" data-key="Agency">
+        <CardSummary :url="`Agencies/${entityId}`" data-key="Agency" module-name="Agency">
             <template #header="{ entity: agency }">{{ agency.name }}</template>
             <template #body="{ entity: agency }">
                 <QCard class="vn-one">
                     <VnTitle
-                        :url="`#/agency/${entityId}/basic-data`"
+                        :url="`#/${route.meta.moduleName.toLowerCase()}/agency/${entityId}/basic-data`"
                         :text="t('globals.pageTitles.basicData')"
                     />
                     <VnLv :label="t('globals.name')" :value="agency.name" />
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 3051972b2..299d41f6d 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -135,7 +135,7 @@ const ticketColumns = ref([
             <template #body="{ entity }">
                 <QCard class="vn-max">
                     <VnTitle
-                        :url="`#/route/${entityId}/basic-data`"
+                        :url="`#/${route.meta.moduleName.toLowerCase()}/${entityId}/basic-data`"
                         :text="t('globals.pageTitles.basicData')"
                     />
                 </QCard>
@@ -168,7 +168,7 @@ const ticketColumns = ref([
                     <VnLv
                         :label="t('route.summary.volume')"
                         :value="`${dashIfEmpty(entity?.route?.m3)} / ${dashIfEmpty(
-                            entity?.route?.vehicle?.m3
+                            entity?.route?.vehicle?.m3,
                         )} m³`"
                     />
                     <VnLv
diff --git a/src/pages/Route/Vehicle/Card/VehicleSummary.vue b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
index 0d5e8cdd2..a4879ff1a 100644
--- a/src/pages/Route/Vehicle/Card/VehicleSummary.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
@@ -14,15 +14,20 @@ const props = defineProps({ id: { type: [Number, String], default: null } });
 const route = useRoute();
 const entityId = computed(() => props.id || +route.params.id);
 const links = {
-    'basic-data': `#/vehicle/${entityId.value}/basic-data`,
-    notes: `#/vehicle/${entityId.value}/notes`,
-    dms: `#/vehicle/${entityId.value}/dms`,
-    'invoice-in': `#/vehicle/${entityId.value}/invoice-in`,
-    events: `#/vehicle/${entityId.value}/events`,
+    'basic-data': `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}/basic-data`,
+    notes: `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}/notes`,
+    dms: `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}/dms`,
+    'invoice-in': `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}/invoice-in`,
+    events: `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}/events`,
 };
 </script>
 <template>
-    <CardSummary data-key="Vehicle" :url="`Vehicles/${entityId}`" :filter="VehicleFilter">
+    <CardSummary
+        data-key="Vehicle"
+        :url="`Vehicles/${entityId}`"
+        module-name="Vehicle"
+        :filter="VehicleFilter"
+    >
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.numberPlate }}</div>
         </template>
diff --git a/src/pages/Route/Vehicle/VehicleList.vue b/src/pages/Route/Vehicle/VehicleList.vue
index e5b945010..a79cc2e35 100644
--- a/src/pages/Route/Vehicle/VehicleList.vue
+++ b/src/pages/Route/Vehicle/VehicleList.vue
@@ -116,6 +116,7 @@ const columns = computed(() => [
                 title: t('components.smartCard.openSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, VehicleSummary),
+                isPrimary: true,
             },
         ],
     },

From bc074fe1120ccb42c40eb6353ff977a7abf2d829 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 28 Feb 2025 11:35:47 +0100
Subject: [PATCH 09/10] feat: refs #8616 add summary prop to CardDescriptor in
 RoadmapDescriptor and WorkerDescriptor

---
 src/pages/Route/Roadmap/RoadmapDescriptor.vue | 11 ++++++++++-
 src/pages/Worker/Card/WorkerDescriptor.vue    |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index baa864a15..927eaa573 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -15,6 +15,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -26,7 +30,12 @@ const entityId = computed(() => {
 </script>
 
 <template>
-    <CardDescriptor :url="`Roadmaps/${entityId}`" :filter="filter" data-key="Roadmap">
+    <CardDescriptor
+        :url="`Roadmaps/${entityId}`"
+        :filter="filter"
+        data-key="Roadmap"
+        :summary="$props.summary"
+    >
         <template #body="{ entity }">
             <VnLv :label="t('Roadmap')" :value="entity?.name" />
             <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" />
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 0e946f1dd..20653c97f 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -23,6 +23,10 @@ const $props = defineProps({
         required: false,
         default: 'Worker',
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 const image = ref(null);
 
@@ -51,6 +55,7 @@ const handlePhotoUpdated = (evt = false) => {
     <CardDescriptor
         ref="cardDescriptorRef"
         :data-key="dataKey"
+        :summary="$props.summary"
         url="Workers/summary"
         :filter="{ where: { id: entityId } }"
         title="user.nickname"

From 9e36ddfd8f5cdad8bbd0b33cd1e05c68c635b24a Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 3 Mar 2025 10:44:02 +0100
Subject: [PATCH 10/10] refactor: refs #8616 simplify template bindings and
 improve link generation in VehicleSummary

---
 src/components/ui/CardDescriptor.vue               |  2 +-
 src/pages/Route/Roadmap/RoadmapDescriptor.vue      |  2 +-
 src/pages/Route/RouteRoadmap.vue                   |  1 -
 src/pages/Route/Vehicle/Card/VehicleDescriptor.vue |  1 -
 src/pages/Route/Vehicle/Card/VehicleSummary.vue    | 11 ++++++-----
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 8fc3ade0d..a29d1d429 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -129,7 +129,7 @@ const toModule = computed(() =>
 </script>
 
 <template>
-    <div class="descriptor" v-bind="$attrs">
+    <div class="descriptor">
         <template v-if="entity && !isLoading">
             <div class="header bg-primary q-pa-sm justify-between">
                 <slot name="header-extra-action"
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 927eaa573..198bcf8c7 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -34,7 +34,7 @@ const entityId = computed(() => {
         :url="`Roadmaps/${entityId}`"
         :filter="filter"
         data-key="Roadmap"
-        :summary="$props.summary"
+        :summary="summary"
     >
         <template #body="{ entity }">
             <VnLv :label="t('Roadmap')" :value="entity?.name" />
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 23b1b1d5b..badee148b 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -8,7 +8,6 @@ import { useSummaryDialog } from 'composables/useSummaryDialog';
 import toCurrency from 'filters/toCurrency';
 import axios from 'axios';
 
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import RoadmapSummary from 'pages/Route/Roadmap/RoadmapSummary.vue';
diff --git a/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue b/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue
index d9a2434ab..50129cd9a 100644
--- a/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue
@@ -11,7 +11,6 @@ const { notify } = useNotify();
         :url="`Vehicles/${$route.params.id}`"
         data-key="Vehicle"
         title="numberPlate"
-        :to-module="{ name: 'VehicleList' }"
     >
         <template #menu="{ entity }">
             <QItem
diff --git a/src/pages/Route/Vehicle/Card/VehicleSummary.vue b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
index a4879ff1a..13d4bbc9d 100644
--- a/src/pages/Route/Vehicle/Card/VehicleSummary.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
@@ -13,12 +13,13 @@ const props = defineProps({ id: { type: [Number, String], default: null } });
 
 const route = useRoute();
 const entityId = computed(() => props.id || +route.params.id);
+const baseLink = `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}`;
 const links = {
-    'basic-data': `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}/basic-data`,
-    notes: `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}/notes`,
-    dms: `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}/dms`,
-    'invoice-in': `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}/invoice-in`,
-    events: `#/${route.meta.moduleName.toLowerCase()}/vehicle/${entityId.value}/events`,
+    'basic-data': `${baseLink}/basic-data`,
+    notes: `${baseLink}/notes`,
+    dms: `${baseLink}/dms`,
+    'invoice-in': `${baseLink}/invoice-in`,
+    events: `${baseLink}/events`,
 };
 </script>
 <template>