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

Send the -1 award through for 'no special awards'

Browse Source
This commit is contained in:
james 2011-03-04 16:38:15 +00:00
parent a28ab561eb
commit afd81015eb
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
participant.inc.php
View File

@ -266,6 +266,9 @@ function spawardStatus($reg_id="")
AND projects.conferences_id='".$conference['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)) if(mysql_num_rows($awardsq))
return "complete"; return "complete";
else else

13
projects.inc.php
View File

@ -321,6 +321,19 @@ function getAwardListing($project_id){
$returnval = array(); $returnval = array();
$eligibleAwards = getSpecialAwardsEligibleForProject($project_id); $eligibleAwards = getSpecialAwardsEligibleForProject($project_id);
$nominatedawards = getSpecialAwardsNominatedForProject($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(); $nominatedawards_list=array();
foreach($nominatedawards AS $naward){ foreach($nominatedawards AS $naward){
$nominatedawards_list[] = $naward['id']; $nominatedawards_list[] = $naward['id'];