arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Fix annealer to only use judges that are complete and from the current FAIRYEAR

Browse Source
This commit is contained in:
james 2006-01-03 02:44:26 +00:00
parent 112693c337
commit 635d0b6e2d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/judges_sa.php
View File

@ -351,7 +351,7 @@ $data['teams']['J']['Case'] = 1;
$data['teams']['J']['CS'] = 4; $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(); $judges=array();
while($r=mysql_fetch_object($q)) while($r=mysql_fetch_object($q))

8
admin/judges_schedulerconfig.php
View File

@ -92,7 +92,7 @@ while($catr=mysql_fetch_object($catq))
$divq=mysql_query("SELECT * FROM projectdivisions WHERE year='{$config['FAIRYEAR']}' ORDER BY id"); $divq=mysql_query("SELECT * FROM projectdivisions WHERE year='{$config['FAIRYEAR']}' ORDER BY id");
while($divr=mysql_fetch_object($divq)) 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); $numr=mysql_fetch_object($numq);
echo "<tr><td>".i18n($divr->division)."</td>"; echo "<tr><td>".i18n($divr->division)."</td>";
echo "<td align=\"center\">$numr->num</td>"; echo "<td align=\"center\">$numr->num</td>";
@ -115,7 +115,7 @@ echo "<br />";
echo "Maximum number of judges acceptable: $maxjudges"; echo "Maximum number of judges acceptable: $maxjudges";
echo "<br />"; 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); $jr=mysql_fetch_object($jq);
$currentjudges=$jr->num; $currentjudges=$jr->num;
echo "Current number of registered judges: $currentjudges"; echo "Current number of registered judges: $currentjudges";
@ -154,8 +154,8 @@ foreach($div AS $d_id=>$d_division)
award_awards_projectdivisions award_awards_projectdivisions
WHERE WHERE
award_awards.year='{$config['FAIRYEAR']}' award_awards.year='{$config['FAIRYEAR']}'
AND award_awardS_projecetcategories.year='{$config['FAIRYEAR']}' AND award_awards_projectcategories.year='{$config['FAIRYEAR']}'
AND award_awardS_projecetdivisions.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_projectcategories.award_awards_id
AND award_awards.id=award_awards_projectdivisions.award_awards_id AND award_awards.id=award_awards_projectdivisions.award_awards_id
AND award_awards_projectcategories.projectcategories_id='$c_id' AND award_awards_projectcategories.projectcategories_id='$c_id'