From 2a5942a9a91a228e21ba42f396ea251da909e9ca Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 20 Jan 2025 18:05:32 +0100
Subject: [PATCH] feat: refs #7119 update vehicle selection to use active
 vehicles and refactor vehicle card component

---
 src/pages/Route/Card/RouteFilter.vue               | 2 +-
 src/pages/Route/Card/RouteForm.vue                 | 2 +-
 src/pages/Route/RouteExtendedList.vue              | 3 +--
 src/pages/Route/Vehicle/Card/VehicleCard.vue       | 6 +++---
 src/pages/Route/Vehicle/Card/VehicleDescriptor.vue | 7 +++++++
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 72bfed1da..21858102b 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -100,7 +100,7 @@ const emit = defineEmits(['search']);
                     <VnSelect
                         :label="t('Vehicle')"
                         v-model="params.vehicleFk"
-                        url="Vehicles"
+                        url="Vehicles/active"
                         sort-by="numberPlate ASC"
                         option-value="id"
                         option-label="numberPlate"
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 9bf0a2f4e..c72db9869 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -99,7 +99,7 @@ const onSave = (data, response) => {
                 <VnSelect
                     :label="t('Vehicle')"
                     v-model="data.vehicleFk"
-                    url="Vehicles"
+                    url="Vehicles/active"
                     sort-by="numberPlate ASC"
                     option-value="id"
                     option-label="numberPlate"
diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue
index 221fc4754..03d081fc8 100644
--- a/src/pages/Route/RouteExtendedList.vue
+++ b/src/pages/Route/RouteExtendedList.vue
@@ -96,8 +96,7 @@ const columns = computed(() => [
         create: true,
         component: 'select',
         attrs: {
-            url: 'vehicles',
-            fields: ['id', 'numberPlate'],
+            url: 'vehicles/active',
             optionLabel: 'numberPlate',
             optionFilterValue: 'numberPlate',
             find: {
diff --git a/src/pages/Route/Vehicle/Card/VehicleCard.vue b/src/pages/Route/Vehicle/Card/VehicleCard.vue
index 9fecd550a..5c9530455 100644
--- a/src/pages/Route/Vehicle/Card/VehicleCard.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleCard.vue
@@ -1,11 +1,11 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCard.vue';
 import VehicleSearchbar from '../VehicleSearchbar.vue';
 import VehicleDescriptor from './VehicleDescriptor.vue';
 import VehicleFilter from '../VehicleFilter.js';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Vehicle"
         base-url="Vehicles"
         :filter="VehicleFilter"
@@ -15,5 +15,5 @@ import VehicleFilter from '../VehicleFilter.js';
         <template #searchbar>
             <VehicleSearchbar />
         </template>
-    </VnCard>
+    </VnCardBeta>
 </template>
diff --git a/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue b/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue
index 62032dfe6..aa9b9342a 100644
--- a/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleDescriptor.vue
@@ -4,6 +4,13 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 </script>
 <template>
     <CardDescriptor module="Vehicle" data-key="Vehicle" title="numberPlate">
+        <template #menu="{ entity }">
+            <QItem v-ripple clickable @click="axios.delete(`Vehicles/${entity.id}`)">
+                <QItemSection>
+                    {{ $t('vehicle.delete') }}
+                </QItemSection>
+            </QItem>
+        </template>
         <template #body="{ entity }">
             <VnLv :label="$t('vehicle.numberPlate')" :value="entity.numberPlate" />
             <VnLv :label="$t('vehicle.tradeMark')" :value="entity.tradeMark" />