forked from science-ation/science-ation
MySQL5 Fix for Report 17 (Emergency Contacts)
This commit is contained in:
parent
fb9a23a0e2
commit
cb23d603f3
@ -472,9 +472,10 @@ $report_students_fields = array(
|
|||||||
}
|
}
|
||||||
|
|
||||||
$q = " FROM
|
$q = " FROM
|
||||||
students $partner_join,
|
|
||||||
schools, projects $awards_join, projectdivisions,
|
schools, projects $awards_join, projectdivisions,
|
||||||
projectcategories, registrations
|
projectcategories, registrations
|
||||||
|
JOIN students ON students.registrations_id=registrations_id
|
||||||
|
$partner_join
|
||||||
$emergencycontact_join
|
$emergencycontact_join
|
||||||
$tour_join
|
$tour_join
|
||||||
WHERE
|
WHERE
|
||||||
@ -482,7 +483,6 @@ $report_students_fields = array(
|
|||||||
AND projects.registrations_id=students.registrations_id
|
AND projects.registrations_id=students.registrations_id
|
||||||
AND projectdivisions.id=projects.projectdivisions_id
|
AND projectdivisions.id=projects.projectdivisions_id
|
||||||
AND projectcategories.id=projects.projectcategories_id
|
AND projectcategories.id=projects.projectcategories_id
|
||||||
AND registrations.id=students.registrations_id
|
|
||||||
AND (registrations.status='complete' OR registrations.status='paymentpending')
|
AND (registrations.status='complete' OR registrations.status='paymentpending')
|
||||||
AND students.year='$year'
|
AND students.year='$year'
|
||||||
AND projects.year='$year'
|
AND projects.year='$year'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user