diff options
author | root <root@www.engelsystem.de> | 2010-12-30 13:47:05 +0100 |
---|---|---|
committer | root <root@www.engelsystem.de> | 2010-12-30 13:47:05 +0100 |
commit | e62a94c73161c5a317c93aecebb09cf61f151cd0 (patch) | |
tree | ec38e015ca9a03613af983d6a1252529f11b1404 /www-ssl/admin/aktiv.php | |
parent | 0844e3fc867da6e81fefde9fd339ab9af63d5b0f (diff) | |
parent | ad256ad33941a60e46dbb1daa6531e4246ebf95c (diff) |
Merge branch 'master' into spezial_includes
Diffstat (limited to 'www-ssl/admin/aktiv.php')
-rwxr-xr-x | www-ssl/admin/aktiv.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/www-ssl/admin/aktiv.php b/www-ssl/admin/aktiv.php index ddc7c3e8..3b294402 100755 --- a/www-ssl/admin/aktiv.php +++ b/www-ssl/admin/aktiv.php @@ -55,7 +55,7 @@ echo "</tr>\n"; $SQL = " SELECT d.UID, d.nr, d.len, d.lenWeight, f.nr AS nrFree, f.len AS lenFree, d.lenWeight - COALESCE(f.len, 0) as lenReal FROM - (SELECT e.UID, COUNT(s.Len) as nr, SUM(s.Len) as len, SUM( s.Len*(1+(((HOUR(s.DateS)+2)%24)<10 and ((HOUR(s.DateE)+2)%24)<10)) ) as lenWeight FROM `Shifts` AS s INNER JOIN `ShiftEntry` AS e USING(SID) WHERE NOT UID=0 GROUP BY UID) as d + (SELECT e.UID, COUNT(s.Len) as nr, SUM(s.Len) as len, SUM( s.Len*(1+(((HOUR(s.DateS)+2)%24)<10 and ((HOUR(s.DateE)+2)%24)<=10)) ) as lenWeight FROM `Shifts` AS s INNER JOIN `ShiftEntry` AS e USING(SID) WHERE NOT UID=0 GROUP BY UID) as d LEFT JOIN (SELECT UID, COUNT(Length) AS nr, SUM(Length) AS len FROM `ShiftFreeloader` GROUP BY UID) AS f USING(UID) |