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

feat: refs #8139 Added if is campaign #3206

Open
guillermo wants to merge 2 commits from 8139-clockInCampaign into dev
pull from: 8139-clockInCampaign
merge into: verdnatura:dev
Conversation 0 Commits 2 Files Changed 1 +7 -7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9768ce658f - Show all commits

14
db/routines/vn/procedures/workerTimeControl_clockIn.sql
View File

@ -75,16 +75,11 @@ BEGIN
SET vDated = DATE(vTimed); SET vDated = DATE(vTimed);
SELECT EXISTS (
SELECT TRUE FROM campaign
WHERE vTimed BETWEEN dated - INTERVAL scopeDays DAY AND dated
) INTO vIsCampaing;
SELECT IF(pc.code = 'driverCE', SELECT IF(pc.code = 'driverCE',
wc.dayBreakDriver, wc.dayBreakDriver,
wc.dayBreak), wc.dayBreak),
wc.shortWeekBreak, wc.shortWeekBreak,
IF(vIsCampaing, NULL, wc.longWeekBreak), wc.longWeekBreak,
wc.weekScope, wc.weekScope,
wc.dayMaxTime, wc.dayMaxTime,
wc.maxWorkShortCycle, wc.maxWorkShortCycle,
@ -244,6 +239,11 @@ BEGIN
CALL util.throw(vErrorCode); CALL util.throw(vErrorCode);
END IF; END IF;
SELECT EXISTS (
SELECT id FROM campaign
WHERE vTimed BETWEEN dated - INTERVAL scopeDays DAY AND dated
) INTO vIsCampaing;
-- VERIFICA DESCANSO SEMANAL -- VERIFICA DESCANSO SEMANAL
WITH wtc AS( WITH wtc AS(
(SELECT timed (SELECT timed
@ -262,7 +262,7 @@ BEGIN
), wtcBreak AS( ), wtcBreak AS(
SELECT timed, SELECT timed,
IF(IFNULL(gap, 0) > vShortWeekBreak, TRUE, FALSE) hasShortBreak, IF(IFNULL(gap, 0) > vShortWeekBreak, TRUE, FALSE) hasShortBreak,
IF(IFNULL(gap, 0) > vLongWeekBreak, TRUE, FALSE) hasLongBreak IF(IFNULL(gap, 0) > vLongWeekBreak AND NOT vIsCampaing, TRUE, FALSE) hasLongBreak
FROM wtcGap FROM wtcGap
ORDER BY timed ORDER BY timed
), wtcBreakCounter AS( ), wtcBreakCounter AS(