verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

#1017 ticket.index

This commit is contained in:
Gerard 2019-01-22 16:18:26 +01:00
parent dc46ede513
commit abea582014
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/ticket/back/methods/ticket/filter.js
View File

@ -63,6 +63,10 @@ module.exports = Self => {
arg: 'myTeam', arg: 'myTeam',
type: 'Boolean', type: 'Boolean',
description: `Whether to show only tickets for the current logged user team (For now it shows only the current user tickets)` description: `Whether to show only tickets for the current logged user team (For now it shows only the current user tickets)`
}, {
arg: 'mine',
type: 'Boolean',
description: `Whether to show only tickets for the current logged user`
}, { }, {
arg: 'orderFk', arg: 'orderFk',
type: 'Number', type: 'Number',
@ -107,6 +111,10 @@ module.exports = Self => {
teamIds = [worker && worker.id]; teamIds = [worker && worker.id];
} }
if (ctx.args && ctx.args.mine || ctx.args.myTeam)
ctx.args.teamIds = teamIds;
let orderTickets = []; let orderTickets = [];
if (ctx.args && ctx.args.orderFk) { if (ctx.args && ctx.args.orderFk) {
let ticketsToSearch = await Self.app.models.OrderTickets.find({where: {orderFk: filter.orderFk}}); let ticketsToSearch = await Self.app.models.OrderTickets.find({where: {orderFk: filter.orderFk}});
@ -134,6 +142,7 @@ module.exports = Self => {
return {'a.provinceFk': value}; return {'a.provinceFk': value};
case 'stateFk': case 'stateFk':
return {'ts.stateFk': value}; return {'ts.stateFk': value};
case 'mine':
case 'myTeam': case 'myTeam':
return {'c.salesPersonFk': {inq: teamIds}}; return {'c.salesPersonFk': {inq: teamIds}};
case 'alertLevel': case 'alertLevel':

12
modules/ticket/front/index/index.js
View File

@ -19,9 +19,15 @@ export default class Controller {
tomorrow.setHours(23, 59, 59, 999); tomorrow.setHours(23, 59, 59, 999);
tomorrow.setTime(tomorrow.getTime() - offset); tomorrow.setTime(tomorrow.getTime() - offset);
// FIXME: History loop let sixDays = new Date(today);
// let filter = {myTeam: true, from: today, to: tomorrow}; sixDays.setDate(today.getDate() + 6);
// $state.go('.', {q: JSON.stringify(filter)}); sixDays.setHours(23, 59, 59, 999);
sixDays.setTime(sixDays.getTime() - offset);
this.filter = {mine: true, from: today, to: sixDays};
}
$postLink() {
this.onSearch(this.filter);
} }
onSearch(params) { onSearch(params) {