diff --git a/admin/judges_teams.php b/admin/judges_teams.php index a9bbac8..7132300 100644 --- a/admin/judges_teams.php +++ b/admin/judges_teams.php @@ -396,11 +396,11 @@ function addclicked() echo ""; echo "\n"; - echo ""; + echo ""; echo ""; echo ""; echo ""; - echo ""; + echo ""; foreach($teams AS $team) { echo "
Num
NumTeam NameAward(s)Actions
#".$team['num'].""; @@ -433,7 +433,7 @@ function addclicked() } echo "
"; - + echo ""; echo "
"; } } diff --git a/admin/user_list.php b/admin/user_list.php index 8acf49a..d16e653 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -221,8 +221,14 @@ function neweditor() echo " ".i18n("Actions").""; echo ""; echo ""; - $completeyes=0; - $completeno=0; + + $tally = array(); + $tally['active'] = array(); + $tally['inactive'] = array(); + $tally['active']['complete'] = 0; + $tally['active']['incomplete'] = 0; + $tally['inactive']['complete'] = 0; + $tally['inactive']['incomplete'] = 0; while($r=mysql_fetch_assoc($q)) { //JAMES - TEMP - due to the previous error with improperly setting judge status to NOT complete when special awards was turned off @@ -262,8 +268,10 @@ function neweditor() echo ""; if($r["{$t}_active"] == 'yes') { echo "
".i18n("yes")."
"; + $userstate = 'active'; } else { echo "
".i18n("no")."
"; + $userstate = 'inactive'; } echo ""; @@ -272,10 +280,10 @@ function neweditor() /* Do nothing, there's nothign to complete */ } else if($r["{$t}_complete"] == 'yes') { echo "
".i18n("yes")."
"; - $completeyes++; + $tally[$userstate]['complete']++; } else { echo "
".i18n("no")."
"; - $completeno++; + $tally[$userstate]['incomplete']++; } echo ""; @@ -294,16 +302,38 @@ function neweditor() echo ""; echo i18n("Note: Deleting users from this list is a permanent operation and cannot be undone. Consider editting the user and deactivating or deleting roles in their account instead."); - echo "
"; - echo "
"; - echo "$num ".i18n("people listed."); - echo "
"; - echo "$completeyes ".i18n('complete'); - echo "
"; - echo "$completeno ".i18n('incomplete'); - echo "
"; - echo "
"; - echo "
"; + // let's make a table with the complete/incomplete counts and the active/inacteve states +?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
List Totals
CompleteIncompleteTotal
Active
Inactive
Total
+