From dca7dd5fc7a74fdde20a279eaddac32f10eaf642 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez Ruiz Date: Thu, 21 Nov 2019 14:51:11 +0100 Subject: [PATCH] rejected last modifications --- .../00-workerTimeControlCalculate.sql | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/db/changes/10110-postCampaign/00-workerTimeControlCalculate.sql b/db/changes/10110-postCampaign/00-workerTimeControlCalculate.sql index c51647727..8e8c7471b 100644 --- a/db/changes/10110-postCampaign/00-workerTimeControlCalculate.sql +++ b/db/changes/10110-postCampaign/00-workerTimeControlCalculate.sql @@ -19,17 +19,18 @@ BEGIN userFk, dated FROM (SELECT IF(@vUser = wtc.userFk, @vUser :=@vUser, @vUser := wtc.userFk ), - 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, + 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, wtc.userFk, wtc.timed timed, - wtc.direction + direction FROM workerTimeControl wtc JOIN tmp.`user` w ON w.userFk = wtc.userFk - WHERE wtc.timed BETWEEN curdate()-1 AND curdate() - ORDER BY wtc.userFk, wtc.timed + WHERE wtc.timed BETWEEN vDatedFrom AND vDatedTo + ORDER BY userFk, timed ) sub GROUP BY userFk, dated ORDER BY userFk, dated