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

add age to studygroup CSV report

Browse Source
This commit is contained in:
Nathan Coad
2016-06-24 15:21:17 +10:00
parent 087f0405ef
commit 4df8c4f059
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
booking.studygroups.inc
View File

@@ -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); _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 //check for keep together/apart assignments for people that aren't leaders/helpers/committee
elseif ($working_list[$person->booking_node_id]->processed == 0) { 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 //check if there is someone that should be allocated to a different group than this person

2
booking.studygroups_report.inc
View File

@@ -50,7 +50,7 @@ function booking_studygroups_csv_report($group_id) {
$data[$member->booking_session_id] = array(); $data[$member->booking_session_id] = array();
} }
// lookup the name and role for this entry in the study group session // 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 //add their role if they're leading/helping etc
if ($member->booking_studygroup_role > 0) { if ($member->booking_studygroup_role > 0) {
array_push($text, '(' . _booking_studygroup_role_lookup($member->booking_studygroup_role) . ')'); array_push($text, '(' . _booking_studygroup_role_lookup($member->booking_studygroup_role) . ')');