From f50f99b96234216c6f2db28880d6b4c5fc4486b0 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Fri, 22 Nov 2019 13:23:43 +0100
Subject: [PATCH] Minor bug & style fixes

---
 modules/route/front/tickets/index.html       | 36 +++++++++-----------
 modules/travel/front/index/index.js          | 26 ++++++--------
 modules/travel/front/locale/es.yml           |  4 +++
 modules/travel/front/search-panel/index.html | 20 ++++++++---
 4 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/modules/route/front/tickets/index.html b/modules/route/front/tickets/index.html
index 534a39a385..4a0e581126 100644
--- a/modules/route/front/tickets/index.html
+++ b/modules/route/front/tickets/index.html
@@ -7,8 +7,8 @@
 </vn-crud-model>
 <vn-data-viewer model="model">
     <form name="form">
-        <vn-card class="vn-pa-lg">
-            <vn-tool-bar class="vn-mb-sm">
+        <vn-card class="vn-pa-md">
+            <vn-tool-bar>
                 <vn-button
                     icon="icon-wand"
                     ng-click="$ctrl.guessPriority()"
@@ -18,14 +18,11 @@
                     disabled="!$ctrl.isChecked"
                     ng-click="$ctrl.goToBuscaman()"
                     vn-tooltip="Open buscaman"
-                    tooltip-position="up"
                     icon="icon-buscaman">
                 </vn-button>
             </vn-tool-bar>
-            <vn-icon-button
-                vn-tooltip="Load more"
-                ng-click="$ctrl.goToBuscaman()">
-            </vn-icon-button>
+        </vn-card>
+        <vn-card class="vn-mt-md">
             <vn-table model="model" auto-load="false">
                 <vn-thead>
                     <vn-tr>
@@ -36,12 +33,12 @@
                         </vn-th>
                         <vn-th>Order</vn-th>
                         <vn-th number>Ticket</vn-th>
-                        <vn-th>Client</vn-th>
-                        <vn-th number shrink>Packages</vn-th>
-                        <vn-th shrink>m³</vn-th>
-                        <vn-th shrink>Warehouse</vn-th>
-                        <vn-th expand>Postcode</vn-th>
-                        <vn-th>Street</vn-th>
+                        <vn-th expand>Client</vn-th>
+                        <vn-th number>Packages</vn-th>
+                        <vn-th number>m³</vn-th>
+                        <vn-th>Warehouse</vn-th>
+                        <vn-th>Postcode</vn-th>
+                        <vn-th expand>Street</vn-th>
                         <vn-th shrink></vn-th>
                         <vn-th shrink></vn-th>
                     </vn-tr>
@@ -53,11 +50,12 @@
                                 ng-model="ticket.checked">
                             </vn-check>
                         </vn-td>
-                        <vn-td>
+                        <vn-td number>
                             <vn-input-number
                                 on-change="$ctrl.setPriority(ticket.id, ticket.priority)"
                                 ng-model="ticket.priority"
-                                rule="Ticket">
+                                rule="Ticket"
+                                class="dense">
                             </vn-input-number>
                         </vn-td>
                         <vn-td number>
@@ -74,10 +72,10 @@
                                 {{ticket.nickname}}
                             </span>
                         </vn-td>
-                        <vn-td number shrink>{{ticket.packages}}</vn-td>
-                        <vn-td shrink>{{ticket.volume}}</vn-td>
-                        <vn-td shrink>{{ticket.warehouse.name}}</vn-td>
-                        <vn-td number shrink>{{ticket.address.postalCode}}</vn-td>
+                        <vn-td number>{{ticket.packages}}</vn-td>
+                        <vn-td number>{{ticket.volume}}</vn-td>
+                        <vn-td expand>{{ticket.warehouse.name}}</vn-td>
+                        <vn-td>{{ticket.address.postalCode}}</vn-td>
                         <vn-td expand title="{{ticket.address.street}}">{{ticket.address.street}}</vn-td>
                         <vn-td shrink>
                             <vn-icon-button
diff --git a/modules/travel/front/index/index.js b/modules/travel/front/index/index.js
index b080ed8ec3..a4dd60d774 100644
--- a/modules/travel/front/index/index.js
+++ b/modules/travel/front/index/index.js
@@ -9,21 +9,13 @@ export default class Controller {
             include: [
                 {
                     relation: 'agency',
-                    scope: {
-                        fields: ['name']
-                    }
-                },
-                {
+                    scope: {fields: ['name']}
+                }, {
                     relation: 'warehouseIn',
-                    scope: {
-                        fields: ['name']
-                    }
-                },
-                {
+                    scope: {fields: ['name']}
+                }, {
                     relation: 'warehouseOut',
-                    scope: {
-                        fields: ['name']
-                    }
+                    scope: {fields: ['name']}
                 }
             ]
         };
@@ -35,10 +27,14 @@ export default class Controller {
             return {id: value};
         case 'ref':
             return {[param]: {regexp: value}};
-        case 'shipped':
+        case 'shippedFrom':
+            return {shipped: {gte: value}};
+        case 'shippedTo':
             return {shipped: {lte: value}};
-        case 'landed':
+        case 'landedFrom':
             return {landed: {gte: value}};
+        case 'landedTo':
+            return {landed: {lte: value}};
         case 'id':
         case 'agencyModeFk':
         case 'warehouseOutFk':
diff --git a/modules/travel/front/locale/es.yml b/modules/travel/front/locale/es.yml
index 452897b8a0..54feab876d 100644
--- a/modules/travel/front/locale/es.yml
+++ b/modules/travel/front/locale/es.yml
@@ -2,6 +2,10 @@
 Reference: Referencia
 Warehouse Out: Almacén salida
 Warehouse In: Almacén llegada
+Shipped from: Salida desde
+Shipped to: Salida hasta
+Landed from: Llegada desde
+Landed to: Llegada hasta
 Shipped: F. salida
 Landed: F. llegada
 Delivered: Enviado
diff --git a/modules/travel/front/search-panel/index.html b/modules/travel/front/search-panel/index.html
index a432a65137..bd68fd151e 100644
--- a/modules/travel/front/search-panel/index.html
+++ b/modules/travel/front/search-panel/index.html
@@ -38,13 +38,25 @@
         <vn-horizontal>
             <vn-date-picker
                 vn-one
-                label="Shipped"
-                ng-model="filter.shipped">
+                label="Shipped from"
+                ng-model="filter.shippedFrom">
             </vn-date-picker>
             <vn-date-picker
                 vn-one
-                label="Landed"
-                ng-model="filter.landed">
+                label="Shipped to"
+                ng-model="filter.shippedTo">
+            </vn-date-picker>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-date-picker
+                vn-one
+                label="Landed from"
+                ng-model="filter.landedFrom">
+            </vn-date-picker>
+            <vn-date-picker
+                vn-one
+                label="Landed to"
+                ng-model="filter.landedTo">
             </vn-date-picker>
         </vn-horizontal>
         <vn-horizontal>