Merge branch 'dev' into 6065-fixWorkerTimeControl

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2342.01] - 2023-10-19
+
+### Added
+### Changed
+### Fixed
 
 ## [2340.01] - 2023-10-05
 

db/changes/233801/01-deviceLog_acl.sql

@@ -1,6 +1,6 @@
 
-ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
+-- ALTER TABLE `vn`.`deviceLog` ADD serialNumber varchar(45) DEFAULT NULL NULL;
 
-INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId) 
+-- INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId)
-VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
+-- VALUES( 'DeviceLog', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');
 

db/changes/234001/00-models.sql

@@ -0,0 +1,11 @@
+INSERT INTO `salix`.`ACL` ( model, property, accessType, permission, principalType, principalId)
+    VALUES
+    ('ExpeditionMistakeType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('WorkerMistakeType', '*', 'READ', 'ALLOW', 'ROLE', 'employee'),
+    ('ExpeditionMistake','*','WRITE','ALLOW','ROLE','employee'),
+    ('WorkerMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'),
+    ('MistakesTypes', '*', 'WRITE', 'ALLOW', 'ROLE', 'coolerBoss'),
+    ('MistakeType','*','READ','ALLOW','ROLE','employee'),
+    ('MachineWorker', '*', 'READ', 'ALLOW', 'ROLE', 'coolerAssist'),
+    ('Printer','*','READ','ALLOW','ROLE','employee'),
+    ('SaleMistake', '*', 'WRITE', 'ALLOW', 'ROLE', 'production');

db/changes/234001/01-deliveryAssistantACL.sql

@@ -4,13 +4,18 @@ INSERT INTO `account`.`role` (name, description)
 
 INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
     SELECT (SELECT id FROM account.role r1 WHERE r1.name = 'deliveryAssistant'), ri.inheritsFrom
-FROM account.roleInherit ri
+        FROM account.roleInherit ri
-    JOIN account.role r2 ON r2.id = ri.`role`
+            JOIN account.role r2 ON r2.id = ri.`role`
-WHERE r2.name = 'deliveryBoss';
+        WHERE r2.name = 'deliveryBoss';
+
+DELETE `account`.`roleInherit` FROM `account`.`roleInherit`
+    JOIN `account`.`role` r ON `account`.`roleInherit`.role = r.id
+    WHERE r.name = 'deliveryBoss';
 
 INSERT INTO `account`.`roleInherit` (role, inheritsFrom)
 		SELECT (SELECT id FROM account.role WHERE name = 'deliveryBoss') role,
 		(SELECT id FROM account.role WHERE name = 'deliveryAssistant') roleInherit;
 
-
+UPDATE `salix`.`ACL`
-CALL `account`.`role_syncPrivileges`();
+    SET principalId='deliveryAssistant'
+        WHERE principalId='deliveryBoss';

db/changes/234001/02-roleSync.sql

@@ -0,0 +1,2 @@
+-- Locally it fails because it is executed before the fixtures and the roleConfig table is empty
+CALL `account`.`role_syncPrivileges`();

db/dump/fixtures.sql

@@ -2974,3 +2974,7 @@ INSERT INTO vn.XDiario (id, ASIEN, FECHA, SUBCTA, CONTRA, CONCEPTO, EURODEBE, EU
         (4, 2.0, util.VN_CURDATE(), '4300001104', NULL, 'n/fra T4444444', 8.88, NULL, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
         (5, 2.0, util.VN_CURDATE(), '2000000000', '4300001104', 'n/fra T4444444 Tony Stark', NULL, 8.07, NULL, NULL, '0', NULL, 0.00, NULL, NULL, NULL, NULL, NULL, '2', NULL, 1, 2, 'I.F.', 'Nombre Importador', 1, 0, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0),
         (6, 2.0, util.VN_CURDATE(), '4770000010', '4300001104', 'Inmovilizado pendiente : n/fra T4444444 Tony Stark', NULL, 0.81, 8.07, 'T', '4444444', 10.00, NULL, NULL, NULL, NULL, NULL, '', '2', '', 1, 1, '06089160W', 'IRON MAN', 1, 1, 0, util.VN_CURDATE(), 0, 442, 0, 0, 0.00, NULL, NULL, util.VN_CURDATE(), NULL, 1, 1, 1, 1, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0);
+
+INSERT INTO `vn`.`mistakeType` (`id`, `description`)
+    VALUES
+        (1, 'Incorrect quantity');

e2e/paths/06-claim/02_detail.spec.js

@@ -1,5 +1,5 @@
 import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
+import getBrowser from '../../helpers/puppeteer.js';
 
 // #1528 e2e claim/detail
 xdescribe('Claim detail', () => {

e2e/paths/06-claim/02_development.spec.js

@@ -1,97 +0,0 @@
-import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
-
-describe('Claim development', () => {
-    let browser;
-    let page;
-
-    beforeAll(async() => {
-        browser = await getBrowser();
-        page = browser.page;
-        await page.loginAndModule('claimManager', 'claim');
-        await page.accessToSearchResult('1');
-        await page.accessToSection('claim.card.development');
-    });
-
-    afterAll(async() => {
-        await browser.close();
-    });
-
-    it('should delete a development and create a new one', async() => {
-        await page.waitToClick(selectors.claimDevelopment.firstDeleteDevelopmentButton);
-        await page.waitToClick(selectors.claimDevelopment.addDevelopmentButton);
-        await page.autocompleteSearch(selectors.claimDevelopment.secondClaimReason, 'Baja calidad');
-        await page.autocompleteSearch(selectors.claimDevelopment.secondClaimResult, 'Deshidratacion');
-        await page.autocompleteSearch(selectors.claimDevelopment.secondClaimResponsible, 'Calidad general');
-        await page.autocompleteSearch(selectors.claimDevelopment.secondClaimWorker, 'deliveryNick');
-        await page.autocompleteSearch(selectors.claimDevelopment.secondClaimRedelivery, 'Reparto');
-        await page.waitToClick(selectors.claimDevelopment.saveDevelopmentButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it(`should redirect to the next section of claims as the role is claimManager`, async() => {
-        await page.waitForState('claim.card.action');
-    });
-
-    it('should edit a development', async() => {
-        await page.reloadSection('claim.card.development');
-        await page.autocompleteSearch(selectors.claimDevelopment.firstClaimReason, 'Calor');
-        await page.autocompleteSearch(selectors.claimDevelopment.firstClaimResult, 'Cocido');
-        await page.autocompleteSearch(selectors.claimDevelopment.firstClaimResponsible, 'Calidad general');
-        await page.autocompleteSearch(selectors.claimDevelopment.firstClaimWorker, 'adminAssistantNick');
-        await page.autocompleteSearch(selectors.claimDevelopment.firstClaimRedelivery, 'Cliente');
-        await page.waitToClick(selectors.claimDevelopment.saveDevelopmentButton);
-        const message = await page.waitForSnackbar();
-
-        expect(message.text).toContain('Data saved!');
-    });
-
-    it('should confirm the first development is the expected one', async() => {
-        await page.reloadSection('claim.card.development');
-        const reason = await page
-            .waitToGetProperty(selectors.claimDevelopment.firstClaimReason, 'value');
-
-        const result = await page
-            .waitToGetProperty(selectors.claimDevelopment.firstClaimResult, 'value');
-
-        const responsible = await page
-            .waitToGetProperty(selectors.claimDevelopment.firstClaimResponsible, 'value');
-
-        const worker = await page
-            .waitToGetProperty(selectors.claimDevelopment.firstClaimWorker, 'value');
-
-        const redelivery = await page
-            .waitToGetProperty(selectors.claimDevelopment.firstClaimRedelivery, 'value');
-
-        expect(reason).toEqual('Calor');
-        expect(result).toEqual('Baboso/Cocido');
-        expect(responsible).toEqual('Calidad general');
-        expect(worker).toEqual('adminAssistantNick');
-        expect(redelivery).toEqual('Cliente');
-    });
-
-    it('should confirm the second development is the expected one', async() => {
-        const reason = await page
-            .waitToGetProperty(selectors.claimDevelopment.secondClaimReason, 'value');
-
-        const result = await page
-            .waitToGetProperty(selectors.claimDevelopment.secondClaimResult, 'value');
-
-        const responsible = await page
-            .waitToGetProperty(selectors.claimDevelopment.secondClaimResponsible, 'value');
-
-        const worker = await page
-            .waitToGetProperty(selectors.claimDevelopment.secondClaimWorker, 'value');
-
-        const redelivery = await page
-            .waitToGetProperty(selectors.claimDevelopment.secondClaimRedelivery, 'value');
-
-        expect(reason).toEqual('Baja calidad');
-        expect(result).toEqual('Deshidratacion');
-        expect(responsible).toEqual('Calidad general');
-        expect(worker).toEqual('deliveryNick');
-        expect(redelivery).toEqual('Reparto');
-    });
-});

e2e/paths/06-claim/03_claim_action.spec.js

@@ -1,5 +1,5 @@
 import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
+import getBrowser from '../../helpers/puppeteer.js';
 
 describe('Claim action path', () => {
     let browser;

e2e/paths/06-claim/04_summary.spec.js

@@ -1,6 +1,6 @@
 
 import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
+import getBrowser from '../../helpers/puppeteer.js';
 
 describe('Claim summary path', () => {
     let browser;

e2e/paths/06-claim/05_descriptor.spec.js

@@ -1,5 +1,5 @@
 import selectors from '../../helpers/selectors.js';
-import getBrowser from '../../helpers/puppeteer';
+import getBrowser from '../../helpers/puppeteer.js';
 
 describe('Claim descriptor path', () => {
     let browser;

modules/claim/front/development/index.html

@@ -1,116 +1,2 @@
-<vn-crud-model
+<vn-card>
-    vn-id="model"
+</vn-card>
-    url="ClaimDevelopments"
-    fields="['id', 'claimFk', 'claimReasonFk', 'claimResultFk', 'claimResponsibleFk', 'workerFk', 'claimRedeliveryFk']"
-    link="{claimFk: $ctrl.$params.id}"
-    filter="$ctrl.filter"
-    data="claimDevelopments"
-    auto-load="true">
-</vn-crud-model>
-<vn-crud-model
-    url="ClaimReasons"
-    data="claimReasons"
-    order="description"
-    auto-load="true">
-</vn-crud-model>
-<vn-crud-model
-    url="ClaimResults"
-    data="claimResults"
-    order="description"
-    auto-load="true">
-</vn-crud-model>
-<vn-crud-model
-    url="ClaimResponsibles"
-    data="claimResponsibles"
-    order="description"
-    auto-load="true">
-</vn-crud-model>
-<vn-crud-model
-    url="ClaimRedeliveries"
-    data="claimRedeliveries"
-    order="description"
-    auto-load="true">
-</vn-crud-model>
-<vn-watcher
-    vn-id="watcher"
-    data="claimDevelopments"
-    form="form">
-</vn-watcher>
-<vn-vertical class="vn-w-lg">
-    <vn-card class="vn-pa-lg">
-        <vn-vertical>
-            <form name="form">
-                <vn-horizontal ng-repeat="claimDevelopment in claimDevelopments">
-                    <vn-autocomplete
-                        vn-focus
-                        label="Reason"
-                        ng-model="claimDevelopment.claimReasonFk"
-                        data="claimReasons"
-                        fields="['id', 'description']"
-                        show-field="description"
-                        rule>
-                    </vn-autocomplete>
-                    <vn-autocomplete
-                        label="Result"
-                        ng-model="claimDevelopment.claimResultFk"
-                        data="claimResults"
-                        fields="['id', 'description']"
-                        show-field="description"
-                        rule>
-                    </vn-autocomplete>
-                    <vn-autocomplete
-                        label="Responsible"
-                        ng-model="claimDevelopment.claimResponsibleFk"
-                        data="claimResponsibles"
-                        fields="['id', 'description']"
-                        show-field="description"
-                        rule>
-                    </vn-autocomplete>
-                    <vn-worker-autocomplete
-                        ng-model="claimDevelopment.workerFk"
-                        show-field="nickname"
-                        rule>
-                    </vn-worker-autocomplete>
-                    <vn-autocomplete
-                        label="Redelivery"
-                        ng-model="claimDevelopment.claimRedeliveryFk"
-                        data="claimRedeliveries"
-                        fields="['id', 'description']"
-                        show-field="description"
-                        rule>
-                    </vn-autocomplete>
-                    <vn-icon-button
-                        vn-none
-                        class="vn-my-md"
-                        vn-tooltip="Remove sale"
-                        icon="delete"
-                        ng-click="model.remove($index)"
-                        tabindex="-1">
-                    </vn-icon-button>
-                </vn-horizontal>
-            </form>
-            <vn-one class="vn-pt-md">
-                <vn-icon-button
-                    vn-bind="+"
-                    vn-tooltip="Add sale"
-                    icon="add_circle"
-                    ng-click="model.insert()">
-                </vn-icon-button>
-            </vn-one>
-        </vn-vertical>
-    </vn-card>
-    <vn-button-bar>
-        <vn-submit
-            disabled="!watcher.dataChanged()"
-            ng-click="$ctrl.onSubmit()"
-            label="Save">
-        </vn-submit>
-        <!-- # #2680 Undo changes button bugs -->
-        <!-- <vn-button
-            class="cancel"
-            label="Undo changes"
-            disabled="!watcher.dataChanged()"
-            ng-click="watcher.loadOriginalData()">
-        </vn-button> -->
-    </vn-button-bar>
-</vn-vertical>

modules/claim/front/development/index.js

@@ -1,17 +1,14 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
-import './style.scss';
 
 class Controller extends Section {
-    onSubmit() {
+    constructor($element, $) {
-        this.$.watcher.check();
+        super($element, $);
-        this.$.model.save().then(() => {
+    }
-            this.$.watcher.notifySaved();
-            this.$.watcher.updateOriginalData();
 
-            if (this.aclService.hasAny(['claimManager']))
+    async $onInit() {
-                this.$state.go('claim.card.action');
+        this.$state.go('claim.card.summary', {id: this.$params.id});
-        });
+        window.location.href = await this.vnApp.getUrl(`claim/${this.$params.id}/development`);
     }
 }
 

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

@@ -1,31 +0,0 @@
-import './index.js';
-import watcher from 'core/mocks/watcher';
-import crudModel from 'core/mocks/crud-model';
-
-describe('Claim', () => {
-    describe('Component vnClaimDevelopment', () => {
-        let controller;
-        let $scope;
-
-        beforeEach(ngModule('claim'));
-
-        beforeEach(inject(($componentController, $rootScope) => {
-            $scope = $rootScope.$new();
-            $scope.watcher = watcher;
-            $scope.model = crudModel;
-            const $element = angular.element('<vn-claim-development></vn-claim-development>');
-            controller = $componentController('vnClaimDevelopment', {$element, $scope});
-        }));
-
-        describe('onSubmit()', () => {
-            it(`should redirect to 'claim.card.action' state`, () => {
-                jest.spyOn(controller.aclService, 'hasAny').mockReturnValue(true);
-                jest.spyOn(controller.$state, 'go');
-
-                controller.onSubmit();
-
-                expect(controller.$state.go).toHaveBeenCalledWith('claim.card.action');
-            });
-        });
-    });
-});

modules/claim/front/development/locale/es.yml

@@ -1,8 +0,0 @@
-Destination: Destino
-Development: Trazabilidad
-Reason: Motivo
-Result: Consecuencia
-Responsible: Responsable
-Worker: Trabajador
-Redelivery: Devolución
-Add line: Añadir Linea

modules/invoiceOut/back/models/printer.json

@@ -18,6 +18,13 @@
         "isLabeler": {
             "type": "boolean"
         }
+    },
+   	"relations": {
+        "sector": {
+            "type": "belongsTo",
+            "model": "Sector",
+            "foreignKey": "sectorFk"
+        }
     },
     "acls": [{
         "accessType": "READ",

modules/item/back/methods/item/setVisibleDiscard.js

@@ -32,6 +32,6 @@ module.exports = Self => {
 
     Self.setVisibleDiscard = async(ctx, itemFk, warehouseFk, quantity, addressFk) => {
         const query = `CALL vn.item_setVisibleDiscard(?, ?, ?, ?)`;
-        await Self.rawSql(query, [itemFk, warehouseFk, quantity, addressFk]);
+        await Self.rawSql(query, [itemFk, warehouseFk, quantity, addressFk], {userId: ctx.req.accessToken.userId});
     };
 };

modules/item/back/models/item-shelving-placement-supply.json

@@ -26,11 +26,17 @@
         "shelving": {
             "type": "string"
         },
+        "subName": {
+            "type": "string"
+        },
         "packing": {
             "type": "number"
         },
         "stock": {
             "type": "number"
+        },
+          "size": {
+            "type": "number"
         }
     }
 }

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

@@ -20,10 +20,16 @@
         },
 		"created": {
 			"type": "date"
+        },
+		"grouping": {
+			"type": "number"
         },
         "isChecked": {
             "type": "boolean"
 		},
+		"packing": {
+			"type": "number"
+        },
         "visible": {
             "type": "number"
 		},

modules/shelving/back/model-config.json

@@ -10,5 +10,8 @@
     },
     "Sector": {
         "dataSource": "vn"
+    },
+    "Train": {
+        "dataSource": "vn"
     }
 }

modules/shelving/back/models/shelving.json

@@ -9,12 +9,11 @@
     "properties": {
         "id": {
             "type": "number",
-            "id": true,
+            "description": "Identifier",
-            "description": "Identifier"
+            "id": true
         },
         "code": {
-            "type": "string",
+            "type": "string"
-            "required": true
         },
         "parkingFk": {
             "type": "number"

modules/shelving/back/models/train.json

@@ -0,0 +1,19 @@
+{
+    "name": "Train",
+    "options": {
+        "mysql": {
+            "table": "train"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true
+        },
+        "name": {
+            "type": "string",
+            "required": true
+        }
+        
+    }
+}

modules/ticket/back/model-config.json

@@ -17,6 +17,12 @@
     "Expedition": {
         "dataSource": "vn"
     },
+    "ExpeditionPallet": {
+        "dataSource": "vn"
+    },
+    "ExpeditionScan": {
+        "dataSource": "vn"
+    },
     "ExpeditionState": {
         "dataSource": "vn"
     },
@@ -32,6 +38,9 @@
     "ExpeditionMistake": {
         "dataSource": "vn"
     },
+    "ExpeditionMistakeType": {
+        "dataSource": "vn"
+    },
     "PrintServerQueue": {
         "dataSource": "vn"
     },
@@ -47,6 +56,9 @@
     "SaleGroup": {
         "dataSource": "vn"
     },
+    "SaleMistake": {
+        "dataSource": "vn"
+    },
     "SaleGroupDetail": {
         "dataSource": "vn"
     },

modules/ticket/back/models/expeditionMistake.json

@@ -24,7 +24,7 @@
       },
       "type": {
         "type": "belongsTo",
-        "model": "MistakeType",
+        "model": "ExpeditionMistakeType",
         "foreignKey": "typeFk"
       }
     }

modules/ticket/back/models/expeditionMistakeType.json

@@ -0,0 +1,19 @@
+{
+    "name": "ExpeditionMistakeType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "expeditionMistakeType"
+        }
+    },
+    "properties": {
+      "code": {
+        "id":true,
+        "type": "string"
+    },
+      "description": {
+        "type": "string"
+      }
+    }
+  }
+  

modules/ticket/back/models/expeditionPallet.json

@@ -0,0 +1,22 @@
+{
+    "name": "ExpeditionPallet",
+    "options": {
+        "mysql": {
+          "table": "expeditionPallet"
+        }
+    },
+	"properties": {
+		"id": {
+			"type": "number",
+			"id": true,
+			"description": "Identifier"
+		}
+    },
+    "acls": [{
+        "accessType": "WRITE",
+        "principalType": "ROLE",
+        "principalId": "production",
+        "permission": "ALLOW"
+    }]
+}
+  

modules/ticket/back/models/expeditionScan.json

@@ -0,0 +1,47 @@
+{
+    "name": "ExpeditionScan",
+    "options": {
+        "mysql": {
+          "table": "expeditionScan"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "description": "Identifier"
+        },
+        "expeditionFk": {
+            "type": "number",
+            "description": "Identifier",
+            "id": true
+        },
+        "palletFk": {
+            "type": "number",
+            "description": "Identifier",
+            "id": true
+        },
+        "scanned": {
+            "type": "date",
+            "default": "$now"
+        }
+    },
+    "relations": {
+        "expedition": {
+            "type": "belongsTo",
+            "model": "Expedition",
+            "foreignKey": "expeditionFk"
+        },
+        "pallet": {
+            "type": "belongsTo",
+            "model": "expeditionPallet",
+            "foreignKey": "palletFk"
+        }
+    },
+    "acls": [{
+        "accessType": "WRITE",
+        "principalType": "ROLE",
+        "principalId": "production",
+        "permission": "ALLOW"
+    }]
+}
+  

modules/ticket/back/models/sale-mistake.json

@@ -0,0 +1,49 @@
+{
+    "name": "SaleMistake",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "saleMistake"
+        }
+    },
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "number",
+            "description": "Identifier"
+        },
+        "created": {
+            "type": "date"
+        },
+        "saleFk": {
+            "type": "number",
+            "required": true
+        },
+        "userFk": {
+            "type": "number",
+            "required": true
+        },
+          "typeFk": {
+            "type": "number",
+            "required": true
+        }
+    },
+    "relations": {
+        "sale": {
+            "type": "belongsTo",
+            "model": "Sale",
+            "foreignKey": "saleFk"
+        },
+        "worker": {
+            "type": "belongsTo",
+            "model": "Worker",
+            "foreignKey": "userFk"
+        },
+        "mistakeType": {
+            "type": "belongsTo",
+            "model": "MistakeType",
+            "foreignKey": "typeFk"
+        }
+
+    }
+}

modules/worker/back/model-config.json

@@ -43,6 +43,9 @@
     },
     "EducationLevel": {
         "dataSource": "vn"
+    },
+     "MistakeType": {
+        "dataSource": "vn"
     },
     "ProfileType":{
         "dataSource": "vn"
@@ -83,6 +86,12 @@
     "WorkerMana": {
         "dataSource": "vn"
     },
+    "WorkerMistake": {
+        "dataSource": "vn"
+    },
+    "WorkerMistakeType": {
+        "dataSource": "vn"
+    },
     "WorkerMedia": {
         "dataSource": "vn"
     },

modules/worker/back/models/mistakeType.json

@@ -0,0 +1,20 @@
+{
+    "name": "MistakeType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "mistakeType"
+        }
+    },
+    "properties": {
+      "id": {
+        "id":true,
+        "type": "number"
+    },
+      "description": {
+        "type": "string"
+      }
+       
+    }
+  }
+  

modules/worker/back/models/workerMistake.json

@@ -0,0 +1,25 @@
+{
+    "name": "WorkerMistake",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "workerMistake"
+        }
+    },
+    "properties": {
+      "id": {
+        "id":true,
+        "type": "number"
+      },
+      "userFk": {
+        "type": "number"
+      },
+        "workerMistakeTypeFk": {
+        "type": "string"
+      },
+        "created": {
+        "type": "date"
+      }
+    }
+  }
+  

modules/worker/back/models/workerMistakeType.json

@@ -0,0 +1,26 @@
+{
+    "name": "WorkerMistakeType",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+          "table": "workerMistakeType"
+        }
+    },
+    "properties": {
+      "code": {
+        "id":true,
+        "type": "string"
+    },
+      "description": {
+        "type": "string"
+      }
+    },
+       "relations": {
+        "type": {
+        "type": "belongsTo",
+        "model": "WorkerMistakeType",
+        "foreignKey": "code"
+      }
+    }
+  }
+  

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "salix-back",
-    "version": "23.32.02",
+    "version": "23.42.01",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-back",
-            "version": "23.26.01",
+            "version": "23.42.01",
             "license": "GPL-3.0",
             "dependencies": {
                 "axios": "^1.2.2",

package.json

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