diff --git a/admin/reports.php b/admin/reports.php index 21561ac..6aaff11 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -167,7 +167,14 @@ while($catr=mysql_fetch_object($catq)) echo "
"; echo i18n("Award Ceremony Script").": "; - echo "PDF   "; + echo "FULL PDF  "; + echo "(Divisional)   "; + echo "(Special)   "; + echo "(Interdisciplinary)   "; + echo "(Other)   "; + echo "(Grand)   "; + echo "
"; + echo i18n("Award Ceremony Script").": "; echo "CSV   "; echo "
"; echo "Award Winners CSV   "; diff --git a/admin/reports_acscript.php b/admin/reports_acscript.php index 81454ea..5d51bb1 100644 --- a/admin/reports_acscript.php +++ b/admin/reports_acscript.php @@ -4,6 +4,12 @@ require("../lpdf.php"); require("../lcsv.php"); + if($_GET['year']) $foryear=$_GET['year']; + else $foryear=$config['FAIRYEAR']; + + if($_GET['awardtype']) $awardtype=" AND award_types.type='".mysql_escape_string($_GET['awardtype'])."'"; + else $awardtype=""; + $type=$_GET['type']; if(!$type) $type="pdf"; @@ -27,15 +33,19 @@ award_awards.name, award_awards.presenter, award_awards.order AS awards_order, - award_types.type + award_types.type, + award_sponsors.organization FROM award_awards, - award_types + award_types, + award_sponsors WHERE - award_awards.year='".$config['FAIRYEAR']."' - AND award_types.year='".$config['FAIRYEAR']."' + award_awards.year='$foryear' + AND award_types.year='$foryear' AND award_awards.award_types_id=award_types.id + AND award_awards.award_sponsors_id=award_sponsors.id AND award_awards.excludefromac='0' + $awardtype ORDER BY awards_order"); echo mysql_error(); @@ -45,6 +55,8 @@ while($r=mysql_fetch_object($q)) { $rep->heading("$r->name ($r->type)"); + if($r->type!="Divisional") + $rep->addText(i18n("Sponsored by: %1",array($r->organization))); if($r->presenter) $rep->addText(i18n("Presented by: %1",array($r->presenter))); @@ -64,7 +76,7 @@ LEFT JOIN projects ON projects.id=winners.projects_id WHERE award_awards_id='$r->id' - AND award_prizes.year='".$config['FAIRYEAR']."' + AND award_prizes.year='$foryear' AND award_prizes.excludefromac='0' ORDER BY `order`");