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 "\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) diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php index 6c4d50c7..a1783a23 100755 --- a/www-ssl/admin/debug.php +++ b/www-ssl/admin/debug.php @@ -30,7 +30,7 @@ funktion_db_list("FAQ"); echo "Deaktiviert"; */ -echo "
\n"; +echo "
\n"; funktion_db_element_list_2row( "Tshirt-Size aller engel", "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); @@ -42,7 +42,7 @@ echo "
\n"; funktion_db_element_list_2row( "Tshirt nicht ausgegeben (Gekommen=1)", "SELECT COUNT(`Size`), `Size` FROM `User` WHERE `Gekommen`='1' and `Tshirt`='0' GROUP BY `Size`"); -echo "
\n"; +echo "
\n"; funktion_db_element_list_2row( "Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); @@ -50,6 +50,20 @@ echo "
\n"; funktion_db_element_list_2row( "Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); +echo "
\n"; +funktion_db_element_list_2row( "Gesamte Arbeit", + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID)"); + +echo "
\n"; +funktion_db_element_list_2row( "Geleisteter Arbeit", + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0)"); + +echo "
\n"; +funktion_db_element_list_2row( "Geleisteter Arbeit (Ohne Raum aufabau (RID=7)", + "SELECT COUNT(*) AS `Count [x]`, SUM(Shifts.Len) as `Sum [h]` from Shifts LEFT JOIN ShiftEntry USING(SID) WHERE (ShiftEntry.UID!=0) AND (Shifts.RID!=7)"); + + + include ("../../../27c3/includes/footer.php"); ?>