verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refactor(time-control): getWorkedHours.spec
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2021-11-09 10:09:44 +01:00 committed by joan
parent a3bb3122ed
commit 62cdf52227
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/worker/back/methods/worker/specs/getWorkedHours.spec.js
View File

@ -1,17 +1,17 @@
const app = require('vn-loopback/server/server'); const models = require('vn-loopback/server/server').models;
describe('Worker getWorkedHours()', () => { describe('Worker getWorkedHours()', () => {
it(`should return the expected hours and the worked hours of a given date`, async() => { it(`should return the expected hours and the worked hours of a given date`, async() => {
const workerID = 1106; const workerID = 1106;
let started = new Date(); const started = new Date();
started.setHours(0, 0, 0, 0); started.setHours(0, 0, 0, 0);
let ended = new Date(); const ended = new Date();
ended.setHours(0, 0, 0, 0); ended.setHours(23, 59, 59, 999);
const [result] = await app.models.Worker.getWorkedHours(workerID, started, ended); const [result] = await models.Worker.getWorkedHours(workerID, started, ended);
expect(result.expectedHours).toEqual(28800); // 8:00 hours seconds expect(result.expectedHours).toEqual(28800); // 8:00 hours in seconds
expect(result.workedHours).toEqual(29400); // 8:10 hours in seconds expect(result.workedHours).toEqual(29400); // 8:10 hours in seconds
}); });
}); });

2
modules/worker/front/time-control/index.js
View File

@ -171,11 +171,9 @@ class Controller extends Section {
from: from, from: from,
to: to to: to
}; };
console.log(from, to);
const query = `Workers/${this.$params.id}/getWorkedHours`; const query = `Workers/${this.$params.id}/getWorkedHours`;
return this.$http.get(query, {params}).then(res => { return this.$http.get(query, {params}).then(res => {
const workDays = res.data; const workDays = res.data;
console.log(res.data);
const map = new Map(); const map = new Map();
for (const workDay of workDays) { for (const workDay of workDays) {