From 015b04a81ab5f06ad6f9e3c2ea6b8e001e62090e Mon Sep 17 00:00:00 2001
From: james <james>
Date: Mon, 5 Apr 2010 19:19:53 +0000
Subject: [PATCH] Add two columns for the feeder fair info in the student
 report.

---
 admin/reports_students.inc.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/admin/reports_students.inc.php b/admin/reports_students.inc.php
index 8215c8a2..5e80e8bb 100644
--- a/admin/reports_students.inc.php
+++ b/admin/reports_students.inc.php
@@ -746,6 +746,21 @@ $report_students_fields = array(
 		'table' => 'mentors.description',
 		'components' => array('mentors')),
 
+	'feeder_fair_name' => array (
+		'name' => 'Feeder Fair -- Name',
+		'header' => 'Fair Name',
+		'width' => 1.5,
+		'table' => 'fairs.name',
+		'components' => array('fairs')),
+
+	'feeder_fair_abbrv' => array (
+		'name' => 'Feeder Fair -- Abbreviation',
+		'header' => 'Fair',
+		'width' => 0.75,
+		'table' => 'fairs.abbrv',
+		'components' => array('fairs')),
+
+
 	'fair_year' => array (
 		'name' => 'Fair -- Year',
 		'header' => 'Year',
@@ -851,6 +866,11 @@ $report_students_fields = array(
 		$mentor_where = "AND mentors.year='$year'";
 	}
 
+	$fairs_join = '';
+	if(in_array('fairs', $components)) {
+		$fairs_join = "LEFT JOIN fairs ON fairs.id=projects.fairs_id";
+	}
+
 	if($report['option']['include_incomplete_registrations'] == 'yes') 
 		$reg_where = '';
 	else 
@@ -868,6 +888,7 @@ $report_students_fields = array(
 			$mentor_join
 			$tour_join
 			$awards_join
+			$fairs_join
 		WHERE
 			students.year='$year'
 			AND projects.year='$year'