modules/client/front/consumption-search-panel/index.html

@@ -17,12 +17,11 @@
             <vn-autocomplete
                 vn-one
                 ng-model="filter.buyerId"
-                url="Workers/activeWithRole"
+                url="TicketRequests/getItemTypeWorker"
                 search-function="{firstName: $search}"
+                show-field="nickname"
                 value-field="id"
-                where="{role: {inq: ['logistic', 'buyer']}}"
                 label="Buyer">
-                <tpl-item>{{nickname}}</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>

modules/entry/front/latest-buys-search-panel/index.html

@@ -54,11 +54,10 @@
             vn-id="salesPerson"
             disabled="false"
             ng-model="$ctrl.filter.salesPersonFk"
-            url="Workers/activeWithRole"
+            url="TicketRequests/getItemTypeWorker"
             show-field="nickname"
             search-function="{firstName: $search}"
             value-field="id"
-            where="{role: {inq: ['logistic', 'buyer']}}"
             label="Buyer"
             on-change="$ctrl.addFilters()">
         </vn-autocomplete>

modules/item/front/fixed-price-search-panel/index.html

@@ -54,11 +54,10 @@
             vn-id="buyer"
             disabled="false"
             ng-model="$ctrl.filter.buyerFk"
-            url="Workers/activeWithRole"
+            url="TicketRequests/getItemTypeWorker"
             show-field="nickname"
             search-function="{firstName: $search}"
             value-field="id"
-            where="{role: {inq: ['logistic', 'buyer']}}"
             label="Buyer"
             on-change="$ctrl.addFilters()">
         </vn-autocomplete>

modules/item/front/index/index.js

@@ -44,8 +44,7 @@ class Controller extends Section {
                 {
                     field: 'buyerFk',
                     autocomplete: {
-                        url: 'Workers/activeWithRole',
-                        where: `{role: {inq: ['logistic', 'buyer']}}`,
+                        url: 'TicketRequests/getItemTypeWorker',
                         searchFunction: '{firstName: $search}',
                         showField: 'nickname',
                         valueField: 'id',

modules/item/front/request-search-panel/index.html

@@ -1,7 +1,7 @@
 <div class="search-panel">
     <vn-crud-model
-        auto-load="true" 
-        url="Warehouses" 
+        auto-load="true"
+        url="Warehouses"
         data="warehouses">
     </vn-crud-model>
     <form id="manifold-form" ng-submit="$ctrl.onSearch()">
@@ -22,12 +22,11 @@
             <vn-autocomplete
                 vn-one
                 ng-model="filter.attenderFk"
-                url="Workers/activeWithRole"
+                url="TicketRequests/getItemTypeWorker"
                 search-function="{firstName: $search}"
+                show-field="nickname"
                 value-field="id"
-                where="{role: {inq: ['logistic', 'buyer']}}"
                 label="Atender">
-                <tpl-item>{{nickname}}</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal class="vn-px-lg">
@@ -57,7 +56,7 @@
                 <tpl-item>{{firstName}} {{lastName}}</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
-       
+
     <section class="vn-px-md">
         <vn-horizontal class="manifold-panel vn-pa-md">
             <vn-date-picker
@@ -89,9 +88,9 @@
         </vn-horizontal>
     </section>
         <vn-horizontal class="vn-px-lg">
-            <vn-check vn-one 
-                triple-state="true" 
-                label="For me" 
+            <vn-check vn-one
+                triple-state="true"
+                label="For me"
                 ng-model="filter.mine">
             </vn-check>
             <vn-autocomplete

modules/supplier/front/consumption-search-panel/index.html

@@ -17,12 +17,11 @@
             <vn-autocomplete
                 vn-one
                 ng-model="filter.buyerId"
-                url="Workers/activeWithRole"
+                url="TicketRequests/getItemTypeWorker"
                 search-function="{firstName: $search}"
+                show-field="nickname"
                 value-field="id"
-                where="{role: {inq: ['logistic', 'buyer']}}"
                 label="Buyer">
-                <tpl-item>{{nickname}}</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>

modules/ticket/back/methods/ticket-request/getItemTypeWorker.js

@@ -1,7 +1,9 @@
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
 
 module.exports = Self => {
-    Self.remoteMethodCtx('getItemTypeWorker', {
+    Self.remoteMethod('getItemTypeWorker', {
         description: 'Returns the workers that appear in itemType',
         accessType: 'READ',
         accepts: [{
@@ -20,10 +22,9 @@ module.exports = Self => {
         }
     });
 
-    Self.getItemTypeWorker = async(ctx, filter, options) => {
+    Self.getItemTypeWorker = async(filter, options) => {
         const myOptions = {};
         const conn = Self.dataSource.connector;
-        let tx;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
@@ -33,25 +34,29 @@ module.exports = Self => {
                 FROM itemType it
                     JOIN worker w ON w.id = it.workerFk
                     JOIN account.user u ON u.id = w.id`;
+        const stmt = new ParameterizedSQL(query);
 
-        let stmt = new ParameterizedSQL(query);
-
-        if (filter.where) {
-            const value = filter.where.firstName;
-            const myFilter = {
-                where: {or: [
+        filter.where = buildFilter(filter.where, (param, value) => {
+            switch (param) {
+            case 'firstName':
+                return {or: [
                     {'w.firstName': {like: `%${value}%`}},
                     {'w.lastName': {like: `%${value}%`}},
                     {'u.name': {like: `%${value}%`}},
                     {'u.nickname': {like: `%${value}%`}}
-                ]}
-            };
+                ]};
+            case 'id':
+                return {'w.id': value};
+            }
+        });
 
-            stmt.merge(conn.makeSuffix(myFilter));
-        }
+        let myFilter = {
+            where: {'u.active': true}
+        };
 
-        if (tx) await tx.commit();
+        myFilter = mergeFilters(myFilter, filter);
 
+        stmt.merge(conn.makeSuffix(myFilter));
         return conn.executeStmt(stmt);
     };
 };