231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
2 changed files with 13 additions and 4 deletions
Showing only changes of commit 77b91b77b2 - Show all commits

View File

@ -41,14 +41,16 @@
<vn-horizontal class="vn-px-lg"> <vn-horizontal class="vn-px-lg">
<vn-autocomplete <vn-autocomplete
vn-one vn-one
ng-model="filter.salesPersonFk" ng-model="filter.requesterFk"
url="Workers/activeWithInheritedRole?filter[where][role]=salesPerson" url="Workers/activeWithRole"
search-function="{firstName: $search}" search-function="{firstName: $search}"
value-field="id" value-field="id"
where="{role: 'salesPerson'}"
label="Comercial"> label="Comercial">
<tpl-item>{{firstName}} {{name}}</tpl-item> <tpl-item>{{firstName}} {{lastName}}</tpl-item>
</vn-autocomplete> </vn-autocomplete>
</vn-horizontal> </vn-horizontal>
<section class="vn-px-md"> <section class="vn-px-md">
<vn-horizontal class="manifold-panel vn-pa-md"> <vn-horizontal class="manifold-panel vn-pa-md">
<vn-date-picker <vn-date-picker

View File

@ -37,6 +37,10 @@ module.exports = Self => {
type: 'number', type: 'number',
description: `Search requests attended by a given worker id` description: `Search requests attended by a given worker id`
}, },
{
arg: 'requesterFk',
type: 'number'
},
{ {
arg: 'mine', arg: 'mine',
type: 'boolean', type: 'boolean',
@ -89,6 +93,8 @@ module.exports = Self => {
return {'t.id': value}; return {'t.id': value};
case 'attenderFk': case 'attenderFk':
return {'tr.attenderFk': value}; return {'tr.attenderFk': value};
case 'requesterFk':
return {'tr.requesterFk': value};
case 'state': case 'state':
switch (value) { switch (value) {
case 'pending': case 'pending':
@ -125,6 +131,7 @@ module.exports = Self => {
tr.description, tr.description,
tr.response, tr.response,
tr.saleFk, tr.saleFk,
tr.requesterFk,
tr.isOk, tr.isOk,
s.quantity AS saleQuantity, s.quantity AS saleQuantity,
s.itemFk, s.itemFk,