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

8267-devToTest #3270

Merged
alexm merged 131 commits from 8267-devToTest into test 2024-12-03 12:18:21 +00:00
Conversation 0 Commits 131 Files Changed 87 +11 -7
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a9d45bde4c - Show all commits

14
db/routines/vn/events/printQueue_check.sql
View File

@ -33,10 +33,10 @@ DO BEGIN
FROM printQueue WHERE statusCode = 'queued'; FROM printQueue WHERE statusCode = 'queued';
SELECT isAlreadyNotified INTO vIsAlreadyNotified SELECT isAlreadyNotified INTO vIsAlreadyNotified
FROM printingQueueCheck; FROM printingQueueConfig;
IF (SELECT lastCount FROM printingQueueCheck) = vCurrentCount AND IF (SELECT lastCount FROM printingQueueConfig) = vCurrentCount AND
(SELECT lastCheckSum FROM printingQueueCheck) = vCheckSum AND (SELECT lastCheckSum FROM printingQueueConfig) = vCheckSum AND
vIsAlreadyNotified = FALSE AND vCurrentCount > 0 vIsAlreadyNotified = FALSE AND vCurrentCount > 0
THEN THEN
@ -67,16 +67,16 @@ DO BEGIN
CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas', vTableQueue, '</table>') CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas', vTableQueue, '</table>')
); );
UPDATE printingQueueCheck SET isAlreadyNotified = TRUE; UPDATE printingQueueConfig SET isAlreadyNotified = TRUE;
END IF; END IF;
IF (SELECT lastCount FROM printingQueueCheck) > vCurrentCount AND IF (SELECT lastCount FROM printingQueueConfig) > vCurrentCount AND
vIsAlreadyNotified = TRUE vIsAlreadyNotified = TRUE
THEN THEN
UPDATE printingQueueCheck SET isAlreadyNotified = FALSE; UPDATE printingQueueConfig SET isAlreadyNotified = FALSE;
END IF; END IF;
UPDATE printingQueueCheck UPDATE printingQueueConfig
SET lastCount = vCurrentCount, SET lastCount = vCurrentCount,
lastCheckSum = vCheckSum; lastCheckSum = vCheckSum;

4
db/versions/11354-aquaMastic/00-firstScript.sql Normal file
View File

@ -0,0 +1,4 @@
RENAME TABLE vn.workerTimeControlParams TO vn.workerTimeControlParams__;
ALTER TABLE vn.workerTimeControlParams__ COMMENT='@deprecated 2024-11-19';
RENAME TABLE vn.printingQueueCheck TO vn.printingQueueConfig;