From 635d0b6e2d037b4615e1a3bbe10c6e8e23c0a712 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Tue, 3 Jan 2006 02:44:26 +0000
Subject: [PATCH] Fix annealer to only use judges that are complete and from
 the current FAIRYEAR

---
 admin/judges_sa.php              | 2 +-
 admin/judges_schedulerconfig.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/judges_sa.php b/admin/judges_sa.php
index 3038f2a3..a5ad4d79 100644
--- a/admin/judges_sa.php
+++ b/admin/judges_sa.php
@@ -351,7 +351,7 @@ $data['teams']['J']['Case'] = 1;
 $data['teams']['J']['CS'] = 4;
 */
 
-$q=mysql_query("SELECT * FROM judges ");
+$q=mysql_query("SELECT * FROM judges WHERE complete='yes' AND judges_years.year='{$config['FAIRYEAR']}' AND judges_years.judges_id=judges.id");
 
 $judges=array();
 while($r=mysql_fetch_object($q))
diff --git a/admin/judges_schedulerconfig.php b/admin/judges_schedulerconfig.php
index 0a291aa5..0d6ef148 100644
--- a/admin/judges_schedulerconfig.php
+++ b/admin/judges_schedulerconfig.php
@@ -92,7 +92,7 @@ while($catr=mysql_fetch_object($catq))
 	$divq=mysql_query("SELECT * FROM projectdivisions WHERE year='{$config['FAIRYEAR']}' ORDER BY id");
 	while($divr=mysql_fetch_object($divq))
 	{
-		$numq=mysql_query("SELECT COUNT(id) AS num FROM projects WHERE projectcategories_id='$catr->id' AND projectdivisions_id='$divr->id'");
+		$numq=mysql_query("SELECT COUNT(id) AS num FROM projects WHERE projectcategories_id='$catr->id' AND projectdivisions_id='$divr->id' AND year='{$config['FAIRYEAR']}'");
 		$numr=mysql_fetch_object($numq);
 		echo "<tr><td>".i18n($divr->division)."</td>";
 		echo "<td align=\"center\">$numr->num</td>";
@@ -115,7 +115,7 @@ echo "<br />";
 echo "Maximum number of judges acceptable: $maxjudges";
 echo "<br />";
 
-$jq=mysql_query("SELECT COUNT(id) AS num FROM judges WHERE complete='yes'");
+$jq=mysql_query("SELECT COUNT(judges.id) AS num FROM judges,judges_years WHERE complete='yes' AND judges_years.year='{$config['FAIRYEAR']}' AND judges_years.judges_id=judges.id");
 $jr=mysql_fetch_object($jq);
 $currentjudges=$jr->num;
 echo "Current number of registered judges: $currentjudges";
@@ -154,8 +154,8 @@ foreach($div AS $d_id=>$d_division)
 						award_awards_projectdivisions
 					WHERE 
 						award_awards.year='{$config['FAIRYEAR']}'
-						AND award_awardS_projecetcategories.year='{$config['FAIRYEAR']}'
-						AND award_awardS_projecetdivisions.year='{$config['FAIRYEAR']}'
+						AND award_awards_projectcategories.year='{$config['FAIRYEAR']}'
+						AND award_awards_projectdivisions.year='{$config['FAIRYEAR']}'
 						AND award_awards.id=award_awards_projectcategories.award_awards_id
 						AND award_awards.id=award_awards_projectdivisions.award_awards_id
 						AND award_awards_projectcategories.projectcategories_id='$c_id'