diff --git a/admin/reports.inc.php b/admin/reports.inc.php index 69a78a8..03f91f2 100644 --- a/admin/reports.inc.php +++ b/admin/reports.inc.php @@ -889,6 +889,43 @@ foreach($report_stock as $n=>$v) { // echo "
"; print_r($d); + switch($f) { + case 'static_box': + $rep->label_rect($d['x'], $d['y'], $d['w'], $d['h']); + break; + case 'fair_logo': + $rep->label_fair_logo($d['x'], $d['y'], $d['w'], $d['h'], $show_box); + break; + case "projectbarcode": + $style = array( + 'border' => 2, + 'vpadding' => 'auto', + 'hpadding' => 'auto', + 'fgcolor' => array(0,0,0), + 'bgcolor' => false, //array(255,255,255) + 'module_width' => 3, // width of a single module in points + 'module_height' => 3 // height of a single module in points + ); + $rep->label_barcode($v, 'QRCODE,H', $d['x'], $d['y'], $d['w'], $d['h'], $style, 'N'); + break; + + default: + if($f == 'static_text') + $v = $d['value']; + + $v = iconv("ISO-8859-1","UTF-8",$v); + + $rep->label_text($d['x'], $d['y'], $d['w'], $d['h'], + $v, $show_box, $d['align'], $d['valign'], + $d['fontname'],$d['fontstyle'],$d['fontsize'], + $d['on_overflow']); + + break; + } + + + +/* if($f == 'static_box') { $rep->label_rect($d['x'], $d['y'], $d['w'], $d['h']); } else { @@ -905,7 +942,7 @@ foreach($report_stock as $n=>$v) { 'module_width' => 2, // width of a single module in points 'module_height' => 2 // height of a single module in points ); - $rep->barcode($v, 'QRCODE,H', $d['x'], $d['y'], $d['w'], $d['h'], $style, 'N'); + $rep->label_barcode($v, 'QRCODE,H', $d['x'], $d['y'], $d['w'], $d['h'], $style, 'N'); } else { $rep->label_text($d['x'], $d['y'], $d['w'], $d['h'], @@ -915,6 +952,7 @@ foreach($report_stock as $n=>$v) { } } + */ } diff --git a/admin/reports_students.inc.php b/admin/reports_students.inc.php index 23c6400..b1cd052 100644 --- a/admin/reports_students.inc.php +++ b/admin/reports_students.inc.php @@ -847,6 +847,12 @@ $report_students_fields = array( 'width' => 3, 'table' => "'".mysql_escape_string($config['fairname'])."'"), + 'fair_logo' => array( + 'name' => 'Fair -- Logo (for Labels only)', + 'header' => '', + 'width' => 1 /*mm*/, + 'table' => "CONCAT(' ')"), + /* Special/Misc/Other */ 'static_text' => array ( 'start_option_group' => 'Special Fields',