Merge branch 'dev' into 6005-backupLabeler

back/methods/collection/getSales.js

@@ -29,6 +29,7 @@ module.exports = Self => {
     });
 
     Self.getSales = async(ctx, collectionOrTicketFk, print, source, options) => {
+        const models = Self.app.models;
         const userId = ctx.req.accessToken.userId;
         const myOptions = {userId};
         const $t = ctx.req.__;

back/methods/url/getUrl.js

@@ -19,12 +19,12 @@ module.exports = Self => {
         }
     });
     Self.getUrl = async(appName = 'salix') => {
-        const {url} = await Self.app.models.Url.findOne({
+        const url = await Self.app.models.Url.findOne({
             where: {
                 appName,
                 environment: process.env.NODE_ENV || 'development'
             }
         });
-        return url;
+        return url?.url;
     };
 };

db/dump/fixtures.before.sql

@@ -1880,7 +1880,7 @@ INSERT INTO `vn`.`claimRatio`(`clientFk`, `yearSale`, `claimAmount`, `claimingRa
 
 INSERT INTO `vn`.`claimLog` (`originFk`, userFk, `action`, changedModel, oldInstance, newInstance, changedModelId, `description`)
     VALUES
-        (1, 18, 'update', 'Claim', '{"hasToPickUp":false}', '{"hasToPickUp":true}', 1, NULL),
+        (1, 18, 'update', 'Claim', '{"pickup":null}', '{"pickup":"agency"}', 1, NULL),
         (1, 18, 'update', 'ClaimObservation', '{}', '{"claimFk":1,"text":"Waiting for customer"}', 1, NULL),
         (1, 18, 'insert', 'ClaimBeginning', '{}', '{"claimFk":1,"saleFk":1,"quantity":10}', 1, NULL),
         (1, 18, 'insert', 'ClaimDms', '{}', '{"claimFk":1,"dmsFk":1}', 1, NULL);
@@ -2916,7 +2916,8 @@ INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
     VALUES
         ('lilium', 'development', 'http://localhost:9000/#/'),
         ('hedera', 'development', 'http://localhost:9090/'),
-        ('salix', 'development', 'http://localhost:5000/#!/');
+        ('salix', 'development', 'http://localhost:5000/#!/'),
+        ('docuware', 'development', 'http://docuware');
 
 INSERT INTO `vn`.`report` (`id`, `name`, `paperSizeFk`, `method`)
     VALUES

db/routines/vn/procedures/itemShelving_add.sql

@@ -21,7 +21,6 @@ BEGIN
 	SELECT barcodeToItem(vBarcode) INTO vItemFk;
 	
 	SET vPacking = COALESCE(vPacking, GREATEST(vn.itemPacking(vBarcode,vWarehouseFk), 1));
-
 	SET vQuantity = vQuantity * vPacking;
 
 	IF (SELECT COUNT(*) FROM shelving WHERE code = vShelvingFk COLLATE utf8_unicode_ci) = 0 THEN

db/versions/10976-greenCamellia/00-firstScript.sql

@@ -0,0 +1,20 @@
+CREATE OR REPLACE TEMPORARY TABLE tmp.claimsWithHasToPickUp
+	SELECT id
+		FROM vn.claim
+		WHERE hasToPickUp;
+
+ALTER TABLE vn.claim CHANGE hasToPickUp pickup ENUM('agency', 'delivery') DEFAULT NULL;
+
+UPDATE vn.claim c
+		JOIN tmp.claimsWithHasToPickUp tmp ON tmp.id = c.id
+	SET c.pickup = 'delivery';
+
+-- Solved bug empty value
+UPDATE vn.claim
+	SET pickup = NULL
+	WHERE pickup = '';
+
+DROP TEMPORARY TABLE tmp.claimsWithHasToPickUp;
+
+INSERT INTO salix.ACL (model,property,accessType,principalId)
+	VALUES ('Application','getEnumValues','*','employee');

e2e/helpers/selectors.js

@@ -762,7 +762,6 @@ export default {
     claimBasicData: {
         claimState: 'vn-claim-basic-data vn-autocomplete[ng-model="$ctrl.claim.claimStateFk"]',
         packages: 'vn-input-number[ng-model="$ctrl.claim.packages"]',
-        hasToPickUpCheckbox: 'vn-claim-basic-data vn-check[ng-model="$ctrl.claim.hasToPickUp"]',
         saveButton: `button[type=submit]`
     },
     claimDetail: {

e2e/paths/06-claim/01_basic_data.spec.js

@@ -36,7 +36,6 @@ describe('Claim edit basic data path', () => {
 
     it('should check the "Pick up" checkbox', async() => {
         await page.reloadSection('claim.card.basicData');
-        await page.waitToClick(selectors.claimBasicData.hasToPickUpCheckbox);
         await page.waitToClick(selectors.claimBasicData.saveButton);
         const message = await page.waitForSnackbar();
 
@@ -51,12 +50,6 @@ describe('Claim edit basic data path', () => {
         expect(result).toEqual('Resuelto');
     });
 
-    it('should confirm the "is paid with mana" and "Pick up" checkbox are checked', async() => {
-        const hasToPickUpCheckbox = await page.checkboxState(selectors.claimBasicData.hasToPickUpCheckbox);
-
-        expect(hasToPickUpCheckbox).toBe('checked');
-    });
-
     it('should confirm the claim packages was edited', async() => {
         const result = await page
             .waitToGetProperty(selectors.claimBasicData.packages, 'value');

loopback/common/methods/application/getEnumValues.js

@@ -0,0 +1,56 @@
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethod('getEnumValues', {
+        description: 'Return enum values of column',
+        accessType: 'EXECUTE',
+        accepts: [
+            {
+                arg: 'schema',
+                type: 'string',
+                description: 'The schema of db',
+                required: true,
+            },
+            {
+                arg: 'table',
+                type: 'string',
+                description: 'The table of schema',
+                required: true,
+            },
+            {
+                arg: 'column',
+                type: 'string',
+                description: 'The column of table',
+                required: true,
+            },
+        ],
+        returns: {
+            type: 'any',
+            root: true
+        },
+        http: {
+            path: `/get-enum-values`,
+            verb: 'GET'
+        }
+    });
+
+    Self.getEnumValues = async(schema, table, column) => {
+        const stmt = new ParameterizedSQL(`
+            SELECT COLUMN_TYPE
+                FROM information_schema.COLUMNS
+                    WHERE TABLE_SCHEMA = ?
+                        AND TABLE_NAME = ?
+                        AND COLUMN_NAME = ?
+                        AND DATA_TYPE = 'enum';`,
+        [schema, table, column]);
+
+        const conn = Self.dataSource.connector;
+        const [result] = await conn.executeStmt(stmt);
+
+        if (!result) throw new UserError(`No results found`);
+
+        const regex = /'([^']*)'/g;
+        return result.COLUMN_TYPE.match(regex).map(match => match.slice(1, -1));
+    };
+};

loopback/common/methods/application/spec/getEnumValues.spec.js

@@ -0,0 +1,35 @@
+const models = require('vn-loopback/server/server').models;
+
+describe('Application getEnumValues()', () => {
+    let tx;
+
+    beforeEach(async() => {
+        tx = await models.Application.beginTransaction({});
+        const options = {transaction: tx};
+
+        await models.Application.rawSql(`
+            CREATE TABLE tableWithEnum (
+                direction enum('in', 'out', 'middle'),
+                PRIMARY KEY (direction)
+            ) ENGINE=InnoDB;
+        `, null, options);
+    });
+
+    it('should return three if is ok', async() => {
+        try {
+            const options = {transaction: tx};
+            const response = await models.Application.getEnumValues(
+                'vn',
+                'tableWithEnum',
+                'direction',
+                options
+            );
+
+            expect(response.length).toEqual(3);
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});

loopback/common/models/application.js

@@ -5,4 +5,5 @@ module.exports = function(Self) {
     require('../methods/application/execute')(Self);
     require('../methods/application/executeProc')(Self);
     require('../methods/application/executeFunc')(Self);
+    require('../methods/application/getEnumValues')(Self);
 };

loopback/locale/en.json

@@ -68,7 +68,7 @@
     "Changed client paymethod": "I have changed the pay method for client [{{clientName}} ({{clientId}})]({{{url}}})",
     "Sent units from ticket": "I sent *{{quantity}}* units of [{{concept}} ({{itemId}})]({{{itemUrl}}}) to *\"{{nickname}}\"* coming from ticket id [{{ticketId}}]({{{ticketUrl}}})",
     "Change quantity": "{{concept}} change of {{oldQuantity}} to {{newQuantity}}",
-    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked",
+    "Claim will be picked": "The product from the claim [({{claimId}})]({{{claimUrl}}}) from the client *{{clientName}}* will be picked, with the pickup type *{{claimPickup}}*",
     "Claim state has changed to": "The state of the claim [({{claimId}})]({{{claimUrl}}}) from client *{{clientName}}* has changed to *{{newState}}*",
     "Customs agent is required for a non UEE member": "Customs agent is required for a non UEE member",
     "Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
@@ -89,6 +89,8 @@
     "landed": "Landed",
     "addressFk": "Address",
     "companyFk": "Company",
+    "agency": "Agency",
+    "delivery": "Delivery",
     "You need to fill sage information before you check verified data": "You need to fill sage information before you check verified data",
     "The social name cannot be empty": "The social name cannot be empty",
     "The nif cannot be empty": "The nif cannot be empty",

loopback/locale/es.json

@@ -135,7 +135,7 @@
 	"Changed client paymethod": "He cambiado la forma de pago del cliente [{{clientName}} ({{clientId}})]({{{url}}})",
 	"Sent units from ticket": "Envio *{{quantity}}* unidades de [{{concept}} ({{itemId}})]({{{itemUrl}}}) a *\"{{nickname}}\"* provenientes del ticket id [{{ticketId}}]({{{ticketUrl}}})",
 	"Change quantity": "{{concept}} cambia de {{oldQuantity}} a {{newQuantity}}",
-    "Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*",
+	"Claim will be picked": "Se recogerá el género de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}*, con el tipo de recogida *{{claimPickup}}*",
 	"Claim state has changed to": "Se ha cambiado el estado de la reclamación [({{claimId}})]({{{claimUrl}}}) del cliente *{{clientName}}* a *{{newState}}*",
 	"Client checked as validated despite of duplication": "Cliente comprobado a pesar de que existe el cliente id {{clientId}}",
 	"ORDER_ROW_UNAVAILABLE": "No hay disponibilidad de este producto",
@@ -168,6 +168,8 @@
 	"landed": "F. entrega",
 	"addressFk": "Consignatario",
 	"companyFk": "Empresa",
+	"agency": "Agencia",
+	"delivery": "Reparto",
 	"The social name cannot be empty": "La razón social no puede quedar en blanco",
 	"The nif cannot be empty": "El NIF no puede quedar en blanco",
 	"You need to fill sage information before you check verified data": "Debes rellenar la información de sage antes de marcar datos comprobados",
@@ -349,5 +351,6 @@
 	"The address of the customer must have information about Incoterms and Customs Agent": "El consignatario del cliente debe tener informado Incoterms y Agente de aduanas",
 	"The line could not be marked": "La linea no puede ser marcada",
 	"This password can only be changed by the user themselves": "Esta contraseña solo puede ser modificada por el propio usuario",
-    "They're not your subordinate": "No es tu subordinado/a."
+	"They're not your subordinate": "No es tu subordinado/a.",
+	"No results found": "No se han encontrado resultados"
 }

modules/claim/back/locale/claim/en.yml

@@ -6,7 +6,6 @@ columns:
     isChargedToMana: charged to mana
     created: created
     responsibility: responsibility
-    hasToPickUp: has to pickUp
     ticketFk: ticket
     claimStateFk: claim state
     workerFk: worker

modules/claim/back/locale/claim/es.yml

@@ -6,7 +6,6 @@ columns:
     isChargedToMana: cargado al maná
     created: creado
     responsibility: responsabilidad
-    hasToPickUp: es recogida
     ticketFk: ticket
     claimStateFk: estado reclamación
     workerFk: trabajador

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

@@ -11,7 +11,7 @@ describe('claim log()', () => {
             model: 'Claim',
             action: 'update',
             changes: [
-                {property: 'hasToPickUp', before: false, after: true}
+                {property: 'pickup', before: null, after: 'agency'}
             ]
         };
 

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

@@ -86,7 +86,7 @@ describe('Update Claim', () => {
                 args: {
                     observation: 'valid observation',
                     claimStateFk: pendingState,
-                    hasToPickUp: false
+                    pickup: null
                 }
             };
             ctx.req.__ = i18n.__;
@@ -124,7 +124,7 @@ describe('Update Claim', () => {
                 args: {
                     observation: 'valid observation',
                     claimStateFk: canceledState,
-                    hasToPickUp: false
+                    pickup: null
                 }
             };
             ctx.req.__ = i18n.__;
@@ -163,7 +163,7 @@ describe('Update Claim', () => {
                     claimStateFk: 3,
                     workerFk: 5,
                     observation: 'another valid observation',
-                    hasToPickUp: true
+                    pickup: 'agency'
                 }
             };
             ctx.req.__ = i18n.__;

modules/claim/back/methods/claim/updateClaim.js

@@ -27,8 +27,8 @@ module.exports = Self => {
             type: 'string'
         },
         {
-            arg: 'hasToPickUp',
-            type: 'boolean'
+            arg: 'pickup',
+            type: 'any'
         },
         {
             arg: 'packages',
@@ -72,9 +72,7 @@ module.exports = Self => {
             // Get sales person from claim client
             const salesPerson = claim.client().salesPersonUser();
 
-            let changedHasToPickUp = false;
-            if (args.hasToPickUp)
-                changedHasToPickUp = true;
+            const changedPickup = args.pickup != claim.pickup;
 
             // Validate when claimState has been changed
             if (args.claimStateFk) {
@@ -82,15 +80,15 @@ module.exports = Self => {
                 const canEditNewState = await models.ClaimState.isEditable(ctx, args.claimStateFk, myOptions);
                 const canEditState = await models.ACL.checkAccessAcl(ctx, 'Claim', 'editState', 'WRITE');
 
-                if (!canEditOldState || !canEditNewState || changedHasToPickUp && !canEditState)
+                if (!canEditOldState || !canEditNewState || changedPickup && !canEditState)
                     throw new UserError(`You don't have enough privileges to change that field`);
             }
 
             delete args.ctx;
             const updatedClaim = await claim.updateAttributes(args, myOptions);
 
-            // When hasToPickUp has been changed
-            if (salesPerson && changedHasToPickUp && updatedClaim.hasToPickUp)
+            // When pickup has been changed
+            if (salesPerson && changedPickup && updatedClaim.pickup)
                 await notifyPickUp(ctx, salesPerson.id, claim);
 
             // When claimState has been changed
@@ -132,7 +130,8 @@ module.exports = Self => {
         const message = $t('Claim will be picked', {
             claimId: claim.id,
             clientName: claim.client().name,
-            claimUrl: `${url}claim/${claim.id}/summary`
+            claimUrl: `${url}claim/${claim.id}/summary`,
+            claimPickup: $t(claim.pickup)
         });
         await models.Chat.sendCheckingPresence(ctx, workerId, message);
     }

modules/claim/back/models/claim.json

@@ -31,8 +31,8 @@
         "responsibility": {
             "type": "number"
         },
-        "hasToPickUp": {
-            "type": "boolean"
+        "pickup": {
+            "type": "string"
         },
         "ticketFk": {
             "type": "number"

modules/claim/front/action/index.spec.js

@@ -85,7 +85,7 @@ describe('claim', () => {
             it('should perform a patch query and show a success message', () => {
                 jest.spyOn(controller.vnApp, 'showSuccess');
 
-                const data = {hasToPickUp: true};
+                const data = {pickup: 'agency'};
                 $httpBackend.expect('PATCH', `Claims/1/updateClaimAction`, data).respond({});
                 controller.save(data);
                 $httpBackend.flush();

modules/claim/front/basic-data/index.html

@@ -49,13 +49,6 @@
                 label="Packages received"
                 ng-model="$ctrl.claim.packages">
             </vn-input-number>
-            <vn-check
-                class="vn-mr-md"
-                label="Pick up"
-                ng-model="$ctrl.claim.hasToPickUp"
-                vn-acl="claimManager"
-                title="{{'When checked will notify to the salesPerson' | translate}}">
-            </vn-check>
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>

modules/claim/front/summary/index.html

@@ -49,13 +49,6 @@
                 label="Attended by"
                 value="{{$ctrl.summary.claim.worker.user.nickname}}">
             </vn-label-value>
-            <vn-check
-                class="vn-mr-md"
-                label="Pick up"
-                ng-model="$ctrl.summary.claim.hasToPickUp"
-                title="{{'When checked will notify to the salesPerson' | translate}}"
-                disabled="true">
-            </vn-check>
         </vn-auto>
         <vn-auto>
             <h4 ng-show="$ctrl.isSalesPerson && $ctrl.summary.observations.length">

modules/item/back/methods/item-shelving/specs/upsertItem.spec.js

@@ -30,7 +30,7 @@ describe('ItemShelving upsertItem()', () => {
         await tx.rollback();
     });
 
-    xit('should add two new records', async() => {
+    it('should add two new records', async () => {
         const shelvingFk = 'ZPP';
         const items = [1, 1, 1, 2];
 
@@ -40,17 +40,18 @@ describe('ItemShelving upsertItem()', () => {
         expect(itemShelvings.length).toEqual(2);
     });
 
-    xit('should update the visible items', async() => {
+    it('should update the visible items', async () => {
         const shelvingFk = 'GVC';
         const items = [2, 2];
-        const {visible: itemsBefore} = await models.ItemShelving.findOne({
+        const { visible: visibleItemsBefore } = await models.ItemShelving.findOne({
             where: { shelvingFk, itemFk: items[0] }
         }, options);
         await models.ItemShelving.upsertItem(ctx, shelvingFk, items, warehouseFk, options);
-        const {visible: itemsAfter} = await models.ItemShelving.findOne({
+
+        const { visible: visibleItemsAfter } = await models.ItemShelving.findOne({
             where: { shelvingFk, itemFk: items[0] }
         }, options);
 
-        expect(itemsAfter).toEqual(itemsBefore + 2);
+        expect(visibleItemsAfter).toEqual(visibleItemsBefore + 2);
     });
 });

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

@@ -1,4 +1,5 @@
 const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const {mergeFilters, mergeWhere} = require('vn-loopback/util/filter');
 
 module.exports = Self => {
     Self.remoteMethodCtx('filter', {
@@ -33,28 +34,31 @@ module.exports = Self => {
         const userId = ctx.req.accessToken.userId;
         const models = Self.app.models;
 
+        // Get ids alloweds
         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
+            `SELECT d.id, d.id dmsFk
                 FROM workerDocument wd
                     JOIN dms d ON d.id = wd.document
                     JOIN dmsType dt ON dt.id = d.dmsTypeFk
                     LEFT JOIN account.roleRole rr ON rr.inheritsFrom = dt.readRoleFk AND rr.role = ?
                 `, [account.roleFk]
         );
-        const oldWhere = filter.where;
         const yourOwnDms = {and: [{isReadableByWorker: true}, {worker: userId}]};
-
-        filter.where = {
-            and: [{
+        const where = {
             or: [yourOwnDms, {
                 role: {
                     neq: null
                 }
             }]
-            }, oldWhere]};
-        stmt.merge(conn.makeSuffix(filter));
-        const workerDms = await conn.executeStmt(stmt);
+        };
+        stmt.merge(conn.makeSuffix(mergeWhere(filter.where, where)));
+
+        // Get workerDms alloweds
+        const dmsIds = await conn.executeStmt(stmt);
+        const allowedIds = dmsIds.map(dms => dms.id);
+        const allowedFilter = mergeFilters(filter, {where: {dmsFk: {inq: allowedIds}, workerFk: id}});
+        let workerDms = await models.WorkerDms.find(allowedFilter);
 
         // Get docuware info
         const docuware = await models.Docuware.findOne({
@@ -63,28 +67,43 @@ module.exports = Self => {
         });
         const docuwareDmsType = docuware.dmsTypeFk;
         let workerDocuware = [];
-        if (!docuwareDmsType || (docuwareDmsType && await models.DmsType.hasReadRole(ctx, docuwareDmsType))) {
+        if (!filter.skip && (!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'
+                'Document ID': 'id',
+                'URL': 'download',
+                'Stored by': 'name',
+                'Estado': 'state'
             };
 
             workerDocuware =
             await models.Docuware.getById('hr', worker.lastName + ' ' + worker.firstName, docuwareParse) ?? [];
+            const url = (await Self.app.models.Url.getUrl('docuware')) + 'WebClient';
             for (document of workerDocuware) {
+                const docuwareId = document.id;
                 const defaultData = {
-                    file: 'dw' + document.id + '.png',
+                    id: docuwareId,
+                    workerFk: id,
+                    dmsFk: docuwareId,
+                    dms: {
+                        id: docuwareId,
+                        file: docuwareId + '.pdf',
                         isDocuware: true,
-                    hardCopyNumber: null,
                         hasFile: false,
                         reference: worker.fi,
-                    dmsFk: 'DW' + document.id
+                        dmsFk: docuwareId,
+                        url,
+                        description: document.description + ' - ' + document.state,
+                        download: document.download,
+                        created: document.created,
+                        dmsType: {name: 'Docuware'},
+                        worker: {id: null, user: {name: document.name}},
+                    }
                 };
-
-                document = Object.assign(document, defaultData);
+                Object.assign(document, defaultData);
             }
         }
         return workerDms.concat(workerDocuware);

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

@@ -2,6 +2,7 @@
     vn-id="model"
     url="WorkerDms/{{$ctrl.$params.id}}/filter"
     link="{worker: $ctrl.$params.id}"
+    filter="$ctrl.filter"
     limit="20"
     data="$ctrl.workerDms"
     order="dmsFk DESC"
@@ -28,37 +29,37 @@
         </vn-thead>
         <vn-tbody>
             <vn-tr ng-repeat="document in $ctrl.workerDms">
-                <vn-td number shrink>{{::document.dmsFk}}</vn-td>
+                <vn-td number shrink>{{::document.id}}</vn-td>
                 <vn-td shrink number>
-                    <span class="chip" title="{{::document.hardCopyNumber}}"
+                    <span class="chip" title="{{::document.dms.hardCopyNumber}}"
                         ng-class="{'message': document.hardCopyNumber}">
-                        {{::document.hardCopyNumber}}
+                        {{::document.dms.hardCopyNumber}}
                     </span>
                 </vn-td>
                 <vn-td expand>
-                    <span title="{{::document.reference}}">
-                        {{::document.reference}}
+                    <span title="{{::document.dms.reference}}">
+                        {{::document.dms.reference}}
                     </span>
                 </vn-td>
                 <vn-td expand>
-                    <span title="{{::document.description}}">
-                        {{::document.description}}
+                    <span title="{{::document.dms.description}}">
+                        {{::document.dms.description}}
                     </span>
                 </vn-td>
                 <vn-td shrink>
                     <vn-check
-                        ng-model="document.hasFile"
+                        ng-model="document.dms.hasFile"
                         disabled="true">
                     </vn-check>
                 </vn-td>
                 <vn-td shrink>
                     <span title="{{'Download file' | translate}}" class="link"
-                        ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
-                        {{::document.file}}
+                        ng-click="$ctrl.downloadFile(document.dmsFk, document.dms.isDocuware)">
+                        {{::document.dms.file}}
                     </span>
                 </vn-td>
                 <vn-td shrink-datetime>
-                    {{::document.created | date:'dd/MM/yyyy HH:mm'}}
+                    {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}}
                 </vn-td>
                 <vn-td shrink>
                     <vn-icon-button title="{{'Download file' | translate}}"
@@ -66,7 +67,7 @@
                         ng-click="$ctrl.downloadFile(document.dmsFk, document.isDocuware)">
                     </vn-icon-button>
                 </vn-td>
-                <vn-td expand ng-if="::!document.isDocuware">
+                <vn-td expand ng-if="::!document.dms.isDocuware">
                     <vn-icon-button ui-sref="worker.card.dms.edit({dmsId: {{::document.dmsFk}}})"
                         icon="edit"
                         title="{{'Edit file' | translate}}">
@@ -78,7 +79,7 @@
                         tabindex="-1">
                     </vn-icon-button>
                 </vn-td>
-                <vn-td expand ng-if="::document.isDocuware">
+                <vn-td expand ng-if="::document.dms.isDocuware">
                     <vn-icon-button
                         icon="open_in_new"
                         ng-click="$ctrl.openDocuware()"

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

@@ -6,6 +6,45 @@ class Controller extends Component {
     constructor($element, $, vnFile) {
         super($element, $);
         this.vnFile = vnFile;
+        this.filter = {
+            include: {
+                relation: 'dms',
+                scope: {
+                    fields: [
+                        'dmsTypeFk',
+                        'reference',
+                        'hardCopyNumber',
+                        'workerFk',
+                        'description',
+                        'hasFile',
+                        'file',
+                        'created',
+                        'companyFk',
+                        'warehouseFk',
+                    ],
+                    include: [
+                        {
+                            relation: 'dmsType',
+                            scope: {
+                                fields: ['name'],
+                            },
+                        },
+                        {
+                            relation: 'worker',
+                            scope: {
+                                fields: ['id'],
+                                include: {
+                                    relation: 'user',
+                                    scope: {
+                                        fields: ['name'],
+                                    },
+                                },
+                            },
+                        },
+                    ],
+                },
+            },
+        };
     }
 
     deleteDms(index) {