Merge branch 'test' into dev

docker-compose.yml

@@ -6,14 +6,14 @@ services:
       context: .
       dockerfile: front/Dockerfile
     ports:
-      - ${FRONT_PORT:?}:80
+      - 80
     deploy:
       replicas: 3
   back:
     image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?}
     build: .
     ports:
-      - ${BACK_PORT:?}:3000
+      - 3000
     environment:
       - NODE_ENV
     configs:

front/nginx.conf

@@ -11,4 +11,8 @@ server {
 	location / {
 		autoindex on;
 	}
+	location /index.html {
+		expires -1;
+		add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+	}
 }

modules/worker/back/methods/worker-calendar/specs/absences.spec.js

@@ -1,6 +1,7 @@
 const app = require('vn-loopback/server/server');
 
-describe('Worker absences()', () => {
+// 2066
+xdescribe('Worker absences()', () => {
     it('should get the absence calendar for a full year contract', async() => {
         let ctx = {req: {accessToken: {userId: 106}}};
         let workerFk = 106;
@@ -133,6 +134,7 @@ describe('Worker absences()', () => {
 
         let remainingDays = 0;
         for (let i = today.getMonth(); i < 12; i++) {
+            today.setDate(1);
             today.setMonth(i + 1);
             today.setDate(0);
 

modules/worker/back/methods/worker/getWorkedHours.js

@@ -36,8 +36,8 @@ module.exports = Self => {
     Self.getWorkedHours = async(id, started, ended) => {
         const conn = Self.dataSource.connector;
         const stmts = [];
-        const startedMinusOne = new Date();
-        const endedPlusOne = new Date();
+        const startedMinusOne = new Date(started);
+        const endedPlusOne = new Date(ended);
         let worker = await Self.app.models.Worker.findById(id);
         let userId = worker.userFk;
 
@@ -61,7 +61,6 @@ module.exports = Self => {
                 tmp.timeControlCalculate,
                 tmp.timeBusinessCalculate
         `);
-
         let sql = ParameterizedSQL.join(stmts, ';');
         let result = await conn.executeStmt(sql);