diff --git a/admin/judges_judges.php b/admin/judges_judges.php index 65b0438..127e02c 100644 --- a/admin/judges_judges.php +++ b/admin/judges_judges.php @@ -57,19 +57,22 @@ function openjudgeinfo(id) echo happy(i18n("Successfully removed judge from this year's fair")); } - echo "

".i18n("Judges list")."

"; + echo "

".i18n("Active Judges list for %1",array($config['FAIRYEAR']))."

"; echo ""; $querystr="SELECT judges.id, judges.firstname, judges.lastname, - judges.complete + judges.complete, + judges_years.year + FROM - judges, - judges_years + judges + LEFT JOIN judges_years ON judges.id=judges_years.judges_id WHERE - judges_years.year='".$config['FAIRYEAR']."' AND - judges.id=judges_years.judges_id + (judges_years.year='".$config['FAIRYEAR']."' + OR + judges_years.year IS NULL) ORDER BY lastname, firstname"; @@ -81,6 +84,7 @@ function openjudgeinfo(id) echo mysql_error(); echo ""; echo " "; + echo " "; echo " "; echo " "; echo ""; @@ -91,19 +95,28 @@ function openjudgeinfo(id) echo ""; - if($r->complete=="yes") + if($r->year) { - $cl="happy"; + echo ""; + $active++; + } + else + { + echo ""; + $inactive++; + } + + if($r->complete=="yes" && $r->year) + { + echo ""; $completeyes++; } else { + echo ""; $cl="error"; $completeno++; } - echo ""; echo ""; @@ -112,7 +125,7 @@ function openjudgeinfo(id) echo "
".i18n("Judge Name")."".i18n("Active")."".i18n("Complete")."".i18n("Actions")."
"; echo "id)\">$r->firstname $r->lastname"; echo "".i18n("yes")."".i18n("no")."".i18n("yes")."".i18n("no").""; - echo $r->complete; - echo ""; echo "id\">"; echo "
"; echo "
"; - echo i18n("There are %1 total judges.",array($num),array("the number of judges")); + echo i18n("There are %1 total judges, %2 of which are active for this year, %3 are inactive.",array($num,$active,$inactive),array("the number of judges","number of active judges","number of inactive judges")); echo "
"; echo i18n("There are %1 complete judges.",array($completeyes),array("the number of judges")); echo "
";