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

test

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

8
booking.studygroups_report.inc
View File

@@ -121,15 +121,15 @@ 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 //select entries from the study groups mapping table
$query = db_select('booking_studygroup_mapping', 'm'); $query = db_select('booking_studygroup_mapping', 'm');
$query->join('booking_studygroup_list', 's', 's.sid = m.booking_studygroup_id'); $query->join('booking_studygroup_list', 's', 's.sid = m.booking_studygroup_id');
$query->condition('m.booking_eventid', $event->eid, '='); $query->condition('m.booking_eventid', $event->eid, '=');
$query->fields('m')->fields('s', array('booking_studygroup_descrip')); $query->fields('m')->fields('s', array('booking_studygroup_descrip'));
$group_mapping = $query->execute()->fetchAllAssoc('sid'); $group_mapping = $query->execute()->fetchAllAssoc('sid');
*/
watchdog('booking_debug', "<pre>Leader Helper studygroup query result\n@info</pre>", array('@info' => print_r( $group_mapping, true))); 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' ORDER BY booking_lastname, booking_firstname")->fetchAllAssoc('nid');
@@ -142,7 +142,7 @@ function booking_studygroups_leadhelp_view_summary() {
$session_role = 'session' . $group->sid . '_role'; $session_role = 'session' . $group->sid . '_role';
watchdog('booking_debug2', "<pre>Leader Helper session @session, role @role</pre>", watchdog('booking_debug2', "<pre>Leader Helper session @session, role @role</pre>",
array('@session' => $session, '@role' => $session_role)); array('@session' => $session, '@role' => $session_role));
if ($person->$session_role > 0) { if ($person->$session_role > 0) {
$text = _booking_studygroup_role_lookup($person->$session_role); $text = _booking_studygroup_role_lookup($person->$session_role);
$newline[] .= "<b>" . $text . "</b> for session #" . $group->booking_session_id; $newline[] .= "<b>" . $text . "</b> for session #" . $group->booking_session_id;