arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Multipart commit because I messed up part of my git tree. Implement

Browse Source 
including award criteria in AC script, off by default
This commit is contained in:
dave 2010-03-02 22:50:49 +00:00
parent 471b358f2f
commit 05fe375d3a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/reports_acscript.php
View File

@ -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))

2
admin/reports_ceremony.php
View File

@ -69,6 +69,8 @@
echo "<td><input name=\"show_unawarded_awards\" type=\"checkbox\" ".($config['reports_show_unawarded_awards'] == 'yes' ? "checked" : "")."/></td></tr>";
echo "<tr><td colspan=3><b>".i18n("Show prizes without winners").":</b></td>";
echo "<td><input name=\"show_unawarded_prizes\" type=\"checkbox\" ".($config['reports_show_unawarded_prizes'] == 'yes' ? "checked" : "")."/></td></tr>";
echo "<tr><td colspan=3><b>".i18n("Show criteria for each award").":</b></td>";
echo "<td><input name=\"show_criteria\" type=\"checkbox\" ".($config['reports_show_criteria'] == 'yes' ? "checked" : "")." value=\"on\"/></td></tr>";
echo "<tr><td colspan=3><b>".i18n("Show student name pronunciation").":</b></td>";
echo "<td><input name=\"show_pronunciation\" type=\"checkbox\" /></td></tr>";