From 73972d676f765799fb8ca013a9eef78afa02f4ac Mon Sep 17 00:00:00 2001
From: james <james>
Date: Thu, 3 Apr 2008 20:34:42 +0000
Subject: [PATCH] Show judges language on the judge team members list - for
 quick verification of proper language team assignments. Fix 1x4 and 1x1.33
 Avery stock to print properly.

---
 admin/judges.inc.php           | 11 ++++++++++-
 admin/judges_teams_members.php |  2 +-
 admin/reports.inc.php          |  6 ++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/admin/judges.inc.php b/admin/judges.inc.php
index b9c786e..9d9b5ca 100644
--- a/admin/judges.inc.php
+++ b/admin/judges.inc.php
@@ -48,11 +48,20 @@ function getJudgingTeams()
 		
 		while($mr=mysql_fetch_object($mq))
 		{
+			$lq=mysql_query("SELECT * FROM judges_languages WHERE judges_id='$mr->judges_id'");
+			$judgelangs="";
+			if(mysql_num_rows($lq)) {
+				while($lr=mysql_fetch_object($lq)) {
+					$judgelangs.="$lr->languages_lang/";
+				}
+				$judgelangs=substr($judgelangs,0,-1);
+			}
 			$teams[$lastteamid]['members'][]=array(
 				"id"=>$mr->judges_id,
 				"firstname"=>$mr->firstname,
 				"lastname"=>$mr->lastname,
-				"captain"=>$mr->captain
+				"captain"=>$mr->captain,
+				"languages"=>$judgelangs
 				);
 		}
 
diff --git a/admin/judges_teams_members.php b/admin/judges_teams_members.php
index aaf8c44..6025343 100644
--- a/admin/judges_teams_members.php
+++ b/admin/judges_teams_members.php
@@ -355,7 +355,7 @@ function switchjudgeinfo()
 				}
 				echo "<a href=\"\" onclick=\"return openjudgeinfo(".$member['id'].");\">";
 				echo $member['firstname']." ".$member['lastname'];
-				echo "</a>";
+				echo "</a> (".$member['languages'].")";
 				echo "</td></tr>";
 			}
 
diff --git a/admin/reports.inc.php b/admin/reports.inc.php
index 950a5e1..60d658b 100644
--- a/admin/reports.inc.php
+++ b/admin/reports.inc.php
@@ -140,6 +140,7 @@ LRP 180		99765	5967	4	1 3/4 x 1/2 	80 */
 			'cols' => 2,
 			'label_height' => 1,
 			'y_spacing' => 0.00,
+			'y_padding' => 0.05,
 			'rows' => 10,
 			);
 	
@@ -149,8 +150,9 @@ LRP 180		99765	5967	4	1 3/4 x 1/2 	80 */
 			'label_width' => 4,
 			'x_spacing' => 0.187,
 			'cols' => 2,
-			'label_height' => 1 + 1/3,
+			'label_height' => 1 + 0.33,
 			'y_spacing' => 0.00,
+			'y_padding' => 0.80,
 			'rows' => 7,
 			);
  $report_stock['5163'] = array('name' => 'Avery 5163/5263/5963/8163/8463, G&T 99181 (2"x4")',
@@ -542,7 +544,7 @@ foreach($report_stock as $n=>$v) {
 		$rep->newPage($label_stock['page_width'], $label_stock['page_height']);
 		$rep->setFontSize(11);
 		$rep->setLabelDimensions($label_stock['label_width'], $label_stock['label_height'],
-				$label_stock['x_spacing'], $label_stock['y_spacing']);
+				$label_stock['x_spacing'], $label_stock['y_spacing'],11,$label_stock['y_padding']);
 		$gen_mode = 'label';
 		break;
 	case 'pdf': case '':