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

Ticket index fixes

This commit is contained in:
Juan 2018-10-30 16:03:46 +01:00
parent 260f548019
commit 74c00ef2f0
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/ticket/src/index/index.html
View File

@ -22,17 +22,17 @@
<vn-tr> <vn-tr>
<vn-th></vn-th> <vn-th></vn-th>
<vn-th field="id" number>Id</vn-th> <vn-th field="id" number>Id</vn-th>
<vn-th field="salesPersonFk">Salesperson</vn-th> <vn-th field="salesPerson">Salesperson</vn-th>
<vn-th field="shipped">Date</vn-th> <vn-th field="shipped">Date</vn-th>
<vn-th>Hour</vn-th> <vn-th>Hour</vn-th>
<vn-th field="nickname">Alias</vn-th> <vn-th field="nickname">Alias</vn-th>
<vn-th field="provinceFk">Province</vn-th> <vn-th field="province">Province</vn-th>
<vn-th field="stateFk" >State</vn-th> <vn-th field="state" >State</vn-th>
<vn-th field="agencyModeFk">Agency</vn-th> <vn-th field="agencyMode">Agency</vn-th>
<vn-th field="warehouseFk">Warehouse</vn-th> <vn-th field="warehouse">Warehouse</vn-th>
<vn-th field="refFk" number>Invoice</vn-th> <vn-th field="refFk" number>Invoice</vn-th>
<vn-th field="routeFk" number>Route</vn-th> <vn-th field="routeFk" number>Route</vn-th>
<vn-th field="total" number>Total</vn-th> <vn-th number>Total</vn-th>
<vn-th></vn-th> <vn-th></vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>

7
services/loopback/common/methods/ticket/filter.js
View File

@ -62,7 +62,7 @@ module.exports = Self => {
}, { }, {
arg: 'myTeam', arg: 'myTeam',
type: 'Boolean', type: 'Boolean',
description: `Whether to show only tickets for the current logged user team (Ignored until implemented)` description: `Whether to show only tickets for the current logged user team (For now it shows only the current user tickets)`
} }
], ],
returns: { returns: {
@ -78,7 +78,6 @@ module.exports = Self => {
Self.filter = async (ctx, filter) => { Self.filter = async (ctx, filter) => {
let conn = Self.dataSource.connector; let conn = Self.dataSource.connector;
// TODO: Using the current worker id until WorkerTeam model is created
let worker = await Self.app.models.Worker.findOne({ let worker = await Self.app.models.Worker.findOne({
fields: ['id'], fields: ['id'],
where: {userFk: ctx.req.accessToken.userId} where: {userFk: ctx.req.accessToken.userId}
@ -131,12 +130,8 @@ module.exports = Self => {
t.nickname, t.nickname,
t.refFk, t.refFk,
t.routeFk, t.routeFk,
t.agencyModeFk,
t.warehouseFk, t.warehouseFk,
t.clientFk, t.clientFk,
c.salesPersonFk,
a.provinceFk,
ts.stateFk,
p.name AS province, p.name AS province,
w.name AS warehouse, w.name AS warehouse,
am.name AS agencyMode, am.name AS agencyMode,