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

fix the separation logic

Browse Source
This commit is contained in:
Nathan Coad
2016-06-24 14:34:04 +10:00
parent 49e93895e8
commit 3bdaa51657
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
booking.studygroups.inc
View File

@@ -956,10 +956,16 @@ function _booking_studygroups_update_preallocate($group, $group_mapping, &$sessi
//work out the next session to assign the other person to
$next_session = ($session_id % $group->booking_num_group_sessions) + 1;
$calculation_messages[] = t('Keeping non leader/helper/committee person with id !id separate from !separate by assigning !separate to session !session (currently with !num people).',
array('!id' => $person->booking_node_id, '!session' => $next_session, '!separate' => $keep_separate_id,
'!num' => $session_count[$person->booking_session_id]['total'])
);
$calculation_messages[] = t('Keeping non leader/helper/committee person with id !id separate from !separate by " . "
assigning !id to session !session and !separate to session !nextsession (currently with !num people).',
array('!id' => $person->booking_node_id, '!session' => $person->booking_session_id, '!nextsession' => $next_session,
'!separate' => $keep_separate_id, '!num' => $session_count[$session_id]['total'],
'!separatenum' => $session_count[$next_session]['total'])
);
//the current person
$age = _booking_get_age_years($working_list[$person->booking_node_id]->booking_dob);
_booking_assign_attendee_group($person->booking_node_id, $session_id, $gender, $age, $working_list, $session_count, $calculation_messages);
//the separated person
$age = _booking_get_age_years($working_list[$keep_separate_id]->booking_dob);
$gender = $working_list[$keep_separate_id]->booking_gender == 'M' ? 'male' : 'female';
_booking_assign_attendee_group($keep_separate_id, $next_session, $gender, $age, $working_list, $session_count, $calculation_messages);