Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js

@@ -7,7 +7,7 @@ describe('Client activeWorkersWithRole', () => {
 
         let isSalesPerson = await app.models.Account.hasRole(result[0].id, 'salesPerson');
 
-        expect(result.length).toEqual(10);
+        expect(result.length).toEqual(11);
         expect(isSalesPerson).toBeTruthy();
     });
 

modules/client/back/methods/client/specs/listWorkers.spec.js

@@ -6,7 +6,7 @@ describe('Client listWorkers', () => {
             .then(result => {
                 let amountOfEmployees = Object.keys(result).length;
 
-                expect(amountOfEmployees).toEqual(43);
+                expect(amountOfEmployees).toEqual(44);
                 done();
             })
             .catch(done.fail);

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

@@ -1,7 +1,7 @@
 const app = require('vn-loopback/server/server');
 
 describe('item getLastEntries()', () => {
-    it('should return one entry for a given item', async () => {
+    it('should return one entry for a given item', async() => {
         let date = new Date();
         let filter = {where: {itemFk: 1, date: date}};
         let result = await app.models.Item.getLastEntries(filter);
@@ -9,9 +9,10 @@ describe('item getLastEntries()', () => {
         expect(result.length).toEqual(1);
     });
 
-    it('should return three entries for a given item', async () => {
+    it('should return three entries for a given item', async() => {
         let date = new Date();
-        date.setMonth(date.getMonth() - 2);
+
+        date.setMonth(date.getMonth() - 2, 15);
         let filter = {where: {itemFk: 1, date: date}};
         let result = await app.models.Item.getLastEntries(filter);
 

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

@@ -3,7 +3,7 @@
     "base": "VnModel",
     "options": {
         "mysql": {
-            "table": "personDepartment"
+            "table": "workerDepartment"
         }
     },
     "properties": {

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

@@ -3,7 +3,7 @@
     "base": "VnModel",
     "options": {
         "mysql": {
-            "table": "personMedia"
+            "table": "workerMedia"
         }
     },
     "properties": {

services/db/install/changes/1.2-CHECK/15-personMedia.sql

@@ -3,7 +3,7 @@ CREATE
      OR REPLACE ALGORITHM = UNDEFINED 
     DEFINER = `root`@`%` 
     SQL SECURITY DEFINER
-VIEW `personMedia` AS
+VIEW `workerMedia` AS
     SELECT 
         `p`.`id_trabajador` AS `workerFk`,
         `m`.`value` AS `mediaValue`

services/db/install/changes/1.2-CHECK/19-workerDepartment.sql

@@ -3,12 +3,10 @@ CREATE
      OR REPLACE ALGORITHM = UNDEFINED 
     DEFINER = `root`@`%` 
     SQL SECURITY DEFINER
-VIEW `vn`.`personDepartment` AS
+VIEW `vn`.`workerDepartment` AS
     SELECT 
         `p`.`id_trabajador` AS `workerFk`,
-        `p`.`name` AS `name`,
+        `d`.`name` AS `departmentFk`
-        `p`.`firstname` AS `firstname`,
-        `d`.`name` AS `department`
     FROM
         (((`postgresql`.`person` `p`
         JOIN `postgresql`.`profile` `pr` ON ((`pr`.`person_id` = `p`.`person_id`)))

services/db/install/changes/1.2-CHECK/22-ACL.sql

@@ -1,20 +0,0 @@
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-VALUES ('Zone','*','READ','ALLOW','ROLE','employee');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-VALUES ('ZoneGeo','*','READ','ALLOW','ROLE','employee');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-VALUES ('ZoneCalendar','*','READ','ALLOW','ROLE','employee');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-VALUES ('ZoneIncluded','*','READ','ALLOW','ROLE','employee');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-VALUES ('LabourHoliday','*','READ','ALLOW','ROLE','employee');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-VALUES ('LabourHolidayLegend','*','READ','ALLOW','ROLE','employee');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-VALUES ('LabourHolidayType','*','READ','ALLOW','ROLE','employee');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-VALUES ('Zone','*','WRITE','ALLOW','ROLE','deliveryBoss');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-VALUES ('ZoneCalendar','*','WRITE','ALLOW','ROLE','deliveryBoss');
-INSERT INTO salix.ACL (model,property,accessType,permission,principalType,principalId)
-VALUES ('ZoneIncluded','*','WRITE','ALLOW','ROLE','deliveryBoss');