diff --git a/db/changes/10110-postCampaign/00-workerTimeControlCalculate.sql b/db/changes/10110-postCampaign/00-workerTimeControlCalculate.sql index ef058acb1..c51647727 100644 --- a/db/changes/10110-postCampaign/00-workerTimeControlCalculate.sql +++ b/db/changes/10110-postCampaign/00-workerTimeControlCalculate.sql @@ -19,18 +19,17 @@ BEGIN userFk, dated FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk ), - IF(@vIsOdd, @vIsOdd := FALSE, @vIsOdd := TRUE ), - IF(direction='in', @vIsOdd := TRUE, @vIsOdd := @vIsOdd ), - IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(timed),@vLastTimed:=@vLastTimed), - IF(@vIsOdd, 0, UNIX_TIMESTAMP(timed)-@vLastTimed) timeWork, - IF(direction='in', @vDated := DATE(wtc.timed), @vDated :=@vDated) dated, + IF(wtc.direction='in', @vIsOdd := TRUE, @vIsOdd := !@vIsOdd), + IF(@vIsOdd, @vLastTimed:=UNIX_TIMESTAMP(wtc.timed), TRUE), + IF(@vIsOdd, 0, UNIX_TIMESTAMP(wtc.timed)-@vLastTimed) timeWork, + IF(wtc.direction='in', @vDated := DATE(wtc.timed), @vDated) dated, wtc.userFk, wtc.timed timed, - direction + wtc.direction FROM workerTimeControl wtc JOIN tmp.`user` w ON w.userFk = wtc.userFk - WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo - ORDER BY userFk, timed + WHERE wtc.timed BETWEEN curdate()-1 AND curdate() + ORDER BY wtc.userFk, wtc.timed ) sub GROUP BY userFk, dated ORDER BY userFk, dated @@ -38,5 +37,4 @@ BEGIN END$$ -DELIMITER ; - +DELIMITER ; \ No newline at end of file