diff --git a/booking.studygroups_report.inc b/booking.studygroups_report.inc index 80e3588..7412227 100644 --- a/booking.studygroups_report.inc +++ b/booking.studygroups_report.inc @@ -113,7 +113,7 @@ function booking_studygroups_leadhelp_view_summary() { //get study group definitions $query = db_select('booking_studygroup_list', 's') - ->fields('s') + ->fields('s'); ->condition('s.booking_eventid', $event->eid, '=') ->orderBy('sid'); $studygroup_list = $query->execute()->fetchAllAssoc('sid'); @@ -121,17 +121,10 @@ function booking_studygroups_leadhelp_view_summary() { foreach ($studygroup_list as $group) { $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', "
Leader Helper studygroup query result\n@info", 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) { //add the name to an array for this line