forked from science-ation/science-ation
Send the -1 award through for 'no special awards'
This commit is contained in:
parent
a28ab561eb
commit
afd81015eb
@ -266,6 +266,9 @@ function spawardStatus($reg_id="")
|
||||
AND projects.conferences_id='".$conference['id']."'
|
||||
");
|
||||
|
||||
//this also catches the -1 award for "i dont want special awards"
|
||||
//if there's no rows it means they havent signed up
|
||||
//if there's at least one row, they signed up for at leaset one award, OR they choose ' id ont want specail awards'
|
||||
if(mysql_num_rows($awardsq))
|
||||
return "complete";
|
||||
else
|
||||
|
@ -321,6 +321,19 @@ function getAwardListing($project_id){
|
||||
$returnval = array();
|
||||
$eligibleAwards = getSpecialAwardsEligibleForProject($project_id);
|
||||
$nominatedawards = getSpecialAwardsNominatedForProject($project_id);
|
||||
|
||||
$eligibleawards = array_merge(array(array( 'id'=> -1,
|
||||
'name' => "I do not wish to self-nominate for any special awards",
|
||||
'criteria' => "Select this option if you do not wish to self-nominate you project for any special awards.<hr>",
|
||||
'self_nominate' => 'yes')),
|
||||
$eligibleawards);
|
||||
|
||||
/* See if they have the -1 award selected */
|
||||
$noawards = getNominatedForNoSpecialAwardsForProject($project_id);
|
||||
if($noawards == true) {
|
||||
$nominatedawards = array_merge(array(array('id' => '-1')), $nominatedawards);
|
||||
}
|
||||
|
||||
$nominatedawards_list=array();
|
||||
foreach($nominatedawards AS $naward){
|
||||
$nominatedawards_list[] = $naward['id'];
|
||||
|
Loading…
Reference in New Issue
Block a user