diff --git a/booking.studygroups_report.inc b/booking.studygroups_report.inc index 4767d59..603aa6a 100644 --- a/booking.studygroups_report.inc +++ b/booking.studygroups_report.inc @@ -111,16 +111,29 @@ function booking_studygroups_leadhelp_view_summary() { $rows = array(); $attributes = array('style' => 'max-width:60%'); + //get study group definitions + $query = db_select('booking_studygroup_list', 's') + ->fields('s') + ->condition('s.booking_eventid', $event->eid, '='); + $result = $query->execute(); + + foreach ($result 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( $group_mapping, true))); + /* foreach ($group_mapping as $group) { $header[] = $group->booking_studygroup_descrip; } + */ $person_query = db_query("SELECT * FROM {booking_person_view} WHERE booking_gender = 'M' ORDER BY booking_lastname, booking_firstname")->fetchAllAssoc('nid');