db/dump/fixtures.sql

@@ -1779,7 +1779,7 @@ INSERT INTO `vn`.`claimDestination`(`id`, `description`, `addressFk`)
 INSERT INTO `vn`.`claimDevelopment`(`id`, `claimFk`, `claimResponsibleFk`, `workerFk`, `claimReasonFk`, `claimResultFk`, `claimRedeliveryFk`, `claimDestinationFk`)
     VALUES
         (1, 1, 1, 21, 1,  1, 2, 5),
-        (2, 1, 1, 21, 7,  2, 2, 5),
+        (2, 1, 2, 21, 7,  2, 2, 5),
         (3, 2, 7, 21, 9,  3, 2, 5),
         (4, 3, 7, 21, 15, 8, 2, 5),
         (5, 4, 7, 21, 7,  8, 2, 5);

modules/claim/back/methods/claim/filter.js

@@ -23,7 +23,7 @@ module.exports = Self => {
             {
                 arg: 'search',
                 type: 'string',
-                description: `If it's and integer searchs by id, otherwise it searchs by client name`,
+                description: `If it's a number searchs by id, otherwise it searchs by client name`,
                 http: {source: 'query'}
             },
             {
@@ -34,31 +34,31 @@ module.exports = Self => {
             },
             {
                 arg: 'id',
-                type: 'integer',
+                type: 'number',
                 description: 'The claim id',
                 http: {source: 'query'}
             },
             {
                 arg: 'clientFk',
-                type: 'integer',
+                type: 'number',
                 description: 'The client id',
                 http: {source: 'query'}
             },
             {
                 arg: 'claimStateFk',
-                type: 'integer',
+                type: 'number',
                 description: 'The claim state id',
                 http: {source: 'query'}
             },
             {
                 arg: 'salesPersonFk',
-                type: 'integer',
+                type: 'number',
                 description: 'The salesPerson id',
                 http: {source: 'query'}
             },
             {
                 arg: 'attenderFk',
-                type: 'integer',
+                type: 'number',
                 description: 'The attender worker id',
                 http: {source: 'query'}
             },
@@ -67,6 +67,18 @@ module.exports = Self => {
                 type: 'date',
                 description: 'The to date filter',
                 http: {source: 'query'}
+            },
+            {
+                arg: 'itemFk',
+                type: 'number',
+                description: 'The item id',
+                http: {source: 'query'}
+            },
+            {
+                arg: 'claimResponsibleFk',
+                type: 'number',
+                description: 'The claimResponsible id',
+                http: {source: 'query'}
             }
         ],
         returns: {
@@ -80,33 +92,58 @@ module.exports = Self => {
     });
 
     Self.filter = async(ctx, filter, options) => {
+        const models = Self.app.models;
         const conn = Self.dataSource.connector;
+        const args = ctx.args;
         const myOptions = {};
         let to;
 
         if (typeof options == 'object')
             Object.assign(myOptions, options);
 
-        const where = buildFilter(ctx.args, (param, value) => {
+        let claimIdsByItemFk = [];
+        let claimIdsByClaimResponsibleFk = [];
+
+        if (args.itemFk) {
+            query = `SELECT cb.claimFk
+                            FROM claimBeginning cb
+                                LEFT JOIN sale s ON s.id = cb.saleFk
+                            WHERE s.itemFk = ?`;
+            const claims = await Self.rawSql(query, [args.itemFk], myOptions);
+            claimIdsByItemFk = claims.map(claim => claim.claimFk);
+        }
+
+        if (args.claimResponsibleFk) {
+            const claims = await models.ClaimDevelopment.find({
+                fields: ['claimFk'],
+                where: {claimResponsibleFk: args.claimResponsibleFk}
+            }, myOptions);
+            claimIdsByClaimResponsibleFk = claims.map(claim => claim.claimFk);
+        }
+
+        const where = buildFilter(args, (param, value) => {
             switch (param) {
             case 'search':
                 return /^\d+$/.test(value)
                     ? {'cl.id': value}
                     : {
                         or: [
-                            {'cl.clientName': {like: `%${value}%`}}
+                            {'c.name': {like: `%${value}%`}}
                         ]
                     };
             case 'clientName':
-                return {'cl.clientName': {like: `%${value}%`}};
+                return {'c.name': {like: `%${value}%`}};
             case 'clientFk':
-                return {'cl.clientFk': value};
             case 'id':
             case 'claimStateFk':
             case 'priority':
                 return {[`cl.${param}`]: value};
+            case 'itemFk':
+                return {'cl.id': {inq: claimIdsByItemFk}};
+            case 'claimResponsibleFk':
+                return {'cl.id': {inq: claimIdsByClaimResponsibleFk}};
             case 'salesPersonFk':
-                return {'cl.salesPersonFk': value};
+                return {'c.salesPersonFk': value};
             case 'attenderFk':
                 return {'cl.workerFk': value};
             case 'created':
@@ -118,29 +155,23 @@ module.exports = Self => {
             }
         });
 
-        filter = mergeFilters(ctx.args.filter, {where});
+        filter = mergeFilters(args.filter, {where});
 
         const stmts = [];
 
         const stmt = new ParameterizedSQL(
-            `SELECT * 
+            `SELECT
-                FROM (
-                    SELECT 
                     cl.id,
                     cl.clientFk,
                     c.name AS clientName,
                     cl.workerFk,
                     u.name AS workerName,
                     cs.description,
-                        cl.created,
+                    cl.created
-                        cs.priority,
-                        cl.claimStateFk,
-                        c.salesPersonFk
                 FROM claim cl
                     LEFT JOIN client c ON c.id = cl.clientFk
-                        LEFT JOIN worker w ON w.id = cl.workerFk 
+                    LEFT JOIN account.user u ON u.id = cl.workerFk
-                        LEFT JOIN account.user u ON u.id = w.userFk
+                    LEFT JOIN claimState cs ON cs.id = cl.claimStateFk`
-                        LEFT JOIN claimState cs ON cs.id = cl.claimStateFk ) cl`
         );
 
         stmt.merge(conn.makeSuffix(filter));

modules/claim/back/methods/claim/specs/filter.spec.js

@@ -57,4 +57,44 @@ describe('claim filter()', () => {
             throw e;
         }
     });
+
+    it('should return 3 results filtering by item id', async() => {
+        const tx = await app.models.Claim.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const result = await app.models.Claim.filter({args: {filter: {}, itemFk: 2}}, null, options);
+
+            expect(result.length).toEqual(3);
+            expect(result[0].id).toEqual(1);
+            expect(result[1].id).toEqual(2);
+            expect(result[2].id).toEqual(4);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+
+    it('should return 3 results filtering by claimResponsible id', async() => {
+        const tx = await app.models.Claim.beginTransaction({});
+
+        try {
+            const options = {transaction: tx};
+
+            const result = await app.models.Claim.filter({args: {filter: {}, claimResponsibleFk: 7}}, null, options);
+
+            expect(result.length).toEqual(3);
+            expect(result[0].id).toEqual(2);
+            expect(result[1].id).toEqual(3);
+            expect(result[2].id).toEqual(4);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
 });

modules/claim/front/search-panel/index.html

@@ -58,6 +58,26 @@
                 ng-model="filter.created">
             </vn-date-picker>
         </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete vn-one class="dense"
+                label="Item"
+                url="Items/withName"
+                ng-model="filter.itemFk"
+                show-field="name"
+                value-field="id"
+                search-function="$ctrl.itemSearchFunc($search)"
+                order="id DESC">
+                <tpl-item>{{::id}} - {{::name}}</tpl-item>
+            </vn-autocomplete>
+            <vn-autocomplete
+                vn-one
+                ng-model="filter.claimResponsibleFk"
+                url="ClaimResponsibles"
+                show-field="description"
+                value-field="id"
+                label="Responsible">
+            </vn-autocomplete>
+        </vn-horizontal>
         <vn-horizontal class="vn-mt-lg">
             <vn-submit label="Search"></vn-submit>
         </vn-horizontal>

modules/claim/front/search-panel/index.js

@@ -1,7 +1,14 @@
 import ngModule from '../module';
 import SearchPanel from 'core/components/searchbar/search-panel';
 
+class Controller extends SearchPanel {
+    itemSearchFunc($search) {
+        return /^\d+$/.test($search)
+            ? {id: $search}
+            : {name: {like: '%' + $search + '%'}};
+    }
+}
 ngModule.vnComponent('vnClaimSearchPanel', {
     template: require('./index.html'),
-    controller: SearchPanel
+    controller: Controller
 });