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

fix debug message

Browse Source
This commit is contained in:
Nathan Coad
2016-06-24 14:27:31 +10:00
parent 66f634f600
commit bfc6de4ba5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
booking.studygroups.inc
View File

@@ -915,7 +915,7 @@ function _booking_studygroups_update_preallocate($group, $group_mapping, &$sessi
$next_session = ($session_id % $group->booking_num_group_sessions) + 1; $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).', $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']) '!num' => $session_count[$person->booking_session_id]['total'])
); );
$age = _booking_get_age_years($working_list[$keep_separate_id]->booking_dob); $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 //anyone else already assigned to this group previously
//this was checking equal to zero, shouldn't it be equal to 1? //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) { 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
if ($keep_separate_id > 0) { 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; $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).', $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']) '!num' => $session_count[$person->booking_session_id]['total'])
); );
$age = _booking_get_age_years($working_list[$keep_separate_id]->booking_dob); $age = _booking_get_age_years($working_list[$keep_separate_id]->booking_dob);