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

refs #5858 perf: remove bad comments
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Javier Segarra 2023-12-19 08:02:38 +01:00
parent a31b689ae2
commit dbc3fc8007
6 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/changes/234801/00-zoneIncluded_trigger.sql
View File

@ -17,7 +17,6 @@ BEGIN
`zoneFk` = NEW.zoneFk, `zoneFk` = NEW.zoneFk,
`geoFk` = NEW.geoFk, `geoFk` = NEW.geoFk,
`userFk` = account.myUser_getId(); `userFk` = account.myUser_getId();
-- CALL `vn`.`zoneIncluded_checkCollisions`(NEW.zoneFk, NEW.geoFk);
END$$ END$$
DELIMITER ; DELIMITER ;
@ -42,7 +41,6 @@ BEGIN
`geoFk` = NEW.geoFk, `geoFk` = NEW.geoFk,
`userFk` = account.myUser_getId(); `userFk` = account.myUser_getId();
-- CALL `vn`.`zoneIncluded_checkCollisions`();
END$$ END$$
@ -68,6 +66,5 @@ BEGIN
`geoFk` = OLD.geoFk, `geoFk` = OLD.geoFk,
`userFk` = account.myUser_getId(); `userFk` = account.myUser_getId();
-- CALL `vn`.`zoneIncluded_checkCollisions`();
END$$ END$$
DELIMITER ; DELIMITER ;

14
db/dump/03-zoneIncluded_procedure_checkCollisions.sql
View File

@ -1,14 +0,0 @@
DROP PROCEDURE IF EXISTS `vn`.`zoneIncluded_checkCollisions`;
DELIMITER $$
$$
CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`zoneIncluded_checkCollisions`()
BEGIN
-- DROP TEMPORARY TABLE IF EXISTS tmp.toCheck;
DECLARE vZonesToCheck INT;
DECLARE vDone INT DEFAULT FALSE;
DECLARE vZoneFk INT;
DECLARE vCounter INT;
END$$
DELIMITER ;

3
db/dump/fixtures.sql
View File

@ -3012,7 +3012,6 @@ INSERT INTO `vn`.`invoiceCorrectionType` (`id`, `description`)
(3, 'Error in customer data'); (3, 'Error in customer data');
-- Auto-generated SQL script #202312181416
UPDATE salix.ACL UPDATE salix.ACL
SET principalId='employee' SET principalId='employee'
WHERE id=391; WHERE model ="Notification";

4
modules/zone/back/methods/zone/specs/toggleIsIncluded.spec.js
View File

@ -1,9 +1,7 @@
const models = require('vn-loopback/server/server').models; const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context'); const LoopBackContext = require('loopback-context');
let conn = null;
describe('zone toggleIsIncluded()', () => { describe('zone toggleIsIncluded()', () => {
beforeAll(async() => { beforeAll(async() => {
conn = await models.Item.dataSource.connector;
const activeCtx = { const activeCtx = {
accessToken: {userId: 9}, accessToken: {userId: 9},
http: { http: {
@ -17,7 +15,7 @@ describe('zone toggleIsIncluded()', () => {
}); });
}); });
fit('should return the created location with isIncluded true', async() => { it('should return the created location with isIncluded true', async() => {
const tx = await models.Zone.beginTransaction({}); const tx = await models.Zone.beginTransaction({});
try { try {

5
print/templates/email/zone-included/sql/zoneIncluded.sql
View File

@ -1,5 +0,0 @@
SELECT
z.name
FROM vn.zoneIncluded zI
LEFT JOIN vn.zone z ON z.Id = zI.zoneFk
WHERE zI.id = ?;

16
print/templates/email/zone-included/zone-included.js
View File

@ -15,21 +15,5 @@ module.exports = {
}, },
props: { props: {
zoneCollisions: {type: Array, required: true} zoneCollisions: {type: Array, required: true}
// zoneFk: {
// type: String,
// required: true
// },
// z: {
// type: Object,
// required: true
// },
// zn: {
// type: Object,
// required: true
// },
// w: {
// type: Object,
// required: true
// }
} }
}; };