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

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

Browse Source
This commit is contained in:
james 2012-04-11 17:41:39 +00:00
parent d10385a80f
commit bb1823b2db
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/reports_committees.inc.php
View File

@ -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 committees_link.users_uid=users.uid
AND users.year=$year
AND u2.uid IS NULL
";
return $q;