Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags

CHANGELOG.md

@@ -8,11 +8,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2304.01] - 2023-02-09
 
 ### Added
--
+-  (Trabajadores -> Nuevo trabajador)  Nueva sección
 
 ### Changed
 -
 
+### Fixed
+- (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
+
+
 ## [2302.01] - 2023-01-26
 
 ### Added
@@ -27,7 +31,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - (General) Al utilizar el traductor de Google se descuadraban los iconos
-- (Artículos -> Etiquetas) Permite intercambiar la relevancia entre dos etiquetas.
 
 ### Removed
 - (Tickets -> Control clientes) Eliminada sección

db/changes/230201/00-validPriorities_ItemConfig.sql

@@ -0,0 +1,9 @@
+ALTER TABLE `vn`.`itemConfig` ADD defaultTag INT DEFAULT 56 NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD CONSTRAINT itemConfig_FK FOREIGN KEY (defaultTag) REFERENCES vn.tag(id);
+ALTER TABLE `vn`.`itemConfig` ADD validPriorities varchar(50) DEFAULT '[1,2,3]' NOT NULL;
+ALTER TABLE `vn`.`itemConfig` ADD defaultPriority INT DEFAULT 2 NOT NULL;
+ALTER TABLE `vn`.`item` MODIFY COLUMN relevancy tinyint(1) DEFAULT 0 NOT NULL COMMENT 'La web ordena de forma descendiente por este campo para mostrar los artículos';
+
+INSERT INTO `salix`.`ACL`
+(model, property, accessType, permission, principalType, principalId)
+VALUES('ItemConfig', '*', 'READ', 'ALLOW', 'ROLE', 'buyer');

db/changes/230401/00-createWorker.sql

@@ -0,0 +1,24 @@
+UPDATE `salix`.`ACL`
+SET accessType='READ'
+WHERE model='Worker'
+    AND property='*'
+    AND accessType='*'
+    AND permission='ALLOW'
+    AND principalType='ROLE'
+    AND principalId='employee';
+
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Worker', 'updateAttributes', 'WRITE', 'ALLOW', 'ROLE', 'hr'),
+        ('Worker', 'createAbsence', '*', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'updateAbsence', 'WRITE', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'deleteAbsence', '*', 'ALLOW', 'ROLE', 'employee'),
+        ('Worker', 'new', 'WRITE', 'ALLOW', 'ROLE', 'hr'),
+        ('Role', '*', 'READ', 'ALLOW', 'ROLE', 'hr');
+
+ALTER TABLE `vn`.`workerConfig` ADD roleFk int(10) unsigned NOT NULL COMMENT 'Rol por defecto al dar de alta un trabajador nuevo';
+UPDATE `vn`.`workerConfig`
+    SET roleFk = 1
+    WHERE id = 1;
+

db/dump/fixtures.sql

@@ -2629,7 +2629,7 @@ INSERT INTO `vn`.`machineWorker` (`workerFk`, `machineFk`, `inTimed`, `outTimed`
 
 INSERT INTO `vn`.`zoneExclusion` (`id`, `zoneFk`, `dated`, `created`, `userFk`)
 VALUES
-    (1, 1, DATE_ADD(CURDATE(), INTERVAL (IF(DAYOFWEEK(CURDATE())<=7, 7, 14) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100),
+    (1, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=7, 7, 14) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100),
     (2, 1, DATE_ADD(util.VN_CURDATE(), INTERVAL (IF(DAYOFWEEK(util.VN_CURDATE())<=8, 8, 15) - DAYOFWEEK(util.VN_CURDATE())) DAY), util.VN_CURDATE(), 100);
 
 INSERT INTO `vn`.`zoneExclusionGeo` (`zoneExclusionFk`, `geoFk`)
@@ -2719,6 +2719,10 @@ INSERT INTO `vn`.`collection` (`id`, `created`, `workerFk`, `stateFk`, `itemPack
     VALUES
         (3, util.VN_NOW(), 1107, 5, NULL, 0, 0, 1, NULL, NULL);
 
+INSERT INTO `vn`.`itemConfig` (`id`, `isItemTagTriggerDisabled`, `monthToDeactivate`, `wasteRecipients`, `validPriorities`, `defaultPriority`, `defaultTag`)
+    VALUES
+        (0, 0, 24, '', '[1,2,3]', 2, 56);
+
 INSERT INTO `vn`.`ticketCollection` (`ticketFk`, `collectionFk`, `created`, `level`, `wagon`, `smartTagFk`, `usedShelves`, `itemCount`, `liters`)
     VALUES
         (9, 3, util.VN_NOW(), NULL, 0, NULL, NULL, NULL, NULL);
@@ -2747,10 +2751,14 @@ INSERT INTO `vn`.`mdbApp` (`app`, `baselineBranchFk`, `userFk`, `locked`)
     VALUES
         ('foo', 'master', NULL, NULL),
         ('bar', 'test', 9, util.VN_NOW());
-INSERT INTO `vn`.`ticketLog` (`id`, `originFk`, `userFk`, `action`, `changedModel`, `oldInstance`, `newInstance`, `changedModelId`)
-    VALUES
-        (1, 1, 9, 'insert', 'Ticket', '{}', '{"clientFk":1, "nickname": "Bat cave"}', 1);
 
+INSERT INTO `vn`.`profileType` (`id`, `name`)
+    VALUES
+        (1, 'working');
+
+INSERT INTO `vn`.`newWorkerConfig` (`id`, `street`, `provinceFk`, `companyFk`, `profileTypeFk`, `roleFk`)
+    VALUES
+        (1, 'S/ ', 1, 442, 1, 1);
 
 INSERT INTO `salix`.`url` (`appName`, `environment`, `url`)
     VALUES
@@ -2761,3 +2769,7 @@ INSERT INTO `vn`.`payDemDetail` (`id`, `detail`)
     VALUES
         (1, 1);
 
+INSERT INTO `vn`.`workerConfig` (`id`, `businessUpdated`, `roleFk`)
+    VALUES
+        (1, NULL, 1);
+

e2e/helpers/selectors.js

@@ -58,6 +58,7 @@ export default {
         deleteAccount: '.vn-menu [name="deleteUser"]',
         setPassword: '.vn-menu [name="setPassword"]',
         activateAccount: '.vn-menu [name="enableAccount"]',
+        disableAccount: '.vn-menu [name="disableAccount"]',
         activateUser: '.vn-menu [name="activateUser"]',
         deactivateUser: '.vn-menu [name="deactivateUser"]',
         newPassword: 'vn-textfield[ng-model="$ctrl.newPassword"]',
@@ -428,6 +429,7 @@ export default {
     },
     itemCreateView: {
         temporalName: 'vn-item-create vn-textfield[ng-model="$ctrl.item.provisionalName"]',
+        priority: 'vn-autocomplete[ng-model="$ctrl.item.priority"]',
         type: 'vn-autocomplete[ng-model="$ctrl.item.typeFk"]',
         intrastat: 'vn-autocomplete[ng-model="$ctrl.item.intrastatFk"]',
         origin: 'vn-autocomplete[ng-model="$ctrl.item.originFk"]',
@@ -521,7 +523,7 @@ export default {
     },
     itemLog: {
         anyLineCreated: 'vn-item-log > vn-log vn-tbody > vn-tr',
-        fifthLineCreatedProperty: 'vn-item-log > vn-log vn-tbody > vn-tr:nth-child(5) table tr:nth-child(3) td.after',
+        fifthLineCreatedProperty: 'vn-item-log > vn-log vn-tbody > vn-tr:nth-child(5) table tr:nth-child(2) td.after',
     },
     ticketSummary: {
         header: 'vn-ticket-summary > vn-card > h5',
@@ -968,6 +970,7 @@ export default {
         confirmButton: '.vn-confirm.shown button[response="accept"]'
     },
     workerSummary: {
+        summaryIcon: 'vn-worker-descriptor a[title="Go to module summary"]',
         header: 'vn-worker-summary h5',
         id: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(3) > section > span',
         email: 'vn-worker-summary vn-one:nth-child(1) > vn-label-value:nth-child(4) > section > span',
@@ -1020,6 +1023,25 @@ export default {
         furlough: 'vn-worker-calendar > vn-side-menu [name="absenceTypes"] > vn-chip:nth-child(4)',
         halfFurlough: 'vn-worker-calendar > vn-side-menu [name="absenceTypes"] > vn-chip:nth-child(5)',
     },
+    workerCreate: {
+        newWorkerButton: 'vn-worker-index a[ui-sref="worker.create"]',
+        firstname: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.firstName"]',
+        lastname: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.lastNames"]',
+        birth: 'vn-worker-create vn-date-picker[ng-model="$ctrl.worker.birth"]',
+        fi: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.fi"]',
+        code: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.code"]',
+        phone: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.phone"]',
+        city: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.city"]',
+        postcode: 'vn-worker-create vn-datalist[ng-model="$ctrl.worker.postcode"]',
+        street: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.street"]',
+        user: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.name"]',
+        email: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.email"]',
+        boss: 'vn-worker-create vn-autocomplete[ng-model="$ctrl.worker.bossFk"]',
+        role: 'vn-worker-create vn-autocomplete[ng-model="$ctrl.worker.roleFk"]',
+        iban: 'vn-worker-create vn-textfield[ng-model="$ctrl.worker.iban"]',
+        switft: 'vn-worker-create vn-autocomplete[ng-model="$ctrl.worker.bankEntityFk"]',
+        createButton: 'vn-worker-create vn-submit[label="Create"]',
+    },
     invoiceOutIndex: {
         topbarSearch: 'vn-searchbar',
         searchResult: 'vn-invoice-out-index vn-card > vn-table > div > vn-tbody > a.vn-tr',

e2e/paths/03-worker/06_create.spec.js

@@ -0,0 +1,74 @@
+import selectors from '../../helpers/selectors.js';
+import getBrowser from '../../helpers/puppeteer';
+
+describe('Worker create path', () => {
+    let browser;
+    let page;
+    let newWorker;
+    beforeAll(async() => {
+        browser = await getBrowser();
+        page = browser.page;
+        await page.loginAndModule('hr', 'worker');
+        await page.waitToClick(selectors.workerCreate.newWorkerButton);
+        await page.waitForState('worker.create');
+    });
+
+    afterAll(async() => {
+        await browser.close();
+    });
+
+    it('should insert default data', async() => {
+        await page.write(selectors.workerCreate.firstname, 'Victor');
+        await page.write(selectors.workerCreate.lastname, 'Von Doom');
+        await page.write(selectors.workerCreate.fi, '78457139E');
+        await page.write(selectors.workerCreate.phone, '12356789');
+        await page.write(selectors.workerCreate.postcode, '46680');
+        await page.write(selectors.workerCreate.street, 'S/ Doomstadt');
+        await page.write(selectors.workerCreate.email, 'doctorDoom@marvel.com');
+        await page.write(selectors.workerCreate.iban, 'ES9121000418450200051332');
+        await page.autocompleteSearch(selectors.workerCreate.switft, 'BBKKESMMMMM');
+
+        // should check for autocompleted worker code and worker user name
+        const workerCode = await page
+            .waitToGetProperty(selectors.workerCreate.code, 'value');
+
+        newWorker = await page
+            .waitToGetProperty(selectors.workerCreate.user, 'value');
+
+        expect(workerCode).toEqual('VVD');
+        expect(newWorker).toContain('victorvd');
+
+        // should fail if necessary data is void
+        await page.waitToClick(selectors.workerCreate.createButton);
+        let message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('is a required argument');
+
+        // should create a new worker and go to worker basic data'
+        await page.pickDate(selectors.workerCreate.birth, new Date(1962, 8, 5));
+        await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryBoss');
+        await page.waitToClick(selectors.workerCreate.createButton);
+        message = await page.waitForSnackbar();
+        await page.waitForState('worker.card.basicData');
+
+        expect(message.text).toContain('Data saved!');
+
+        // 'rollback'
+        await page.loginAndModule('sysadmin', 'account');
+        await page.accessToSearchResult(newWorker);
+
+        await page.waitToClick(selectors.accountDescriptor.menuButton);
+        await page.waitToClick(selectors.accountDescriptor.deactivateUser);
+        await page.waitToClick(selectors.accountDescriptor.acceptButton);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('User deactivated!');
+
+        await page.waitToClick(selectors.accountDescriptor.menuButton);
+        await page.waitToClick(selectors.accountDescriptor.disableAccount);
+        await page.waitToClick(selectors.accountDescriptor.acceptButton);
+        message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Account disabled!');
+    });
+});

e2e/paths/04-item/07_create.spec.js

@@ -36,11 +36,20 @@ describe('Item Create', () => {
         await page.waitForState('item.create');
     });
 
-    it('should create the Infinity Gauntlet item', async() => {
+    it('should throw an error when insert an invalid priority', async() => {
         await page.write(selectors.itemCreateView.temporalName, 'Infinity Gauntlet');
         await page.autocompleteSearch(selectors.itemCreateView.type, 'Crisantemo');
         await page.autocompleteSearch(selectors.itemCreateView.intrastat, 'Coral y materiales similares');
         await page.autocompleteSearch(selectors.itemCreateView.origin, 'Holand');
+        await page.clearInput(selectors.itemCreateView.priority);
+        await page.waitToClick(selectors.itemCreateView.createButton);
+        const message = await page.waitForSnackbar();
+
+        expect(message.text).toContain('Valid priorities');
+    });
+
+    it('should create the Infinity Gauntlet item', async() => {
+        await page.autocompleteSearch(selectors.itemCreateView.priority, '2');
         await page.waitToClick(selectors.itemCreateView.createButton);
         const message = await page.waitForSnackbar();
 

front/salix/components/reset-password/locale/es.yml

@@ -1,6 +1,6 @@
 Reset password: Restrablecer contraseña
 New password: Nueva contraseña
-Repeat password: Repetir contraseñaç
+Repeat password: Repetir contraseña
 Password changed!: ¡Contraseña cambiada!
 Password requirements: >
     La contraseña debe tener al menos {{ length }} caracteres de longitud,

loopback/locale/es.json

@@ -252,6 +252,9 @@
 	"Receipt's bank was not found": "No se encontró el banco del recibo",
 	"This receipt was not compensated": "Este recibo no ha sido compensado",
 	"Client's email was not found": "No se encontró el email del cliente",
+	"This worker code already exists": "Este codigo de trabajador ya existe",
+	"This personal mail already exists": "Este correo personal ya existe",
+	"This worker already exists": "Este trabajador ya existe",
 	"App name does not exist": "El nombre de aplicación no es válido",
 	"Try again": "Vuelve a intentarlo",
 	"Aplicación bloqueada por el usuario 9": "Aplicación bloqueada por el usuario 9",

loopback/util/not-found-error.js

@@ -0,0 +1,9 @@
+module.exports = class NotFoundError extends Error {
+    constructor(message = 'Not found', code = 'NOT_FOUND', ...translateArgs) {
+        super(message);
+        this.name = 'NotFoundError';
+        this.statusCode = 404;
+        this.code = code;
+        this.translateArgs = translateArgs;
+    }
+};

modules/item/back/methods/item/new.js

@@ -37,7 +37,8 @@ module.exports = Self => {
             'typeFk',
             'intrastatFk',
             'originFk',
-            'relevancy'
+            'priority',
+            'tag'
         ];
 
         for (const key in params) {
@@ -46,10 +47,14 @@ module.exports = Self => {
         }
 
         try {
+            const itemConfig = await models.ItemConfig.findOne({fields: ['validPriorities']}, myOptions);
+            if (!itemConfig.validPriorities.includes(params.priority))
+                throw new UserError(`Valid priorities: ${[...itemConfig.validPriorities]}`);
+
             const provisionalName = params.provisionalName;
             delete params.provisionalName;
 
-            const itemType = await models.ItemType.findById(params.typeFk, myOptions);
+            const itemType = await models.ItemType.findById(params.typeFk, {fields: ['isLaid']}, myOptions);
 
             params.isLaid = itemType.isLaid;
 
@@ -63,13 +68,14 @@ module.exports = Self => {
 
             await Self.rawSql(query, null, myOptions);
 
-            let nameTag = await models.Tag.findOne({where: {name: 'Nombre temporal'}});
+            const nameTag = await models.Tag.findById(params.tag, {fields: ['id']}, myOptions);
 
             let newTags = [];
 
-            newTags.push({itemFk: item.id, tagFk: nameTag.id, value: provisionalName, priority: '2'});
+            newTags.push({itemFk: item.id, tagFk: nameTag.id, value: provisionalName, priority: item.priority});
             typeTags.forEach(typeTag => {
-                newTags.push({itemFk: item.id, tagFk: typeTag.tagFk, value: '', priority: typeTag.priority});
+                if (nameTag.id != typeTag.tagFk)
+                    newTags.push({itemFk: item.id, tagFk: typeTag.tagFk, value: '', priority: typeTag.priority});
             });
 
             await models.ItemTag.create(newTags, myOptions);

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

@@ -11,7 +11,8 @@ describe('item new()', () => {
                 originFk: 1,
                 provisionalName: 'planta',
                 typeFk: 2,
-                relevancy: 0
+                priority: 2,
+                tag: 1
             };
 
             let item = await models.Item.new(itemParams, options);
@@ -20,7 +21,7 @@ describe('item new()', () => {
 
             item.isLaid = itemType.isLaid;
 
-            const temporalNameTag = await models.Tag.findOne({where: {name: 'Nombre temporal'}}, options);
+            const temporalNameTag = await models.Tag.findById(itemParams.tag, {fields: ['id']}, options);
 
             const temporalName = await models.ItemTag.findOne({
                 where: {
@@ -31,7 +32,7 @@ describe('item new()', () => {
 
             item = await models.Item.findById(item.id, null, options);
 
-            itemType = await models.ItemType.findById(item.typeFk, options);
+            itemType = await models.ItemType.findById(item.typeFk, {fields: ['isLaid']}, options);
 
             item.isLaid = itemType.isLaid;
 

modules/item/back/models/item-config.json

@@ -16,6 +16,22 @@
         "wasteRecipients": {
             "type": "string",
             "description": "Buyers waste report recipients"
+        },
+        "validPriorities": {
+            "type": "array"
+        },
+        "defaultPriority": {
+            "type": "int"
+        },
+        "defaultTag": {
+            "type": "int"
+        }
+    },
+    "relations": {
+        "tag": {
+            "type": "belongsTo",
+            "model": "Tag",
+            "foreignKey": "defaultTag"
         }
     }
 }

modules/item/front/create/index.html

@@ -16,10 +16,24 @@
     <vn-card class="vn-pa-lg">
         <vn-horizontal>
             <vn-textfield
-                label="Temporal name" 
+                label="Name"
                 ng-model="$ctrl.item.provisionalName"
                 vn-focus>
             </vn-textfield>
+            <vn-autocomplete
+                ng-model="$ctrl.item.tag"
+                url="Tags"
+                show-field="name"
+                value-field="id"
+                label="Tag">
+            </vn-autocomplete>
+            <vn-autocomplete
+                data="$ctrl.validPriorities"
+                label="Priority"
+                ng-model="$ctrl.item.priority"
+                show-field="priority"
+                value-field="priority">
+            </vn-autocomplete>
         </vn-horizontal>
         <vn-horizontal>
             <vn-autocomplete

modules/item/front/create/index.js

@@ -4,9 +4,25 @@ import Section from 'salix/components/section';
 class Controller extends Section {
     constructor($element, $) {
         super($element, $);
-        this.item = {
-            relevancy: 0
-        };
+        this.fetchDefaultPriorityTag();
+    }
+
+    fetchDefaultPriorityTag() {
+        this.validPriorities = [];
+        const filter = {fields: ['defaultPriority', 'defaultTag', 'validPriorities'], limit: 1};
+        this.$http.get(`ItemConfigs`, {filter})
+            .then(res => {
+                if (res.data) {
+                    const dataRow = res.data[0];
+                    dataRow.validPriorities.forEach(priority => {
+                        this.validPriorities.push({priority});
+                    });
+                    this.item = {
+                        priority: dataRow.defaultPriority,
+                        tag: dataRow.defaultTag
+                    };
+                }
+            });
     }
 
     onSubmit() {

modules/order/front/catalog/index.js

@@ -157,7 +157,7 @@ class Controller extends Section {
      * Apply order to model
      */
     applyOrder() {
-        if (this.typeId || this.tagGroups.length > 0)
+        if (this.typeId || this.tagGroups.length > 0 || this.itemName)
             this.$.model.addFilter(null, {orderBy: this.getOrderBy()});
     }
 

modules/ticket/back/methods/sale-tracking/listSaleTracking.js

@@ -36,7 +36,7 @@ module.exports = Self => {
                 st.originalQuantity,
                 st.created,
                 st.workerFk,
-                u.nickname userNickname,
+                u.name,
                 ste.name AS state
             FROM saleTracking st
                 JOIN sale s ON s.id = st.saleFk
@@ -48,24 +48,6 @@ module.exports = Self => {
 
         const trackings = await Self.rawStmt(stmt, myOptions);
 
-        const salesFilter = {
-            include: [
-                {
-                    relation: 'item'
-                }
-            ],
-            where: {ticketFk: filter.where.ticketFk}
-        };
-
-        const sales = await Self.app.models.Sale.find(salesFilter, myOptions);
-
-        for (const tracking of trackings) {
-            for (const sale of sales) {
-                if (tracking.itemFk == sale.itemFk)
-                    tracking.item = sale.item();
-            }
-        }
-
         return trackings;
     };
 };

modules/ticket/front/sale-tracking/index.html

@@ -30,12 +30,12 @@
                     <span class="chip {{$ctrl.chipIsControled(sale.preparingList.isControled)}} vn-mx-xs" vn-tooltip="is controled"></span>
                 </vn-td>
                 <vn-td number>
-                    <span
-                        ng-click="$ctrl.showItemDescriptor($event, sale)"
+                        <span
+                        ng-click="itemDescriptor.show($event, sale.item.id)"
                         class="link">
-                        {{::sale.itemFk | zeroFill:6}}
+                        {{::sale.item.id}}
                     </span>
-                </vn-td>
+                    </vn-td>
                 <vn-td vn-fetched-tags>
                     <div>
                         <vn-one title="{{::sale.item.name}}">{{::sale.item.name}}</vn-one>
@@ -96,27 +96,23 @@
                 </vn-tr>
             </vn-thead>
             <vn-tbody>
-                <vn-tr ng-repeat="sale in saleTrackings">
-                    <vn-td number>{{::sale.quantity}}</vn-td>
-                    <vn-td number>{{::sale.originalQuantity}}</vn-td>
+                <vn-tr ng-repeat="saleTracking in saleTrackings">
+                    <vn-td number>{{::saleTracking.quantity}}</vn-td>
+                    <vn-td number>{{::saleTracking.originalQuantity}}</vn-td>
                     <vn-td expand>
                         <span
                             class="link"
-                            ng-click="workerDescriptor.show($event, sale.workerFk)">
-                            {{::sale.userNickname | dashIfEmpty}}
+                            ng-click="workerDescriptor.show($event, saleTracking.workerFk)">
+                            {{::saleTracking.name | dashIfEmpty}}
                         </span>
                     </vn-td>
-                    <vn-td shrink>{{::sale.state}}</vn-td>
-                    <vn-td expand>{{::sale.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
+                    <vn-td shrink>{{::saleTracking.state}}</vn-td>
+                    <vn-td expand>{{::saleTracking.created | date: 'dd/MM/yyyy HH:mm'}}</vn-td>
                 </vn-tr>
             </vn-tbody>
         </vn-table>
         </vn-card>
     </vn-data-viewer>
-    <vn-item-descriptor-popover
-        vn-id="item-descriptor"
-        warehouse-fk="$ctrl.ticket.warehouseFk">
-    </vn-item-descriptor-popover>
     <vn-worker-descriptor-popover
         vn-id="worker-descriptor">
     </vn-worker-descriptor-popover>

modules/ticket/front/sale-tracking/index.js

@@ -45,14 +45,14 @@ class Controller extends Section {
             btnThree: {
                 icon: 'icon-transaction',
                 state: `item.card.diary({
-                    id: ${sale.itemFk},
+                    id: ${sale.item.id},
                     warehouseFk: ${this.ticket.warehouseFk},
                     lineFk: ${sale.id}
                 })`,
                 tooltip: 'Item diary'
             }
         };
-        this.$.itemDescriptor.show(event.target, sale.itemFk);
+        this.$.itemDescriptor.show(event.target, sale.item.id);
     }
 
     chipHasSaleGroupDetail(hasSaleGroupDetail) {

modules/worker/back/methods/worker/new.js

@@ -0,0 +1,256 @@
+/* eslint max-len: ["error", { "code": 130 }]*/
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('new', {
+        description: 'Creates a new worker and returns the id',
+        accessType: 'WRITE',
+        accepts: [
+            {
+                arg: 'fi',
+                type: 'string',
+                description: `The worker fi`,
+                required: true,
+            },
+            {
+                arg: 'name',
+                type: 'string',
+                description: `The user name`,
+                required: true,
+            },
+            {
+                arg: 'firstName',
+                type: 'string',
+                description: `The worker firstname`,
+                required: true,
+            },
+            {
+                arg: 'lastNames',
+                type: 'string',
+                description: `The worker lastnames`,
+                required: true,
+            },
+            {
+                arg: 'email',
+                type: 'string',
+                description: `The worker email`,
+                required: true,
+            },
+            {
+                arg: 'street',
+                type: 'string',
+                description: `The worker address`,
+                required: true,
+            },
+            {
+                arg: 'city',
+                type: 'string',
+                description: `The worker city`,
+                required: true,
+            },
+            {
+                arg: 'provinceFk',
+                type: 'number',
+                description: `The worker province`,
+                required: true,
+            },
+            {
+                arg: 'iban',
+                type: 'string',
+                description: `The worker iban`,
+                required: true,
+            },
+            {
+                arg: 'bankEntityFk',
+                type: 'number',
+                description: `The worker bank entity`,
+                required: true,
+            },
+            {
+                arg: 'companyFk',
+                type: 'number',
+                description: `The worker company`,
+                required: true,
+            },
+            {
+                arg: 'postcode',
+                type: 'string',
+                description: `The worker postcode`,
+                required: true,
+            },
+            {
+                arg: 'phone',
+                type: 'string',
+                description: `The worker phone`,
+                required: true,
+            },
+            {
+                arg: 'code',
+                type: 'string',
+                description: `The worker code`,
+                required: true,
+            },
+            {
+                arg: 'bossFk',
+                type: 'number',
+                description: `The worker boss`,
+                required: true,
+            },
+            {
+                arg: 'birth',
+                type: 'date',
+                description: `The worker birth`,
+                required: true,
+            }
+        ],
+        returns: {
+            type: 'number',
+            root: true,
+        },
+        http: {
+            path: `/new`,
+            verb: 'POST',
+        },
+    });
+
+    Self.new = async(ctx, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+        const args = ctx.args;
+
+        let tx;
+
+        if (typeof options == 'object') Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        let client;
+
+        try {
+            client = await models.Client.findOne(
+                {
+                    where: {fi: args.fi},
+                },
+                myOptions
+            );
+
+            if (!client) {
+                const nickname = args.firstName.concat(' ', args.lastNames);
+                const workerConfig = await models.WorkerConfig.findOne({fields: ['roleFk']});
+                const [randomPassword] = await models.Worker.rawSql(
+                    'SELECT account.passwordGenerate() as password;'
+                );
+
+                const user = await models.Account.create(
+                    {
+                        name: args.name,
+                        nickname,
+                        password: randomPassword.password,
+                        email: args.email,
+                        roleFk: workerConfig.roleFk,
+                    },
+                    myOptions
+                );
+
+                await models.UserAccount.create(
+                    {
+                        id: user.id,
+                    },
+                    myOptions
+                );
+
+                await models.Worker.rawSql(
+                    'CALL vn.clientCreate(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+                    [
+                        args.firstName,
+                        args.lastNames,
+                        args.fi,
+                        args.street,
+                        args.postalCode,
+                        args.city,
+                        args.provinceFk,
+                        args.companyFk,
+                        args.phone,
+                        args.email,
+                        user.id,
+                    ],
+                    myOptions
+                );
+
+                const address = await models.Address.create(
+                    {
+                        clientFk: user.id,
+                        street: args.street,
+                        city: args.city,
+                        provinceFk: args.provinceFk,
+                        postalCode: args.postalCode,
+                        mobile: args.phone,
+                        nickname: nickname,
+                        isDefaultAddress: true,
+                    },
+                    myOptions
+                );
+
+                client = await models.Client.findById(
+                    user.id,
+                    {fields: ['id', 'name', 'socialName', 'street', 'city', 'iban', 'bankEntityFk', 'defaultAddressFk']},
+                    myOptions
+                );
+
+                await client.updateAttributes(
+                    {
+                        iban: args.iban,
+                        bankEntityFk: args.bankEntityFk,
+                        defaultAddressFk: address.id,
+                    },
+                    myOptions
+                );
+            }
+
+            const user = await models.Account.findById(client.id, null, myOptions);
+            await user.updateAttribute('email', args.email, myOptions);
+
+            await models.Worker.rawSql(
+                'CALL vn.workerCreate(?, ?, ?, ?, ?, ?, ?)',
+                [
+                    args.firstName,
+                    args.lastNames,
+                    args.code,
+                    args.bossFk,
+                    client.id,
+                    args.fi,
+                    args.birth,
+                ],
+                myOptions
+            );
+
+            if (tx) await tx.commit();
+        } catch (error) {
+            if (tx) await tx.rollback();
+            const code = error.code;
+            const message = error.sqlMessage;
+
+            if (code === 'ER_DUP_ENTRY' && message.includes(`for key 'mail'`))
+                throw new UserError(`This personal mail already exists`);
+
+            if (code === 'ER_DUP_ENTRY' && message.includes(`CodigoTrabajador_UNIQUE`))
+                throw new UserError(`This worker code already exists`);
+
+            if (code === 'ER_DUP_ENTRY' && message.includes(`PRIMARY`))
+                throw new UserError(`This worker already exists`);
+
+            throw error;
+        }
+
+        await models.user.resetPassword({
+            email: args.email,
+            emailTemplate: 'worker-welcome',
+            id: client.id
+        });
+
+        return {id: client.id};
+    };
+};

modules/worker/back/methods/worker/specs/new.spec.js

@@ -0,0 +1,139 @@
+const models = require('vn-loopback/server/server').models;
+const LoopBackContext = require('loopback-context');
+
+describe('Worker new', () => {
+    beforeAll(async() => {
+        const activeCtx = {
+            accessToken: {userId: 9},
+            http: {
+                req: {
+                    headers: {origin: 'http://localhost'}
+                }
+            }
+        };
+
+        spyOn(LoopBackContext, 'getCurrentContext').and.returnValue({
+            active: activeCtx
+        });
+    });
+
+    const employeeId = 1;
+    const defaultWorker = {
+        fi: '78457139E',
+        name: 'defaultWorker',
+        firstName: 'default',
+        lastNames: 'worker',
+        email: 'defaultWorker@mydomain.com',
+        street: 'S/ defaultWorkerStreet',
+        city: 'defaultWorkerCity',
+        provinceFk: 1,
+        iban: 'ES8304879798578129532677',
+        bankEntityFk: 128,
+        companyFk: 442,
+        postcode: '46680',
+        phone: '123456789',
+        code: 'DWW',
+        bossFk: 9,
+        birth: '2022-12-11T23:00:00.000Z'
+    };
+
+    it('should return error if personal mail already exists', async() => {
+        const user = await models.Account.findById(employeeId, {fields: ['email']});
+
+        const tx = await models.Worker.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const ctx = {
+                args: Object.assign({}, defaultWorker, {email: user.email})
+            };
+
+            await models.Worker.new(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('This personal mail already exists');
+    });
+
+    it('should return error if worker code already exists', async() => {
+        const worker = await models.Worker.findById(employeeId, {fields: ['code']});
+
+        const tx = await models.Worker.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const ctx = {
+                args: Object.assign({}, defaultWorker, {code: worker.code})
+            };
+
+            await models.Worker.new(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('This worker code already exists');
+    });
+
+    it('should return error if worker already exists', async() => {
+        const worker = await models.Client.findById(employeeId, {fields: ['fi']});
+
+        const tx = await models.Worker.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+            const ctx = {
+                args: Object.assign({}, defaultWorker, {fi: worker.fi})
+            };
+            await models.Worker.new(ctx, options);
+
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
+        }
+
+        expect(error.message).toEqual('This worker already exists');
+    });
+
+    it('should create a new worker', async() => {
+        const newWorker = await models.Worker.new({args: defaultWorker});
+
+        await models.Worker.destroyById(newWorker.id);
+        await models.Address.destroyAll({clientFk: newWorker.id});
+        await models.Mandate.destroyAll({clientFk: newWorker.id});
+        await models.Client.destroyById(newWorker.id);
+        await models.Account.destroyById(newWorker.id);
+
+        expect(newWorker.id).toBeDefined();
+    });
+
+    it('should create a new worker in client', async() => {
+        const bruceWayneId = 1101;
+        const client = await models.Client.findById(bruceWayneId, {fields: ['fi', 'email']});
+
+        const newWorkerData = {
+            args: Object.assign(
+                {},
+                defaultWorker,
+                {
+                    fi: client.fi,
+                    email: client.email
+                })
+        };
+        const newWorker = await models.Worker.new(newWorkerData);
+
+        await models.Worker.destroyById(newWorker.id);
+
+        expect(newWorker.id).toEqual(bruceWayneId);
+    });
+});

modules/worker/back/model-config.json

@@ -17,12 +17,18 @@
     "Department": {
         "dataSource": "vn"
     },
+    "Device": {
+        "dataSource": "vn"
+    },
     "EducationLevel": {
         "dataSource": "vn"
     },
     "Journey": {
         "dataSource": "vn"
     },
+    "ProfileType":{
+        "dataSource": "vn"
+    },
     "Time": {
         "dataSource": "vn"
     },
@@ -32,39 +38,42 @@
     "WorkCenterHoliday": {
         "dataSource": "vn"
     },
-    "WorkerDms": {
+    "Worker": {
         "dataSource": "vn"
     },
-    "Worker": {
+    "WorkerConfig": {
+        "dataSource": "vn"
+    },
+    "WorkerDepartment": {
+        "dataSource": "vn"
+    },
+    "WorkerDisableExcluded": {
+        "dataSource": "vn"
+    },
+    "WorkerDms": {
         "dataSource": "vn"
     },
     "WorkerLabour": {
         "dataSource": "vn"
     },
+    "WorkerLog": {
+        "dataSource": "vn"
+    },
     "WorkerMana": {
         "dataSource": "vn"
     },
+    "WorkerMedia": {
+        "dataSource": "vn"
+    },
     "WorkerTeam": {
         "dataSource": "vn"
     },
     "WorkerTeamCollegues": {
         "dataSource": "vn"
     },
-    "WorkerMedia": {
-        "dataSource": "vn"
-    },
-    "WorkerDepartment": {
-        "dataSource": "vn"
-    },    
     "WorkerTimeControl": {
         "dataSource": "vn"
     },
-    "Device": {
-        "dataSource": "vn"
-    },
-    "WorkerLog": {
-        "dataSource": "vn"
-    },
     "WorkerTimeControlConfig": {
         "dataSource": "vn"
     },
@@ -73,9 +82,6 @@
     },
     "WorkerTimeControlMail": {
         "dataSource": "vn"
-    },
-    "WorkerDisableExcluded": {
-        "dataSource": "vn"
     }
 }
 

modules/worker/back/models/profile-type.json

@@ -0,0 +1,19 @@
+{
+    "name": "ProfileType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "profileType"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "name": {
+            "type": "string"
+        }
+    }
+}

modules/worker/back/models/worker-config.json

@@ -0,0 +1,27 @@
+{
+    "name": "WorkerConfig",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "workerConfig"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "roleFk": {
+            "type": "number"
+        }
+    },
+	"acls": [
+        {
+        "accessType": "READ",
+        "principalType": "ROLE",
+        "principalId": "$everyone",
+        "permission": "ALLOW"
+        }
+    ]
+}

modules/worker/back/models/worker.js

@@ -13,4 +13,5 @@ module.exports = Self => {
     require('../methods/worker/contracts')(Self);
     require('../methods/worker/holidays')(Self);
     require('../methods/worker/activeContract')(Self);
+    require('../methods/worker/new')(Self);
 };

modules/worker/back/models/worker.json

@@ -52,6 +52,9 @@
         },
         "mobileExtension": {
             "type" : "number"
+        },
+        "code": {
+            "type" : "string"
         }
     },
     "relations": {

modules/worker/front/create/index.html

@@ -0,0 +1,194 @@
+<vn-watcher
+    vn-id="watcher"
+    url="Workers/new"
+    data="$ctrl.worker"
+    insert-mode="true"
+    form="form">
+</vn-watcher>
+<form name="form" vn-http-submit="$ctrl.onSubmit()" class="vn-w-md">
+    <vn-card class="vn-pa-lg">
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Firstname"
+                ng-model="$ctrl.worker.firstName"
+                rule
+                on-change="$ctrl.generateCodeUser()"
+                vn-focus>
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Lastname"
+                on-change="$ctrl.generateCodeUser()"
+                ng-model="$ctrl.worker.lastNames"
+                rule>
+            </vn-textfield>
+            <vn-date-picker
+                vn-one
+                label="Birth"
+                ng-model="$ctrl.worker.birth">
+            </vn-date-picker>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Fi"
+                ng-model="$ctrl.worker.fi"
+                rule>
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Code"
+                ng-model="$ctrl.worker.code"
+                maxLength="3"
+                on-change="$ctrl.worker.code = $ctrl.worker.code.toUpperCase()"
+                rule>
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Phone"
+                ng-model="$ctrl.worker.phone"
+                rule>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-datalist
+                label="Postcode"
+                vn-one
+                ng-model="$ctrl.worker.postcode"
+                selection="$ctrl.postcode"
+                url="Postcodes/location"
+                fields="['code','townFk']"
+                order="code, townFk"
+                value-field="code"
+                show-field="code"
+                rule>
+                <tpl-item>
+                    {{code}} - {{town.name}} ({{town.province.name}},
+                    {{town.province.country.country}})
+                </tpl-item>
+                <append>
+                    <vn-icon-button
+                        icon="add_circle"
+                        vn-tooltip="New postcode"
+                        ng-click="postcode.open()"
+                        vn-acl="deliveryBoss"
+                        vn-acl-action="remove">
+                    </vn-icon-button>
+                </append>
+            </vn-datalist>
+            <vn-autocomplete
+                vn-id="province"
+                label="Province"
+                ng-model="$ctrl.worker.provinceFk"
+                selection="$ctrl.province"
+                url="Provinces/location"
+                fields="['id', 'name', 'countryFk']"
+                rule>
+                <tpl-item>{{name}} ({{country.country}})</tpl-item>
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-datalist
+                vn-id="town"
+                label="City"
+                ng-model="$ctrl.worker.city"
+                selection="$ctrl.town"
+                url="Towns/location"
+                fields="['id', 'name', 'provinceFk']"
+                value-field="name">
+                <tpl-item>
+                    {{name}}, {{province.name}}
+                    ({{province.country.country}})
+                </tpl-item>
+            </vn-datalist>
+            <vn-textfield
+                vn-two
+                label="Street"
+                ng-model="$ctrl.worker.street"
+                rule>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                label="Web user"
+                ng-model="$ctrl.worker.name"
+                rule>
+            </vn-textfield>
+            <vn-textfield
+                label="Personal email"
+                ng-model="$ctrl.worker.email"
+                rule>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete
+                vn-one
+                vn-id="company"
+                ng-model="$ctrl.worker.companyFk"
+                url="Companies"
+                show-field="code"
+                value-field="id"
+                label="Company">
+            </vn-autocomplete>
+            <vn-autocomplete
+                vn-one
+                ng-model="$ctrl.worker.bossFk"
+                url="Workers/activeWithInheritedRole"
+                show-field="nickname"
+                search-function="{firstName: $search}"
+                where="{role: 'employee'}"
+                label="Boss">
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="IBAN"
+                ng-model="$ctrl.worker.iban"
+                rule
+                on-change="$ctrl.autofillBic()">
+            </vn-textfield>
+            <vn-autocomplete
+                vn-one
+                label="Swift / BIC"
+                url="BankEntities"
+                ng-model="$ctrl.worker.bankEntityFk"
+                fields="['name']"
+                initial-data="$ctrl.worker.bankEntityFk"
+                on-change="$ctrl.autofillBic()"
+                search-function="{or: [{bic: {like: $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
+                value-field="id"
+                show-field="bic"
+                vn-acl="salesAssistant, hr"
+                disabled="$ctrl.ibanCountry == 'ES'">
+                <tpl-item>{{bic}} {{name}}</tpl-item>
+                <append>
+                    <vn-icon-button
+                        vn-auto
+                        icon="add_circle"
+                        vn-click-stop="bankEntity.show({countryFk: $ctrl.worker.countryFk})"
+                        vn-tooltip="New bank entity"
+                        vn-acl="salesAssistant, hr">
+                    </vn-icon-button>
+                </append>
+        </vn-autocomplete>
+        </vn-horizontal>
+    </vn-card>
+    <vn-button-bar>
+        <vn-submit
+            disabled="!watcher.dataChanged()"
+            label="Create">
+        </vn-submit>
+        <vn-button
+            class="cancel"
+            label="Cancel"
+            ui-sref="worker.index">
+        </vn-button>
+    </vn-button-bar>
+</form>
+<!-- New postcode dialog -->
+<vn-geo-postcode
+    vn-id="postcode"
+    on-response="$ctrl.onResponse($response)">
+</vn-geo-postcode>

modules/worker/front/create/index.js

@@ -0,0 +1,127 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+        this.worker = {companyFk: this.vnConfig.user.companyFk};
+    }
+
+    onSubmit() {
+        return this.$.watcher.submit().then(json => {
+            this.$state.go('worker.card.basicData', {id: json.data.id});
+        });
+    }
+
+    autofillBic() {
+        if (!this.worker || !this.worker.iban) return;
+
+        let bankEntityId = parseInt(this.worker.iban.substr(4, 4));
+        let filter = {where: {id: bankEntityId}};
+
+        if (this.ibanCountry != 'ES') return;
+
+        this.$http.get(`BankEntities`, {filter}).then(response => {
+            const hasData = response.data && response.data[0];
+
+            if (hasData)
+                this.worker.bankEntityFk = response.data[0].id;
+            else if (!hasData)
+                this.worker.bankEntityFk = null;
+        });
+    }
+
+    generateCodeUser() {
+        if (!this.worker.firstName || !this.worker.lastNames) return;
+
+        const totalName = this.worker.firstName.concat(' ' + this.worker.lastNames).toLowerCase();
+        const totalNameArray = totalName.split(' ');
+        let newCode = '';
+
+        for (let part of totalNameArray)
+            newCode += part.charAt(0);
+
+        this.worker.code = newCode.toUpperCase().slice(0, 3);
+        this.worker.name = totalNameArray[0] + newCode.slice(1);
+
+        if (!this.worker.companyFk)
+            this.worker.companyFk = this.vnConfig.user.companyFk;
+    }
+
+    get province() {
+        return this._province;
+    }
+
+    // Province auto complete
+    set province(selection) {
+        this._province = selection;
+
+        if (!selection) return;
+
+        const country = selection.country;
+
+        if (!this.worker.countryFk)
+            this.worker.countryFk = country.id;
+    }
+
+    get town() {
+        return this._town;
+    }
+
+    // Town auto complete
+    set town(selection) {
+        this._town = selection;
+
+        if (!selection) return;
+
+        const province = selection.province;
+        const country = province.country;
+        const postcodes = selection.postcodes;
+
+        if (!this.worker.provinceFk)
+            this.worker.provinceFk = province.id;
+
+        if (!this.worker.countryFk)
+            this.worker.countryFk = country.id;
+
+        if (postcodes.length === 1)
+            this.worker.postcode = postcodes[0].code;
+    }
+
+    get postcode() {
+        return this._postcode;
+    }
+
+    // Postcode auto complete
+    set postcode(selection) {
+        this._postcode = selection;
+
+        if (!selection) return;
+
+        const town = selection.town;
+        const province = town.province;
+        const country = province.country;
+
+        if (!this.worker.city)
+            this.worker.city = town.name;
+
+        if (!this.worker.provinceFk)
+            this.worker.provinceFk = province.id;
+
+        if (!this.worker.countryFk)
+            this.worker.countryFk = country.id;
+    }
+
+    onResponse(response) {
+        this.worker.postcode = response.code;
+        this.worker.city = response.city;
+        this.worker.provinceFk = response.provinceFk;
+    }
+}
+
+Controller.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnWorkerCreate', {
+    template: require('./index.html'),
+    controller: Controller
+});

modules/worker/front/create/index.spec.js

@@ -0,0 +1,133 @@
+import './index';
+
+describe('Worker', () => {
+    describe('Component vnWorkerCreate', () => {
+        let $scope;
+        let $state;
+        let controller;
+
+        beforeEach(ngModule('worker'));
+
+        beforeEach(inject(($componentController, $rootScope, _$state_) => {
+            $scope = $rootScope.$new();
+            $state = _$state_;
+            $scope.watcher = {
+                submit: () => {
+                    return {
+                        then: callback => {
+                            callback({data: {id: '1234'}});
+                        }
+                    };
+                }
+            };
+            const $element = angular.element('<vn-worker-create></vn-worker-create>');
+            controller = $componentController('vnWorkerCreate', {$element, $scope});
+            controller.worker = {};
+            controller.vnConfig = {user: {companyFk: 1}};
+        }));
+
+        describe('onSubmit()', () => {
+            it(`should call submit() on the watcher then expect a callback`, () => {
+                jest.spyOn($state, 'go');
+                controller.onSubmit();
+
+                expect(controller.$state.go).toHaveBeenCalledWith('worker.card.basicData', {id: '1234'});
+            });
+        });
+
+        describe('province() setter', () => {
+            it(`should set countryFk property`, () => {
+                controller.worker.countryFk = null;
+                controller.province = {
+                    id: 1,
+                    name: 'New york',
+                    country: {
+                        id: 2,
+                        name: 'USA'
+                    }
+                };
+
+                expect(controller.worker.countryFk).toEqual(2);
+            });
+        });
+
+        describe('town() setter', () => {
+            it(`should set provinceFk property`, () => {
+                controller.town = {
+                    provinceFk: 1,
+                    code: 46001,
+                    province: {
+                        id: 1,
+                        name: 'New york',
+                        country: {
+                            id: 2,
+                            name: 'USA'
+                        }
+                    },
+                    postcodes: []
+                };
+
+                expect(controller.worker.provinceFk).toEqual(1);
+            });
+
+            it(`should set provinceFk property and fill the postalCode if there's just one`, () => {
+                controller.town = {
+                    provinceFk: 1,
+                    code: 46001,
+                    province: {
+                        id: 1,
+                        name: 'New york',
+                        country: {
+                            id: 2,
+                            name: 'USA'
+                        }
+                    },
+                    postcodes: [{code: '46001'}]
+                };
+
+                expect(controller.worker.provinceFk).toEqual(1);
+                expect(controller.worker.postcode).toEqual('46001');
+            });
+        });
+
+        describe('postcode() setter', () => {
+            it(`should set the town, provinceFk and contryFk properties`, () => {
+                controller.postcode = {
+                    townFk: 1,
+                    code: 46001,
+                    town: {
+                        id: 1,
+                        name: 'New York',
+                        province: {
+                            id: 1,
+                            name: 'New york',
+                            country: {
+                                id: 2,
+                                name: 'USA'
+                            }
+                        }
+                    }
+                };
+
+                expect(controller.worker.city).toEqual('New York');
+                expect(controller.worker.provinceFk).toEqual(1);
+                expect(controller.worker.countryFk).toEqual(2);
+            });
+        });
+
+        describe('generateCodeUser()', () => {
+            it(`should generate worker code, name and company `, () => {
+                controller.worker = {
+                    firstName: 'default',
+                    lastNames: 'generate worker'
+                };
+
+                controller.generateCodeUser();
+
+                expect(controller.worker.code).toEqual('DGW');
+                expect(controller.worker.name).toEqual('defaultgw');
+                expect(controller.worker.companyFk).toEqual(controller.vnConfig.user.companyFk);
+            });
+        });
+    });
+});

modules/worker/front/create/locale/es.yml

@@ -0,0 +1,12 @@
+Firstname: Nombre
+Lastname: Apellidos
+Fi: DNI/NIF/NIE
+Birth: Fecha de nacimiento
+Code: Código de trabajador
+Province: Provincia
+City: Población
+ProfileType: Tipo de perfil
+Street: Dirección
+Postcode: Código postal
+Web user: Usuario Web
+Access permission: Permiso de acceso

modules/worker/front/index.js

@@ -4,6 +4,7 @@ import './main';
 import './index/';
 import './summary';
 import './card';
+import './create';
 import './descriptor';
 import './descriptor-popover';
 import './search-panel';

modules/worker/front/index/index.html

@@ -42,6 +42,14 @@
         </div>
     </vn-card>
 </vn-data-viewer>
+<a ui-sref="worker.create"
+    vn-tooltip="New worker"
+    vn-bind="+"
+    vn-acl="hr"
+    vn-acl-action="remove"
+    fixed-bottom-right>
+    <vn-float-button icon="person_add"></vn-float-button>
+</a>
 <vn-popup vn-id="preview">
     <vn-worker-summary
         worker="$ctrl.selectedWorker">

modules/worker/front/index/locale/es.yml

@@ -0,0 +1 @@
+New worker: Nuevo trabajador

modules/worker/front/routes.json

@@ -134,6 +134,13 @@
                 "worker": "$ctrl.worker"
             },
             "acl": ["hr"]
+        },
+        {
+            "url": "/create",
+            "state": "worker.create",
+            "component": "vn-worker-create",
+            "description": "New worker",
+            "acl": ["hr"]
         }
     ]
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-back",
-    "version": "230401",
+    "version": "23.04.01",
     "author": "Verdnatura Levante SL",
     "description": "Salix backend",
     "license": "GPL-3.0",

print/core/mixins/vn-report.js

@@ -0,0 +1,23 @@
+const Component = require(`vn-print/core/component`);
+const reportHeader = new Component('report-header');
+const reportFooter = new Component('report-footer');
+const reportBody = new Component('report-body');
+const NotFoundError = require('vn-loopback/util/not-found-error');
+
+module.exports = {
+    components: {
+        'report-body': reportBody.build(),
+        'report-header': reportHeader.build(),
+        'report-footer': reportFooter.build()
+    },
+    methods: {
+        checkMainEntity: function(entity) {
+            if (entity == null)
+                throw new NotFoundError();
+        },
+        formatDate: function(date, format) {
+            const filters = this.$options.filters;
+            return filters.date(date, format);
+        }
+    },
+};

print/templates/email/email-verify/email-verify.js

@@ -10,7 +10,7 @@ module.exports = {
     },
     props: {
         url: {
-            type: [String],
+            type: String,
             required: true
         }
     }

print/templates/email/printer-setup/locale/es.yml

@@ -8,8 +8,8 @@ description:
     <a href='https://www.youtube.com/watch?v=qhb0kgQF3o8' title='Youtube' target='_blank'
     style='color:#8dba25'>https://www.youtube.com/watch?v=qhb0kgQF3o8</a>. También
     necesitarás el QLabel, el programa para imprimir las cintas.
-  downloadFrom: Puedes descargarlo desde este enlace <a href='https://godex.s3-accelerate.amazonaws.com/gGnOPoojkP6vC1lgmrbEqQ.file?v01'
-    title='Descargar QLabel' target='_blank' style='color:#8dba25'>https://godex.s3-accelerate.amazonaws.com/gGnOPoojkP6vC1lgmrbEqQ.file?v01</a>
+  downloadFrom: Puedes descargarlo desde este enlace <a href='https://cdn.verdnatura.es/public/QLabel_IV_V1.37_Install_en.exe'
+    title='Descargar QLabel' target='_blank' style='color:#8dba25'>https://cdn.verdnatura.es/public/QLabel_IV_V1.37_Install_en.exe</a>
   downloadDriver: En este enlace puedes descargar el driver de la impresora <a href='https://es.seagullscientific.com/support/downloads/drivers/godex/download/'
     title='Descargar driver' target='_blank' style='color:#8dba25'>https://es.seagullscientific.com/support/downloads/drivers/godex/download/</a>
 sections:

print/templates/email/recover-password/recover-password.js

@@ -10,7 +10,7 @@ module.exports = {
     },
     props: {
         url: {
-            type: [String],
+            type: String,
             required: true
         }
     }

print/templates/email/worker-welcome/assets/css/import.js

@@ -0,0 +1,11 @@
+const Stylesheet = require(`vn-print/core/stylesheet`);
+
+const path = require('path');
+const vnPrintPath = path.resolve('print');
+
+module.exports = new Stylesheet([
+    `${vnPrintPath}/common/css/spacing.css`,
+    `${vnPrintPath}/common/css/misc.css`,
+    `${vnPrintPath}/common/css/layout.css`,
+    `${vnPrintPath}/common/css/email.css`])
+    .mergeStyles();

print/templates/email/worker-welcome/locale/es.yml

@@ -0,0 +1,8 @@
+subject: Bienvenido a Verdnatura
+title: "¡Te damos la bienvenida!"
+dearWorker: Estimado trabajador
+workerData: 'Estos son los datos de tu usuario de Verdnatura.
+    Usuario: <strong>{0}</strong>. Haz click aquí para
+    <a href="{1}"
+        title="Cambiar contraseña" target="_blank" style="color: #8dba25">establecer tu contraseña
+    </a>.'

print/templates/email/worker-welcome/sql/worker.sql

@@ -0,0 +1,7 @@
+SELECT
+    u.id,
+    u.name,
+    e.email
+FROM account.user u
+    LEFT JOIN account.emailUser e ON e.userFk = u.id
+WHERE u.id = ?;

print/templates/email/worker-welcome/worker-welcome.html

@@ -0,0 +1,9 @@
+<email-body v-bind="$props">
+    <div class="grid-row">
+        <div class="grid-block vn-pa-ml">
+            <h1>{{ $t('title', [id]) }}</h1>
+            <p>{{ $t('dearWorker') }},</p>
+            <p v-html="$t('workerData', [this.worker.name, this.url])"></p>
+        </div>
+    </div>
+</email-body>

print/templates/email/worker-welcome/worker-welcome.js

@@ -0,0 +1,27 @@
+const Component = require(`vn-print/core/component`);
+const emailBody = new Component('email-body');
+
+module.exports = {
+    name: 'worker-welcome',
+    async serverPrefetch() {
+        this.worker = await this.fetchWorker(this.id);
+    },
+    methods: {
+        fetchWorker(id) {
+            return this.findOneFromDef('worker', [id]);
+        },
+    },
+    components: {
+        'email-body': emailBody.build(),
+    },
+    props: {
+        id: {
+            type: Number,
+            required: true
+        },
+        url: {
+            type: String,
+            required: true
+        }
+    }
+};

print/templates/reports/balance-compensation/balance-compensation.html

@@ -3,7 +3,7 @@
         <div class="grid-block">
             <div class="columns">
                 <div class="size50">
-                    <p style="text-align: right">{{$t('Place')}} {{currentDate()}}</p>
+                    <p style="text-align: right">{{$t('Place')}} {{formatDate(new Date(), '%d-%m-%Y')}}</p>
                     <h3 style="text-align: center; margin-top: 8%">{{$t('Compensation') | uppercase}}</h3>
                     <p style="margin-top: 8%">{{$t('In one hand')}}:</p>
                     <p style="text-align: justify">
@@ -17,7 +17,7 @@
                     </p>
                     <h4 style="text-align: center; margin-top: 10%">{{$t('Agree') | uppercase}}</h4>
                     <p style="margin-top: 8%; text-align: justify">
-                        {{$t('Date')}} {{client.payed | date('%d-%m-%Y')}} {{$t('Compensate')}} {{client.amountPaid}} €
+                        {{$t('Date')}} {{formatDate(client.payed, '%d-%m-%Y')}} {{$t('Compensate')}} {{client.amountPaid}} €
                         {{$t('From client')}} {{client.name}} {{$t('Toclient')}} {{company.name}}.
                     </p>
                     <p style="margin-top: 8%">

print/templates/reports/balance-compensation/balance-compensation.js

@@ -1,28 +1,12 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'balance-compensation',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.company = await this.fetchCompany(this.id);
-    },
-    methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchCompany(id) {
-            return this.findOneFromDef('company', [id]);
-        },
-
-        currentDate() {
-            const current = new Date();
-            const date = `${current.getDate()}/${current.getMonth() + 1}/${current.getFullYear()}`;
-            return date;
-        }
-    },
-    components: {
-        'report-body': reportBody.build()
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
+        this.company = await this.findOneFromDef('company', [this.id]);
     },
     props: {
         id: {

print/templates/reports/campaign-metrics/campaign-metrics.html

@@ -13,11 +13,11 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray">{{$t('From')}}</td>
-                                    <th>{{from | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(from, '%d-%m-%Y')}}</th>
                                 </tr>
                                 <tr>
                                     <td class="font gray">{{$t('To')}}</td>
-                                    <th>{{to | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(to, '%d-%m-%Y')}}</th>
                                 </tr>
                             </tbody>
                         </table>

print/templates/reports/campaign-metrics/campaign-metrics.js

@@ -1,27 +1,12 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'campaign-metrics',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.sales = await this.fetchSales(this.id, this.from, this.to);
-
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchSales(id, from, to) {
-            return this.rawSqlFromDef('sales', [id, from, to]);
-        },
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
+        this.sales = await this.rawSqlFromDef('sales', [this.id, this.from, this.to]);
     },
     props: {
         id: {

print/templates/reports/claim-pickup-order/claim-pickup-order.html

@@ -20,7 +20,7 @@
                             </tr>
                             <tr>
                                 <td class="font gray uppercase">{{$t('date')}}</td>
-                                <th>{{dated}}</th>
+                                <th>{{formatDate(new Date(), '%d-%m-%Y')}}</th>
                             </tr>
                         </tbody>
                     </table>

print/templates/reports/claim-pickup-order/claim-pickup-order.js

@@ -1,34 +1,12 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'claim-pickup-order',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.sales = await this.fetchSales(this.id);
-
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-        dated: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%d-%m-%Y');
-        }
-    },
-    methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchSales(id) {
-            return this.rawSqlFromDef('sales', [id]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
+        this.sales = await this.rawSqlFromDef('sales', [this.id]);
     },
     props: {
         id: {
@@ -36,5 +14,5 @@ module.exports = {
             required: true,
             description: 'The claim id'
         }
-    }
+    },
 };

print/templates/reports/client-debt-statement/client-debt-statement.html

@@ -13,7 +13,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{dated}}</th>
+                                    <th>{{formatDate(new Date(), '%d-%m-%Y');}}</th>
                                 </tr>
                             </tbody>
                         </table>
@@ -44,7 +44,7 @@
                 </thead>
                 <tbody v-for="sale in sales" :key="sale.id">
                     <tr>
-                        <td>{{sale.issued | date('%d-%m-%Y')}}</td>
+                        <td>{{formatDate(sale.issued, '%d-%m-%Y');}}</td>
                         <td>{{sale.ref}}</td>
                         <td class="number">{{sale.debtOut}}</td>
                         <td class="number">{{sale.debtIn}}</td>

print/templates/reports/client-debt-statement/client-debt-statement.js

@@ -1,44 +1,18 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'client-debt-statement',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.sales = await this.fetchSales(this.id, this.from);
-
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-        dated: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%d-%m-%Y');
-        }
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
+        this.sales = await this.rawSqlFromDef('sales',
+            [this.from, this.id, this.from, this.id, this.from, this.id, this.from, this.id, this.from, this.id]);
     },
     data() {
         return {totalBalance: 0.00};
     },
     methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchSales(id, from) {
-            return this.rawSqlFromDef('sales', [
-                from,
-                id,
-                from,
-                id,
-                from,
-                id,
-                from,
-                id,
-                from,
-                id
-            ]);
-        },
         getBalance(sale) {
             if (sale.debtOut)
                 this.totalBalance += parseFloat(sale.debtOut);
@@ -63,10 +37,6 @@ module.exports = {
             return debtIn.toFixed(2);
         },
     },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
-    },
     props: {
         id: {
             type: Number,

print/templates/reports/collection-label/collection-label.js

@@ -1,11 +1,10 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
 const jsBarcode = require('jsbarcode');
 const {DOMImplementation, XMLSerializer} = require('xmldom');
-const UserError = require('vn-loopback/util/user-error');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'collection-label',
+    mixins: [vnReport],
     props: {
         id: {
             type: Number,
@@ -30,8 +29,7 @@ module.exports = {
             ticketIds = [this.id];
 
         this.labelsData = await this.rawSqlFromDef('labelsData', [ticketIds]);
-        if (!this.labelsData.length)
-            throw new UserError('Empty data source');
+        this.checkMainEntity(this.labelsData);
     },
     methods: {
         getBarcode(id) {
@@ -62,7 +60,4 @@ module.exports = {
             return value;
         },
     },
-    components: {
-        'report-body': reportBody.build()
-    },
 };

print/templates/reports/credit-request/credit-request.html

@@ -159,6 +159,6 @@
         </div>
     </div>
     <template v-slot:footer>
-        <report-footer id="pageFooter" v-bind:left-text="dated" v-bind="$props"> </report-footer>
+        <report-footer id="pageFooter" v-bind:left-text="formatDate(new Date(), '%d-%m-%Y')" v-bind="$props"> </report-footer>
     </template>
 </report-body>

print/templates/reports/credit-request/credit-request.js

@@ -1,20 +1,7 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body')
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
-const rptCreditRequest = {
+module.exports = {
     name: 'credit-request',
-    computed: {
-        dated: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%d-%m-%Y');
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
-    }
+    mixins: [vnReport],
 };
 
-module.exports = rptCreditRequest;

print/templates/reports/delivery-note/delivery-note.html

@@ -20,7 +20,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{ticket.shipped | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(ticket.shipped, '%d-%m-%Y')}}</th>
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('packages')}}</td>
@@ -231,7 +231,7 @@
                         <div class="header">{{$t('digitalSignature')}}</div>
                         <div class="body centered">
                             <img v-bind:src="dmsPath" />
-                            <div>{{signature.created | date('%d-%m-%Y')}}</div>
+                            <div>{{formatDate(signature.created, '%d-%m-%Y')}}</div>
                         </div>
                     </div>
                 </div>

print/templates/reports/delivery-note/delivery-note.js

@@ -1,25 +1,21 @@
 const config = require(`vn-print/core/config`);
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const md5 = require('md5');
 const fs = require('fs-extra');
 
 module.exports = {
     name: 'delivery-note',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.ticket = await this.fetchTicket(this.id);
-        this.sales = await this.fetchSales(this.id);
-        this.address = await this.fetchAddress(this.id);
-        this.services = await this.fetchServices(this.id);
-        this.taxes = await this.fetchTaxes(this.id);
-        this.packagings = await this.fetchPackagings(this.id);
-        this.signature = await this.fetchSignature(this.id);
-
-        if (!this.ticket)
-            throw new Error('Something went wrong');
+        this.ticket = await this.findOneFromDef('ticket', [this.id]);
+        this.checkMainEntity(this.ticket);
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.sales = await this.rawSqlFromDef('sales', [this.id]);
+        this.address = await this.findOneFromDef(`address`, [this.id]);
+        this.services = await this.rawSqlFromDef('services', [this.id]);
+        this.taxes = await this.rawSqlFromDef('taxes', [this.id]);
+        this.packagings = await this.rawSqlFromDef('packagings', [this.id]);
+        this.signature = await this.findOneFromDef('signature', [this.id]);
     },
     data() {
         return {totalBalance: 0.00};
@@ -61,31 +57,6 @@ module.exports = {
         }
     },
     methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchTicket(id) {
-            return this.findOneFromDef('ticket', [id]);
-        },
-        fetchAddress(id) {
-            return this.findOneFromDef(`address`, [id]);
-        },
-        fetchSignature(id) {
-            return this.findOneFromDef('signature', [id]);
-        },
-        fetchTaxes(id) {
-            return this.findOneFromDef(`taxes`, [id]);
-        },
-        fetchSales(id) {
-            return this.rawSqlFromDef('sales', [id]);
-        },
-        fetchPackagings(id) {
-            return this.rawSqlFromDef('packagings', [id]);
-        },
-        fetchServices(id) {
-            return this.rawSqlFromDef('services', [id]);
-        },
-
         getSubTotal() {
             let subTotal = 0.00;
             this.sales.forEach(sale => {
@@ -125,11 +96,6 @@ module.exports = {
             ).join(', ');
         }
     },
-    components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build(),
-        'report-footer': reportFooter.build()
-    },
     props: {
         id: {
             type: Number,

print/templates/reports/driver-route/driver-route.html

@@ -16,13 +16,13 @@
                                 </tr>
                                 <tr>
                                     <th class="font gray align-right">{{$t('date')}}</th>
-                                    <td>{{route.created | date('%d-%m-%Y')}}</td>
+                                    <td>{{formatDate(route.created, '%d-%m-%Y')}}</td>
                                     <th class="font gray align-right">{{$t('vehicle')}}</th>
                                     <td>{{route.vehicleTradeMark}} {{route.vehicleModel}}</td>
                                 </tr>
                                 <tr>
                                     <th class="font gray align-right">{{$t('time')}}</th>
-                                    <td>{{route.time | date('%H:%M')}}</td>
+                                    <td>{{formatDate(route.time, '%H:%M')}}</td>
                                     <td></td>
                                     <td>{{route.plateNumber}}</td>
                                 </tr>

print/templates/reports/driver-route/driver-route.js

@@ -1,9 +1,8 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'driver-route',
+    mixins: [vnReport],
     async serverPrefetch() {
         let ids = this.id;
 
@@ -11,8 +10,8 @@ module.exports = {
         if (hasMultipleRoutes)
             ids = this.id.split(',');
 
-        const routes = await this.fetchRoutes(ids);
-        const tickets = await this.fetchTickets(ids);
+        const routes = await this.rawSqlFromDef('routes', [ids]);
+        const tickets = await this.rawSqlFromDef('tickets', [ids, ids]);
 
         const map = new Map();
 
@@ -27,20 +26,7 @@ module.exports = {
 
         this.routes = routes;
 
-        if (!this.routes)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchRoutes(ids) {
-            return this.rawSqlFromDef('routes', [ids]);
-        },
-        fetchTickets(ids) {
-            return this.rawSqlFromDef('tickets', [ids, ids]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
+        this.checkMainEntity(this.routes);
     },
     props: {
         id: {

print/templates/reports/entry-order/entry-order.html

@@ -16,7 +16,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{entry.landed | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(entry.landed,'%d-%m-%Y')}}</th>
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('ref')}}</td>

print/templates/reports/entry-order/entry-order.js

@@ -1,31 +1,18 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'entry-order',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.supplier = await this.fetchSupplier(this.id);
-        this.entry = await this.fetchEntry(this.id);
-        this.buys = await this.fetchBuys(this.id);
-
-        if (!this.entry)
-            throw new Error('Something went wrong');
+        this.entry = await this.findOneFromDef('entry', [this.id]);
+        this.checkMainEntity(this.entry);
+        this.supplier = await this.findOneFromDef('supplier', [this.id]);
+        this.buys = await this.rawSqlFromDef('buys', [this.id]);
     },
     data() {
         return {totalBalance: 0.00};
     },
     methods: {
-        fetchSupplier(id) {
-            return this.findOneFromDef('supplier', [id]);
-        },
-        fetchEntry(id) {
-            return this.findOneFromDef('entry', [id]);
-        },
-        fetchBuys(id) {
-            return this.rawSqlFromDef('buys', [id]);
-        },
         getTotal() {
             let total = 0.00;
             this.buys.forEach(buy => {
@@ -35,11 +22,6 @@ module.exports = {
             return total;
         }
     },
-    components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build(),
-        'report-footer': reportFooter.build()
-    },
     props: {
         id: {
             type: Number,

print/templates/reports/expedition-pallet-label/expedition-pallet-label.js

@@ -1,12 +1,11 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const jsBarcode = require('jsbarcode');
 const {DOMImplementation, XMLSerializer} = require('xmldom');
-const UserError = require('vn-loopback/util/user-error');
 const qrcode = require('qrcode');
 
 module.exports = {
     name: 'expedition-pallet-label',
+    mixins: [vnReport],
     props: {
         id: {
             type: Number,
@@ -33,8 +32,7 @@ module.exports = {
         });
 
         this.QR = await this.getQR(QRdata);
-        if (!this.labelsData.length)
-            throw new UserError('Empty data source');
+        this.checkMainEntity(this.labelsData);
     },
     methods: {
         getQR(id) {
@@ -56,7 +54,4 @@ module.exports = {
             return xmlSerializer.serializeToString(svgNode);
         },
     },
-    components: {
-        'report-body': reportBody.build()
-    },
 };

print/templates/reports/exportation/exportation.html

@@ -3,7 +3,7 @@
         <div class="grid-block">
             <h1 class="title centered uppercase">{{$t('title')}}</h1>
             <p>{{$t('toAttention')}}</p>
-            <p v-html="$t('declaration', [invoice.ref, issued])"></p>
+            <p v-html="$t('declaration', [invoice.ref, formatDate(invoice.issued, '%d-%m-%Y')])"></p>
             <p>
             <ul>
                 <li v-for="responsibility in $t('responsibilities')">

print/templates/reports/exportation/exportation.js

@@ -1,33 +1,13 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'exportation',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.reference);
-
-        if (!this.invoice)
-            throw new Error('Something went wrong');
-
+        this.invoice = await this.findOneFromDef('invoice', [this.reference]);
+        this.checkMainEntity(this.invoice);
         this.company = await this.findOneFromDef('company', [this.invoice.companyFk]);
     },
-    methods: {
-        fetchInvoice(reference) {
-            return this.findOneFromDef('invoice', [reference]);
-        }
-    },
-    computed: {
-        issued: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(this.invoice.issued, '%d-%m-%Y');
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
-    },
     props: {
         reference: {
             type: Number,

print/templates/reports/extra-community/extra-community.html

@@ -26,7 +26,7 @@
                                 </tr>
                                 <tr>
                                     <th class="font gray align-right">{{$t('shipped')}}</th>
-                                    <td>{{travel.shipped | date('%d-%m-%Y')}}</td>
+                                    <td>{{formatDate(travel.shipped, '%d-%m-%Y')}}</td>
                                     <th class="font gray align-right">{{$t('physicalKg')}}</th>
                                     <td>{{travel.loadedKg | number($i18n.locale)}}</td>
                                 </tr>
@@ -62,6 +62,6 @@
         </div>
     </div>
     <template v-slot:footer>
-        <report-footer id="pageFooter" v-bind:left-text="dated" v-bind="$props"></report-footer>
+        <report-footer id="pageFooter" v-bind:left-text="formatDate(new Date(), '%d-%m-%Y')" v-bind="$props"></report-footer>
     </template>
 </report-body>

print/templates/reports/extra-community/extra-community.js

@@ -1,12 +1,10 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const db = require(`vn-print/core/database`);
 
 module.exports = {
     name: 'extra-community',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.filters = this.$options.filters;
         const args = {
             landedTo: this.landedEnd,
             shippedFrom: this.shippedStart,
@@ -21,8 +19,9 @@ module.exports = {
         };
 
         const travels = await this.fetchTravels(args);
+        this.checkMainEntity(travels);
         const travelIds = travels.map(travel => travel.id);
-        const entries = await this.fetchEntries(travelIds);
+        const entries = await this.rawSqlFromDef('entries', [travelIds]);
 
         const map = new Map();
         for (let travel of travels)
@@ -35,23 +34,15 @@ module.exports = {
         }
 
         this.travels = travels;
-
-        if (!this.travels)
-            throw new Error('Something went wrong');
     },
     computed: {
-        dated: function() {
-            return this.filters.date(new Date(), '%d-%m-%Y');
-        },
         landedEnd: function() {
             if (!this.landedTo) return;
-
-            return this.filters.date(this.landedTo, '%Y-%m-%d');
+            return formatDate(this.landedTo, '%Y-%m-%d');
         },
         shippedStart: function() {
             if (!this.shippedFrom) return;
-
-            return this.filters.date(this.shippedFrom, '%Y-%m-%d');
+            return formatDate(this.shippedFrom, '%Y-%m-%d');
         }
     },
     methods: {
@@ -94,14 +85,6 @@ module.exports = {
 
             return this.rawSql(query);
         },
-
-        fetchEntries(travelIds) {
-            return this.rawSqlFromDef('entries', [travelIds]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
     },
     props: [
         'landedTo',

print/templates/reports/incoterms-authorization/incoterms-authorization.js

@@ -1,23 +1,12 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'incoterms-authorization',
+    mixins: [vnReport],
     async serverPrefetch() {
         this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
         this.company = await this.findOneFromDef('company', [this.companyId]);
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-        issued: function() {
-            return new Date();
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
     },
     props: {
         id: {

print/templates/reports/invoice-incoterms/invoice-incoterms.html

@@ -20,7 +20,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{invoice.issued | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(invoice.issued, '%d-%m-%Y')}}</th>
                                 </tr>
                             </tbody>
                         </table>

print/templates/reports/invoice-incoterms/invoice-incoterms.js

@@ -1,34 +1,13 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'invoice-incoterms',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.reference);
-        this.client = await this.fetchClient(this.reference);
-        this.incoterms = await this.fetchIncoterms(this.reference);
-
-        if (!this.invoice)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-
-    },
-    methods: {
-        fetchInvoice(reference) {
-            return this.findOneFromDef('invoice', [reference]);
-        },
-        fetchClient(reference) {
-            return this.findOneFromDef('client', [reference]);
-        },
-        fetchIncoterms(reference) {
-            return this.findOneFromDef('incoterms', [reference, reference, reference]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build()
+        this.invoice = await this.findOneFromDef('invoice', [this.reference]);
+        this.checkMainEntity(this.invoice);
+        this.client = await this.findOneFromDef('client', [this.reference]);
+        this.incoterms = await this.findOneFromDef('incoterms', [this.reference, this.reference, this.reference]);
     },
     props: {
         reference: {

print/templates/reports/invoice/invoice.html

@@ -21,7 +21,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{invoice.issued | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(invoice.issued, '%d-%m-%Y')}}</th>
                                 </tr>
                             </tbody>
                         </table>
@@ -53,7 +53,7 @@
                     <tbody>
                         <tr v-for="row in rectified">
                             <td>{{row.ref}}</td>
-                            <td>{{row.issued | date}}</td>
+                            <td>{{formatDate(row.issued, '%d-%m-%Y')}}</td>
                             <td class="number">{{row.amount | currency('EUR', $i18n.locale)}}</td>
                             <td width="50%">{{row.description}}</td>
                         </tr>
@@ -75,7 +75,7 @@
                     </div>
                     <div class="pull-left">
                         <div class="field rectangle">
-                            <span>{{ticket.shipped | date}}</span>
+                            <span>{{formatDate(ticket.shipped, '%d-%m-%Y')}}</span>
                         </div>
                     </div>
                     <span id="nickname" class="pull-right">

print/templates/reports/invoice/invoice.js

@@ -1,22 +1,21 @@
-const Component = require(`vn-print/core/component`);
 const Report = require(`vn-print/core/report`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const invoiceIncoterms = new Report('invoice-incoterms');
 
 module.exports = {
     name: 'invoice',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.reference);
-        this.client = await this.fetchClient(this.reference);
-        this.taxes = await this.fetchTaxes(this.reference);
-        this.intrastat = await this.fetchIntrastat(this.reference);
-        this.rectified = await this.fetchRectified(this.reference);
-        this.hasIncoterms = await this.fetchHasIncoterms(this.reference);
+        this.invoice = await this.findOneFromDef('invoice', [this.reference]);
+        this.checkMainEntity(this.invoice);
+        this.client = await this.findOneFromDef('client', [this.reference]);
+        this.taxes = await this.rawSqlFromDef(`taxes`, [this.reference]);
+        this.intrastat = await this.rawSqlFromDef(`intrastat`, [this.reference, this.reference, this.reference]);
+        this.rectified = await this.rawSqlFromDef(`rectified`, [this.reference]);
+        this.hasIncoterms = await this.findValueFromDef(`hasIncoterms`, [this.reference]);
 
-        const tickets = await this.fetchTickets(this.reference);
-        const sales = await this.fetchSales(this.reference);
+        const tickets = await this.rawSqlFromDef('tickets', [this.reference]);
+        const sales = await this.rawSqlFromDef('sales', [this.reference, this.reference]);
 
         const map = new Map();
 
@@ -33,9 +32,6 @@ module.exports = {
         }
 
         this.tickets = tickets;
-
-        if (!this.invoice)
-            throw new Error('Something went wrong');
     },
     data() {
         return {totalBalance: 0.00};
@@ -66,30 +62,6 @@ module.exports = {
         }
     },
     methods: {
-        fetchInvoice(reference) {
-            return this.findOneFromDef('invoice', [reference]);
-        },
-        fetchClient(reference) {
-            return this.findOneFromDef('client', [reference]);
-        },
-        fetchTickets(reference) {
-            return this.rawSqlFromDef('tickets', [reference]);
-        },
-        fetchSales(reference) {
-            return this.rawSqlFromDef('sales', [reference, reference]);
-        },
-        fetchTaxes(reference) {
-            return this.rawSqlFromDef(`taxes`, [reference]);
-        },
-        fetchIntrastat(reference) {
-            return this.rawSqlFromDef(`intrastat`, [reference, reference, reference]);
-        },
-        fetchRectified(reference) {
-            return this.rawSqlFromDef(`rectified`, [reference]);
-        },
-        fetchHasIncoterms(reference) {
-            return this.findValueFromDef(`hasIncoterms`, [reference]);
-        },
         saleImport(sale) {
             const price = sale.quantity * sale.price;
 
@@ -111,9 +83,6 @@ module.exports = {
         }
     },
     components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build(),
-        'report-footer': reportFooter.build(),
         'invoice-incoterms': invoiceIncoterms.build()
     },
     props: {

print/templates/reports/invoiceIn/invoiceIn.html

@@ -19,7 +19,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{invoice.created | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(invoice.created, '%d-%m-%Y')}}</th>
                                 </tr>
                             </tbody>
                         </table>
@@ -54,7 +54,7 @@
                     </div>
                     <div class="pull-left">
                         <div class="field rectangle">
-                            <span>{{entry.landed | date}}</span>
+                            <span>{{formatDate(entry.landed, '%d-%m-%Y')}}</span>
                         </div>
                     </div>
                     <span id="nickname" class="pull-right">

print/templates/reports/invoiceIn/invoiceIn.js

@@ -1,15 +1,14 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'invoiceIn',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.invoice = await this.fetchInvoice(this.id);
+        this.invoice = await this.findOneFromDef('invoice', [this.id]);
+        this.checkMainEntity(this.invoice);
         this.taxes = await this.fetchTaxes(this.id);
 
-        let defaultTax = await this.fetchDefaultTax();
+        let defaultTax = await this.findOneFromDef('defaultTax');
 
         if (defaultTax) {
             defaultTax = Object.assign(defaultTax, {
@@ -19,11 +18,8 @@ module.exports = {
             this.taxes.push(defaultTax);
         }
 
-        if (!this.invoice)
-            throw new Error('Something went wrong');
-
-        const entries = await this.fetchEntry(this.id);
-        const buys = await this.fetchBuy(this.id);
+        const entries = await this.rawSqlFromDef('entry', [this.id]);
+        const buys = await this.rawSqlFromDef('buy', [this.id]);
 
         const map = new Map();
 
@@ -41,21 +37,7 @@ module.exports = {
 
         this.entries = entries;
     },
-    computed: {
-    },
     methods: {
-        fetchInvoice(id) {
-            return this.findOneFromDef('invoice', [id]);
-        },
-        fetchEntry(id) {
-            return this.rawSqlFromDef('entry', [id]);
-        },
-        fetchBuy(id) {
-            return this.rawSqlFromDef('buy', [id]);
-        },
-        fetchDefaultTax() {
-            return this.findOneFromDef('defaultTax');
-        },
         async fetchTaxes(id) {
             const taxes = await this.rawSqlFromDef(`taxes`, [id]);
             return this.taxVat(taxes);
@@ -95,11 +77,6 @@ module.exports = {
             return base + vat;
         }
     },
-    components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build(),
-        'report-footer': reportFooter.build(),
-    },
     props: {
         id: {
             type: Number,

print/templates/reports/item-label/item-label.html

@@ -16,7 +16,7 @@
             <div class="details">
                 <div class="package">
                     <div class="packing">{{packing()}}</div>
-                    <div class="dated">{{dated}}</div>
+                    <div class="dated">{{formatDate(new Date(), '%W/%d')}}</div>
                     <div class="labelNumber">{{labelPage}}</div>
                 </div>
                 <div class="size">{{item.size}}</div>

print/templates/reports/item-label/item-label.js

@@ -1,24 +1,17 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const qrcode = require('qrcode');
 
 module.exports = {
     name: 'item-label',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.item = await this.fetchItem(this.id, this.warehouseId);
+        this.item = await this.findOneFromDef('item', [this.id, this.warehouseId]);
+        this.checkMainEntity(this.item);
         this.tags = await this.fetchItemTags(this.id);
         this.barcode = await this.getBarcodeBase64(this.id);
-
-        if (!this.item)
-            throw new Error('Something went wrong');
     },
 
     computed: {
-        dated() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%W/%d');
-        },
         labelPage() {
             const labelNumber = this.labelNumber ? this.labelNumber : 1;
             const totalLabels = this.totalLabels ? this.totalLabels : 1;
@@ -27,9 +20,6 @@ module.exports = {
         }
     },
     methods: {
-        fetchItem(id, warehouseId) {
-            return this.findOneFromDef('item', [id, warehouseId]);
-        },
         fetchItemTags(id) {
             return this.rawSqlFromDef('itemTags', [id]).then(rows => {
                 const tags = {};
@@ -48,9 +38,6 @@ module.exports = {
             return `${this.item.packing}x${stems}`;
         }
     },
-    components: {
-        'report-body': reportBody.build()
-    },
     props: {
         id: {
             type: Number,

print/templates/reports/letter-debtor/letter-debtor.html

@@ -13,7 +13,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('date')}}</td>
-                                    <th>{{dated}}</th>
+                                    <th>{{formatDate(new Date(), '%d-%m-%Y')}}</th>
                                 </tr>
                             </tbody>
                         </table>
@@ -44,7 +44,7 @@
                 </thead>
                 <tbody v-for="sale in sales" :key="sale.id">
                     <tr>
-                        <td>{{sale.issued | date('%d-%m-%Y')}}</td>
+                        <td>{{formatDate(sale.issued, '%d-%m-%Y')}}</td>
                         <td>{{sale.ref}}</td>
                         <td class="number">{{sale.debtOut}}</td>
                         <td class="number">{{sale.debtIn}}</td>

print/templates/reports/letter-debtor/letter-debtor.js

@@ -1,36 +1,17 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'letter-debtor',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.sales = await this.fetchSales(this.id, this.companyId);
-
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-        dated: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%d-%m-%Y');
-        }
+        this.client = await this.findOneFromDef('client', [this.id]);
+        this.checkMainEntity(this.client);
+        this.sales = await this.findOneFromDef('sales', [this.id, this.companyId]);
     },
     data() {
         return {totalBalance: 0.00};
     },
     methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchSales(id, companyId) {
-            return this.findOneFromDef('sales', [
-                id,
-                companyId
-            ]);
-        },
         getBalance(sale) {
             if (sale.debtOut)
                 this.totalBalance += parseFloat(sale.debtOut);
@@ -57,10 +38,6 @@ module.exports = {
             return debtIn.toFixed(2);
         },
     },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
-    },
     props: {
         id: {
             type: Number,

print/templates/reports/previa-label/previa-label.js

@@ -1,36 +1,24 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
+const vnReport = require('../../../core/mixins/vn-report.js');
 const qrcode = require('qrcode');
-const UserError = require('vn-loopback/util/user-error');
 
 module.exports = {
     name: 'previa-label',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.previa = await this.fetchPrevia(this.id);
-        this.sector = await this.fetchSector(this.id);
+        this.sector = await this.findOneFromDef('sector', [this.id]);
+        this.checkMainEntity(this.sector);
+        this.previa = await this.findOneFromDef('previa', [this.id]);
         this.barcode = await this.getBarcodeBase64(this.id);
 
         if (this.previa)
             this.previa = this.previa[0];
-
-        if (!this.sector)
-            throw new UserError('Something went wrong - no sector found');
     },
     methods: {
-        fetchPrevia(id) {
-            return this.findOneFromDef('previa', [id]);
-        },
         getBarcodeBase64(id) {
             const data = String(id);
 
             return qrcode.toDataURL(data, {margin: 0});
         },
-        fetchSector(id) {
-            return this.findOneFromDef('sector', [id]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build()
     },
     props: {
         id: {

print/templates/reports/receipt/receipt.js

@@ -1,27 +1,12 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'receipt',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id);
-        this.receipt = await this.fetchReceipt(this.id);
-
-        if (!this.receipt)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchClient(id) {
-            return this.findOneFromDef('client', [id]);
-        },
-        fetchReceipt(id) {
-            return this.findOneFromDef('receipt', [id]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
+        this.receipt = await this.findOneFromDef('receipt', [this.id]);
+        this.checkMainEntity(this.receipt);
+        this.client = await this.findOneFromDef('client', [this.id]);
     },
     props: {
         id: {

print/templates/reports/sepa-core/sepa-core.html

@@ -147,7 +147,7 @@
                             </tr>
                             <tr>
                                 <td>{{$t('client.signLocation')}}</td>
-                                <th>{{dated}}, {{client.province}}</th>
+                                <th>{{formatDate(new Date(), '%d-%m-%Y')}}, {{client.province}}</th>
                             </tr>
                             <tr>
                                 <td>{{$t('client.sign')}}</td>

print/templates/reports/sepa-core/sepa-core.js

@@ -1,44 +1,12 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportHeader = new Component('report-header');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
-const rptSepaCore = {
+module.exports = {
     name: 'sepa-core',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.client = await this.fetchClient(this.id, this.companyId);
-        this.supplier = await this.fetchSupplier(this.id, this.companyId);
-
-        if (!this.client)
-            throw new Error('Something went wrong');
-    },
-    computed: {
-        dated: function() {
-            const filters = this.$options.filters;
-
-            return filters.date(new Date(), '%d-%m-%Y');
-        }
-    },
-    methods: {
-        fetchClient(id, companyId) {
-            return this.findOneFromDef('client', [
-                companyId,
-                companyId,
-                id
-            ]);
-        },
-        fetchSupplier(id, companyId) {
-            return this.findOneFromDef('supplier', [
-                companyId,
-                companyId,
-                id
-            ]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-header': reportHeader.build(),
-        'report-footer': reportFooter.build()
+        this.client = await this.findOneFromDef('client', [this.companyId, this.companyId, this.id]);
+        this.checkMainEntity(this.client);
+        this.supplier = await this.findOneFromDef('supplier', [this.companyId, this.companyId, this.id]);
     },
     props: {
         id: {
@@ -52,5 +20,3 @@ const rptSepaCore = {
         }
     }
 };
-
-module.exports = rptSepaCore;

print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.html

@@ -13,11 +13,11 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray">{{$t('From')}}</td>
-                                    <th>{{from | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(from, '%d-%m-%Y')}}</th>
                                 </tr>
                                 <tr>
                                     <td class="font gray">{{$t('To')}}</td>
-                                    <th>{{to | date('%d-%m-%Y')}}</th>
+                                    <th>{{formatDate(to, '%d-%m-%Y')}}</th>
                                 </tr>
                             </tbody>
                         </table>
@@ -38,7 +38,7 @@
             <div v-for="entry in entries" v-if="entry.buys">
                 <h2>
                     <span>{{$t('entry')}} {{entry.id}}</span>
-                    <span>{{$t('dated')}} {{entry.shipped | date('%d-%m-%Y')}}</span>
+                    <span>{{$t('dated')}} {{formatDate(entry.shipped, '%d-%m-%Y')}}</span>
                     <span class="pull-right">{{$t('reference')}} {{entry.reference}}</span>
                 </h2>
                 <table class="column-oriented repeatable">

print/templates/reports/supplier-campaign-metrics/supplier-campaign-metrics.js

@@ -1,19 +1,19 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-const reportFooter = new Component('report-footer');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'supplier-campaign-metrics',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.supplier = await this.fetchSupplier(this.id);
-        let entries = await this.fetchEntries(this.id, this.from, this.to);
+        this.supplier = await this.findOneFromDef('supplier', [this.id]);
+        this.checkMainEntity(this.supplier);
+        let entries = await this.rawSqlFromDef('entries', [this.id, this.from, this.to]);
 
         const entriesId = [];
 
         for (let entry of entries)
             entriesId.push(entry.id);
 
-        const buys = await this.fetchBuys(entriesId);
+        const buys = await this.rawSqlFromDef('buys', [entriesId]);
 
         const entriesMap = new Map();
         for (let entry of entries)
@@ -29,23 +29,6 @@ module.exports = {
         }
 
         this.entries = entries;
-        if (!this.supplier)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchSupplier(supplierId) {
-            return this.findOneFromDef('supplier', [supplierId]);
-        },
-        fetchEntries(supplierId, from, to) {
-            return this.rawSqlFromDef('entries', [supplierId, from, to]);
-        },
-        fetchBuys(entriesId) {
-            return this.rawSqlFromDef('buys', [entriesId]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build(),
-        'report-footer': reportFooter.build()
     },
     props: {
         id: {

print/templates/reports/vehicle-event-expired/vehicle-event-expired.html

@@ -16,7 +16,7 @@
                     <tr>
                         <td>{{vehicleEvent.numberPlate}}</td>
                         <td>{{vehicleEvent.description}}</td>
-                        <td>{{vehicleEvent.finished | date('%d-%m-%Y')}}</td>
+                        <td>{{formatDate(vehicleEvent.finished, '%d-%m-%Y')}}</td>
                     </tr>
                 </tbody>
             </table>

print/templates/reports/vehicle-event-expired/vehicle-event-expired.js

@@ -1,21 +1,10 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
-
+const vnReport = require('../../../core/mixins/vn-report.js');
 module.exports = {
     name: 'vehicle-event-expired',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.vehicleEvents = await this.fetchVehicleEvent(this.eventIds);
-
-        if (!this.vehicleEvents)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchVehicleEvent(vehicleEventIds) {
-            return this.rawSqlFromDef('vehicleEvents', [vehicleEventIds]);
-        },
-    },
-    components: {
-        'report-body': reportBody.build()
+        this.vehicleEvents = await this.rawSqlFromDef('vehicleEvents', [this.eventIds]);
+        this.checkMainEntity(this.vehicleEvents);
     },
     props: {
         eventIds: {

print/templates/reports/zone/zone.html

@@ -1,5 +1,5 @@
 <report-body v-bind="$props">
     <div class="text">{{zone.agencyName}}</div>
     <div class="text">{{zone.id}}</div>
-    <div class="text">{{zone.plateNumber}} {{zone.time | date('%H:%M')}}</div>
+    <div class="text">{{zone.plateNumber}} {{formatDate(zone.time, '%H:%M')}}</div>
 </report-body>

print/templates/reports/zone/zone.js

@@ -1,21 +1,11 @@
-const Component = require(`vn-print/core/component`);
-const reportBody = new Component('report-body');
+const vnReport = require('../../../core/mixins/vn-report.js');
 
 module.exports = {
     name: 'zone',
+    mixins: [vnReport],
     async serverPrefetch() {
-        this.zone = await this.fetchZone(this.id);
-
-        if (!this.zone)
-            throw new Error('Something went wrong');
-    },
-    methods: {
-        fetchZone(id) {
-            return this.findOneFromDef('zone', [id]);
-        }
-    },
-    components: {
-        'report-body': reportBody.build()
+        this.zone = await this.findOneFromDef('zone', [this.id]);
+        this.checkMainEntity(this.zone);
     },
     props: {
         id: {