From 9caa5b0a175d343601030cf9264dad7e62a5b3b8 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Fri, 4 Mar 2011 20:07:10 +0000
Subject: [PATCH] Fix the local sfiab side of special awards Add "numstudents"
 to top of participant main page

---
 register_participants.inc.php      |  6 ++++-
 register_participants_main.php     | 38 ++++++++++++++++++++++++++++--
 register_participants_spawards.php | 15 ++++--------
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/register_participants.inc.php b/register_participants.inc.php
index 7198f7d..65e7cff 100644
--- a/register_participants.inc.php
+++ b/register_participants.inc.php
@@ -599,9 +599,13 @@ function getProject($userId,$registrations_id=null){
 	$safetyquestions=getSafetyQuestions($regId);
 	$returnval['safetyquestions']=$safetyquestions;
 
+/*
+	$noawards=getNominatedForNoSpecialAwardsForProject($returnval['id']);
+	$returnval['specialawards_none']=$noawards;
+	*/
+
 	$specialawards=getAwardListing($returnval['id']);
 	$returnval['specialawards']=$specialawards;
-
 	return $returnval;
 }
 
diff --git a/register_participants_main.php b/register_participants_main.php
index fff6660..6508ca5 100644
--- a/register_participants_main.php
+++ b/register_participants_main.php
@@ -32,12 +32,47 @@
 
  send_header("Participant Registration - Summary");
 
+ if(!$reg) {
+	 echo "You don't have a valid registration yet, would you like to: <br />\n";
+	 echo "<ul>";
+	 echo "<li>Create a new project/registration</li>\n";
+	 echo "<li>Join an existing project/registration that your partner has already created</li>\n";
+	 echo "</li>\n";
+	send_footer();
+ }
+
+ if($_POST['numstudents']) {
+	 mysql_query("UPDATE registrations SET numstudents='".intval($_POST['numstudents'])."' WHERE id='{$reg['id']}'");
+	 echo mysql_error();
+ }
+
  //only display the named greeting if we have their name
  if($u['firstname']) {
 	echo i18n("Hello <b>%1</b>",array($u['firstname']));
  	echo "<br />";
  }
  echo "<br />";
+ echo "<form action=\"register_participants_main.php\" method=\"post\">";
+ echo "Please indicate how many students worked on your project: ";
+ echo "<select name=\"numstudents\">";
+	//get the num students from the registrations table
+	$q=mysql_query("SELECT numstudents FROM registrations WHERE id='{$reg['id']}'");
+	$r=mysql_fetch_object($q);
+	$numstudents=$r->numstudents;
+	if(!$numstudents)
+		echo "<option value=\"\">Choose</option>\n";
+	for($x=$config['minstudentsperproject'];$x<=$config['maxstudentsperproject'];$x++) {
+		if($numstudents==$x) $sel="selected=\"selected\""; else $sel="";
+		echo "<option $sel value=\"$x\">$x</option>\n";
+
+	}
+ echo "</select>\n";
+ echo "<input type=\"submit\" value=\"Save\">";
+ echo "</form>\n";
+ echo "<br />";
+ echo "<br />";
+ if($numstudents) {
+
 
  if(registrationFormsReceived()) {
 	 //now select their project number
@@ -334,8 +369,7 @@ echo "<table><tr><td>";
   echo "<br /><br />";
 
 
- echo "<a href=\"register_participants.php?action=logout\">".i18n("Logout")."</a>";
-
+ }
 
  send_footer();
 ?>
diff --git a/register_participants_spawards.php b/register_participants_spawards.php
index 98e8e55..5268fd6 100644
--- a/register_participants_spawards.php
+++ b/register_participants_spawards.php
@@ -93,19 +93,15 @@ function checkboxclicked(b)
 		}
 		
 		$num=count($splist);
-		if($num>$config['maxspecialawardsperproject'])
-		{
+		if($num>$config['maxspecialawardsperproject']) {
 			echo error(i18n("You can only apply to %1 special awards.  You have selected %2",array($config['maxspecialawardsperproject'],$num)));
 		}
-		else
-		{
+		else {
 			mysql_query("DELETE FROM project_specialawards_link WHERE projects_id='$project->id' AND conferences_id='".$conference['id']."'");
 
-			foreach($splist AS $spaward)
-			{
-				$s = ($spaward == -1) ? "NULL" : "'$spaward'";
+			foreach($splist AS $spaward) {
 				mysql_query("INSERT INTO project_specialawards_link (award_awards_id,projects_id,conferences_id) VALUES (".
-						"$s, ".
+						"$spaward, ".
 						"'$project->id', ".
 						"'".$conference['id']."')");
 						echo mysql_error();
@@ -118,8 +114,7 @@ function checkboxclicked(b)
 			}
 		}
 	}
-	else
-	{
+	else {
  		echo error(i18n("Special award self-nomination is only available from %1 to %2",array($config['dates']['specawardregopen'],$config['dates']['specawardregclose'])));
 
 	}