verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

Minor bug & style fixes
gitea/salix/dev This commit looks good Details

This commit is contained in:
Juan Ferrer 2019-11-22 13:23:43 +01:00
parent 6a153bd69d
commit f50f99b962
4 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/route/front/tickets/index.html
View File

@ -7,8 +7,8 @@
</vn-crud-model> </vn-crud-model>
<vn-data-viewer model="model"> <vn-data-viewer model="model">
<form name="form"> <form name="form">
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-md">
<vn-tool-bar class="vn-mb-sm"> <vn-tool-bar>
<vn-button <vn-button
icon="icon-wand" icon="icon-wand"
ng-click="$ctrl.guessPriority()" ng-click="$ctrl.guessPriority()"
@ -18,14 +18,11 @@
disabled="!$ctrl.isChecked" disabled="!$ctrl.isChecked"
ng-click="$ctrl.goToBuscaman()" ng-click="$ctrl.goToBuscaman()"
vn-tooltip="Open buscaman" vn-tooltip="Open buscaman"
tooltip-position="up"
icon="icon-buscaman"> icon="icon-buscaman">
</vn-button> </vn-button>
</vn-tool-bar> </vn-tool-bar>
<vn-icon-button </vn-card>
vn-tooltip="Load more" <vn-card class="vn-mt-md">
ng-click="$ctrl.goToBuscaman()">
</vn-icon-button>
<vn-table model="model" auto-load="false"> <vn-table model="model" auto-load="false">
<vn-thead> <vn-thead>
<vn-tr> <vn-tr>
@ -36,12 +33,12 @@
</vn-th> </vn-th>
<vn-th>Order</vn-th> <vn-th>Order</vn-th>
<vn-th number>Ticket</vn-th> <vn-th number>Ticket</vn-th>
<vn-th>Client</vn-th> <vn-th expand>Client</vn-th>
<vn-th number shrink>Packages</vn-th> <vn-th number>Packages</vn-th>
<vn-th shrink>m³</vn-th> <vn-th number>m³</vn-th>
<vn-th shrink>Warehouse</vn-th> <vn-th>Warehouse</vn-th>
<vn-th expand>Postcode</vn-th> <vn-th>Postcode</vn-th>
<vn-th>Street</vn-th> <vn-th expand>Street</vn-th>
<vn-th shrink></vn-th> <vn-th shrink></vn-th>
<vn-th shrink></vn-th> <vn-th shrink></vn-th>
</vn-tr> </vn-tr>
@ -53,11 +50,12 @@
ng-model="ticket.checked"> ng-model="ticket.checked">
</vn-check> </vn-check>
</vn-td> </vn-td>
<vn-td> <vn-td number>
<vn-input-number <vn-input-number
on-change="$ctrl.setPriority(ticket.id, ticket.priority)" on-change="$ctrl.setPriority(ticket.id, ticket.priority)"
ng-model="ticket.priority" ng-model="ticket.priority"
rule="Ticket"> rule="Ticket"
class="dense">
</vn-input-number> </vn-input-number>
</vn-td> </vn-td>
<vn-td number> <vn-td number>
@ -74,10 +72,10 @@
{{ticket.nickname}} {{ticket.nickname}}
</span> </span>
</vn-td> </vn-td>
<vn-td number shrink>{{ticket.packages}}</vn-td> <vn-td number>{{ticket.packages}}</vn-td>
<vn-td shrink>{{ticket.volume}}</vn-td> <vn-td number>{{ticket.volume}}</vn-td>
<vn-td shrink>{{ticket.warehouse.name}}</vn-td> <vn-td expand>{{ticket.warehouse.name}}</vn-td>
<vn-td number shrink>{{ticket.address.postalCode}}</vn-td> <vn-td>{{ticket.address.postalCode}}</vn-td>
<vn-td expand title="{{ticket.address.street}}">{{ticket.address.street}}</vn-td> <vn-td expand title="{{ticket.address.street}}">{{ticket.address.street}}</vn-td>
<vn-td shrink> <vn-td shrink>
<vn-icon-button <vn-icon-button

26
modules/travel/front/index/index.js
View File

@ -9,21 +9,13 @@ export default class Controller {
include: [ include: [
{ {
relation: 'agency', relation: 'agency',
scope: { scope: {fields: ['name']}
fields: ['name'] }, {
}
},
{
relation: 'warehouseIn', relation: 'warehouseIn',
scope: { scope: {fields: ['name']}
fields: ['name'] }, {
}
},
{
relation: 'warehouseOut', relation: 'warehouseOut',
scope: { scope: {fields: ['name']}
fields: ['name']
}
} }
] ]
}; };
@ -35,10 +27,14 @@ export default class Controller {
return {id: value}; return {id: value};
case 'ref': case 'ref':
return {[param]: {regexp: value}}; return {[param]: {regexp: value}};
case 'shipped': case 'shippedFrom':
return {shipped: {gte: value}};
case 'shippedTo':
return {shipped: {lte: value}}; return {shipped: {lte: value}};
case 'landed': case 'landedFrom':
return {landed: {gte: value}}; return {landed: {gte: value}};
case 'landedTo':
return {landed: {lte: value}};
case 'id': case 'id':
case 'agencyModeFk': case 'agencyModeFk':
case 'warehouseOutFk': case 'warehouseOutFk':

4
modules/travel/front/locale/es.yml
View File

@ -2,6 +2,10 @@
Reference: Referencia Reference: Referencia
Warehouse Out: Almacén salida Warehouse Out: Almacén salida
Warehouse In: Almacén llegada Warehouse In: Almacén llegada
Shipped from: Salida desde
Shipped to: Salida hasta
Landed from: Llegada desde
Landed to: Llegada hasta
Shipped: F. salida Shipped: F. salida
Landed: F. llegada Landed: F. llegada
Delivered: Enviado Delivered: Enviado

20
modules/travel/front/search-panel/index.html
View File

@ -38,13 +38,25 @@
<vn-horizontal> <vn-horizontal>
<vn-date-picker <vn-date-picker
vn-one vn-one
label="Shipped" label="Shipped from"
ng-model="filter.shipped"> ng-model="filter.shippedFrom">
</vn-date-picker> </vn-date-picker>
<vn-date-picker <vn-date-picker
vn-one vn-one
label="Landed" label="Shipped to"
ng-model="filter.landed"> 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-date-picker>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>