forked from science-ation/science-ation
- Fix volunteer reports to only show volunteers
- Also, show volunteers that haven't signed up for anything yet
This commit is contained in:
parent
f83a04ab04
commit
760b84f6ac
@ -94,12 +94,6 @@ $report_volunteers_fields = array(
|
||||
'table' => 'volunteer_positions.name',
|
||||
'components' => array('signup')),
|
||||
|
||||
/* 'language' => array(
|
||||
'name' => 'Project -- Language',
|
||||
'header' => 'Lang',
|
||||
'width' => 1.00,
|
||||
'table' => 'projects.language' ),
|
||||
*/
|
||||
'fair_year' => array (
|
||||
'name' => 'Fair -- Year',
|
||||
'header' => 'Year',
|
||||
@ -135,14 +129,14 @@ $report_volunteers_fields = array(
|
||||
ON (users.id=volunteer_positions_signup.users_id)
|
||||
LEFT JOIN volunteer_positions
|
||||
ON (volunteer_positions_signup.volunteer_positions_id=volunteer_positions.id)";
|
||||
$signup_where = "AND volunteer_positions_signup.year = '$year'";
|
||||
$signup_where = "AND (volunteer_positions_signup.year = '$year' OR volunteer_positions_signup.year IS NULL)";
|
||||
}
|
||||
|
||||
$q = " FROM
|
||||
users
|
||||
$signup_join
|
||||
WHERE
|
||||
users.complete='yes'
|
||||
users.types LIKE '%volunteer%'
|
||||
$signup_where
|
||||
";
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user