Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
commit
25dab78ca2
|
@ -565,12 +565,12 @@ describe('workerTimeControl add/delete timeEntry()', () => {
|
||||||
date = nextWeek(date);
|
date = nextWeek(date);
|
||||||
await populateWeek(date, monday, thursday, ctx, workerId, options);
|
await populateWeek(date, monday, thursday, ctx, workerId, options);
|
||||||
date = weekDay(date, friday);
|
date = weekDay(date, friday);
|
||||||
date.setHours(6, 59, 0);
|
date.setHours(7, 59, 0);
|
||||||
ctx.args = {timed: date, direction: 'in'};
|
ctx.args = {timed: date, direction: 'in'};
|
||||||
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
|
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
date.setHours(7, 1, 0);
|
date.setHours(8, 1, 0);
|
||||||
ctx.args = {timed: date, direction: 'out'};
|
ctx.args = {timed: date, direction: 'out'};
|
||||||
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
|
await models.WorkerTimeControl.addTimeEntry(ctx, workerId, options);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue