From 06f1abbc600762e507b2955151f0141135ebf885 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Wed, 22 Jun 2016 23:08:47 +1000 Subject: [PATCH] add committee tag to study group output --- booking.studygroups_report.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/booking.studygroups_report.inc b/booking.studygroups_report.inc index 68f9444..48a0b27 100644 --- a/booking.studygroups_report.inc +++ b/booking.studygroups_report.inc @@ -38,7 +38,7 @@ function booking_studygroups_csv_report($group_id) { $enclosure_esc = preg_quote($enclosure, '/'); //get the list of study group session memberships - $session_members_query = db_query("SELECT m.*, p.booking_firstname, p.booking_lastname FROM {booking_studygroup_mapping} m + $session_members_query = db_query("SELECT m.*, p.* FROM {booking_studygroup_mapping} m inner join {booking_person} p on p.nid = m.booking_node_id WHERE m.booking_studygroup_id = :sid ORDER BY m.booking_session_id, m.booking_studygroup_role DESC", array(':sid' => $group_id)); @@ -55,6 +55,10 @@ function booking_studygroups_csv_report($group_id) { if ($member->booking_studygroup_role > 0) { array_push($text, '(' . _booking_studygroup_role_lookup($member->booking_studygroup_role) . ')'); } + //also tag committee members + if ($member->booking_committee_member == 'Y') { + array_push($text, '(committee)'); + } //add the spaces and put this element in the right array $data[$member->booking_session_id][] = implode(' ', $text);