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

Front acoplado al endpoint RouteFk

This commit is contained in:
Dani Herrero 2017-07-06 09:02:27 +02:00
parent d2e0051b38
commit 3c1847134b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/core/src/popover/popover.js
View File

@ -158,7 +158,7 @@ export class Popover {
} }
_findPopOver(node) { _findPopOver(node) {
while (node != null) { while (node != null) {
if (node.id && node.id.indexOf('popover-') !== -1) { if (node.id && node.id.startsWith('popover-')) {
return node.id; return node.id;
} }
node = node.parentNode; node = node.parentNode;

2
client/production/src/production-filters/production-filters.html
View File

@ -1,6 +1,6 @@
<form ng-submit="$ctrl.onSubmit($ctrl.filter)" pad-large> <form ng-submit="$ctrl.onSubmit($ctrl.filter)" pad-large>
<vn-horizontal> <vn-horizontal>
<vn-textfield vn-one label="Route ID" model="$ctrl.filter.ruteId"></vn-textfield> <vn-textfield vn-one label="Route ID" model="$ctrl.filter.routeFk"></vn-textfield>
<vn-date-picker vn-one label="Date" model="$ctrl.filter.date"></vn-date-picker> <vn-date-picker vn-one label="Date" model="$ctrl.filter.date"></vn-date-picker>
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>

4
client/production/src/production-table/production-table.html
View File

@ -6,7 +6,7 @@
</vn-colum-header> </vn-colum-header>
<vn-colum-header vn-one pad-medium-h field="ticketFk" text="Ticket ID"></vn-colum-header> <vn-colum-header vn-one pad-medium-h field="ticketFk" text="Ticket ID"></vn-colum-header>
<vn-colum-header vn-two pad-medium-h field="agency" text="Agency"></vn-colum-header> <vn-colum-header vn-two pad-medium-h field="agency" text="Agency"></vn-colum-header>
<vn-colum-header vn-one pad-medium-h field="id" text="Route ID"></vn-colum-header> <vn-colum-header vn-one pad-medium-h field="routeFk" text="Route ID"></vn-colum-header>
<vn-colum-header vn-two pad-medium-h field="salesPerson" text="Commercial"></vn-colum-header> <vn-colum-header vn-two pad-medium-h field="salesPerson" text="Commercial"></vn-colum-header>
<vn-colum-header vn-one pad-medium-h field="hour" text="Hour"></vn-colum-header> <vn-colum-header vn-one pad-medium-h field="hour" text="Hour"></vn-colum-header>
<vn-colum-header vn-one pad-medium-h field="state" text="State"></vn-colum-header> <vn-colum-header vn-one pad-medium-h field="state" text="State"></vn-colum-header>
@ -25,7 +25,7 @@
</vn-none> </vn-none>
<vn-one pad-medium-h>{{::ticket.ticketFk}}</vn-one> <vn-one pad-medium-h>{{::ticket.ticketFk}}</vn-one>
<vn-two pad-medium-h>{{::ticket.agency}}</vn-two> <vn-two pad-medium-h>{{::ticket.agency}}</vn-two>
<vn-one pad-medium-h>{{::ticket.id}}</vn-one> <vn-one pad-medium-h>{{::ticket.routeFk}}</vn-one>
<vn-two pad-medium-h>{{::ticket.salesPerson | ucwords}}</vn-two> <vn-two pad-medium-h>{{::ticket.salesPerson | ucwords}}</vn-two>
<vn-one pad-medium-h>{{ticket.hour}}</vn-one> <vn-one pad-medium-h>{{ticket.hour}}</vn-one>
<vn-one pad-medium-h>{{ticket.state}}</vn-one> <vn-one pad-medium-h>{{ticket.state}}</vn-one>