back/methods/docuware/checkFile.js

@@ -1,7 +1,5 @@
-const axios = require('axios');
-
 module.exports = Self => {
-    Self.remoteMethodCtx('checkFile', {
+    Self.remoteMethod('checkFile', {
         description: 'Check if exist docuware file',
         accessType: 'READ',
         accepts: [
@@ -17,12 +15,16 @@ module.exports = Self => {
                 required: true,
                 description: 'The fileCabinet name'
             },
+            {
+                arg: 'filter',
+                type: 'object',
+                description: 'The filter'
+            },
             {
                 arg: 'signed',
                 type: 'boolean',
-                required: true,
                 description: 'If pdf is necessary to be signed'
-            }
+            },
         ],
         returns: {
             type: 'object',
@@ -34,7 +36,7 @@ module.exports = Self => {
         }
     });
 
-    Self.checkFile = async function(ctx, id, fileCabinet, signed) {
+    Self.checkFile = async function(id, fileCabinet, filter, signed) {
         const models = Self.app.models;
         const action = 'find';
 
@@ -45,11 +47,11 @@ module.exports = Self => {
             }
         });
 
-        const searchFilter = {
+        if (!filter) {
+            filter = {
                 condition: [
                     {
                         DBName: docuwareInfo.findById,
-
                         Value: [id]
                     }
                 ],
@@ -60,24 +62,19 @@ module.exports = Self => {
                     }
                 ]
             };
+        }
+        if (signed) {
+            filter.condition.push({
+                DBName: 'ESTADO',
+                Value: ['Firmado']
+            });
+        }
 
         try {
-            const options = await Self.getOptions();
+            const response = await Self.get(fileCabinet, filter);
-
+            const [documents] = response.Items;
-            const fileCabinetId = await Self.getFileCabinet(fileCabinet);
-            const dialogId = await Self.getDialog(fileCabinet, action, fileCabinetId);
-
-            const response = await axios.post(
-                `${options.url}/FileCabinets/${fileCabinetId}/Query/DialogExpression?dialogId=${dialogId}`,
-                searchFilter,
-                options.headers
-            );
-            const [documents] = response.data.Items;
             if (!documents) return false;
 
-            const state = documents.Fields.find(field => field.FieldName == 'ESTADO');
-            if (signed && state.Item != 'Firmado') return false;
-
             return {id: documents.Id};
         } catch (error) {
             return false;

back/methods/docuware/core.js

@@ -1,59 +1,6 @@
 const axios = require('axios');
 
 module.exports = Self => {
-    /**
-     * Returns the dialog id
-     *
-     * @param {string} code - The fileCabinet name
-     * @param {string} action - The fileCabinet name
-     * @param {string} fileCabinetId - Optional The fileCabinet name
-     * @return {number} - The fileCabinet id
-     */
-    Self.getDialog = async(code, action, fileCabinetId) => {
-        const docuwareInfo = await Self.app.models.Docuware.findOne({
-            where: {
-                code: code,
-                action: action
-            }
-        });
-        if (!fileCabinetId) fileCabinetId = await Self.getFileCabinet(code);
-
-        const options = await Self.getOptions();
-
-        if (!process.env.NODE_ENV)
-            return Math.round();
-
-        const response = await axios.get(`${options.url}/FileCabinets/${fileCabinetId}/dialogs`, options.headers);
-        const dialogs = response.data.Dialog;
-        const dialogId = dialogs.find(dialogs => dialogs.DisplayName === docuwareInfo.dialogName).Id;
-
-        return dialogId;
-    };
-
-    /**
-     * Returns the fileCabinetId
-     *
-     * @param {string} code - The fileCabinet code
-     * @return {number} - The fileCabinet id
-     */
-    Self.getFileCabinet = async code => {
-        const options = await Self.getOptions();
-        const docuwareInfo = await Self.app.models.Docuware.findOne({
-            where: {
-                code: code
-            }
-        });
-
-        if (!process.env.NODE_ENV)
-            return Math.round();
-
-        const fileCabinetResponse = await axios.get(`${options.url}/FileCabinets`, options.headers);
-        const fileCabinets = fileCabinetResponse.data.FileCabinet;
-        const fileCabinetId = fileCabinets.find(fileCabinet => fileCabinet.Name === docuwareInfo.fileCabinetName).Id;
-
-        return fileCabinetId;
-    };
-
     /**
      * Returns basic headers
      *
@@ -75,4 +22,139 @@ module.exports = Self => {
             headers
         };
     };
+
+    /**
+     * Returns the dialog id
+     *
+     * @param {string} code - The fileCabinet name
+     * @param {string} action - The fileCabinet name
+     * @param {string} fileCabinetId - Optional The fileCabinet name
+     * @return {number} - The fileCabinet id
+     */
+    Self.getDialog = async(code, action, fileCabinetId) => {
+        if (!process.env.NODE_ENV)
+            return Math.floor(Math.random() + 100);
+
+        const docuwareInfo = await Self.app.models.Docuware.findOne({
+            where: {
+                code,
+                action
+            }
+        });
+        if (!fileCabinetId) fileCabinetId = await Self.getFileCabinet(code);
+
+        const options = await Self.getOptions();
+
+        const response = await axios.get(`${options.url}/FileCabinets/${fileCabinetId}/dialogs`, options.headers);
+        const dialogs = response.data.Dialog;
+        const dialogId = dialogs.find(dialogs => dialogs.DisplayName === docuwareInfo.dialogName).Id;
+
+        return dialogId;
+    };
+
+    /**
+     * Returns the fileCabinetId
+     *
+     * @param {string} code - The fileCabinet code
+     * @return {number} - The fileCabinet id
+     */
+    Self.getFileCabinet = async code => {
+        if (!process.env.NODE_ENV)
+            return Math.floor(Math.random() + 100);
+
+        const options = await Self.getOptions();
+        const docuwareInfo = await Self.app.models.Docuware.findOne({
+            where: {
+                code
+            }
+        });
+
+        const fileCabinetResponse = await axios.get(`${options.url}/FileCabinets`, options.headers);
+        const fileCabinets = fileCabinetResponse.data.FileCabinet;
+        const fileCabinetId = fileCabinets.find(fileCabinet => fileCabinet.Name === docuwareInfo.fileCabinetName).Id;
+
+        return fileCabinetId;
+    };
+
+    /**
+     * Returns docuware data
+     *
+     * @param {string} code - The fileCabinet code
+     * @param {object} filter - The filter for docuware
+     * @param {object} parse - The fields parsed
+     * @return {object} - The data
+     */
+    Self.get = async(code, filter, parse) => {
+        if (!process.env.NODE_ENV) return;
+
+        const options = await Self.getOptions();
+        const fileCabinetId = await Self.getFileCabinet(code);
+        const dialogId = await Self.getDialog(code, 'find', fileCabinetId);
+
+        const data = await axios.post(
+            `${options.url}/FileCabinets/${fileCabinetId}/Query/DialogExpression?dialogId=${dialogId}`,
+            filter,
+            options.headers
+        );
+        return parser(data.data, parse);
+    };
+
+    /**
+     * Returns docuware data
+     *
+     * @param {string} code - The fileCabinet code
+     * @param {any} id - The id of docuware
+     * @param {object} parse - The fields parsed
+     * @return {object} - The data
+     */
+    Self.getById = async(code, id, parse) => {
+        if (!process.env.NODE_ENV) return;
+
+        const docuwareInfo = await Self.app.models.Docuware.findOne({
+            fields: ['findById'],
+            where: {
+                code,
+                action: 'find'
+            }
+        });
+        const filter = {
+            condition: [
+                {
+                    DBName: docuwareInfo.findById,
+                    Value: [id]
+                }
+            ]
+        };
+
+        return Self.get(code, filter, parse);
+    };
+
+    /**
+     * Returns docuware data filtered
+     *
+     * @param {array} data - The data
+     * @param {object} parse - The fields parsed
+     * @return {object} - The data parsed
+     */
+    function parser(data, parse) {
+        if (!(data && data.Items)) return data;
+
+        const parsed = [];
+        for (item of data.Items) {
+            const itemParsed = {};
+            item.Fields.map(field => {
+                if (field.ItemElementName.includes('Date')) field.Item = toDate(field.Item);
+                if (!parse) return itemParsed[field.FieldLabel] = field.Item;
+                if (parse[field.FieldLabel])
+                    itemParsed[parse[field.FieldLabel]] = field.Item;
+            });
+            parsed.push(itemParsed);
+        }
+        return parsed;
+    }
+
+    function toDate(value) {
+        if (!value) return;
+        return new Date(Number(value.substring(6, 19)));
+    }
 };

back/methods/docuware/download.js

@@ -3,7 +3,7 @@ const axios = require('axios');
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
-    Self.remoteMethodCtx('download', {
+    Self.remoteMethod('download', {
         description: 'Download an docuware PDF',
         accessType: 'READ',
         accepts: [
@@ -16,8 +16,12 @@ module.exports = Self => {
             {
                 arg: 'fileCabinet',
                 type: 'string',
-                description: 'The file cabinet',
+                description: 'The file cabinet'
-                http: {source: 'path'}
+            },
+            {
+                arg: 'filter',
+                type: 'object',
+                description: 'The filter'
             }
         ],
         returns: [
@@ -36,14 +40,15 @@ module.exports = Self => {
             }
         ],
         http: {
-            path: `/:id/download/:fileCabinet`,
+            path: `/:id/download`,
             verb: 'GET'
         }
     });
 
-    Self.download = async function(ctx, id, fileCabinet) {
+    Self.download = async function(id, fileCabinet, filter) {
         const models = Self.app.models;
-        const docuwareFile = await models.Docuware.checkFile(ctx, id, fileCabinet, true);
+
+        const docuwareFile = await models.Docuware.checkFile(id, fileCabinet, filter);
         if (!docuwareFile) throw new UserError('The DOCUWARE PDF document does not exists');
 
         const fileCabinetId = await Self.getFileCabinet(fileCabinet);

back/methods/docuware/specs/checkFile.spec.js

@@ -1,57 +1,15 @@
 const models = require('vn-loopback/server/server').models;
-const axios = require('axios');
 
 describe('docuware download()', () => {
     const ticketId = 1;
-    const userId = 9;
-    const ctx = {
-        req: {
-
-            accessToken: {userId: userId},
-            headers: {origin: 'http://localhost:5000'},
-        }
-    };
 
     const docuwareModel = models.Docuware;
     const fileCabinetName = 'deliveryNote';
 
-    beforeAll(() => {
-        spyOn(docuwareModel, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-        spyOn(docuwareModel, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
-    });
-
     it('should return false if there are no documents', async() => {
-        const response = {
+        spyOn(docuwareModel, 'get').and.returnValue((new Promise(resolve => resolve({Items: []}))));
-            data: {
-                Items: []
-            }
-        };
-        spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(response)));
 
-        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, true);
+        const result = await models.Docuware.checkFile(ticketId, fileCabinetName, null, true);
-
-        expect(result).toEqual(false);
-    });
-
-    it('should return false if the document is unsigned', async() => {
-        const response = {
-            data: {
-                Items: [
-                    {
-                        Id: 1,
-                        Fields: [
-                            {
-                                FieldName: 'ESTADO',
-                                Item: 'Unsigned'
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-        spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(response)));
-
-        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, true);
 
         expect(result).toEqual(false);
     });
@@ -59,7 +17,6 @@ describe('docuware download()', () => {
     it('should return the document data', async() => {
         const docuwareId = 1;
         const response = {
-            data: {
             Items: [
                 {
                     Id: docuwareId,
@@ -71,11 +28,10 @@ describe('docuware download()', () => {
                     ]
                 }
             ]
-            }
         };
-        spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(response)));
+        spyOn(docuwareModel, 'get').and.returnValue((new Promise(resolve => resolve(response))));
 
-        const result = await models.Docuware.checkFile(ctx, ticketId, fileCabinetName, true);
+        const result = await models.Docuware.checkFile(ticketId, fileCabinetName, null, true);
 
         expect(result.id).toEqual(docuwareId);
     });

back/methods/docuware/specs/core.spec.js

@@ -0,0 +1,135 @@
+const axios = require('axios');
+const models = require('vn-loopback/server/server').models;
+
+describe('Docuware core', () => {
+    beforeAll(() => {
+        process.env.NODE_ENV = 'testing';
+    });
+
+    afterAll(() => {
+        delete process.env.NODE_ENV;
+    });
+
+    describe('getOptions()', () => {
+        it('should return url and headers', async() => {
+            const result = await models.Docuware.getOptions();
+
+            expect(result.url).toBeDefined();
+            expect(result.headers).toBeDefined();
+        });
+    });
+
+    describe('getDialog()', () => {
+        it('should return dialogId', async() => {
+            const dialogs = {
+                data: {
+                    Dialog: [
+                        {
+                            DisplayName: 'find',
+                            Id: 'getDialogTest'
+                        }
+                    ]
+                }
+            };
+            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
+            const result = await models.Docuware.getDialog('deliveryNote', 'find', 'randomFileCabinetId');
+
+            expect(result).toEqual('getDialogTest');
+        });
+    });
+
+    describe('getFileCabinet()', () => {
+        it('should return fileCabinetId', async() => {
+            const code = 'deliveryNote';
+            const docuwareInfo = await models.Docuware.findOne({
+                where: {
+                    code
+                }
+            });
+            const dialogs = {
+                data: {
+                    FileCabinet: [
+                        {
+                            Name: docuwareInfo.fileCabinetName,
+                            Id: 'getFileCabinetTest'
+                        }
+                    ]
+                }
+            };
+            spyOn(axios, 'get').and.returnValue(new Promise(resolve => resolve(dialogs)));
+            const result = await models.Docuware.getFileCabinet(code);
+
+            expect(result).toEqual('getFileCabinetTest');
+        });
+    });
+
+    describe('get()', () => {
+        it('should return data without parse', async() => {
+            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            const data = {
+                data: {
+                    id: 1
+                }
+            };
+            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
+            const result = await models.Docuware.get('deliveryNote');
+
+            expect(result.id).toEqual(1);
+        });
+
+        it('should return data with parse', async() => {
+            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            const data = {
+                data: {
+                    Items: [{
+                        Fields: [
+                            {
+                                ItemElementName: 'integer',
+                                FieldLabel: 'firstRequiredField',
+                                Item: 1
+                            },
+                            {
+                                ItemElementName: 'string',
+                                FieldLabel: 'secondRequiredField',
+                                Item: 'myName'
+                            },
+                            {
+                                ItemElementName: 'integer',
+                                FieldLabel: 'notRequiredField',
+                                Item: 2
+                            }
+                        ]
+                    }]
+                }
+            };
+            const parse = {
+                'firstRequiredField': 'id',
+                'secondRequiredField': 'name',
+            };
+            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
+            const [result] = await models.Docuware.get('deliveryNote', null, parse);
+
+            expect(result.id).toEqual(1);
+            expect(result.name).toEqual('myName');
+            expect(result.notRequiredField).not.toBeDefined();
+        });
+    });
+
+    describe('getById()', () => {
+        it('should return data', async() => {
+            spyOn(models.Docuware, 'getFileCabinet').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            spyOn(models.Docuware, 'getDialog').and.returnValue((new Promise(resolve => resolve(Math.random()))));
+            const data = {
+                data: {
+                    id: 1
+                }
+            };
+            spyOn(axios, 'post').and.returnValue(new Promise(resolve => resolve(data)));
+            const result = await models.Docuware.getById('deliveryNote', 1);
+
+            expect(result.id).toEqual(1);
+        });
+    });
+});

back/methods/docuware/specs/download.spec.js

@@ -39,7 +39,7 @@ describe('docuware download()', () => {
         spyOn(docuwareModel, 'checkFile').and.returnValue({});
         spyOn(axios, 'get').and.returnValue(new stream.PassThrough({objectMode: true}));
 
-        const result = await models.Docuware.download(ctx, ticketId, fileCabinetName);
+        const result = await models.Docuware.download(ticketId, fileCabinetName);
 
         expect(result[1]).toEqual('application/pdf');
         expect(result[2]).toEqual(`filename="${ticketId}.pdf"`);

back/models/docuware.json

@@ -28,5 +28,12 @@
         "findById": {
             "type": "string"
         }
+    },
+    "relations": {
+        "dmsType": {
+            "type": "belongsTo",
+            "model": "DmsType",
+            "foreignKey": "dmsTypeFk"
+        }
     }
 }

db/changes/233201/00-workerDocuware.sql

@@ -0,0 +1,10 @@
+ALTER TABLE `vn`.`docuware` ADD dmsTypeFk INT(11) DEFAULT NULL NULL;
+ALTER TABLE `vn`.`docuware` ADD CONSTRAINT docuware_FK FOREIGN KEY (dmsTypeFk) REFERENCES `vn`.`dmsType`(id) ON DELETE RESTRICT ON UPDATE CASCADE;
+INSERT INTO `vn`.`docuware` (code, fileCabinetName, `action`, dialogName, findById, dmsTypeFk)
+    VALUES
+        ('hr', 'RRHH', 'find', 'Búsqueda', 'N__DOCUMENTO', NULL); -- set dmsTypeFk 3 when deploy in production
+
+INSERT INTO `salix`.`url` (appName, environment, url)
+    VALUES
+        ('docuware', 'production', 'https://verdnatura.docuware.cloud/DocuWare/Platform/');
+

e2e/helpers/selectors.js

@@ -875,7 +875,7 @@ export default {
 
     },
     routeTickets: {
-        firstTicketPriority: 'vn-route-tickets vn-tr:nth-child(1) vn-input-number[ng-model="ticket.priority"]',
+        firstTicketPriority: 'vn-route-tickets vn-tr:nth-child(1) vn-td-editable',
         firstTicketCheckbox: 'vn-route-tickets vn-tr:nth-child(1) vn-check',
         buscamanButton: 'vn-route-tickets vn-button[icon="icon-buscaman"]',
         firstTicketDeleteButton: 'vn-route-tickets vn-tr:nth-child(1) vn-icon[icon="delete"]',

e2e/paths/08-route/04_tickets.spec.js

@@ -18,8 +18,7 @@ describe('Route tickets path', () => {
     });
 
     it('should modify the first ticket priority', async() => {
-        await page.clearInput(selectors.routeTickets.firstTicketPriority);
+        await page.writeOnEditableTD(selectors.routeTickets.firstTicketPriority, '9');
-        await page.type(selectors.routeTickets.firstTicketPriority, '9');
         await page.keyboard.press('Enter');
         const message = await page.waitForSnackbar();
 

front/core/services/app.js

@@ -66,7 +66,11 @@ export default class App {
 
         return this.logger.$http.get('Urls/findOne', {filter})
             .then(res => {
+                if (res && res.data)
                     return res.data.url + route;
+            })
+            .catch(() => {
+                this.showError('Direction not found');
             });
     }
 }

front/core/services/locale/es.yml

@@ -4,3 +4,4 @@ Please enter your username: Por favor introduce tu nombre de usuario
 It seems that the server has fall down: Parece que el servidor se ha caído, espera unos minutos e inténtalo de nuevo
 Session has expired: Tu sesión ha expirado, por favor vuelve a iniciar sesión
 Access denied: Acción no permitida
+Direction not found: Dirección no encontrada

modules/route/front/tickets/index.html

@@ -84,14 +84,21 @@
                                 tabindex="-1">
                             </vn-icon-button>
                         </vn-td>
-                        <vn-td>
+                        <vn-td-editable number>
+                            <text>
+                                <strong>{{ticket.priority}}</strong>
+                            </text>
+                            <field>
                                 <vn-input-number
-                                on-change="$ctrl.setPriority(ticket.id, ticket.priority)"
-                                ng-model="ticket.priority"
                                     rule="Ticket"
-                                class="dense">
+                                    ng-model="ticket.priority"
+                                    on-change="$ctrl.setPriority(ticket.id, ticket.priority)"
+                                    step="1"
+                                    class="dense"
+                                    vn-focus>
                                 </vn-input-number>
-                        </vn-td>
+                            </field>
+                        </vn-td-editable>
                         <vn-td expand title="{{::ticket.street}}">{{::ticket.street}}</vn-td>
                         <vn-td 
                             expand 

modules/ticket/back/methods/ticket/docuwareDownload.js

@@ -0,0 +1,55 @@
+module.exports = Self => {
+    Self.remoteMethod('docuwareDownload', {
+        description: 'Download a ticket delivery note document',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'Number',
+                description: 'The document id',
+                http: {source: 'path'}
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: `/:id/docuwareDownload`,
+            verb: 'GET'
+        }
+    });
+
+    Self.docuwareDownload = async id => {
+        const filter = {
+            condition: [
+                {
+                    DBName: docuwareInfo.findById,
+                    Value: [id]
+                },
+                {
+                    DBName: 'ESTADO',
+                    Value: ['Firmado']
+                }
+            ],
+            sortOrder: [
+                {
+                    Field: 'FILENAME',
+                    Direction: 'Desc'
+                }
+            ]
+        };
+        return Self.app.models.Docuware.download(id, 'deliveryNote', filter);
+    };
+};

modules/ticket/front/descriptor-menu/index.html

@@ -36,13 +36,12 @@
                         translate>
                         as PDF without prices
                     </vn-item>
-                    <a class="vn-item"
+                    <vn-item
                         ng-if="$ctrl.hasDocuwareFile"
-                        href='api/Docuwares/{{$ctrl.ticket.id}}/download/deliveryNote?access_token={{$ctrl.vnToken.token}}'
+                        ng-click="$ctrl.docuwareDownload()"
-                        target="_blank"
                         translate>
                         as PDF signed
-                    </a>
+                    </vn-item>
                     <vn-item
                         ng-click="$ctrl.showCsvDeliveryNote()"
                         translate>

modules/ticket/front/descriptor-menu/index.js

@@ -321,6 +321,10 @@ class Controller extends Section {
             });
     }
 
+    docuwareDownload() {
+        this.vnFile.download(`api/Ticket/${this.ticket.id}/docuwareDownload`);
+    }
+
     setTicketWeight(weight) {
         return this.$http.patch(`Tickets/${this.ticket.id}`, {weight})
             .then(() => {

modules/worker/back/methods/worker-dms/docuwareDownload.js

@@ -0,0 +1,45 @@
+module.exports = Self => {
+    Self.remoteMethod('docuwareDownload', {
+        description: 'Download a worker document',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'Number',
+                description: 'The document id',
+                http: {source: 'path'}
+            }
+        ],
+        returns: [
+            {
+                arg: 'body',
+                type: 'file',
+                root: true
+            }, {
+                arg: 'Content-Type',
+                type: 'String',
+                http: {target: 'header'}
+            }, {
+                arg: 'Content-Disposition',
+                type: 'String',
+                http: {target: 'header'}
+            }
+        ],
+        http: {
+            path: `/:id/docuwareDownload`,
+            verb: 'GET'
+        }
+    });
+
+    Self.docuwareDownload = async id => {
+        const filter = {
+            condition: [
+                {
+                    DBName: 'FILENAME',
+                    Value: [id]
+                }
+            ]
+        };
+        return Self.app.models.Docuware.download(id, 'hr', filter);
+    };
+};

modules/worker/back/methods/worker-dms/filter.js

@@ -5,6 +5,12 @@ module.exports = Self => {
         description: 'Find all instances of the model matched by filter from the data source.',
         accessType: 'READ',
         accepts: [
+            {
+                arg: 'id',
+                type: 'Number',
+                description: 'The worker id',
+                http: {source: 'path'}
+            },
             {
                 arg: 'filter',
                 type: 'Object',
@@ -17,16 +23,17 @@ module.exports = Self => {
             root: true
         },
         http: {
-            path: `/filter`,
+            path: `/:id/filter`,
             verb: 'GET'
         }
     });
 
-    Self.filter = async(ctx, filter) => {
+    Self.filter = async(ctx, id, filter) => {
         const conn = Self.dataSource.connector;
         const userId = ctx.req.accessToken.userId;
+        const models = Self.app.models;
 
-        const account = await Self.app.models.VnUser.findById(userId);
+        const account = await models.VnUser.findById(userId);
         const stmt = new ParameterizedSQL(
             `SELECT d.id dmsFk, d.reference, d.description, d.file, d.created, d.hardCopyNumber, d.hasFile
                 FROM workerDocument wd
@@ -47,7 +54,38 @@ module.exports = Self => {
                 }]
             }, oldWhere]};
         stmt.merge(conn.makeSuffix(filter));
+        const workerDms = await conn.executeStmt(stmt);
 
-        return await conn.executeStmt(stmt);
+        // Get docuware info
+        const docuware = await models.Docuware.findOne({
+            fields: ['dmsTypeFk'],
+            where: {code: 'hr', action: 'find'}
+        });
+        const docuwareDmsType = docuware.dmsTypeFk;
+        let workerDocuware = [];
+        if (!docuwareDmsType || (docuwareDmsType && await models.DmsType.hasReadRole(ctx, docuwareDmsType))) {
+            const worker = await models.Worker.findById(id, {fields: ['fi', 'firstName', 'lastName']});
+            const docuwareParse = {
+                'Filename': 'dmsFk',
+                'Tipo Documento': 'description',
+                'Stored on': 'created',
+                'Document ID': 'id'
+            };
+            workerDocuware =
+            await models.Docuware.getById('hr', worker.lastName + worker.firstName, docuwareParse) ?? [];
+            for (document of workerDocuware) {
+                const defaultData = {
+                    file: 'dw' + document.id + '.png',
+                    isDocuware: true,
+                    hardCopyNumber: null,
+                    hasFile: false,
+                    reference: worker.fi,
+                    dmsFk: 'DW' + document.id
+                };
+
+                document = Object.assign(document, defaultData);
+            }
+        }
+        return workerDms.concat(workerDocuware);
     };
 };

modules/worker/back/models/worker-dms.js

@@ -2,6 +2,7 @@ module.exports = Self => {
     require('../methods/worker-dms/downloadFile')(Self);
     require('../methods/worker-dms/removeFile')(Self);
     require('../methods/worker-dms/filter')(Self);
+    require('../methods/worker-dms/docuwareDownload')(Self);
 
     Self.isMine = async function(ctx, dmsId) {
         const myUserId = ctx.req.accessToken.userId;

modules/worker/front/dms/index/index.html

@@ -1,6 +1,6 @@
 <vn-crud-model
     vn-id="model"
-    url="WorkerDms/filter"
+    url="WorkerDms/{{$ctrl.$params.id}}/filter"
     link="{worker: $ctrl.$params.id}"
     limit="20"
     data="$ctrl.workerDms"
@@ -53,7 +53,7 @@
                 </vn-td>
                 <vn-td shrink>
                     <span title="{{'Download file' | translate}}" class="link"
-                        ng-click="$ctrl.downloadFile(document.dmsFk)">
+                        ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
                         {{::document.file}}
                     </span>
                 </vn-td>
@@ -63,16 +63,14 @@
                 <vn-td shrink>
                     <vn-icon-button title="{{'Download file' | translate}}"
                         icon="cloud_download"
-                        ng-click="$ctrl.downloadFile(document.dmsFk)">
+                        ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
                     </vn-icon-button>
                 </vn-td>
-                <vn-td shrink>
+                <vn-td expand ng-if="::!document.isDocuware">
                     <vn-icon-button ui-sref="worker.card.dms.edit({dmsId: {{::document.dmsFk}}})"
                         icon="edit"
                         title="{{'Edit file' | translate}}">
                     </vn-icon-button>
-                </vn-td>
-                <vn-td shrink>
                     <vn-icon-button
                         icon="delete"
                         ng-click="confirm.show($index)"
@@ -80,6 +78,14 @@
                         tabindex="-1">
                     </vn-icon-button>
                 </vn-td>
+                <vn-td expand ng-if="::document.isDocuware">
+                    <vn-icon-button
+                        icon="open_in_new"
+                        ng-click="$ctrl.openDocuware()"
+                        title="{{'Open in docuware' | translate}}"
+                        tabindex="-1">
+                    </vn-icon-button>
+                </vn-td>
             </vn-tr>
         </vn-tbody>
     </vn-table>

modules/worker/front/dms/index/index.js

@@ -17,9 +17,15 @@ class Controller extends Component {
             });
     }
 
-    downloadFile(dmsId) {
+    downloadFile(dmsId, isDocuware) {
+        if (isDocuware) return this.vnFile.download(`api/workerDms/${dmsId}/docuwareDownload`);
         this.vnFile.download(`api/workerDms/${dmsId}/downloadFile`);
     }
+
+    async openDocuware() {
+        const url = await this.vnApp.getUrl(`WebClient`, 'docuware');
+        if (url) window.open(url).focus();
+    }
 }
 
 Controller.$inject = ['$element', '$scope', 'vnFile'];