From bfc6de4ba533e3848f1f63298ca53fb0e8e5b318 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Fri, 24 Jun 2016 14:27:31 +1000 Subject: [PATCH] fix debug message --- booking.studygroups.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/booking.studygroups.inc b/booking.studygroups.inc index cbadf94..abf48c4 100644 --- a/booking.studygroups.inc +++ b/booking.studygroups.inc @@ -915,7 +915,7 @@ function _booking_studygroups_update_preallocate($group, $group_mapping, &$sessi $next_session = ($session_id % $group->booking_num_group_sessions) + 1; $calculation_messages[] = t('Keeping person with id !id separate from !separate by assigning !separate to session !session (currently with !num people).', - array('!id' => $spouse_id, '!session' => $next_session, '!separate' => $keep_separate_id, + array('!id' => $person->booking_node_id, '!session' => $next_session, '!separate' => $keep_separate_id, '!num' => $session_count[$person->booking_session_id]['total']) ); $age = _booking_get_age_years($working_list[$keep_separate_id]->booking_dob); @@ -947,6 +947,9 @@ function _booking_studygroups_update_preallocate($group, $group_mapping, &$sessi } //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 if ($keep_separate_id > 0) { @@ -954,7 +957,7 @@ function _booking_studygroups_update_preallocate($group, $group_mapping, &$sessi $next_session = ($session_id % $group->booking_num_group_sessions) + 1; $calculation_messages[] = t('Keeping person with id !id separate from !separate by assigning !separate to session !session (currently with !num people).', - array('!id' => $spouse_id, '!session' => $next_session, '!separate' => $keep_separate_id, + array('!id' => $person->booking_node_id, '!session' => $next_session, '!separate' => $keep_separate_id, '!num' => $session_count[$person->booking_session_id]['total']) ); $age = _booking_get_age_years($working_list[$keep_separate_id]->booking_dob);