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

Check for minimum teams based on language as well.... this causes things to not "add up" properly but

Browse Source 
that is kind of intended..., ie the "total" doesnt equal  "english + french"... but its a lot better
than it was (it now tells ottawa that we dont have enough french judges, which is correct.)
This commit is contained in:
james 2010-04-06 18:30:23 +00:00
parent fcccfd16c0
commit 123cee67d3
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
admin/judges_schedulerconfig_check.inc.php
View File

@ -140,32 +140,47 @@ function judges_scheduler_check_judges()
$totalteams['total'] = 0; $totalteams['total'] = 0;
echo "<table border=1 width=\"85%\"><tr><th></th>". echo "<table border=1 width=\"85%\"><tr><th></th>".
"<th colspan=\"".(count($config['languages'])+1)."\">".i18n("Projects")."</th>". "<th colspan=\"".(count($config['languages'])+1)."\">".i18n("Projects")."</th>".
"<th>".i18n("Required Teams")."</th></tr>"; "<th colspan=\"".(count($config['languages'])+1)."\">".i18n("Estimated Required Teams")."</th></tr>";
echo "<tr>"; echo "<tr>";
echo "<th></th><th>".i18n("Total")."</th>"; echo "<th></th><th>".i18n("Total")."</th>";
foreach($config['languages'] AS $lkey=>$lname) foreach($config['languages'] AS $lkey=>$lname)
echo "<th>$lkey</th>"; echo "<th>$lkey</th>";
echo "<th></th>"; echo "<th>".i18n("Total")."</th>";
foreach($config['languages'] AS $lkey=>$lname)
echo "<th>$lkey</th>";
echo "</tr>\n"; echo "</tr>\n";
foreach($jdiv AS $jdiv_id=>$jd) { foreach($jdiv AS $jdiv_id=>$jd) {
$c = $jd['num_projects']['total']; $c = $jd['num_projects']['total'];
//total judge teams calculation //total judge teams calculation
$t['total']=ceil($c/$config['max_projects_per_team']*$config['times_judged']); $t['total']=ceil($c/$config['max_projects_per_team']*$config['times_judged']);
if($t['total'] < $config['times_judged'] && $c>0) $t['total'] = $config['times_judged']; if($t['total'] < $config['times_judged'] && $c>0) $t['total'] = $config['times_judged'];
$jdiv[$jdiv_id]['num_jteams']['total'] = $t['total']; $jdiv[$jdiv_id]['num_jteams']['total'] = $t['total'];
$totalteams['total']+=$t['total']; $totalteams['total']+=$t['total'];
//language teams calculation
foreach($config['languages'] AS $lkey=>$lname) {
$c = $jd['num_projects'][$lkey];
$t['total_'.$lkey]=ceil($c/$config['max_projects_per_team']*$config['times_judged']);
if($t['total_'.$lkey] < $config['times_judged'] && $c>0) $t['total_'.$lkey] = $config['times_judged'];
$jdiv[$jdiv_id]['num_jteams']['total_'.$lkey] = $t['total_'.$lkey];
$totalteams['total_'.$lkey]+=$t['total_'.$lkey];
}
echo "<tr><td>Judging Division Group $jdiv_id</td>"; echo "<tr><td>Judging Division Group $jdiv_id</td>";
echo "<td align=\"center\">$c</td>"; echo "<td align=\"center\">$c</td>";
$langstr=""; $langstr="";
foreach($config['languages'] AS $lkey=>$lname) { foreach($config['languages'] AS $lkey=>$lname) {
$clang=($jd['num_projects'][$lkey]?$jd['num_projects'][$lkey]:0); $clang=($jd['num_projects'][$lkey]?$jd['num_projects'][$lkey]:0);
echo "<td align=\"center\">$clang</td>"; echo "<td align=\"center\">$clang</td>";
} }
echo "<td align=\"center\">{$t['total']}</td>"; echo "<td align=\"center\">{$t['total']}</td>";
foreach($config['languages'] AS $lkey=>$lname) {
$clang=($jd['num_projects'][$lkey]?$jd['num_projects'][$lkey]:0);
//echo "<td align=\"center\">{$t['total']}</td>";
echo "<td align=\"center\">{$t['total_'.$lkey]}</td>";
}
echo "</tr>"; echo "</tr>";
} }
@ -182,7 +197,7 @@ function judges_scheduler_check_judges()
foreach($config['languages'] AS $lkey=>$lname) { foreach($config['languages'] AS $lkey=>$lname) {
if($minjudges['total'] && $projecttotal) if($minjudges['total'] && $projecttotal)
$minjudges[$lkey]=round($projectlanguagetotal[$lkey]/$projecttotal*$minjudges['total']); $minjudges[$lkey]=round($totalteams['total_'.$lkey]*$config['min_judges_per_team']); //$projectlanguagetotal[$lkey]/$projecttotal*$minjudges['total']);
else else
$minjudges[$lkey]=0; $minjudges[$lkey]=0;