diff --git a/winners.php b/winners.php index babc498d..a3f34a69 100644 --- a/winners.php +++ b/winners.php @@ -35,6 +35,9 @@ if($_POST['action']) $action=$_POST['action']; if($_GET['year'] && $_GET['type']) { + $show_unawarded_awards="no"; + $show_unawarded_prizes="no"; + echo "

".i18n("%1 %2 Award Winners",array($_GET['year'],$_GET['type']))."

"; $year=$_GET['year']; @@ -78,8 +81,6 @@ if($_GET['year'] && $_GET['type']) echo "
"; while($r=mysql_fetch_object($q)) { - echo "

".i18n($r->name)."

\n"; - $pq=mysql_query("SELECT award_prizes.prize, award_prizes.number, @@ -100,9 +101,30 @@ if($_GET['year'] && $_GET['type']) ORDER BY `order`"); echo mysql_error(); + $awarded_count = 0; + if($show_unawarded_awards=="no") + { + while($pr=mysql_fetch_object($pq)) + { + if($pr->projectnumber) + { + $awarded_count++; + } + } + mysql_data_seek($pq, 0); + } + if($show_unawarded_awards=="yes" || $awarded_count > 0) + { + echo "

".i18n($r->name)."

\n"; + } + $prevprizeid=-1; while($pr=mysql_fetch_object($pq)) { + if(!($pr->projectnumber) && $show_unawarded_prizes=="no") + { + continue; + } if($prevprizeid!=$pr->id) { echo " "; @@ -190,7 +212,7 @@ if($_GET['year'] && $_GET['type']) echo $schoollist; echo "
"; } - else + else { echo "    "; echo i18n("Prize not awarded");