diff options
| author | root <root@www.engelsystem.de> | 2010-12-30 13:50:29 +0100 |
|---|---|---|
| committer | root <root@www.engelsystem.de> | 2010-12-30 13:50:29 +0100 |
| commit | e13971a74c491ea2d754d064fccd85874e0ebed6 (patch) | |
| tree | 7399c3e75a55f66cdd9221e1017ed7a015c03bb0 /www-ssl | |
| parent | e62a94c73161c5a317c93aecebb09cf61f151cd0 (diff) | |
| parent | 4c9831be9b21c2c2616563c7bb735a6afac66458 (diff) | |
Merge branch 'master' into spezial_includes
Diffstat (limited to 'www-ssl')
| -rwxr-xr-x | www-ssl/admin/debug.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/www-ssl/admin/debug.php b/www-ssl/admin/debug.php index a1783a23..2acabb87 100755 --- a/www-ssl/admin/debug.php +++ b/www-ssl/admin/debug.php @@ -33,11 +33,9 @@ echo "Deaktiviert"; echo "<hr>\n"; funktion_db_element_list_2row( "Tshirt-Size aller engel", "SELECT `Size`, COUNT(`Size`) FROM `User` GROUP BY `Size`"); - echo "<br>\n"; funktion_db_element_list_2row( "Tshirt ausgegeben", "SELECT `Size`, COUNT(`Size`) FROM `User` WHERE `Tshirt`='1' GROUP BY `Size`"); - echo "<br>\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`"); @@ -45,7 +43,6 @@ funktion_db_element_list_2row( "Tshirt nicht ausgegeben (Gekommen=1)", echo "<hr>\n"; funktion_db_element_list_2row( "Hometown", "SELECT COUNT(`Hometown`), `Hometown` FROM `User` GROUP BY `Hometown`"); - echo "<br>\n"; funktion_db_element_list_2row( "Engeltypen", "SELECT COUNT(`Art`), `Art` FROM `User` GROUP BY `Art`"); @@ -53,11 +50,13 @@ funktion_db_element_list_2row( "Engeltypen", echo "<hr>\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 "<br>\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 "<hr>\n"; +funktion_db_element_list_2row( "Gesamte 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 (Shifts.RID!=7)"); echo "<br>\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)"); |