drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

restrict summary to people booked in or waiting list

Browse Source
This commit is contained in:
Nathan Coad
2016-06-08 14:34:11 +10:00
parent 04e43f4ccd
commit c46966033f
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
booking.studygroups_report.inc
View File

@@ -113,7 +113,7 @@ function booking_studygroups_leadhelp_view_summary() {
//get study group definitions //get study group definitions
$query = db_select('booking_studygroup_list', 's') $query = db_select('booking_studygroup_list', 's')
->fields('s') ->fields('s');
->condition('s.booking_eventid', $event->eid, '=') ->condition('s.booking_eventid', $event->eid, '=')
->orderBy('sid'); ->orderBy('sid');
$studygroup_list = $query->execute()->fetchAllAssoc('sid'); $studygroup_list = $query->execute()->fetchAllAssoc('sid');
@@ -121,17 +121,10 @@ function booking_studygroups_leadhelp_view_summary() {
foreach ($studygroup_list as $group) { foreach ($studygroup_list as $group) {
$header[] = $group->booking_studygroup_descrip; $header[] = $group->booking_studygroup_descrip;
} }
/*
//select entries from the study groups mapping table
$query = db_select('booking_studygroup_mapping', 'm');
$query->join('booking_studygroup_list', 's', 's.sid = m.booking_studygroup_id');
$query->condition('m.booking_eventid', $event->eid, '=');
$query->fields('m')->fields('s', array('booking_studygroup_descrip'));
$group_mapping = $query->execute()->fetchAllAssoc('sid');
*/
//watchdog('booking_debug', "<pre>Leader Helper studygroup query result\n@info</pre>", array('@info' => print_r( $studygroup_list, true)));
$person_query = db_query("SELECT * FROM {booking_person_view} WHERE booking_gender = 'M' ORDER BY booking_lastname, booking_firstname")->fetchAllAssoc('nid'); $person_query = db_query("SELECT * FROM {booking_person_view} WHERE booking_gender = 'M' " .
" AND (booking_status = 1 OR booking_status = 2)" .
" ORDER BY booking_lastname, booking_firstname")->fetchAllAssoc('nid');
foreach ($person_query as $person) { foreach ($person_query as $person) {
//add the name to an array for this line //add the name to an array for this line