From 834f6864753b529a4a86655c580b2dab8ff46cf8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 23 Jan 2025 18:02:57 +0100
Subject: [PATCH] feat: refs #7119 add delivery point localization and update
 vehicle forms

---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Route/Vehicle/Card/VehicleBasicData.vue   | 61 +++++++++----------
 .../Route/Vehicle/Card/VehicleSummary.vue     |  4 ++
 src/pages/Route/Vehicle/VehicleFilter.js      |  8 +++
 src/pages/Route/Vehicle/VehicleList.vue       | 49 +++++++++++++++
 src/pages/Route/Vehicle/locale/en.yml         |  2 +
 src/pages/Route/Vehicle/locale/es.yml         |  2 +
 8 files changed, 96 insertions(+), 32 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index e5b3a4517..cdd75f29a 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -358,6 +358,7 @@ globals:
     fuel: Fuel
     active: Active
     inactive: Inactive
+    deliveryPoint: Delivery point
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 7f7b51e0a..abadaa2dc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -360,6 +360,7 @@ globals:
     fuel: Combustible
     active: Activo
     inactive: Inactivo
+    deliveryPoint: Punto de entrega
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Route/Vehicle/Card/VehicleBasicData.vue b/src/pages/Route/Vehicle/Card/VehicleBasicData.vue
index d7e74ebc5..4705210b4 100644
--- a/src/pages/Route/Vehicle/Card/VehicleBasicData.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleBasicData.vue
@@ -41,22 +41,8 @@ const bankPolicies = ref([]);
     <FormModel model="Vehicle" :url-update="`Vehicles/${$route.params.id}`">
         <template #form="{ data }">
             <VnRow>
-                <VnInput v-model="data.numberPlate" :label="$t('vehicle.numberPlate')" />
                 <VnInput v-model="data.description" :label="$t('globals.description')" />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    v-model="data.tradeMark"
-                    :label="$t('vehicle.tradeMark')"
-                    :required="true"
-                />
-                <VnSelect
-                    v-model="data.fuelTypeFk"
-                    :label="$t('globals.fuel')"
-                    :options="fuelTypes"
-                    option-label="name"
-                    option-value="id"
-                />
+                <VnInput v-model="data.numberPlate" :label="$t('vehicle.numberPlate')" />
             </VnRow>
             <VnRow>
                 <VnInput
@@ -69,15 +55,21 @@ const bankPolicies = ref([]);
                     v-model="data.vehicleTypeFk"
                     :label="$t('globals.type')"
                 />
-                <VnSelect
-                    url="Ppes"
-                    option-label="id"
-                    v-model="data.ppeFk"
-                    :label="$t('vehicle.ppe')"
-                />
             </VnRow>
             <VnRow>
+                <VnInput
+                    v-model="data.tradeMark"
+                    :label="$t('vehicle.tradeMark')"
+                    :required="true"
+                />
                 <VnInput v-model="data.chassis" :label="$t('vehicle.chassis')" />
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    v-model="data.fuelTypeFk"
+                    :label="$t('globals.fuel')"
+                    :options="fuelTypes"
+                />
                 <VnInput v-model="data.vin" :label="$t('vehicle.vin')" />
             </VnRow>
             <VnRow>
@@ -107,7 +99,6 @@ const bankPolicies = ref([]);
                     :label="$t('vehicle.supplierCooler')"
                 />
             </VnRow>
-
             <VnRow>
                 <VnSelect
                     url="BankPolicies"
@@ -121,30 +112,36 @@ const bankPolicies = ref([]);
                 <VnInput v-model="data.leasing" :label="$t('vehicle.nLeasing')" />
             </VnRow>
             <VnRow>
+                <VnInputNumber v-model="data.import" :label="$t('globals.amount')" />
+                <VnInputNumber
+                    v-model="data.importCooler"
+                    :label="$t('vehicle.amountCooler')"
+                />
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    url="Ppes"
+                    option-label="id"
+                    v-model="data.ppeFk"
+                    :label="$t('vehicle.ppe')"
+                />
                 <VnSelect
                     v-model="data.countryCodeFk"
-                    :label="$t('vehicle.countryCode')"
+                    :label="$t('globals.country')"
                     :options="countries"
                     option-label="code"
                     option-value="code"
                 />
-                <VnInputNumber v-model="data.import" :label="$t('globals.amount')" />
             </VnRow>
             <VnRow>
-                <span>
-                    <QCheckbox
-                        v-model="data.isKmTruckRate"
-                        :label="$t('vehicle.isKmTruckRate')"
-                        :false-value="0"
-                        :true-value="1"
-                    />
-                </span>
                 <span>
                     <QCheckbox
                         v-model="data.isActive"
                         :label="$t('vehicle.isActive')"
                         :false-value="0"
                         :true-value="1"
+                        dense
+                        class="q-mt-sm"
                     />
                 </span>
             </VnRow>
diff --git a/src/pages/Route/Vehicle/Card/VehicleSummary.vue b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
index 53bac89ca..a61a1cc49 100644
--- a/src/pages/Route/Vehicle/Card/VehicleSummary.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
@@ -86,6 +86,10 @@ const links = {
                             :label="$t('globals.company')"
                             :value="entity.company?.code"
                         />
+                        <VnLv
+                            :label="$t('globals.deliveryPoint')"
+                            :value="entity.deliveryPoint?.name"
+                        />
                         <VnLv
                             :label="$t('globals.country')"
                             :value="entity.countryCodeFk"
diff --git a/src/pages/Route/Vehicle/VehicleFilter.js b/src/pages/Route/Vehicle/VehicleFilter.js
index 6d9ff36f8..be933bc3d 100644
--- a/src/pages/Route/Vehicle/VehicleFilter.js
+++ b/src/pages/Route/Vehicle/VehicleFilter.js
@@ -13,6 +13,7 @@ export default {
         'tradeMark',
         'fuelTypeFk',
         'import',
+        'importCooler',
         'vin',
         'model',
         'ppeFk',
@@ -20,6 +21,7 @@ export default {
         'leasing',
         'bankPolicyFk',
         'vehicleTypeFk',
+        'deliveryPointFk',
     ],
     include: [
         {
@@ -64,5 +66,11 @@ export default {
                 fields: ['id'],
             },
         },
+        {
+            relation: 'deliveryPoint',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
     ],
 };
diff --git a/src/pages/Route/Vehicle/VehicleList.vue b/src/pages/Route/Vehicle/VehicleList.vue
index 0f25ee876..3b237f5ea 100644
--- a/src/pages/Route/Vehicle/VehicleList.vue
+++ b/src/pages/Route/Vehicle/VehicleList.vue
@@ -6,6 +6,8 @@ import FetchData from 'src/components/FetchData.vue';
 import VehicleSearchbar from 'src/pages/Route/Vehicle/VehicleSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import VehicleSummary from 'src/pages/Route/Vehicle/Card/VehicleSummary.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -14,6 +16,7 @@ const companies = ref([]);
 const countries = ref([]);
 const vehicleStates = ref([]);
 const vehicleTypes = ref([]);
+const deliveryPoints = ref([]);
 
 const columns = computed(() => [
     {
@@ -150,12 +153,25 @@ const columns = computed(() => [
         @on-fetch="(data) => (vehicleTypes = data)"
         auto-load
     />
+    <FetchData
+        url="DeliveryPoints"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (deliveryPoints = data)"
+        auto-load
+    />
     <VehicleSearchbar />
     <VnTable
+        ref="tableRef"
         data-key="VehicleList"
         url="Vehicles/filter"
         :columns="columns"
         redirect="vehicle"
+        :create="{
+            urlCreate: 'Vehicles',
+            title: t('vehicle.create'),
+            onDataSaved: ({ id }) => $refs.tableRef.redirect(id),
+            formInitialData: { isActive: true, isKmTruckRate: false },
+        }"
     >
         <template #column-isActive="{ row }">
             <span>
@@ -164,5 +180,38 @@ const columns = computed(() => [
                 </QIcon>
             </span>
         </template>
+        <template #more-create-dialog="{ data }">
+            <VnInput
+                v-model="data.numberPlate"
+                :label="$t('vehicle.numberPlate')"
+                :uppercase="true"
+            />
+            <VnInput v-model="data.tradeMark" :label="$t('vehicle.tradeMark')" />
+            <VnInput v-model="data.model" :label="$t('globals.model')" />
+            <VnSelect
+                v-model="data.vehicleTypeFk"
+                :label="$t('globals.type')"
+                :options="vehicleTypes"
+            />
+            <VnSelect
+                v-model="data.warehouseFk"
+                :label="$t('globals.warehouse')"
+                :options="warehouses"
+            />
+            <VnSelect
+                v-model="data.countryCodeFk"
+                :label="$t('globals.country')"
+                option-value="code"
+                option-label="code"
+                :options="countries"
+            />
+            <VnInput v-model="data.description" :label="$t('globals.description')" />
+            <VnSelect
+                v-model="data.deliveryPointFk"
+                :label="$t('globals.deliveryPoint')"
+                :options="deliveryPoints"
+            />
+            <QCheckbox to v-model="data.isActive" :label="$t('globals.active')" />
+        </template>
     </VnTable>
 </template>
diff --git a/src/pages/Route/Vehicle/locale/en.yml b/src/pages/Route/Vehicle/locale/en.yml
index 927a9bb2e..a5b43fe9e 100644
--- a/src/pages/Route/Vehicle/locale/en.yml
+++ b/src/pages/Route/Vehicle/locale/en.yml
@@ -10,6 +10,8 @@ vehicle:
     ppe: Ppe
     isActive: Active
     nLeasing: Nº Leasing
+    create: Create Vehicle
+    amountCooler: Amount cooler
     searchbar:
         label: Search Vehicle
         info: Search by id or number plate
diff --git a/src/pages/Route/Vehicle/locale/es.yml b/src/pages/Route/Vehicle/locale/es.yml
index 8862b52a9..e3eebe62a 100644
--- a/src/pages/Route/Vehicle/locale/es.yml
+++ b/src/pages/Route/Vehicle/locale/es.yml
@@ -8,6 +8,8 @@ vehicle:
     supplierCooler: Proveedor Frío
     vin: VIN
     ppe: Nº Inmovilizado
+    create: Crear vehículo
+    amountCooler: Importe frío
     isActive: Activo
     nLeasing: Nº leasing
     searchbar: