From 0225dcc736f8ba749688a96fa6a8f33b168682f6 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 26 Feb 2025 11:47:31 +0100
Subject: [PATCH 1/3] fix: fixed agency and vehicle Fk and add select fields on
 create form

---
 src/pages/Route/RouteList.vue | 40 ++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index bc3227f6c..899b3b8c3 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -38,6 +38,17 @@ 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',
+            },
+        },
         create: true,
         cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
@@ -45,18 +56,40 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'agencyName',
+        name: 'agencyModeFk',
         label: t('route.Agency'),
+        format: (row) => row?.agencyName,
         cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'agencyModes',
+            fields: ['id', 'name'],
+            find: {
+                value: 'agencyModeFk',
+                label: 'agencyName',
+            },
+        },
         create: true,
         columnClass: 'expand',
         columnFilter: false,
     },
     {
         align: 'left',
-        name: 'vehiclePlateNumber',
+        name: 'vehicleFk',
         label: t('route.Vehicle'),
+        format: (row) => row?.vehiclePlateNumber,
         cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'vehicles',
+            fields: ['id', 'numberPlate'],
+            optionLabel: 'numberPlate',
+            optionFilterValue: 'numberPlate',
+            find: {
+                value: 'vehicleFk',
+                label: 'vehiclePlateNumber',
+            },
+        },
         create: true,
         columnFilter: false,
     },
@@ -124,6 +157,7 @@ const columns = computed(() => [
         <template #body>
             <VnTable
                 :data-key
+                ref="tableRef"
                 :columns="columns"
                 :right-search="false"
                 redirect="route"
@@ -144,4 +178,4 @@ const columns = computed(() => [
             </VnTable>
         </template>
     </VnSection>
-</template>
+</template>
\ No newline at end of file

From 1c568227c2a39b41c8b9f0d3447d9b2d56e6236c Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 27 Feb 2025 12:45:20 +0100
Subject: [PATCH 2/3] refactor: replace select component with VnSelectWorker in
 RouteList.vue

---
 src/pages/Route/RouteList.vue | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 899b3b8c3..58314a2f5 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),
@@ -58,7 +49,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'agencyModeFk',
         label: t('route.Agency'),
-        format: (row) => row?.agencyName,
         cardVisible: true,
         component: 'select',
         attrs: {
@@ -77,7 +67,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'vehicleFk',
         label: t('route.Vehicle'),
-        format: (row) => row?.vehiclePlateNumber,
         cardVisible: true,
         component: 'select',
         attrs: {
@@ -157,8 +146,8 @@ const columns = computed(() => [
         <template #body>
             <VnTable
                 :data-key
-                ref="tableRef"
                 :columns="columns"
+                ref="tableRef"
                 :right-search="false"
                 redirect="route"
                 :create="{
@@ -175,7 +164,17 @@ const columns = computed(() => [
                         <WorkerDescriptorProxy :id="row?.workerFk" v-if="row?.workerFk" />
                     </span>
                 </template>
+                <template #column-agencyModeFk="{ row }">
+                    <span>
+                        {{ row?.agencyName }}
+                    </span>
+                </template>
+                <template #column-vehicleFk="{ row }">
+                    <span>
+                        {{ row?.vehiclePlateNumber }}
+                    </span>
+                </template>
             </VnTable>
         </template>
     </VnSection>
-</template>
\ No newline at end of file
+</template>

From e9660b2687ff66635024ae39d52437394ee8c451 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 28 Feb 2025 09:00:23 +0100
Subject: [PATCH 3/3] refactor: rename agencyModeFk to agencyName and vehicleFk
 to vehiclePlateNumber in RouteList.vue

---
 src/pages/Route/RouteList.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 58314a2f5..5723e2f0d 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -47,9 +47,13 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'agencyModeFk',
+        name: 'agencyName',
         label: t('route.Agency'),
         cardVisible: true,
+    },
+    {
+        label: t('route.Agency'),
+        name: 'agencyModeFk',
         component: 'select',
         attrs: {
             url: 'agencyModes',
@@ -60,11 +64,16 @@ const columns = computed(() => [
             },
         },
         create: true,
-        columnClass: 'expand',
         columnFilter: false,
+        visible: false,
     },
     {
         align: 'left',
+        name: 'vehiclePlateNumber',
+        label: t('route.Vehicle'),
+        cardVisible: true,
+    },
+    {
         name: 'vehicleFk',
         label: t('route.Vehicle'),
         cardVisible: true,
@@ -81,6 +90,7 @@ const columns = computed(() => [
         },
         create: true,
         columnFilter: false,
+        visible: false,
     },
     {
         align: 'left',
@@ -164,16 +174,6 @@ const columns = computed(() => [
                         <WorkerDescriptorProxy :id="row?.workerFk" v-if="row?.workerFk" />
                     </span>
                 </template>
-                <template #column-agencyModeFk="{ row }">
-                    <span>
-                        {{ row?.agencyName }}
-                    </span>
-                </template>
-                <template #column-vehicleFk="{ row }">
-                    <span>
-                        {{ row?.vehiclePlateNumber }}
-                    </span>
-                </template>
             </VnTable>
         </template>
     </VnSection>