From dbe56b2496fb250552b62b72446fc18b1ba6b20a Mon Sep 17 00:00:00 2001
From: Bernat <bernat.verdnatura@gmail.com>
Date: Fri, 12 Apr 2019 14:33:08 +0200
Subject: [PATCH] #1330 add info in the search panel

---
 front/core/components/searchbar/searchbar.html   | 10 ++++++++--
 front/core/components/searchbar/searchbar.js     |  6 ++++--
 front/core/components/textfield/style.scss       |  2 +-
 front/core/components/textfield/textfield.js     |  4 ++--
 modules/agency/front/index/index.html            |  1 +
 modules/agency/front/locale/es.yml               |  3 ++-
 modules/agency/front/search-panel/index.html     |  1 +
 modules/claim/back/models/claim.json             |  3 ---
 modules/claim/front/index/index.html             |  1 +
 modules/claim/front/locale/es.yml                |  1 +
 modules/claim/front/search-panel/index.html      |  1 +
 modules/client/front/index/index.html            |  1 +
 modules/client/front/locale/es.yml               |  1 +
 modules/client/front/search-panel/index.html     |  1 +
 modules/invoiceOut/front/index/index.html        |  1 +
 modules/invoiceOut/front/locale/es.yml           |  3 ++-
 modules/invoiceOut/front/search-panel/index.html |  1 +
 modules/item/front/index/index.html              |  1 +
 modules/item/front/locale/es.yml                 |  1 +
 modules/item/front/search-panel/index.html       |  1 +
 modules/order/front/index/index.html             |  1 +
 modules/order/front/locale/es.yml                |  3 ++-
 modules/order/front/search-panel/index.html      |  1 +
 modules/route/front/index/index.html             |  1 +
 modules/route/front/locale/es.yml                |  3 ++-
 modules/route/front/search-panel/index.html      |  1 +
 modules/ticket/front/index/index.html            |  1 +
 modules/ticket/front/locale/es.yml               |  1 +
 modules/ticket/front/search-panel/index.html     |  1 +
 modules/travel/front/index/index.html            |  1 +
 modules/travel/front/locale/es.yml               |  1 +
 modules/travel/front/search-panel/index.html     |  1 +
 modules/worker/front/index/index.html            |  1 +
 modules/worker/front/locale/es.yml               |  3 ++-
 modules/worker/front/search-panel/index.html     |  1 +
 35 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/front/core/components/searchbar/searchbar.html b/front/core/components/searchbar/searchbar.html
index 61132d5c0..d06c4247d 100644
--- a/front/core/components/searchbar/searchbar.html
+++ b/front/core/components/searchbar/searchbar.html
@@ -8,8 +8,14 @@
                     pointer>
                 </vn-icon>
             </t-left-icons>
-            <t-right-icons>
-                <vn-icon
+            <t-right-icons vn-horizontal>
+                <vn-icon vn-one
+                ng-if="$ctrl.info"
+                icon="info_outline"
+                vn-tooltip = "{{$ctrl.info}}"
+                pointer>
+                </vn-icon>
+                <vn-icon vn-one
                     ng-if="$ctrl.panel"
                     ng-click="$ctrl.openPanel($event)"
                     icon="keyboard_arrow_down"
diff --git a/front/core/components/searchbar/searchbar.js b/front/core/components/searchbar/searchbar.js
index ed9f34899..69e826c8c 100644
--- a/front/core/components/searchbar/searchbar.js
+++ b/front/core/components/searchbar/searchbar.js
@@ -19,9 +19,10 @@ import {buildFilter} from 'vn-loopback/util/filter';
 export default class Controller extends Component {
     constructor($element, $scope, $compile, $state, $transitions) {
         super($element, $scope);
+        this.$element = $element;
         this.$compile = $compile;
         this.$state = $state;
-
+        this.$scope = $scope;
         let criteria = {to: this.$state.current.name};
         this.deregisterCallback = $transitions.onSuccess(criteria,
             () => this.onStateChange());
@@ -218,7 +219,8 @@ ngModule.component('vnSearchbar', {
         model: '<?',
         exprBuilder: '&?',
         paramBuilder: '&?',
-        autoLoad: '<?'
+        autoLoad: '<?',
+        info: '@?'
     },
     controller: Controller
 });
diff --git a/front/core/components/textfield/style.scss b/front/core/components/textfield/style.scss
index 1cc03c997..36792ef90 100644
--- a/front/core/components/textfield/style.scss
+++ b/front/core/components/textfield/style.scss
@@ -23,7 +23,7 @@ vn-textfield {
     .leftIcons, .rightIcons, .suffix {
         display: flex;
         color: $color-font-secondary;
-
+        
         .material-icons {
             font-size: 20px !important
         }
diff --git a/front/core/components/textfield/textfield.js b/front/core/components/textfield/textfield.js
index f9b51f29f..fcf823c6b 100644
--- a/front/core/components/textfield/textfield.js
+++ b/front/core/components/textfield/textfield.js
@@ -10,7 +10,6 @@ export default class Textfield extends Input {
         this.type = $attrs.type;
         this.showActions = false;
         this.hasInfo = Boolean($attrs.info);
-        this.info = $attrs.info || null;
         this.hasFocus = false;
         this.hasMouseIn = false;
 
@@ -90,6 +89,7 @@ ngModule.component('vnTextfield', {
         type: '@?',
         vnTabIndex: '@?',
         onChange: '&',
-        onClear: '&'
+        onClear: '&',
+        info: '@?'
     }
 });
diff --git a/modules/agency/front/index/index.html b/modules/agency/front/index/index.html
index 175c00ce6..7566deaa8 100644
--- a/modules/agency/front/index/index.html
+++ b/modules/agency/front/index/index.html
@@ -13,6 +13,7 @@
                 panel="vn-zone-search-panel"
                 model="model"
                 expr-builder="$ctrl.exprBuilder(param, value)"
+                info="Search zone by id or name"
                 vn-focus>
             </vn-searchbar>
         </vn-card>
diff --git a/modules/agency/front/locale/es.yml b/modules/agency/front/locale/es.yml
index 7f70ca50a..d34ab1f70 100644
--- a/modules/agency/front/locale/es.yml
+++ b/modules/agency/front/locale/es.yml
@@ -9,4 +9,5 @@ Are you sure you want to delete this zone?: ¿Estás seguro de querer eliminar e
 Zones: Zonas
 New zone: Nueva zona
 Volumetric: Volumétrico
-Clone: Clonar
\ No newline at end of file
+Clone: Clonar
+Search zone by id or name: Buscar zonas por identificador o nombre
\ No newline at end of file
diff --git a/modules/agency/front/search-panel/index.html b/modules/agency/front/search-panel/index.html
index 9621f8b56..fd0a0158b 100644
--- a/modules/agency/front/search-panel/index.html
+++ b/modules/agency/front/search-panel/index.html
@@ -5,6 +5,7 @@
                 vn-one
                 label="General search"
                 model="filter.search"
+                info="Search zone by id or name"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
diff --git a/modules/claim/back/models/claim.json b/modules/claim/back/models/claim.json
index 38d508725..1462c4222 100644
--- a/modules/claim/back/models/claim.json
+++ b/modules/claim/back/models/claim.json
@@ -34,9 +34,6 @@
         "claimStateFk": {
             "type": "Number"
         },
-        "clientFk": {
-            "type": "Number"
-        },
         "workerFk": {
             "type": "Number"
         }
diff --git a/modules/claim/front/index/index.html b/modules/claim/front/index/index.html
index a486eac3b..92b798420 100644
--- a/modules/claim/front/index/index.html
+++ b/modules/claim/front/index/index.html
@@ -14,6 +14,7 @@
                 model="model"
                 expr-builder="$ctrl.exprBuilder(param, value)"
                 auto-load="true"
+                info="Search claim by id or client name"
                 vn-focus>
             </vn-searchbar>
         </vn-card>
diff --git a/modules/claim/front/locale/es.yml b/modules/claim/front/locale/es.yml
index 307494dcd..6c33a779f 100644
--- a/modules/claim/front/locale/es.yml
+++ b/modules/claim/front/locale/es.yml
@@ -10,4 +10,5 @@ Claim Id: Id reclamación
 Created: Creado
 Send Pickup order: Enviar orden de recogida
 Show Pickup order: Ver orden de recogida
+Search claim by id or client name: Buscar reclamaciones por identificador o nombre de cliente
 
diff --git a/modules/claim/front/search-panel/index.html b/modules/claim/front/search-panel/index.html
index 2ce6b704a..580c96eda 100644
--- a/modules/claim/front/search-panel/index.html
+++ b/modules/claim/front/search-panel/index.html
@@ -5,6 +5,7 @@
                 vn-one
                 label="General search"
                 model="filter.search"
+                info="Search claim by id or client name"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
diff --git a/modules/client/front/index/index.html b/modules/client/front/index/index.html
index da718f952..8873e10ae 100644
--- a/modules/client/front/index/index.html
+++ b/modules/client/front/index/index.html
@@ -13,6 +13,7 @@
                 panel="vn-client-search-panel"
                 model="model"
                 expr-builder="$ctrl.exprBuilder(param, value)"
+                info="Search client by id or name"
                 vn-focus>
             </vn-searchbar>
         </vn-card>
diff --git a/modules/client/front/locale/es.yml b/modules/client/front/locale/es.yml
index ed38dfe0d..8c154bbf4 100644
--- a/modules/client/front/locale/es.yml
+++ b/modules/client/front/locale/es.yml
@@ -27,6 +27,7 @@ Client inactive: Cliente inactivo
 Client not checked: Cliente no comprobado
 Credit insurance: Crédito asegurado
 Web Account inactive: Sin acceso Web
+Search client by id or name: Buscar clientes por identificador o nombre
 
 # Sections
 
diff --git a/modules/client/front/search-panel/index.html b/modules/client/front/search-panel/index.html
index 9fb1aaf3e..b33d9d7c9 100644
--- a/modules/client/front/search-panel/index.html
+++ b/modules/client/front/search-panel/index.html
@@ -5,6 +5,7 @@
             vn-one
             label="General search"
             model="filter.search"
+            info="Search client by id or name"
             vn-focus>
         </vn-textfield>
     </vn-horizontal>
diff --git a/modules/invoiceOut/front/index/index.html b/modules/invoiceOut/front/index/index.html
index 79c075777..98c286dbc 100644
--- a/modules/invoiceOut/front/index/index.html
+++ b/modules/invoiceOut/front/index/index.html
@@ -15,6 +15,7 @@
                 model="model"
                 expr-builder="$ctrl.exprBuilder(param, value)"
                 auto-load="true"
+                info="Search invoices by reference"
                 vn-focus>
             </vn-searchbar>
         </vn-card>
diff --git a/modules/invoiceOut/front/locale/es.yml b/modules/invoiceOut/front/locale/es.yml
index 4981025e8..87de48f56 100644
--- a/modules/invoiceOut/front/locale/es.yml
+++ b/modules/invoiceOut/front/locale/es.yml
@@ -1 +1,2 @@
-Invoice out: Facturas
\ No newline at end of file
+Invoice out: Facturas
+Search invoices by reference: Buscar facturas por referencia
\ No newline at end of file
diff --git a/modules/invoiceOut/front/search-panel/index.html b/modules/invoiceOut/front/search-panel/index.html
index 40bd57736..1abded45a 100644
--- a/modules/invoiceOut/front/search-panel/index.html
+++ b/modules/invoiceOut/front/search-panel/index.html
@@ -5,6 +5,7 @@
                 vn-one
                 label="General search"
                 model="filter.search"
+                info="Search invoices by reference"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
diff --git a/modules/item/front/index/index.html b/modules/item/front/index/index.html
index 1157c40c9..6fb0fdfb5 100644
--- a/modules/item/front/index/index.html
+++ b/modules/item/front/index/index.html
@@ -14,6 +14,7 @@
                     vn-three
                     panel="vn-item-search-panel"
                     on-search="$ctrl.onSearch($params)"
+                    info="Search items by id, name or barcode"
                     vn-focus>
                 </vn-searchbar>
                 <vn-icon-menu
diff --git a/modules/item/front/locale/es.yml b/modules/item/front/locale/es.yml
index 38f088f18..12522459a 100644
--- a/modules/item/front/locale/es.yml
+++ b/modules/item/front/locale/es.yml
@@ -44,6 +44,7 @@ Shipped: F. envío
 stems: Tallos
 Compression: Compresión
 Density: Densidad
+Search items by id, name or barcode: Buscar articulos por identificador, nombre o codigo de barras
 
 # Sections
 Items: Artículos
diff --git a/modules/item/front/search-panel/index.html b/modules/item/front/search-panel/index.html
index a31f79497..c353b9e64 100644
--- a/modules/item/front/search-panel/index.html
+++ b/modules/item/front/search-panel/index.html
@@ -6,6 +6,7 @@
                 vn-one
                 label="General search"
                 model="filter.search"
+                info="Search items by id, name or barcode"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html
index 705fb5c7a..c5d29c292 100644
--- a/modules/order/front/index/index.html
+++ b/modules/order/front/index/index.html
@@ -11,6 +11,7 @@
             <vn-searchbar
                 panel="vn-order-search-panel"
                 on-search="$ctrl.onSearch($params)"
+                info="Search orders by id"
                 vn-focus>
             </vn-searchbar>
         </vn-card>
diff --git a/modules/order/front/locale/es.yml b/modules/order/front/locale/es.yml
index 8fa991bc7..cd32325eb 100644
--- a/modules/order/front/locale/es.yml
+++ b/modules/order/front/locale/es.yml
@@ -19,4 +19,5 @@ Order: Orden
 Price: Precio
 Ascendant: Ascendente
 Descendant: Descendente
-Created from: Creado desde
\ No newline at end of file
+Created from: Creado desde
+Search orders by id: Buscar en la cesta por identificador
\ No newline at end of file
diff --git a/modules/order/front/search-panel/index.html b/modules/order/front/search-panel/index.html
index 0af885a53..2a6f33b8c 100644
--- a/modules/order/front/search-panel/index.html
+++ b/modules/order/front/search-panel/index.html
@@ -5,6 +5,7 @@
                 vn-one
                 label="General search"
                 model="filter.search"
+                info="Search orders by id"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html
index 62bfee7f9..43238fd4d 100644
--- a/modules/route/front/index/index.html
+++ b/modules/route/front/index/index.html
@@ -14,6 +14,7 @@
                 model="model"
                 expr-builder="$ctrl.exprBuilder(param, value)"
                 auto-load="true"
+                info="Search routes by id"
                 vn-focus>
             </vn-searchbar>
         </vn-card>
diff --git a/modules/route/front/locale/es.yml b/modules/route/front/locale/es.yml
index 5c60e1724..0b6c1f2b3 100644
--- a/modules/route/front/locale/es.yml
+++ b/modules/route/front/locale/es.yml
@@ -1 +1,2 @@
-Routes: Rutas
\ No newline at end of file
+Routes: Rutas
+Search routes by id: Buscar rutas por identificador
\ No newline at end of file
diff --git a/modules/route/front/search-panel/index.html b/modules/route/front/search-panel/index.html
index 337d96121..5be281981 100644
--- a/modules/route/front/search-panel/index.html
+++ b/modules/route/front/search-panel/index.html
@@ -5,6 +5,7 @@
                 vn-one
                 label="General search"
                 model="filter.search"
+                info="Search routes by id"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html
index 70aabd729..9a494b6a8 100644
--- a/modules/ticket/front/index/index.html
+++ b/modules/ticket/front/index/index.html
@@ -15,6 +15,7 @@
                     style="width: 100%"
                     panel="vn-ticket-search-panel"
                     on-search="$ctrl.onSearch($params)"
+                    info="Search ticket by id or alias"
                     vn-focus>
                 </vn-searchbar>
                 <vn-icon-menu
diff --git a/modules/ticket/front/locale/es.yml b/modules/ticket/front/locale/es.yml
index 42f38d78d..d57ca3fdf 100644
--- a/modules/ticket/front/locale/es.yml
+++ b/modules/ticket/front/locale/es.yml
@@ -60,6 +60,7 @@ Risk: Riesgo
 Invoice: Factura
 You are going to delete this ticket: Vas a eliminar este ticket
 Ticket deleted: Ticket borrado
+Search ticket by id or alias: Buscar tickets por identificador o alias
 
 #sections
 List: Listado
diff --git a/modules/ticket/front/search-panel/index.html b/modules/ticket/front/search-panel/index.html
index 35802bc7c..7e3267f45 100644
--- a/modules/ticket/front/search-panel/index.html
+++ b/modules/ticket/front/search-panel/index.html
@@ -5,6 +5,7 @@
                 vn-one
                 label="General search"
                 model="filter.search"
+                info="Search ticket by id or alias"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html
index c649d24fb..9b5d4c829 100644
--- a/modules/travel/front/index/index.html
+++ b/modules/travel/front/index/index.html
@@ -13,6 +13,7 @@
                 panel="vn-travel-search-panel"
                 model="model"
                 expr-builder="$ctrl.exprBuilder(param, value)"
+                info="Search travels by id"
                 vn-focus>
             </vn-searchbar>
         </vn-card>
diff --git a/modules/travel/front/locale/es.yml b/modules/travel/front/locale/es.yml
index b2eb3297c..d474130ae 100644
--- a/modules/travel/front/locale/es.yml
+++ b/modules/travel/front/locale/es.yml
@@ -7,6 +7,7 @@ Landed: F. llegada
 Delivered: Enviado
 Received: Recibido
 Travel id: Id envío
+Search travels by id: Buscar envios por identificador
 
 # Sections
 Travels: Envíos
\ No newline at end of file
diff --git a/modules/travel/front/search-panel/index.html b/modules/travel/front/search-panel/index.html
index c6662836c..2a763767e 100644
--- a/modules/travel/front/search-panel/index.html
+++ b/modules/travel/front/search-panel/index.html
@@ -5,6 +5,7 @@
                 vn-one
                 label="General search"
                 model="filter.search"
+                info="Search travels by id"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>
diff --git a/modules/worker/front/index/index.html b/modules/worker/front/index/index.html
index d6e42ddd1..9c590cc1c 100644
--- a/modules/worker/front/index/index.html
+++ b/modules/worker/front/index/index.html
@@ -13,6 +13,7 @@
                     style="width: 100%"
                     panel="vn-worker-search-panel"
                     on-search="$ctrl.onSearch($params)"
+                    info="Search workers by id, firstName, lastName or user name"
                     vn-focus>
                 </vn-searchbar>
                 <vn-icon-menu
diff --git a/modules/worker/front/locale/es.yml b/modules/worker/front/locale/es.yml
index a4b13d34d..d13c1d831 100644
--- a/modules/worker/front/locale/es.yml
+++ b/modules/worker/front/locale/es.yml
@@ -14,4 +14,5 @@ Worker id: Id trabajador
 Fiscal Identifier: NIF
 User name: Usuario
 Departments: Departamentos
-Calendar: Calendario
\ No newline at end of file
+Calendar: Calendario
+Search workers by id, firstName, lastName or user name: Buscar trabajadores por el identificador, nombre, apellidos o nombre de usuario
\ No newline at end of file
diff --git a/modules/worker/front/search-panel/index.html b/modules/worker/front/search-panel/index.html
index 67fd0ffcc..14abcad45 100644
--- a/modules/worker/front/search-panel/index.html
+++ b/modules/worker/front/search-panel/index.html
@@ -5,6 +5,7 @@
                 vn-one
                 label="General search"
                 model="filter.search"
+                info="Search workers by id, firstName, lastName or user name"
                 vn-focus>
             </vn-textfield>
         </vn-horizontal>