From 3bdaa516573d1b98543b91f4fa7112c5d8eaa3aa Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@cdc.home>
Date: Fri, 24 Jun 2016 14:34:04 +1000
Subject: [PATCH] fix the separation logic

---
 booking.studygroups.inc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/booking.studygroups.inc b/booking.studygroups.inc
index 275e15a..b611f10 100644
--- a/booking.studygroups.inc
+++ b/booking.studygroups.inc
@@ -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);