This commit is contained in:
parent
ac8a27d2f4
commit
dbe56b2496
|
@ -8,8 +8,14 @@
|
||||||
pointer>
|
pointer>
|
||||||
</vn-icon>
|
</vn-icon>
|
||||||
</t-left-icons>
|
</t-left-icons>
|
||||||
<t-right-icons>
|
<t-right-icons vn-horizontal>
|
||||||
<vn-icon
|
<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-if="$ctrl.panel"
|
||||||
ng-click="$ctrl.openPanel($event)"
|
ng-click="$ctrl.openPanel($event)"
|
||||||
icon="keyboard_arrow_down"
|
icon="keyboard_arrow_down"
|
||||||
|
|
|
@ -19,9 +19,10 @@ import {buildFilter} from 'vn-loopback/util/filter';
|
||||||
export default class Controller extends Component {
|
export default class Controller extends Component {
|
||||||
constructor($element, $scope, $compile, $state, $transitions) {
|
constructor($element, $scope, $compile, $state, $transitions) {
|
||||||
super($element, $scope);
|
super($element, $scope);
|
||||||
|
this.$element = $element;
|
||||||
this.$compile = $compile;
|
this.$compile = $compile;
|
||||||
this.$state = $state;
|
this.$state = $state;
|
||||||
|
this.$scope = $scope;
|
||||||
let criteria = {to: this.$state.current.name};
|
let criteria = {to: this.$state.current.name};
|
||||||
this.deregisterCallback = $transitions.onSuccess(criteria,
|
this.deregisterCallback = $transitions.onSuccess(criteria,
|
||||||
() => this.onStateChange());
|
() => this.onStateChange());
|
||||||
|
@ -218,7 +219,8 @@ ngModule.component('vnSearchbar', {
|
||||||
model: '<?',
|
model: '<?',
|
||||||
exprBuilder: '&?',
|
exprBuilder: '&?',
|
||||||
paramBuilder: '&?',
|
paramBuilder: '&?',
|
||||||
autoLoad: '<?'
|
autoLoad: '<?',
|
||||||
|
info: '@?'
|
||||||
},
|
},
|
||||||
controller: Controller
|
controller: Controller
|
||||||
});
|
});
|
||||||
|
|
|
@ -23,7 +23,7 @@ vn-textfield {
|
||||||
.leftIcons, .rightIcons, .suffix {
|
.leftIcons, .rightIcons, .suffix {
|
||||||
display: flex;
|
display: flex;
|
||||||
color: $color-font-secondary;
|
color: $color-font-secondary;
|
||||||
|
|
||||||
.material-icons {
|
.material-icons {
|
||||||
font-size: 20px !important
|
font-size: 20px !important
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,6 @@ export default class Textfield extends Input {
|
||||||
this.type = $attrs.type;
|
this.type = $attrs.type;
|
||||||
this.showActions = false;
|
this.showActions = false;
|
||||||
this.hasInfo = Boolean($attrs.info);
|
this.hasInfo = Boolean($attrs.info);
|
||||||
this.info = $attrs.info || null;
|
|
||||||
this.hasFocus = false;
|
this.hasFocus = false;
|
||||||
this.hasMouseIn = false;
|
this.hasMouseIn = false;
|
||||||
|
|
||||||
|
@ -90,6 +89,7 @@ ngModule.component('vnTextfield', {
|
||||||
type: '@?',
|
type: '@?',
|
||||||
vnTabIndex: '@?',
|
vnTabIndex: '@?',
|
||||||
onChange: '&',
|
onChange: '&',
|
||||||
onClear: '&'
|
onClear: '&',
|
||||||
|
info: '@?'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
panel="vn-zone-search-panel"
|
panel="vn-zone-search-panel"
|
||||||
model="model"
|
model="model"
|
||||||
expr-builder="$ctrl.exprBuilder(param, value)"
|
expr-builder="$ctrl.exprBuilder(param, value)"
|
||||||
|
info="Search zone by id or name"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
|
|
|
@ -9,4 +9,5 @@ Are you sure you want to delete this zone?: ¿Estás seguro de querer eliminar e
|
||||||
Zones: Zonas
|
Zones: Zonas
|
||||||
New zone: Nueva zona
|
New zone: Nueva zona
|
||||||
Volumetric: Volumétrico
|
Volumetric: Volumétrico
|
||||||
Clone: Clonar
|
Clone: Clonar
|
||||||
|
Search zone by id or name: Buscar zonas por identificador o nombre
|
|
@ -5,6 +5,7 @@
|
||||||
vn-one
|
vn-one
|
||||||
label="General search"
|
label="General search"
|
||||||
model="filter.search"
|
model="filter.search"
|
||||||
|
info="Search zone by id or name"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
@ -34,9 +34,6 @@
|
||||||
"claimStateFk": {
|
"claimStateFk": {
|
||||||
"type": "Number"
|
"type": "Number"
|
||||||
},
|
},
|
||||||
"clientFk": {
|
|
||||||
"type": "Number"
|
|
||||||
},
|
|
||||||
"workerFk": {
|
"workerFk": {
|
||||||
"type": "Number"
|
"type": "Number"
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
model="model"
|
model="model"
|
||||||
expr-builder="$ctrl.exprBuilder(param, value)"
|
expr-builder="$ctrl.exprBuilder(param, value)"
|
||||||
auto-load="true"
|
auto-load="true"
|
||||||
|
info="Search claim by id or client name"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
|
|
|
@ -10,4 +10,5 @@ Claim Id: Id reclamación
|
||||||
Created: Creado
|
Created: Creado
|
||||||
Send Pickup order: Enviar orden de recogida
|
Send Pickup order: Enviar orden de recogida
|
||||||
Show Pickup order: Ver 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
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
vn-one
|
vn-one
|
||||||
label="General search"
|
label="General search"
|
||||||
model="filter.search"
|
model="filter.search"
|
||||||
|
info="Search claim by id or client name"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
panel="vn-client-search-panel"
|
panel="vn-client-search-panel"
|
||||||
model="model"
|
model="model"
|
||||||
expr-builder="$ctrl.exprBuilder(param, value)"
|
expr-builder="$ctrl.exprBuilder(param, value)"
|
||||||
|
info="Search client by id or name"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
|
|
|
@ -27,6 +27,7 @@ Client inactive: Cliente inactivo
|
||||||
Client not checked: Cliente no comprobado
|
Client not checked: Cliente no comprobado
|
||||||
Credit insurance: Crédito asegurado
|
Credit insurance: Crédito asegurado
|
||||||
Web Account inactive: Sin acceso Web
|
Web Account inactive: Sin acceso Web
|
||||||
|
Search client by id or name: Buscar clientes por identificador o nombre
|
||||||
|
|
||||||
# Sections
|
# Sections
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
vn-one
|
vn-one
|
||||||
label="General search"
|
label="General search"
|
||||||
model="filter.search"
|
model="filter.search"
|
||||||
|
info="Search client by id or name"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
model="model"
|
model="model"
|
||||||
expr-builder="$ctrl.exprBuilder(param, value)"
|
expr-builder="$ctrl.exprBuilder(param, value)"
|
||||||
auto-load="true"
|
auto-load="true"
|
||||||
|
info="Search invoices by reference"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
Invoice out: Facturas
|
Invoice out: Facturas
|
||||||
|
Search invoices by reference: Buscar facturas por referencia
|
|
@ -5,6 +5,7 @@
|
||||||
vn-one
|
vn-one
|
||||||
label="General search"
|
label="General search"
|
||||||
model="filter.search"
|
model="filter.search"
|
||||||
|
info="Search invoices by reference"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
vn-three
|
vn-three
|
||||||
panel="vn-item-search-panel"
|
panel="vn-item-search-panel"
|
||||||
on-search="$ctrl.onSearch($params)"
|
on-search="$ctrl.onSearch($params)"
|
||||||
|
info="Search items by id, name or barcode"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
<vn-icon-menu
|
<vn-icon-menu
|
||||||
|
|
|
@ -44,6 +44,7 @@ Shipped: F. envío
|
||||||
stems: Tallos
|
stems: Tallos
|
||||||
Compression: Compresión
|
Compression: Compresión
|
||||||
Density: Densidad
|
Density: Densidad
|
||||||
|
Search items by id, name or barcode: Buscar articulos por identificador, nombre o codigo de barras
|
||||||
|
|
||||||
# Sections
|
# Sections
|
||||||
Items: Artículos
|
Items: Artículos
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
vn-one
|
vn-one
|
||||||
label="General search"
|
label="General search"
|
||||||
model="filter.search"
|
model="filter.search"
|
||||||
|
info="Search items by id, name or barcode"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
<vn-searchbar
|
<vn-searchbar
|
||||||
panel="vn-order-search-panel"
|
panel="vn-order-search-panel"
|
||||||
on-search="$ctrl.onSearch($params)"
|
on-search="$ctrl.onSearch($params)"
|
||||||
|
info="Search orders by id"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
|
|
|
@ -19,4 +19,5 @@ Order: Orden
|
||||||
Price: Precio
|
Price: Precio
|
||||||
Ascendant: Ascendente
|
Ascendant: Ascendente
|
||||||
Descendant: Descendente
|
Descendant: Descendente
|
||||||
Created from: Creado desde
|
Created from: Creado desde
|
||||||
|
Search orders by id: Buscar en la cesta por identificador
|
|
@ -5,6 +5,7 @@
|
||||||
vn-one
|
vn-one
|
||||||
label="General search"
|
label="General search"
|
||||||
model="filter.search"
|
model="filter.search"
|
||||||
|
info="Search orders by id"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
model="model"
|
model="model"
|
||||||
expr-builder="$ctrl.exprBuilder(param, value)"
|
expr-builder="$ctrl.exprBuilder(param, value)"
|
||||||
auto-load="true"
|
auto-load="true"
|
||||||
|
info="Search routes by id"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
Routes: Rutas
|
Routes: Rutas
|
||||||
|
Search routes by id: Buscar rutas por identificador
|
|
@ -5,6 +5,7 @@
|
||||||
vn-one
|
vn-one
|
||||||
label="General search"
|
label="General search"
|
||||||
model="filter.search"
|
model="filter.search"
|
||||||
|
info="Search routes by id"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
panel="vn-ticket-search-panel"
|
panel="vn-ticket-search-panel"
|
||||||
on-search="$ctrl.onSearch($params)"
|
on-search="$ctrl.onSearch($params)"
|
||||||
|
info="Search ticket by id or alias"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
<vn-icon-menu
|
<vn-icon-menu
|
||||||
|
|
|
@ -60,6 +60,7 @@ Risk: Riesgo
|
||||||
Invoice: Factura
|
Invoice: Factura
|
||||||
You are going to delete this ticket: Vas a eliminar este ticket
|
You are going to delete this ticket: Vas a eliminar este ticket
|
||||||
Ticket deleted: Ticket borrado
|
Ticket deleted: Ticket borrado
|
||||||
|
Search ticket by id or alias: Buscar tickets por identificador o alias
|
||||||
|
|
||||||
#sections
|
#sections
|
||||||
List: Listado
|
List: Listado
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
vn-one
|
vn-one
|
||||||
label="General search"
|
label="General search"
|
||||||
model="filter.search"
|
model="filter.search"
|
||||||
|
info="Search ticket by id or alias"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
panel="vn-travel-search-panel"
|
panel="vn-travel-search-panel"
|
||||||
model="model"
|
model="model"
|
||||||
expr-builder="$ctrl.exprBuilder(param, value)"
|
expr-builder="$ctrl.exprBuilder(param, value)"
|
||||||
|
info="Search travels by id"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
|
|
|
@ -7,6 +7,7 @@ Landed: F. llegada
|
||||||
Delivered: Enviado
|
Delivered: Enviado
|
||||||
Received: Recibido
|
Received: Recibido
|
||||||
Travel id: Id envío
|
Travel id: Id envío
|
||||||
|
Search travels by id: Buscar envios por identificador
|
||||||
|
|
||||||
# Sections
|
# Sections
|
||||||
Travels: Envíos
|
Travels: Envíos
|
|
@ -5,6 +5,7 @@
|
||||||
vn-one
|
vn-one
|
||||||
label="General search"
|
label="General search"
|
||||||
model="filter.search"
|
model="filter.search"
|
||||||
|
info="Search travels by id"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
panel="vn-worker-search-panel"
|
panel="vn-worker-search-panel"
|
||||||
on-search="$ctrl.onSearch($params)"
|
on-search="$ctrl.onSearch($params)"
|
||||||
|
info="Search workers by id, firstName, lastName or user name"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-searchbar>
|
</vn-searchbar>
|
||||||
<vn-icon-menu
|
<vn-icon-menu
|
||||||
|
|
|
@ -14,4 +14,5 @@ Worker id: Id trabajador
|
||||||
Fiscal Identifier: NIF
|
Fiscal Identifier: NIF
|
||||||
User name: Usuario
|
User name: Usuario
|
||||||
Departments: Departamentos
|
Departments: Departamentos
|
||||||
Calendar: Calendario
|
Calendar: Calendario
|
||||||
|
Search workers by id, firstName, lastName or user name: Buscar trabajadores por el identificador, nombre, apellidos o nombre de usuario
|
|
@ -5,6 +5,7 @@
|
||||||
vn-one
|
vn-one
|
||||||
label="General search"
|
label="General search"
|
||||||
model="filter.search"
|
model="filter.search"
|
||||||
|
info="Search workers by id, firstName, lastName or user name"
|
||||||
vn-focus>
|
vn-focus>
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
|
Loading…
Reference in New Issue