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

Don't do a newpage for empty awards if we're not showing them. Move the pronunciation key to a new line so it doesn't overlap the school.

Browse Source
This commit is contained in:
dave 2010-04-10 03:56:53 +00:00
parent 8c83a9a755
commit 02244937d2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/reports_acscript.php
View File

@ -77,8 +77,6 @@ if(!$scriptformat) $scriptformat="default";
if(mysql_num_rows($q)) { if(mysql_num_rows($q)) {
while($r=mysql_fetch_object($q)) { while($r=mysql_fetch_object($q)) {
if($scriptformat=="formatted")
$rep->newPage();
$pq=mysql_query("SELECT $pq=mysql_query("SELECT
award_prizes.prize, award_prizes.prize,
@ -118,6 +116,9 @@ if(!$scriptformat) $scriptformat="default";
} }
mysql_data_seek($pq, 0); mysql_data_seek($pq, 0);
} }
if($scriptformat=="formatted")
$rep->newPage();
if($scriptformat=="default") if($scriptformat=="default")
$rep->heading("$r->name ($r->type)"); $rep->heading("$r->name ($r->type)");
if($scriptformat=="formatted") { if($scriptformat=="formatted") {
@ -209,8 +210,10 @@ if(!$scriptformat) $scriptformat="default";
for($x=0; $x<$studnum; $x++) { for($x=0; $x<$studnum; $x++) {
$rep->addTextX($student_winner[$x],1.4); $rep->addTextX($student_winner[$x],1.4);
$rep->addTextX($student_school[$x],5.5); $rep->addTextX($student_school[$x],5.5);
if($show_pronunciation == TRUE && $student_win_pronunc[$x]) if($show_pronunciation == TRUE && $student_win_pronunc[$x]) {
$rep->addTextX("({$student_win_pronunc[$x]})",4.0); $rep->nextline();
$rep->addTextX("({$student_win_pronunc[$x]})",2.0);
}
if($type=="pdf") if($type=="pdf")
$rep->nextline(); $rep->nextline();
} }