diff --git a/back/methods/workerActivity/add.js b/back/methods/workerActivity/add.js index 89131491d1..b5b1bd65de 100644 --- a/back/methods/workerActivity/add.js +++ b/back/methods/workerActivity/add.js @@ -13,6 +13,11 @@ module.exports = Self => { type: 'string', description: 'Origin model from insert' }, + { + arg: 'description', + type: 'string', + description: 'Action description' + }, ], 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 myOptions = {}; @@ -29,8 +34,8 @@ module.exports = Self => { Object.assign(myOptions, options); return await Self.rawSql(` - INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model) - SELECT ?, ?, ? + INSERT INTO workerActivity (workerFk, workerActivityTypeFk, model, description) + SELECT ?, ?, ?, ? FROM workerTimeControlConfig wtcc LEFT JOIN ( SELECT wa.workerFk, @@ -43,8 +48,8 @@ module.exports = Self => { LIMIT 1 ) sub ON TRUE WHERE sub.workerFk IS NULL - OR sub.code <> ? + OR sub.code <> ? OR TIMESTAMPDIFF(SECOND, sub.created, util.VN_NOW()) > wtcc.dayBreak;` - , [userId, code, model, userId, code], myOptions); + , [userId, code, model, description, userId, code], myOptions); }; }; diff --git a/back/methods/workerActivity/specs/add.spec.js b/back/methods/workerActivity/specs/add.spec.js index 751cce009e..ad6cc7fa70 100644 --- a/back/methods/workerActivity/specs/add.spec.js +++ b/back/methods/workerActivity/specs/add.spec.js @@ -13,7 +13,7 @@ describe('workerActivity insert()', () => { {'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( {'workerFK': 1106}, options diff --git a/back/models/agency-workCenter.json b/back/models/agency-workCenter.json index adf1e5bcb0..71de17cb25 100644 --- a/back/models/agency-workCenter.json +++ b/back/models/agency-workCenter.json @@ -24,7 +24,7 @@ "relations": { "agency": { "type": "belongsTo", - "model": "WorkCenter", + "model": "Agency", "foreignKey": "agencyFk" }, "workCenter": { diff --git a/db/versions/11444-orangeMastic/00-firstScript.sql b/db/versions/11444-orangeMastic/00-firstScript.sql new file mode 100644 index 0000000000..2476ea6f2c --- /dev/null +++ b/db/versions/11444-orangeMastic/00-firstScript.sql @@ -0,0 +1,8 @@ +UPDATE vn.claimEnd ce + JOIN( + SELECT id + FROM vn.claimEnd + WHERE claimDestinationFk NOT IN + (SELECT id FROM vn.claimDestination WHERE id IS NOT NULL) + ) s ON ce.id = s.id + SET ce.claimDestinationFk = 1; \ No newline at end of file diff --git a/db/versions/11444-orangeMastic/01-firstScript.sql b/db/versions/11444-orangeMastic/01-firstScript.sql new file mode 100644 index 0000000000..38cd7c0914 --- /dev/null +++ b/db/versions/11444-orangeMastic/01-firstScript.sql @@ -0,0 +1,9 @@ +ALTER TABLE vn.claimEnd + MODIFY COLUMN claimDestinationFk tinyint(3) unsigned NOT NULL DEFAULT 1; + +ALTER TABLE vn.claimEnd + ADD CONSTRAINT fk_claimEnd_claimDestination + FOREIGN KEY (claimDestinationFk) + REFERENCES claimDestination(id) + ON UPDATE CASCADE + ON DELETE RESTRICT; \ No newline at end of file diff --git a/db/versions/11455-orangeTulip/00-firstScript.sql b/db/versions/11455-orangeTulip/00-firstScript.sql new file mode 100644 index 0000000000..d64c8e324e --- /dev/null +++ b/db/versions/11455-orangeTulip/00-firstScript.sql @@ -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'); + + diff --git a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js index 5a08140e7f..74ae102d0c 100644 --- a/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js +++ b/modules/claim/back/methods/claim-beginning/importToNewRefundTicket.js @@ -109,7 +109,7 @@ module.exports = Self => { ); const newRefundTicket = await models.Ticket.create({ clientFk: claim.ticket().clientFk, - shipped: nextShipped, + shipped: nextShipped.shipped, landed: null, nickname, warehouseFk, diff --git a/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js b/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js index 7771310674..d305ca1f56 100644 --- a/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js +++ b/modules/claim/back/methods/claim-beginning/specs/importToNewRefundTicket.spec.js @@ -19,7 +19,7 @@ describe('importToNewRefundTicket()', () => { }); tx = await models.Entry.beginTransaction({}); options = {transaction: tx}; - spyOn(models.Agency, 'getShipped').and.returnValue(Promise.resolve(expectedDate)); + spyOn(models.Agency, 'getShipped').and.returnValue(Promise.resolve({shipped: expectedDate})); }); afterEach(async() => { diff --git a/modules/ticket/back/methods/ticket/filter.js b/modules/ticket/back/methods/ticket/filter.js index 87556810b4..d300b1815d 100644 --- a/modules/ticket/back/methods/ticket/filter.js +++ b/modules/ticket/back/methods/ticket/filter.js @@ -33,6 +33,11 @@ module.exports = Self => { type: 'date', description: `The to date filter` }, + { + arg: 'shipped', + type: 'date', + description: `The shipped date filter` + }, { arg: 'nickname', type: 'string', @@ -201,6 +206,7 @@ module.exports = Self => { case 'clientFk': case 'agencyModeFk': case 'warehouseFk': + case 'shipped': param = `t.${param}`; return {[param]: value}; }