db/routines/vn/procedures/workerTimeControl_clockIn.sql

@@ -75,16 +75,11 @@ BEGIN
 
 	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',
 				wc.dayBreakDriver,
 				wc.dayBreak),
 			wc.shortWeekBreak,
-			IF(vIsCampaing, NULL, wc.longWeekBreak),
+			wc.longWeekBreak,
 			wc.weekScope,
 			wc.dayMaxTime,
 			wc.maxWorkShortCycle,
@@ -244,6 +239,11 @@ BEGIN
 			CALL util.throw(vErrorCode);
 		END IF;
 
+		SELECT EXISTS (
+			SELECT id FROM campaign
+				WHERE vTimed BETWEEN dated - INTERVAL scopeDays DAY AND dated
+		) INTO vIsCampaing;
+
 		-- VERIFICA DESCANSO SEMANAL
 		WITH wtc AS(
 		(SELECT timed 
@@ -262,7 +262,7 @@ BEGIN
 		), wtcBreak AS( 
 			SELECT timed,
 					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
 				ORDER BY timed
 		), wtcBreakCounter AS(