From 880d5b0a828787a9b845769149ebc3da25776884 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Wed, 8 Dec 2004 20:34:02 +0000
Subject: [PATCH] - display status on project and student pages to show if the
 section is complete or not - add a new function happy() for displaying 'good'
 things... also the CSS to go with it.    now we have:		error() -
 displaying bad things (in red)    			notice() - displaying
 neutral things (in grey/blue) 			happy() - displaying good
 things (in green)

---
 common.inc.php                     |  5 +++++
 register_participants_project.php  | 20 ++++++++++++++++++--
 register_participants_students.php | 19 +++++++++++++++++--
 sfiab.css                          |  7 +++++++
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/common.inc.php b/common.inc.php
index fbb88f3..1fbc2cd 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -129,6 +129,11 @@ function notice($str)
 	return "<div class=\"notice\">$str</div><br />";
 }
 
+function happy($str)
+{
+	return "<div class=\"happy\">$str</div><br />";
+}
+
 $HEADER_SENT=false;
 function send_header($title="")
 {
diff --git a/register_participants_project.php b/register_participants_project.php
index cf6bcb3..4edd988 100644
--- a/register_participants_project.php
+++ b/register_participants_project.php
@@ -34,6 +34,9 @@ echo mysql_error();
  //send the header
  send_header("Participant Registration - Project Information");
 
+ echo "<a href=\"register_participants_main.php\">&lt;&lt; ".i18n("Back to Participant Registration Summary")."</a><br />";
+ echo "<br />";
+
  $studentstatus=studentStatus();
  if($studentstatus!="complete")
  {
@@ -105,8 +108,21 @@ echo mysql_error();
  }
 
 
- echo "<a href=\"register_participants_main.php\">&lt;&lt; ".i18n("Back to Participant Registration Summary")."</a><br />";
- echo "<br />";
+
+//output the current status
+$newstatus=projectStatus();
+if($newstatus!="complete")
+{
+	echo error(i18n("Project Information Incomplete"));
+}
+else if($newstatus=="complete")
+{
+	echo happy(i18n("Project Information Complete"));
+
+}
+
+
+
  echo "<form method=\"post\" action=\"register_participants_project.php\">\n";
  echo "<input type=\"hidden\" name=\"action\" value=\"save\">\n";
  echo "<input type=\"hidden\" name=\"id\" value=\"$projectinfo->id\">\n";
diff --git a/register_participants_students.php b/register_participants_students.php
index 21a525c..28628a8 100644
--- a/register_participants_students.php
+++ b/register_participants_students.php
@@ -1,5 +1,6 @@
 <?
  require("common.inc.php");
+ include "register_participants.inc.php";
  
  //authenticate based on email address and registration number from the SESSION
  if(!$_SESSION['email'])
@@ -89,6 +90,7 @@ echo mysql_error();
 		}
 		$x++;	
 	}
+
 }
 
 if($_GET['action']=="removestudent")
@@ -107,6 +109,19 @@ if($_GET['action']=="removestudent")
 }
 
 
+
+//output the current status
+$newstatus=studentStatus();
+if($newstatus!="complete")
+{
+	echo error(i18n("Student Information Incomplete"));
+}
+else if($newstatus=="complete")
+{
+	echo happy(i18n("Student Information Complete"));
+
+}
+
 //now query and display
 
  $q=mysql_query("SELECT * FROM students WHERE registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."'");
@@ -206,10 +221,10 @@ if($_GET['action']=="removestudent")
 	echo "</tr>";
 	echo "<tr>\n";
 	echo " <td>".i18n("School")."</td><td>";
-	$q=mysql_query("SELECT id,school FROM schools WHERE year='".$config['FAIRYEAR']."' ORDER by school");
+	$schoolq=mysql_query("SELECT id,school FROM schools WHERE year='".$config['FAIRYEAR']."' ORDER by school");
 	echo "<select name=\"schools_id[$x]\">\n";
 	echo "<option value=\"\">".i18n("Choose School")."</option>\n";
-	while($r=mysql_fetch_object($q))
+	while($r=mysql_fetch_object($schoolq))
 	{
 		if($studentinfo->schools_id==$r->id) $sel="selected=\"selected\""; else $sel="";
 		echo "<option $sel value=\"$r->id\">".htmlspecialchars($r->school)."</option>\n";
diff --git a/sfiab.css b/sfiab.css
index 2f2aef0..4dd233f 100644
--- a/sfiab.css
+++ b/sfiab.css
@@ -153,6 +153,13 @@ a {
 	background: #E0E0FF;
 }
 
+.happy {
+	color: green;
+	font-weight: bold;
+	border: 1px solid Silver;
+	background: #D0EED0;
+}
+
 .caution {
 	text-decoration: none;
 	font-weight: bold;