From 4df8c4f05927f44732abe606e957f6d5259ac547 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Fri, 24 Jun 2016 15:21:17 +1000 Subject: [PATCH] add age to studygroup CSV report --- booking.studygroups.inc | 4 ---- booking.studygroups_report.inc | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/booking.studygroups.inc b/booking.studygroups.inc index 07a5078..b07fddb 100644 --- a/booking.studygroups.inc +++ b/booking.studygroups.inc @@ -945,10 +945,6 @@ function _booking_studygroups_update_preallocate($group, $group_mapping, &$sessi _booking_assign_attendee_group($bf_gf_id, $session_id, $bfgf_gender, $age, $working_list, $session_count, $calculation_messages); } } - //anyone else already assigned to this group previously - //this was checking equal to zero, shouldn't it be equal to 1? - - //@todo maybe comment should read something like: //check for keep together/apart assignments for people that aren't leaders/helpers/committee elseif ($working_list[$person->booking_node_id]->processed == 0) { //check if there is someone that should be allocated to a different group than this person diff --git a/booking.studygroups_report.inc b/booking.studygroups_report.inc index 67cfb1d..2411ea1 100644 --- a/booking.studygroups_report.inc +++ b/booking.studygroups_report.inc @@ -50,7 +50,7 @@ function booking_studygroups_csv_report($group_id) { $data[$member->booking_session_id] = array(); } // lookup the name and role for this entry in the study group session - $text = array($member->booking_firstname, $member->booking_lastname); + $text = array($member->booking_firstname, $member->booking_lastname, '[' . _booking_get_age_years($member->booking_dob) .']'); //add their role if they're leading/helping etc if ($member->booking_studygroup_role > 0) { array_push($text, '(' . _booking_studygroup_role_lookup($member->booking_studygroup_role) . ')');