forked from science-ation/science-ation
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:
parent
8c044c8309
commit
eff30a5adb
@ -107,7 +107,7 @@ if($action=="edit" && $edit)
|
|||||||
|
|
||||||
echo "<br />";
|
echo "<br />";
|
||||||
//get the projets that are eligible for the award, given the award ID ($r->id)
|
//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);
|
$projects=getProjectsNominatedForSpecialAward($r->id);
|
||||||
}
|
}
|
||||||
@ -210,6 +210,8 @@ if($action=="edit" && $edit)
|
|||||||
echo "</select>";
|
echo "</select>";
|
||||||
echo "<input type=\"submit\" value=\"".i18n("Add")."\">";
|
echo "<input type=\"submit\" value=\"".i18n("Add")."\">";
|
||||||
echo "</form>";
|
echo "</form>";
|
||||||
|
echo "<a href=\"winners.php?action=$action&edit=$edit&eligible=true\">Show All Eligible</a>";
|
||||||
|
echo "<br />";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
echo "<br />";
|
echo "<br />";
|
||||||
|
@ -155,7 +155,7 @@ if($_GET['year'] && $_GET['type'])
|
|||||||
else
|
else
|
||||||
$prev=false;
|
$prev=false;
|
||||||
|
|
||||||
$students.="$studentinfo->firstname $studentinfo->lastname";
|
// $students.="$studentinfo->firstname $studentinfo->lastname";
|
||||||
$studnum++;
|
$studnum++;
|
||||||
|
|
||||||
//we will assume that they are coming from the same school, so lets just grab the last students school
|
//we will assume that they are coming from the same school, so lets just grab the last students school
|
||||||
|
Loading…
Reference in New Issue
Block a user