verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

Merge pull request 'feat: refs#8624 addWorkerActions' (!3489) from 8624-addActionCleanShelving into dev
gitea/salix/pipeline/head There was a failure building this commit Details 

Reviewed-on: #3489
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
Sergio De la torre 2025-02-25 08:22:30 +00:00
parent 08cd31181b 5093393f3b
commit 65c3f158f7
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
back/methods/workerActivity/add.js
View File

@ -13,6 +13,11 @@ module.exports = Self => {
type: 'string', type: 'string',
description: 'Origin model from insert' description: 'Origin model from insert'
}, },
{
arg: 'description',
type: 'string',
description: 'Action description'
},
], ],
http: { http: {
@ -21,7 +26,7 @@ module.exports = Self => {
} }
}); });
Self.add = async(ctx, code, model, options) => { Self.add = async(ctx, code, model, description, options) => {
const userId = ctx.req.accessToken.userId; const userId = ctx.req.accessToken.userId;
const myOptions = {}; const myOptions = {};
@ -29,8 +34,8 @@ module.exports = Self => {
Object.assign(myOptions, options); Object.assign(myOptions, options);
return await Self.rawSql(` return await Self.rawSql(`
INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model) INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model, description)
SELECT ?, ?, ? SELECT ?, ?, ?, ?
FROM workerTimeControlConfig wtcc FROM workerTimeControlConfig wtcc
LEFT JOIN ( LEFT JOIN (
SELECT wa.workerFk, SELECT wa.workerFk,
@ -45,6 +50,6 @@ module.exports = Self => {
WHERE sub.workerFk IS NULL WHERE sub.workerFk IS NULL
OR sub.code <> ? OR sub.code <> ?
OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcc.dayBreak;` OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcc.dayBreak;`
, [userId, code, model, userId, code], myOptions); , [userId, code, model, description, userId, code], myOptions);
}; };
}; };

2
back/methods/workerActivity/specs/add.spec.js
View File

@ -13,7 +13,7 @@ describe('workerActivity insert()', () => {
{'code': 'TEST', 'description': 'TEST'}, options {'code': 'TEST', 'description': 'TEST'}, options
); );
await models.WorkerActivity.add(ctx, 'TEST', 'APP', options); await models.WorkerActivity.add(ctx, 'TEST', 'APP', 'description', options);
count = await models.WorkerActivity.count( count = await models.WorkerActivity.count(
{'workerFK': 1106}, options {'workerFK': 1106}, options

9
db/versions/11455-orangeTulip/00-firstScript.sql Normal file
View File

@ -0,0 +1,9 @@
USE vn;
INSERT INTO vn.workerActivityType (code, description)
VALUES('SHELVING_CLEAN_START', 'SE INICIA LIMPIEZA CARRO'),
('SHELVING_CLEAN_STOP', 'SE FINALIZA LIMPIEZA CARRO');