From 75866f2d27a63e37856952ca54d7379031c58c9e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 6 Aug 2024 11:00:59 +0200
Subject: [PATCH 1/4] refs #6898 fix new list

---
 src/components/common/VnCard.vue         | 2 ++
 src/components/ui/VnSearchbar.vue        | 4 ++++
 src/pages/Supplier/Card/SupplierCard.vue | 1 +
 src/pages/Supplier/SupplierList.vue      | 8 +++++---
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 17fa74317..b211a3c7f 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -23,6 +23,7 @@ const props = defineProps({
     searchCustomRouteRedirect: { type: String, default: undefined },
     searchRedirect: { type: Boolean, default: true },
     searchMakeFetch: { type: Boolean, default: true },
+    searchUrlQuery: { type: String, default: undefined },
 });
 
 const stateStore = useStateStore();
@@ -70,6 +71,7 @@ if (props.baseUrl) {
             :url="props.searchUrl"
             :label="props.searchbarLabel"
             :info="props.searchbarInfo"
+            :search-url="props.searchUrlQuery"
             :custom-route-redirect-name="searchCustomRouteRedirect"
             :redirect="searchRedirect"
         />
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 0c7a8a3f6..2053efd62 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -67,6 +67,10 @@ const props = defineProps({
         type: Boolean,
         default: true,
     },
+    searchUrl: {
+        type: String,
+        default: 'params',
+    },
 });
 
 const searchText = ref('');
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index adf0315da..ed4ce7eb2 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -12,5 +12,6 @@ import SupplierListFilter from '../SupplierListFilter.vue';
         search-data-key="SupplierList"
         search-url="Suppliers/filter"
         searchbar-label="Search suppliers"
+        search-url-query="table"
     />
 </template>
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 8cc2f7422..d8404632c 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -19,9 +19,6 @@ const columns = computed(() => [
         label: t('supplier.list.tableVisibleColumns.name'),
         name: 'socialName',
         create: true,
-        columnCreate: {
-            component: 'input',
-        },
         columnFilter: {
             name: 'search',
         },
@@ -93,6 +90,11 @@ const columns = computed(() => [
             title: t('Create Supplier'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {},
+            mapper: (data) => {
+                data.name = data.socialName;
+                delete data.socialName;
+                return data;
+            },
         }"
         order="id ASC"
         :columns="columns"

From 7d6520fdaabe93d5811a6a4db93bfc21b1539d2d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 6 Aug 2024 11:44:38 +0200
Subject: [PATCH 2/4] fix: routeForm

---
 src/pages/Route/Card/RouteForm.vue | 49 +++++-------------------------
 1 file changed, 8 insertions(+), 41 deletions(-)

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index db7dede1e..725644824 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -26,9 +26,6 @@ const defaultInitialData = {
     isOk: false,
 };
 const maxDistance = ref();
-const workerList = ref([]);
-const agencyList = ref([]);
-const vehicleList = ref([]);
 
 const routeFilter = {
     fields: [
@@ -79,30 +76,6 @@ const onSave = (data, response) => {
 </script>
 <template>
     <VnSubToolbar v-if="isNew" />
-    <FetchData
-        url="Workers/search"
-        :filter="{ fields: ['id', 'nickname'] }"
-        sort-by="nickname ASC"
-        limit="30"
-        @on-fetch="(data) => (workerList = data)"
-        auto-load
-    />
-    <FetchData
-        url="AgencyModes/isActive"
-        :filter="{ fields: ['id', 'name'] }"
-        sort-by="name"
-        limit="30"
-        @on-fetch="(data) => (agencyList = data)"
-        auto-load
-    />
-    <FetchData
-        url="Vehicles"
-        :filter="{ fields: ['id', 'numberPlate'] }"
-        sort-by="numberPlate ASC"
-        limit="30"
-        @on-fetch="(data) => (vehicleList = data)"
-        auto-load
-    />
     <FetchData
         url="RouteConfigs/findOne"
         @on-fetch="({ kmMax }) => (maxDistance = kmMax)"
@@ -124,12 +97,10 @@ const onSave = (data, response) => {
                 <VnSelect
                     :label="t('Worker')"
                     v-model="data.workerFk"
-                    :options="workerList"
+                    url="Workers/search"
+                    sort-by="nickname ASC"
                     option-value="id"
                     option-label="nickname"
-                    emit-value
-                    map-options
-                    use-input
                     :input-debounce="0"
                 >
                     <template #option="{ itemProps, opt }">
@@ -146,12 +117,10 @@ const onSave = (data, response) => {
                 <VnSelect
                     :label="t('Vehicle')"
                     v-model="data.vehicleFk"
-                    :options="vehicleList"
+                    url="Vehicles"
+                    sort-by="numberPlate ASC"
                     option-value="id"
                     option-label="numberPlate"
-                    emit-value
-                    map-options
-                    use-input
                     :input-debounce="0"
                 />
             </VnRow>
@@ -159,12 +128,10 @@ const onSave = (data, response) => {
                 <VnSelect
                     :label="t('Agency')"
                     v-model="data.agencyModeFk"
-                    :options="agencyList"
+                    url="AgencyModes/isActive"
+                    sort-by="name"
                     option-value="id"
                     option-label="name"
-                    emit-value
-                    map-options
-                    use-input
                     :input-debounce="0"
                 />
                 <VnInputDate v-model="data.created" :label="t('Created')" />
@@ -178,7 +145,7 @@ const onSave = (data, response) => {
                         :rules="[
                             (val) =>
                                 val < maxDistance ||
-                                t('Distance must be lesser than 4000'),
+                                t('Distance must be lesser than') + ` ${maxDistance}`,
                         ]"
                         clearable
                         type="number"
@@ -227,5 +194,5 @@ es:
     Description: Descripción
     Is served: Se ha servido
     Created: Creado
-    Distance must be lesser than {maxDistance}: La distancia debe ser inferior a {maxDistance}
+    Distance must be lesser than: La distancia debe ser inferior a
 </i18n>

From 7e7fddb86babd87b4dcf0b82a382d3c3ed57d038 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 6 Aug 2024 11:50:33 +0200
Subject: [PATCH 3/4] fix(router_basicData): transalation kmMax

---
 src/pages/Route/Card/RouteForm.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 725644824..b80b4536d 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -145,7 +145,7 @@ const onSave = (data, response) => {
                         :rules="[
                             (val) =>
                                 val < maxDistance ||
-                                t('Distance must be lesser than') + ` ${maxDistance}`,
+                                t('Distance must be lesser than', { maxDistance }),
                         ]"
                         clearable
                         type="number"
@@ -194,5 +194,7 @@ es:
     Description: Descripción
     Is served: Se ha servido
     Created: Creado
-    Distance must be lesser than: La distancia debe ser inferior a
+    Distance must be lesser than: La distancia debe ser inferior a {maxDistance}
+en:
+    Distance must be lesser than: Distance must be lesser than {maxDistance}
 </i18n>

From 1db7fd8412cba50070390f4307e088ed23196556 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 6 Aug 2024 13:01:07 +0200
Subject: [PATCH 4/4] hotFix(routeTicket): limit 0

---
 src/pages/Route/RouteTickets.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index fc9087032..9356f7590 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -301,6 +301,7 @@ const openSmsDialog = async () => {
                 data-key="RouteTicketList"
                 url="Routes/getTickets"
                 :filter="{ id: route.params.id }"
+                :limit="0"
                 :order="['priority ASC']"
                 auto-load
                 @on-fetch="(data) => (ticketList = data)"