#1330 add info in the search panel

2019-04-12 14:33:08 +02:00 · 2019-04-12 14:33:08 +02:00 · dbe56b2496
parent ac8a27d2f4
commit dbe56b2496
35 changed files with 50 additions and 15 deletions
--- 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"
--- 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
 });
--- 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: '@?'
    }
 });
--- 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>
--- a/modules/agency/front/locale/es.yml
+++ b/modules/agency/front/locale/es.yml
@ -10,3 +10,4 @@ Zones: Zonas
 New zone: Nueva zona
 Volumetric: Volumétrico
 Clone: Clonar
+Search zone by id or name: Buscar zonas por identificador o nombre
--- 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>
--- 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"
        }
--- 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>
--- 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

--- 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>
--- 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>
--- 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

--- 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>
--- 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>
--- a/modules/invoiceOut/front/locale/es.yml
+++ b/modules/invoiceOut/front/locale/es.yml
@ -1 +1,2 @@
 Invoice out: Facturas
+Search invoices by reference: Buscar facturas por referencia
--- 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>
--- 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
--- 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
--- 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>
--- 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>
--- a/modules/order/front/locale/es.yml
+++ b/modules/order/front/locale/es.yml
@ -20,3 +20,4 @@ Price: Precio
 Ascendant: Ascendente
 Descendant: Descendente
 Created from: Creado desde
+Search orders by id: Buscar en la cesta por identificador
--- 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>
--- 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>
--- a/modules/route/front/locale/es.yml
+++ b/modules/route/front/locale/es.yml
@ -1 +1,2 @@
 Routes: Rutas
+Search routes by id: Buscar rutas por identificador
--- 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>
--- 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
--- 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
--- 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>
--- 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>
--- 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
--- 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>
--- 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
--- a/modules/worker/front/locale/es.yml
+++ b/modules/worker/front/locale/es.yml
@ -15,3 +15,4 @@ Fiscal Identifier: NIF
 User name: Usuario
 Departments: Departamentos
 Calendar: Calendario
+Search workers by id, firstName, lastName or user name: Buscar trabajadores por el identificador, nombre, apellidos o nombre de usuario
--- 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>