Add an option on the winners selection page, to show all ELIGIBLE projects for a special award, not just the nomiated ones. Helps in teh case that an award was added last minute that nominations didnt happen for, or in a caase that the judges decided to choose a winner that didnt nominate to begin with.

Update the winners page to not duplicate students names :p
This commit is contained in:
james 2007-04-03 20:10:00 +00:00
parent 8c044c8309
commit eff30a5adb
2 changed files with 4 additions and 2 deletions

View File

@ -107,7 +107,7 @@ if($action=="edit" && $edit)
echo "<br />";
//get the projets that are eligible for the award, given the award ID ($r->id)
if($r->type=="Special")
if($r->type=="Special" && !$_GET['eligible'])
{
$projects=getProjectsNominatedForSpecialAward($r->id);
}
@ -210,6 +210,8 @@ if($action=="edit" && $edit)
echo "</select>";
echo "<input type=\"submit\" value=\"".i18n("Add")."\">";
echo "</form>";
echo "<a href=\"winners.php?action=$action&edit=$edit&eligible=true\">Show All Eligible</a>";
echo "<br />";
}
else
echo "<br />";

View File

@ -155,7 +155,7 @@ if($_GET['year'] && $_GET['type'])
else
$prev=false;
$students.="$studentinfo->firstname $studentinfo->lastname";
// $students.="$studentinfo->firstname $studentinfo->lastname";
$studnum++;
//we will assume that they are coming from the same school, so lets just grab the last students school