Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut

modules/item/back/methods/item/activeBuyers.js

@@ -1,44 +0,0 @@
-const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
-const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
-
-module.exports = Self => {
-    Self.remoteMethod('activeBuyers', {
-        description: 'Returns a list of buyers for the given item type',
-        accepts: [{
-            arg: 'filter',
-            type: 'object',
-            description: `Filter defining where, order, offset, and limit - must be a JSON-encoded string`
-        }],
-        returns: {
-            type: ['object'],
-            root: true
-        },
-        http: {
-            path: `/activeBuyers`,
-            verb: 'GET'
-        }
-    });
-
-    Self.activeBuyers = async(filter, options) => {
-        const conn = Self.dataSource.connector;
-        const where = {isActive: true};
-        const myOptions = {};
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        filter = mergeFilters(filter, {where});
-
-        let stmt = new ParameterizedSQL(
-            `SELECT DISTINCT w.id workerFk, w.firstName, w.lastName, u.name, u.nickname
-                FROM worker w
-                    JOIN itemType it ON it.workerFk = w.id
-                    JOIN account.user u ON u.id = w.id
-                    JOIN item i ON i.typeFk = it.id`,
-            null, myOptions);
-
-        stmt.merge(conn.makeSuffix(filter));
-
-        return conn.executeStmt(stmt);
-    };
-};

modules/item/back/methods/item/specs/activeBuyers.spec.js

@@ -1,24 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-
-describe('Worker activeBuyers', () => {
-    it('should return the buyers in itemType as result', async() => {
-        const tx = await models.Item.beginTransaction({});
-
-        try {
-            const options = {transaction: tx};
-            const filter = {};
-            const result = await models.Item.activeBuyers(filter, options);
-            const firstWorker = result[0];
-            const secondWorker = result[1];
-
-            expect(result.length).toEqual(2);
-            expect(firstWorker.nickname).toEqual('logisticBossNick');
-            expect(secondWorker.nickname).toEqual('buyerNick');
-
-            await tx.rollback();
-        } catch (e) {
-            await tx.rollback();
-            throw e;
-        }
-    });
-});

modules/item/back/models/item.js

@@ -14,7 +14,6 @@ module.exports = Self => {
     require('../methods/item/getWasteByWorker')(Self);
     require('../methods/item/getWasteByItem')(Self);
     require('../methods/item/createIntrastat')(Self);
-    require('../methods/item/activeBuyers')(Self);
     require('../methods/item/buyerWasteEmail')(Self);
     require('../methods/item/labelPdf')(Self);
 

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()">
@@ -26,7 +26,7 @@
                 search-function="{firstName: $search}"
                 value-field="id"
                 where="{role: {inq: ['logistic', 'buyer']}}"
-                label="Atender">
+                label="Buyer">
                 <tpl-item>{{nickname}}</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
@@ -57,7 +57,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 +89,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/item/front/search-panel/index.html

@@ -38,13 +38,13 @@
             </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-autocomplete 
+            <vn-autocomplete
                 vn-one
                 ng-model="filter.buyerFk"
-                url="Items/activeBuyers"
+                url="TicketRequests/getItemTypeWorker"
+                search-function="{firstName: $search}"
                 show-field="nickname"
-                search-function="{nickname: {like: '%'+ $search +'%'}}"
-                value-field="workerFk"
+                value-field="id"
                 label="Buyer">
             </vn-autocomplete>
             <vn-autocomplete
@@ -88,7 +88,7 @@
                 label="Value"
                 ng-model="itemTag.value">
             </vn-textfield>
-            <vn-autocomplete 
+            <vn-autocomplete
                 vn-one
                 ng-show="tag.selection.isFree === false"
                 url="{{'Tags/' + itemTag.tagFk + '/filterValue'}}"
@@ -167,7 +167,7 @@
             </vn-icon-button>
         </vn-horizontal>
         <vn-horizontal>
-            <vn-check 
+            <vn-check
                 vn-one
                 label="Floramondo"
                 ng-model="filter.isFloramondo"

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,38 +22,37 @@ module.exports = Self => {
         }
     });
 
-    Self.getItemTypeWorker = async(ctx, filter, options) => {
-        const myOptions = {};
+    Self.getItemTypeWorker = async filter => {
         const conn = Self.dataSource.connector;
-        let tx;
-
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
 
         const query =
             `SELECT DISTINCT u.id, u.nickname
                 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);
     };
 };

modules/ticket/back/methods/ticket-request/specs/getItemTypeWorkers.spec.js

@@ -1,12 +1,10 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('ticket-request getItemTypeWorker()', () => {
-    const ctx = {req: {accessToken: {userId: 18}}};
-
     it('should return the buyer as result', async() => {
         const filter = {where: {firstName: 'buyer'}};
 
-        const result = await models.TicketRequest.getItemTypeWorker(ctx, filter);
+        const result = await models.TicketRequest.getItemTypeWorker(filter);
 
         expect(result.length).toEqual(1);
     });
@@ -14,7 +12,7 @@ describe('ticket-request getItemTypeWorker()', () => {
     it('should return the workers at itemType as result', async() => {
         const filter = {};
 
-        const result = await models.TicketRequest.getItemTypeWorker(ctx, filter);
+        const result = await models.TicketRequest.getItemTypeWorker(filter);
 
         expect(result.length).toBeGreaterThan(1);
     });