From 05fe375d3a9cf8292ce14fda19f540ab52c190af Mon Sep 17 00:00:00 2001 From: dave Date: Tue, 2 Mar 2010 22:50:49 +0000 Subject: [PATCH] Multipart commit because I messed up part of my git tree. Implement including award criteria in AC script, off by default --- admin/reports_acscript.php | 5 +++++ admin/reports_ceremony.php | 2 ++ 2 files changed, 7 insertions(+) diff --git a/admin/reports_acscript.php b/admin/reports_acscript.php index 911dd3b..c1f9b0c 100644 --- a/admin/reports_acscript.php +++ b/admin/reports_acscript.php @@ -30,6 +30,8 @@ $and_categories = '1'; } + $show_criteria = ($_GET['show_criteria']=='on') ? true : false; + $type=$_GET['type']; if(!$type) $type="pdf"; @@ -53,6 +55,7 @@ award_awards.name, award_awards.presenter, award_awards.description, + award_awards.criteria, award_awards.order AS awards_order, award_types.type, sponsors.organization @@ -123,6 +126,8 @@ $rep->addText(i18n("Presented by: %1",array($r->presenter))); if($r->description) $rep->addText(i18n("Description: %1",array($r->description))); + if($show_criteria) + $rep->addText(i18n("Criteria: %1",array($r->criteria))); $prevprizeid=-1; while($pr=mysql_fetch_object($pq)) diff --git a/admin/reports_ceremony.php b/admin/reports_ceremony.php index 53efda6..e0abf57 100644 --- a/admin/reports_ceremony.php +++ b/admin/reports_ceremony.php @@ -69,6 +69,8 @@ echo ""; echo "".i18n("Show prizes without winners").":"; echo ""; + echo "".i18n("Show criteria for each award").":"; + echo ""; echo "".i18n("Show student name pronunciation").":"; echo "";