From a98d98789655c178067c3c063447db5a4b1a4073 Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Fri, 5 May 2023 07:51:06 +0200
Subject: [PATCH] =?UTF-8?q?refs=20#4770=20a=C3=B1adido=20campo=20hora=20de?=
 =?UTF-8?q?=20ETD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../route/front/roadmap/basic-data/index.html | 35 +++++++++++--------
 .../route/front/roadmap/basic-data/index.js   |  4 +--
 .../front/roadmap/basic-data/locale/es.yml    |  1 -
 modules/route/front/roadmap/locale/es.yml     |  4 ++-
 .../front/roadmap/search-panel/index.html     | 24 ++++++-------
 modules/route/front/roadmap/stops/index.html  |  7 +++-
 6 files changed, 42 insertions(+), 33 deletions(-)
 delete mode 100644 modules/route/front/roadmap/basic-data/locale/es.yml

diff --git a/modules/route/front/roadmap/basic-data/index.html b/modules/route/front/roadmap/basic-data/index.html
index e186f7f24..28c67eb47 100644
--- a/modules/route/front/roadmap/basic-data/index.html
+++ b/modules/route/front/roadmap/basic-data/index.html
@@ -16,9 +16,14 @@
             </vn-textfield>
             <vn-date-picker
                 vn-one
-                label="ETD"
+                label="ETD date"
                 ng-model="$ctrl.roadmap.etd">
             </vn-date-picker>
+            <vn-input-time
+                vn-one
+                label="ETD hour"
+                ng-model="$ctrl.roadmap.etd">
+            </vn-input-time>
         </vn-horizontal>
         <vn-horizontal>
             <vn-textfield
@@ -34,20 +39,6 @@
                 rule>
             </vn-textfield>
         </vn-horizontal>
-        <vn-horizontal>
-            <vn-textfield
-                vn-one
-                label="Phone"
-                ng-model="$ctrl.roadmap.phone"
-                rule>
-            </vn-textfield>
-            <vn-textfield
-                vn-one
-                label="Driver name"
-                ng-model="$ctrl.roadmap.driverName"
-                rule>
-            </vn-textfield>
-        </vn-horizontal>
         <vn-horizontal>
             <vn-autocomplete
                 vn-one
@@ -69,6 +60,20 @@
                 rule>
             </vn-input-number>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Driver name"
+                ng-model="$ctrl.roadmap.driverName"
+                rule>
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Phone"
+                ng-model="$ctrl.roadmap.phone"
+                rule>
+            </vn-textfield>
+        </vn-horizontal>
         <vn-horizontal>
             <vn-textArea
                 vn-one
diff --git a/modules/route/front/roadmap/basic-data/index.js b/modules/route/front/roadmap/basic-data/index.js
index 43d01b3e0..d5b39b76e 100644
--- a/modules/route/front/roadmap/basic-data/index.js
+++ b/modules/route/front/roadmap/basic-data/index.js
@@ -3,9 +3,7 @@ import Section from 'salix/components/section';
 
 export default class Controller extends Section {
     onSubmit() {
-        this.$.watcher.submit().then(() =>
-            this.card.reload()
-        );
+        this.$.watcher.submit();
     }
 }
 
diff --git a/modules/route/front/roadmap/basic-data/locale/es.yml b/modules/route/front/roadmap/basic-data/locale/es.yml
deleted file mode 100644
index 4872313a0..000000000
--- a/modules/route/front/roadmap/basic-data/locale/es.yml
+++ /dev/null
@@ -1 +0,0 @@
-Carrier: Transportista
diff --git a/modules/route/front/roadmap/locale/es.yml b/modules/route/front/roadmap/locale/es.yml
index ecc60eb9e..e136eca31 100644
--- a/modules/route/front/roadmap/locale/es.yml
+++ b/modules/route/front/roadmap/locale/es.yml
@@ -9,4 +9,6 @@ Select the estimated time of departure (ETD): Seleccione la hora estimada de sal
 Create roadmap: Crear troncal
 Tractor plate: Matrícula tractor
 Trailer plate: Matrícula trailer
-
+Carrier: Transportista
+ETD date: Fecha ETD
+ETD hour: Hora ETD
diff --git a/modules/route/front/roadmap/search-panel/index.html b/modules/route/front/roadmap/search-panel/index.html
index 65c3e9abf..53fd37344 100644
--- a/modules/route/front/roadmap/search-panel/index.html
+++ b/modules/route/front/roadmap/search-panel/index.html
@@ -35,18 +35,6 @@
                 ng-model="filter.trailerPlate">
             </vn-textfield>
         </vn-horizontal>
-        <vn-horizontal class="vn-px-lg">
-            <vn-textfield
-                vn-one
-                label="Phone"
-                ng-model="filter.phone">
-            </vn-textfield>
-            <vn-textfield
-                vn-one
-                label="Driver name"
-                ng-model="filter.driverName">
-            </vn-textfield>
-        </vn-horizontal>
         <vn-horizontal class="vn-px-lg">
             <vn-autocomplete
                 vn-one
@@ -67,6 +55,18 @@
                 ng-model="filter.price">
             </vn-input-number>
         </vn-horizontal>
+        <vn-horizontal class="vn-px-lg">
+            <vn-textfield
+                vn-one
+                label="Driver name"
+                ng-model="filter.driverName">
+            </vn-textfield>
+             <vn-textfield
+                vn-one
+                label="Phone"
+                ng-model="filter.phone">
+            </vn-textfield>
+        </vn-horizontal>
         <vn-horizontal class="vn-px-lg vn-pb-lg vn-mt-lg">
             <vn-submit label="Search"></vn-submit>
         </vn-horizontal>
diff --git a/modules/route/front/roadmap/stops/index.html b/modules/route/front/roadmap/stops/index.html
index 908560365..3776cfa15 100644
--- a/modules/route/front/roadmap/stops/index.html
+++ b/modules/route/front/roadmap/stops/index.html
@@ -24,10 +24,15 @@
                 rule>
             </vn-autocomplete>
             <vn-date-picker vn-one
-                label="ETD"
+                label="ETD date"
                 ng-model="expeditionTruck.ETD"
                 rule>
             </vn-date-picker>
+            <vn-input-time
+                vn-one
+                label="ETD hour"
+                ng-model="expeditionTruck.ETD">
+            </vn-input-time>
             <vn-textArea
                 vn-one
                 label="Description"