Properly pull the committee members based on their highest year linking since all memebrs dont have a users record for the current year. also add new fields to show the committee name, and a combo field for committee nadm and title

admin/reports_committees.inc.php

@@ -95,12 +95,24 @@ $report_committees_fields = array(
 		'width' => 2,
 		'table' => 'users.organization'),
 
+	'committee' => array(
+		'name' => 'Committee Member -- Committee Name',
+		'header' => 'Committee',
+		'width' => 2,
+		'table' => 'committees.name'),
+
 	'title' => array(
 		'name' => 'Committee Member -- Title on Committee',
 		'header' => 'Title',
 		'width' => 2,
 		'table' => 'committees_link.title'),
 
+	'committeetitle' => array(
+		'name' => 'Committee Member -- Committee and Title',
+		'header' => 'Committee and Title',
+		'width' => 2,
+		'table' => "CONCAT(committees.name, ' - ', committees_link.title)"),
+
 	'firstaid' => array(
 		'name' => 'Committee Member -- First Aid Training',
 		'header' => 'F.Aid',
@@ -141,14 +153,16 @@ $report_committees_fields = array(
 	}
 */										
 	$q = "	FROM 
-			users,
-			committees,
 			committees_link
+			JOIN committees ON committees_link.committees_id=committees.id
+			JOIN users
+				ON committees_link.users_uid=users.uid
+			LEFT OUTER JOIN users u2
+				ON u2.uid=users.uid
+				AND u2.year>users.year
 		WHERE
 			users.types LIKE '%committee%'
-			AND committees_link.committees_id=committees.id
+			AND u2.uid IS NULL
-			AND committees_link.users_uid=users.uid
-			AND users.year=$year
 		";
 
 	return $q;