From 9f517eb59d4a8d63469899dc3ee25440ef0619df Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 20 May 2024 12:40:47 +0200
Subject: [PATCH 1/4] refs #6820 fix BasicData Tickets

---
 src/pages/Route/Card/RouteForm.vue | 20 +++++++++++++-------
 src/pages/Route/RouteTickets.vue   |  5 -----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 892a0333c..ea75955ce 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -28,7 +28,7 @@ const defaultInitialData = {
     workerFk: null,
     isOk: false,
 };
-
+const maxDistance = ref(null);
 const workerList = ref([]);
 const agencyList = ref([]);
 const vehicleList = ref([]);
@@ -82,11 +82,6 @@ const onSave = (data, response) => {
 </script>
 <template>
     <VnSubToolbar />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <RouteSearchbar />
-        </Teleport>
-    </template>
     <FetchData
         url="Workers/search"
         :filter="{ fields: ['id', 'nickname'] }"
@@ -111,6 +106,12 @@ const onSave = (data, response) => {
         @on-fetch="(data) => (vehicleList = data)"
         auto-load
     />
+    <FetchData
+        url="RouteConfigs"
+        @on-fetch="(data) => (maxDistance = data.kmMax)"
+        auto-load
+        :where="{ id: 1 }"
+    />
     <FormModel
         :url="isNew ? null : `Routes/${route.params?.id}`"
         :url-create="isNew ? 'Routes' : null"
@@ -174,7 +175,12 @@ const onSave = (data, response) => {
             <template v-if="!isNew">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
-                    <VnInput v-model="data.kmEnd" :label="t('Km End')" clearable />
+                    <VnInput
+                        v-model.number="data.kmEnd"
+                        :label="t('Km End')"
+                        max="maxDistance"
+                        clearable
+                    />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnInputTime
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index eb2035011..0efcd6e0c 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -222,11 +222,6 @@ const openSmsDialog = async () => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <RouteSearchbar />
-        </Teleport>
-    </template>
     <FetchData
         @on-fetch="(data) => (routeEntity = data)"
         auto-load

From bacc07a4cac76b2a3a30d26a7eb1eaeca958ce08 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 21 May 2024 12:04:56 +0200
Subject: [PATCH 2/4] remove right

---
 src/pages/Worker/Card/WorkerCalendar.vue    | 17 -----------------
 src/pages/Worker/Card/WorkerTimeControl.vue | 17 -----------------
 2 files changed, 34 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendar.vue b/src/pages/Worker/Card/WorkerCalendar.vue
index 2e525aa30..cfde97f93 100644
--- a/src/pages/Worker/Card/WorkerCalendar.vue
+++ b/src/pages/Worker/Card/WorkerCalendar.vue
@@ -170,23 +170,6 @@ watch([year, businessFk], () => refreshData());
         ref="WorkerFreelanceRef"
         auto-load
     />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <WorkerCalendarFilter
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index d0b91e3a7..d9a650d9a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -489,23 +489,6 @@ onMounted(async () => {
             </QBtnGroup>
         </div>
     </Teleport>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="260" class="q-pa-md">
         <div class="q-pa-md q-mb-md" style="border: 2px solid #222">
             <QCardSection horizontal>

From 506b5dd9c289f6fc7af6abb6686988ce9de4a565 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 22 May 2024 12:24:08 +0200
Subject: [PATCH 3/4] refs #6820 fix error front

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

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index ea75955ce..27927a98d 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -81,7 +81,7 @@ const onSave = (data, response) => {
 };
 </script>
 <template>
-    <VnSubToolbar />
+    <VnSubToolbar v-if="isNew" />
     <FetchData
         url="Workers/search"
         :filter="{ fields: ['id', 'nickname'] }"
@@ -107,10 +107,10 @@ const onSave = (data, response) => {
         auto-load
     />
     <FetchData
-        url="RouteConfigs"
-        @on-fetch="(data) => (maxDistance = data.kmMax)"
+        url="RouteConfigs/findOne"
+        @on-fetch="({ kmMax }) => (maxDistance = kmMax)"
         auto-load
-        :where="{ id: 1 }"
+        sort-by="id ASC"
     />
     <FormModel
         :url="isNew ? null : `Routes/${route.params?.id}`"
@@ -175,11 +175,16 @@ const onSave = (data, response) => {
             <template v-if="!isNew">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
-                    <VnInput
+                    <QInput
                         v-model.number="data.kmEnd"
                         :label="t('Km End')"
-                        max="maxDistance"
+                        :rules="[
+                            (val) =>
+                                val < maxDistance ||
+                                t('Distance must be lesser than 4000'),
+                        ]"
                         clearable
+                        type="number"
                     />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
@@ -227,4 +232,5 @@ es:
     Description: Descripción
     Is served: Se ha servido
     Created: Creado
+    Distance must be lesser than 4000: La distancia debe ser inferior a 4000
 </i18n>

From e4ebf4c4db19126872ab228db97a8f9fb9b77b62 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 22 May 2024 13:44:53 +0200
Subject: [PATCH 4/4] refs #6820 fix traduction

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

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 27927a98d..7c25c6a02 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -28,7 +28,7 @@ const defaultInitialData = {
     workerFk: null,
     isOk: false,
 };
-const maxDistance = ref(null);
+const maxDistance = ref();
 const workerList = ref([]);
 const agencyList = ref([]);
 const vehicleList = ref([]);
@@ -232,5 +232,5 @@ es:
     Description: Descripción
     Is served: Se ha servido
     Created: Creado
-    Distance must be lesser than 4000: La distancia debe ser inferior a 4000
+    Distance must be lesser than {maxDistance}: La distancia debe ser inferior a {maxDistance}
 </i18n>