From 445703c6e2f870a7dcafeae9c09a73efaf0c1ad7 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Tue, 9 Jan 2024 09:14:48 +0100 Subject: [PATCH 1/9] 6275-hotFix version not applied --- db/changes/{235001 => 240002}/00-silexToSalix.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename db/changes/{235001 => 240002}/00-silexToSalix.sql (100%) diff --git a/db/changes/235001/00-silexToSalix.sql b/db/changes/240002/00-silexToSalix.sql similarity index 100% rename from db/changes/235001/00-silexToSalix.sql rename to db/changes/240002/00-silexToSalix.sql From 783436e8d222b1cef2d0284aaa884be54968b66e Mon Sep 17 00:00:00 2001 From: guillermo Date: Tue, 9 Jan 2024 15:02:58 +0100 Subject: [PATCH 2/9] fix: refs #6582 Traductions routesMonitor --- modules/route/back/locale/route/en.yml | 17 +----- modules/route/back/locale/route/es.yml | 17 +----- .../route/back/locale/routesMonitor/en.yml | 19 ++++++ .../route/back/locale/routesMonitor/es.yml | 19 ++++++ modules/route/back/model-config.json | 3 + modules/route/back/models/routesMonitor.json | 61 +++++++++++++++++++ 6 files changed, 104 insertions(+), 32 deletions(-) create mode 100644 modules/route/back/locale/routesMonitor/en.yml create mode 100644 modules/route/back/locale/routesMonitor/es.yml create mode 100644 modules/route/back/models/routesMonitor.json diff --git a/modules/route/back/locale/route/en.yml b/modules/route/back/locale/route/en.yml index d86cbe342..34ebd8932 100644 --- a/modules/route/back/locale/route/en.yml +++ b/modules/route/back/locale/route/en.yml @@ -16,19 +16,4 @@ columns: vehicleFk: vehicle agencyModeFk: agency routeFk: route - zoneFk: zone - name: name - beachFk: beach - ticketPacked: tickets packed - ticketFree: tickets free - ticketProduction: tickets production - packages: packages - note: note - dated: dated - dockFk: dock - priority: priority - etd: etd - expeditionTruckFk: truck - m3boxes: m3 boxes - bufferFk: buffer - isPickingAllowed: is picking allowed \ No newline at end of file + zoneFk: zone \ No newline at end of file diff --git a/modules/route/back/locale/route/es.yml b/modules/route/back/locale/route/es.yml index baefb6433..6693f7d1a 100644 --- a/modules/route/back/locale/route/es.yml +++ b/modules/route/back/locale/route/es.yml @@ -16,19 +16,4 @@ columns: vehicleFk: vehículo agencyModeFk: agencia routeFk: ruta - zoneFk: zona - name: nombre - beachFk: playa - ticketPacked: tickets encajados - ticketFree: tickets libres - ticketProduction: tickets producción - packages: paquetes - note: nota - dated: fecha - dockFk: muelle - priority: prioridad - etd: etd - expeditionTruckFk: camión - m3boxes: m3 cajas - bufferFk: buffer - isPickingAllowed: está permitido recoger \ No newline at end of file + zoneFk: zona \ No newline at end of file diff --git a/modules/route/back/locale/routesMonitor/en.yml b/modules/route/back/locale/routesMonitor/en.yml new file mode 100644 index 000000000..8908ee636 --- /dev/null +++ b/modules/route/back/locale/routesMonitor/en.yml @@ -0,0 +1,19 @@ +name: routesMonitor +columns: + routeFk: route + name: name + beachFk: beach + ticketPacked: tickets packed + ticketFree: tickets free + ticketProduction: tickets production + packages: packages + note: note + dated: dated + dockFk: dock + m3: m3 + priority: priority + etd: etd + expeditionTruckFk: truck + m3boxes: m3 boxes + bufferFk: buffer + isPickingAllowed: is picking allowed \ No newline at end of file diff --git a/modules/route/back/locale/routesMonitor/es.yml b/modules/route/back/locale/routesMonitor/es.yml new file mode 100644 index 000000000..9ded8983d --- /dev/null +++ b/modules/route/back/locale/routesMonitor/es.yml @@ -0,0 +1,19 @@ +name: monitorRutas +columns: + routeFk: ruta + name: nombre + beachFk: playa + ticketPacked: tickets encajados + ticketFree: tickets libres + ticketProduction: tickets producción + packages: paquetes + note: nota + dated: fecha + dockFk: muelle + m3: m3 + priority: prioridad + etd: etd + expeditionTruckFk: camión + m3boxes: m3 cajas + bufferFk: buffer + isPickingAllowed: está permitido recoger \ No newline at end of file diff --git a/modules/route/back/model-config.json b/modules/route/back/model-config.json index 6688a243a..6cf8da986 100644 --- a/modules/route/back/model-config.json +++ b/modules/route/back/model-config.json @@ -22,5 +22,8 @@ }, "Vehicle": { "dataSource": "vn" + }, + "RoutesMonitor": { + "dataSource": "vn" } } diff --git a/modules/route/back/models/routesMonitor.json b/modules/route/back/models/routesMonitor.json new file mode 100644 index 000000000..e5a0f6062 --- /dev/null +++ b/modules/route/back/models/routesMonitor.json @@ -0,0 +1,61 @@ +{ + "name": "RoutesMonitor", + "base": "Loggable", + "options": { + "mysql": { + "table": "routesMonitor" + } + }, + "properties": { + "routeFk": { + "type": "number", + "id": true, + "description": "Identifier" + }, + "name": { + "type": "string" + }, + "beachFk": { + "type": "number" + }, + "ticketPacked": { + "type": "number" + }, + "ticketFree": { + "type": "number" + }, + "ticketProduction": { + "type": "number" + }, + "packages": { + "type": "number" + }, + "note": { + "type": "string" + }, + "dated": { + "type": "date" + }, + "dockFk": { + "type": "number" + }, + "m3": { + "type": "number" + }, + "priority": { + "type": "number" + }, + "expeditionTruckFk": { + "type": "number" + }, + "m3boxes": { + "type": "number" + }, + "bufferFk": { + "type": "number" + }, + "isPickingAllowed": { + "type": "boolean" + } + } +} From 63b20c1e91b7e09a7b184553b4a7ad9e4de611eb Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 10 Jan 2024 13:12:12 +0100 Subject: [PATCH 3/9] fix(ticketTracking): refs #6398 assign ticket workerFk to userFk --- modules/ticket/front/tracking/edit/index.html | 2 +- modules/ticket/front/tracking/edit/index.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/ticket/front/tracking/edit/index.html b/modules/ticket/front/tracking/edit/index.html index 47f367007..3b42cb2c2 100644 --- a/modules/ticket/front/tracking/edit/index.html +++ b/modules/ticket/front/tracking/edit/index.html @@ -21,7 +21,7 @@ + ng-model="$ctrl.userFk"> diff --git a/modules/ticket/front/tracking/edit/index.js b/modules/ticket/front/tracking/edit/index.js index 3057c492b..fc9315d4c 100644 --- a/modules/ticket/front/tracking/edit/index.js +++ b/modules/ticket/front/tracking/edit/index.js @@ -17,19 +17,19 @@ class Controller extends Section { set stateFk(value) { this.params.stateFk = value; this.isPickerDesignedState = this.getIsPickerDesignedState(value); - this.workerFk = window.localStorage.currentUserWorkerId; + this.userFk = window.localStorage.currentUserWorkerId; } get stateFk() { return this.params.stateFk; } - set workerFk(value) { - this.params.workerFk = value; + set userFk(value) { + this.params.userFk = value; } - get workerFk() { - return this.params.workerFk; + get userFk() { + return this.params.userFk; } getPickerDesignedState() { From df13fa3c884ebbb1d2e16fd56da8621b7d8a5428 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 10 Jan 2024 13:35:34 +0100 Subject: [PATCH 4/9] fix(selector): refs #6398 change selector name --- e2e/helpers/selectors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js index acd13800b..dba430e66 100644 --- a/e2e/helpers/selectors.js +++ b/e2e/helpers/selectors.js @@ -735,7 +735,7 @@ export default { }, createStateView: { state: 'vn-autocomplete[ng-model="$ctrl.stateFk"]', - worker: 'vn-worker-autocomplete[ng-model="$ctrl.workerFk"]', + worker: 'vn-worker-autocomplete[ng-model="$ctrl.userFk"]', saveStateButton: `button[type=submit]` }, claimsIndex: { From dff277ed12b233e3465171305405cbe6da77eb20 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 10 Jan 2024 13:55:01 +0100 Subject: [PATCH 5/9] fix(spec): refs #6398 fix spec --- modules/ticket/front/tracking/edit/index.spec.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ticket/front/tracking/edit/index.spec.js b/modules/ticket/front/tracking/edit/index.spec.js index 9d9aa7983..de3b85ca3 100644 --- a/modules/ticket/front/tracking/edit/index.spec.js +++ b/modules/ticket/front/tracking/edit/index.spec.js @@ -29,11 +29,11 @@ describe('Ticket', () => { }); }); - describe('workerFk setter', () => { - it('should set params.workerFk', () => { - controller.workerFk = 1; + describe('userFk setter', () => { + it('should set params.userFk', () => { + controller.userFk = 1; - expect(controller.params.workerFk).toEqual(1); + expect(controller.params.userFk).toEqual(1); }); }); From 9b15551013e69d27a47dd7be16da2f25275eda15 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 11 Jan 2024 09:00:45 +0100 Subject: [PATCH 6/9] refs #6675 fix: correct sql folder --- db/changes/240001/00-truncate-where-signInLog.sql | 1 - db/changes/{235201 => 240201}/00-aclsMails.sql | 0 .../00-fixInvoiceCorrectionConstraintsName.sql | 0 db/changes/{240001 => 240201}/00-getTaxBases.sql | 0 db/changes/240201/00-truncateWhereSignInLog.sql | 2 ++ db/changes/{240001 => 240201}/01-newHasAnyPositiveBase.sql | 0 .../{240001 => 240201}/01-refactorHasAnyNegativeBase.sql | 0 loopback/locale/en.json | 5 +++-- 8 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 db/changes/240001/00-truncate-where-signInLog.sql rename db/changes/{235201 => 240201}/00-aclsMails.sql (100%) rename db/changes/{240001 => 240201}/00-fixInvoiceCorrectionConstraintsName.sql (100%) rename db/changes/{240001 => 240201}/00-getTaxBases.sql (100%) create mode 100644 db/changes/240201/00-truncateWhereSignInLog.sql rename db/changes/{240001 => 240201}/01-newHasAnyPositiveBase.sql (100%) rename db/changes/{240001 => 240201}/01-refactorHasAnyNegativeBase.sql (100%) diff --git a/db/changes/240001/00-truncate-where-signInLog.sql b/db/changes/240001/00-truncate-where-signInLog.sql deleted file mode 100644 index 93d80d716..000000000 --- a/db/changes/240001/00-truncate-where-signInLog.sql +++ /dev/null @@ -1 +0,0 @@ -DELETE FROM `account`.`signInLog` where owner <> FALSE diff --git a/db/changes/235201/00-aclsMails.sql b/db/changes/240201/00-aclsMails.sql similarity index 100% rename from db/changes/235201/00-aclsMails.sql rename to db/changes/240201/00-aclsMails.sql diff --git a/db/changes/240001/00-fixInvoiceCorrectionConstraintsName.sql b/db/changes/240201/00-fixInvoiceCorrectionConstraintsName.sql similarity index 100% rename from db/changes/240001/00-fixInvoiceCorrectionConstraintsName.sql rename to db/changes/240201/00-fixInvoiceCorrectionConstraintsName.sql diff --git a/db/changes/240001/00-getTaxBases.sql b/db/changes/240201/00-getTaxBases.sql similarity index 100% rename from db/changes/240001/00-getTaxBases.sql rename to db/changes/240201/00-getTaxBases.sql diff --git a/db/changes/240201/00-truncateWhereSignInLog.sql b/db/changes/240201/00-truncateWhereSignInLog.sql new file mode 100644 index 000000000..db5d8e25d --- /dev/null +++ b/db/changes/240201/00-truncateWhereSignInLog.sql @@ -0,0 +1,2 @@ +DELETE FROM `account`.`signInLog` where owner <> FALSE; + diff --git a/db/changes/240001/01-newHasAnyPositiveBase.sql b/db/changes/240201/01-newHasAnyPositiveBase.sql similarity index 100% rename from db/changes/240001/01-newHasAnyPositiveBase.sql rename to db/changes/240201/01-newHasAnyPositiveBase.sql diff --git a/db/changes/240001/01-refactorHasAnyNegativeBase.sql b/db/changes/240201/01-refactorHasAnyNegativeBase.sql similarity index 100% rename from db/changes/240001/01-refactorHasAnyNegativeBase.sql rename to db/changes/240201/01-refactorHasAnyNegativeBase.sql diff --git a/loopback/locale/en.json b/loopback/locale/en.json index 2c7dc6be1..0c3c9ec67 100644 --- a/loopback/locale/en.json +++ b/loopback/locale/en.json @@ -203,5 +203,6 @@ "keepPrice": "keepPrice", "Cannot past travels with entries": "Cannot past travels with entries", "It was not able to remove the next expeditions:": "It was not able to remove the next expeditions: {{expeditions}}", - "Incorrect pin": "Incorrect pin." -} + "Incorrect pin": "Incorrect pin.", + "The notification subscription of this worker cant be modified": "The notification subscription of this worker cant be modified" +} \ No newline at end of file From 4673145c582f8bc4c8d22d8cd85fdc399a932daf Mon Sep 17 00:00:00 2001 From: guillermo Date: Thu, 11 Jan 2024 10:09:35 +0100 Subject: [PATCH 7/9] fix: ticket 147437: Fix packages in incoterms --- .../invoice-incoterms/invoice-incoterms.js | 2 +- .../reports/invoice-incoterms/sql/client.sql | 25 +++--- .../invoice-incoterms/sql/incoterms.sql | 77 ++++++++----------- .../reports/invoice-incoterms/sql/invoice.sql | 35 ++++----- 4 files changed, 61 insertions(+), 78 deletions(-) diff --git a/print/templates/reports/invoice-incoterms/invoice-incoterms.js b/print/templates/reports/invoice-incoterms/invoice-incoterms.js index 2c183b6cc..9cc2600af 100755 --- a/print/templates/reports/invoice-incoterms/invoice-incoterms.js +++ b/print/templates/reports/invoice-incoterms/invoice-incoterms.js @@ -7,7 +7,7 @@ module.exports = { this.invoice = await this.findOneFromDef('invoice', [this.reference]); this.checkMainEntity(this.invoice); this.client = await this.findOneFromDef('client', [this.reference]); - this.incoterms = await this.findOneFromDef('incoterms', [this.reference, this.reference, this.reference]); + this.incoterms = await this.findOneFromDef('incoterms', [this.reference, this.reference, this.reference, this.reference]); }, props: { reference: { diff --git a/print/templates/reports/invoice-incoterms/sql/client.sql b/print/templates/reports/invoice-incoterms/sql/client.sql index 3e66c15c9..f3734bcd9 100644 --- a/print/templates/reports/invoice-incoterms/sql/client.sql +++ b/print/templates/reports/invoice-incoterms/sql/client.sql @@ -1,13 +1,12 @@ -SELECT - c.id, - c.socialName, - c.street AS postalAddress, - IF (ios.taxAreaFk IS NOT NULL, CONCAT(cty.code, c.fi), c.fi) fi, - CONCAT(c.postcode, ' - ', c.city) postcodeCity -FROM vn.invoiceOut io - JOIN vn.client c ON c.id = io.clientFk - JOIN vn.country cty ON cty.id = c.countryFk - LEFT JOIN vn.invoiceOutSerial ios ON ios.code = io.serial - AND ios.taxAreaFk = 'CEE' - LEFT JOIN ticket t ON t.refFk = io.ref -WHERE t.refFk = ? \ No newline at end of file +SELECT c.id, + c.socialName, + c.street postalAddress, + IF (ios.taxAreaFk IS NOT NULL, CONCAT(cty.code, c.fi), c.fi) fi, + CONCAT(c.postcode, ' - ', c.city) postcodeCity + FROM vn.invoiceOut io + JOIN vn.client c ON c.id = io.clientFk + JOIN vn.country cty ON cty.id = c.countryFk + LEFT JOIN vn.invoiceOutSerial ios ON ios.code = io.serial + AND ios.taxAreaFk = 'CEE' + LEFT JOIN ticket t ON t.refFk = io.ref + WHERE t.refFk = ? \ No newline at end of file diff --git a/print/templates/reports/invoice-incoterms/sql/incoterms.sql b/print/templates/reports/invoice-incoterms/sql/incoterms.sql index 0c4af803d..b36f50084 100644 --- a/print/templates/reports/invoice-incoterms/sql/incoterms.sql +++ b/print/templates/reports/invoice-incoterms/sql/incoterms.sql @@ -1,38 +1,14 @@ -SELECT io.issued, - c.socialName, - c.street postalAddress, - c.fi, - io.clientFk, - c.postcode, - c.city, - io.companyFk, - io.ref, - tc.code, - s.concept, - s.quantity, - s.price, - s.discount, - s.ticketFk, - t.shipped, - t.refFk, - a.nickname, - s.itemFk, - s.id saleFk, - pm.name AS pmname, - sa.iban, - c.phone, - MAX(t.packages) packages, +SELECT pack.packages, a.incotermsFk, - ic.name incotermsName , + ic.name incotermsName, t.weight, - t.observations, ca.fiscalName customsAgentName, ca.street customsAgentStreet, ca.nif customsAgentNif, ca.phone customsAgentPhone, ca.email customsAgentEmail, - CAST(sub2.volume AS DECIMAL (10,2)) volume, - sub3.intrastat + CAST(vol.volume AS DECIMAL (10,2)) volume, + intr.intrastat FROM vn.invoiceOut io JOIN vn.supplier su ON su.id = io.companyFk JOIN vn.client c ON c.id = io.clientFk @@ -42,26 +18,35 @@ SELECT io.issued, LEFT JOIN vn.incoterms ic ON ic.code = a.incotermsFk LEFT JOIN vn.customsAgent ca ON ca.id = a.customsAgentFk JOIN vn.sale s ON s.ticketFk = t.id - JOIN (SELECT SUM(volume) volume - FROM vn.invoiceOut io - JOIN vn.ticket t ON t.refFk = io.ref - JOIN vn.saleVolume sv ON sv.ticketFk = t.id - WHERE t.refFk = ? - ) sub2 ON TRUE - JOIN vn.itemTaxCountry itc ON itc.countryFk = su.countryFk AND itc.itemFk = s.itemFk + JOIN ( + SELECT SUM(volume) volume, COUNT(*) packages + FROM vn.invoiceOut io + JOIN vn.ticket t ON t.refFk = io.ref + JOIN vn.saleVolume sv ON sv.ticketFk = t.id + WHERE t.refFk = ? + ) vol + JOIN vn.itemTaxCountry itc ON itc.countryFk = su.countryFk + AND itc.itemFk = s.itemFk JOIN vn.taxClass tc ON tc.id = itc.taxClassFk - JOIN vn.invoiceOutSerial ios ON ios.code = io.serial AND ios.taxAreaFk = 'WORLD' + JOIN vn.invoiceOutSerial ios ON ios.code = io.serial + AND ios.taxAreaFk = 'WORLD' JOIN vn.country cty ON cty.id = c.countryFk JOIN vn.payMethod pm ON pm.id = c .payMethodFk JOIN vn.company co ON co.id=io.companyFk JOIN vn.supplierAccount sa ON sa.id=co.supplierAccountFk - LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT ir.description ORDER BY ir.description SEPARATOR '. ' ) as intrastat - FROM vn.ticket t - JOIN vn.invoiceOut io ON io.ref = t.refFk - JOIN vn.sale s ON t.id = s.ticketFk - JOIN vn.item i ON i.id = s.itemFk - JOIN vn.intrastat ir ON ir.id = i.intrastatFk - WHERE t.refFk = ? - )sub3 ON TRUE - WHERE t.refFk = ? - + JOIN ( + SELECT GROUP_CONCAT(DISTINCT ir.description ORDER BY ir.description SEPARATOR '. ' ) intrastat + FROM vn.ticket t + JOIN vn.invoiceOut io ON io.ref = t.refFk + JOIN vn.sale s ON t.id = s.ticketFk + JOIN vn.item i ON i.id = s.itemFk + JOIN vn.intrastat ir ON ir.id = i.intrastatFk + WHERE t.refFk = ? + ) intr + JOIN ( + SELECT SUM(packages) packages + FROM ticket + WHERE refFk = ? + ) pack + WHERE t.refFk = ? + LIMIT 1 diff --git a/print/templates/reports/invoice-incoterms/sql/invoice.sql b/print/templates/reports/invoice-incoterms/sql/invoice.sql index 571ea2af3..02074f5c4 100644 --- a/print/templates/reports/invoice-incoterms/sql/invoice.sql +++ b/print/templates/reports/invoice-incoterms/sql/invoice.sql @@ -1,18 +1,17 @@ -SELECT - io.id, - io.issued, - io.clientFk, - io.companyFk, - io.ref, - pm.code AS payMethodCode, - cny.code companyCode, - sa.iban, - ios.footNotes -FROM invoiceOut io - JOIN client c ON c.id = io.clientFk - JOIN payMethod pm ON pm.id = c.payMethodFk - JOIN company cny ON cny.id = io.companyFk - JOIN supplierAccount sa ON sa.id = cny.supplierAccountFk - LEFT JOIN invoiceOutSerial ios ON ios.code = io.serial - LEFT JOIN ticket t ON t.refFk = io.ref -WHERE t.refFk = ? \ No newline at end of file +SELECT io.id, + io.issued, + io.clientFk, + io.companyFk, + io.ref, + pm.code payMethodCode, + cny.code companyCode, + sa.iban, + ios.footNotes + FROM invoiceOut io + JOIN client c ON c.id = io.clientFk + JOIN payMethod pm ON pm.id = c.payMethodFk + JOIN company cny ON cny.id = io.companyFk + JOIN supplierAccount sa ON sa.id = cny.supplierAccountFk + LEFT JOIN invoiceOutSerial ios ON ios.code = io.serial + LEFT JOIN ticket t ON t.refFk = io.ref + WHERE t.refFk = ? \ No newline at end of file From b1530d049ed07a36132f77918022d0ce16e422d3 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 11 Jan 2024 13:29:03 +0100 Subject: [PATCH 8/9] refs #6398 hotFix: use userFk --- modules/ticket/back/methods/ticket-tracking/setDelivered.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ticket/back/methods/ticket-tracking/setDelivered.js b/modules/ticket/back/methods/ticket-tracking/setDelivered.js index d3cdb192f..eded63d11 100644 --- a/modules/ticket/back/methods/ticket-tracking/setDelivered.js +++ b/modules/ticket/back/methods/ticket-tracking/setDelivered.js @@ -49,7 +49,7 @@ module.exports = Self => { for (const id of ticketIds) { const promise = await models.Ticket.state(ctx, { stateFk: state.id, - workerFk: worker.id, + userFk: worker.id, ticketFk: id }, myOptions); promises.push(promise); From 2a6b509a78e864778db794d8e5c32092474ad51d Mon Sep 17 00:00:00 2001 From: jorgep Date: Fri, 12 Jan 2024 09:54:18 +0100 Subject: [PATCH 9/9] fix: refs #6656 change acls --- db/changes/240202/.gitkeep | 0 db/changes/240202/00-aclWorkerTimeControl.sql | 14 ++++++++++++++ .../methods/worker-time-control/deleteTimeEntry.js | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 db/changes/240202/.gitkeep create mode 100644 db/changes/240202/00-aclWorkerTimeControl.sql diff --git a/db/changes/240202/.gitkeep b/db/changes/240202/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/db/changes/240202/00-aclWorkerTimeControl.sql b/db/changes/240202/00-aclWorkerTimeControl.sql new file mode 100644 index 000000000..5ccb3131d --- /dev/null +++ b/db/changes/240202/00-aclWorkerTimeControl.sql @@ -0,0 +1,14 @@ +DELETE FROM salix.ACL + WHERE model = 'WorkerTimeControl' + AND property IN ('*','addTime'); + +INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId) + VALUES + ('WorkerTimeControl', 'addTimeEntry', 'WRITE', 'ALLOW', 'ROLE', 'employee'), + ('WorkerTimeControl', 'deleteTimeEntry', 'WRITE', 'ALLOW', 'ROLE', 'employee'), + ('WorkerTimeControl', 'updateTimeEntry', 'WRITE', 'ALLOW', 'ROLE', 'employee'), + ('WorkerTimeControl', 'sendMail', 'WRITE', 'ALLOW', 'ROLE', 'employee'), + ('WorkerTimeControl', 'updateWorkerTimeControlMail', 'WRITE', 'ALLOW', 'ROLE', 'employee'), + ('WorkerTimeControl', 'weeklyHourRecordEmail', 'WRITE', 'ALLOW', 'ROLE', 'employee'), + ('WorkerTimeControl', 'getMailStates', 'READ', 'ALLOW', 'ROLE', 'employee'), + ('WorkerTimeControl', 'resendWeeklyHourEmail', 'WRITE', 'ALLOW', 'ROLE', 'employee'); diff --git a/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js b/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js index 8f9541596..3e1d731bb 100644 --- a/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js +++ b/modules/worker/back/methods/worker-time-control/deleteTimeEntry.js @@ -3,7 +3,7 @@ const UserError = require('vn-loopback/util/user-error'); module.exports = Self => { Self.remoteMethodCtx('deleteTimeEntry', { description: 'Deletes a manual time entry for a worker if the user role is above the worker', - accessType: 'READ', + accessType: 'WRITE', accepts: [{ arg: 'id', type: 'number',