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

update

Browse Source
This commit is contained in:
Nathan Coad
2016-06-23 16:30:10 +10:00
parent d4d1f9e14e
commit 76e2357c78
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
booking.studygroups.inc
View File

@@ -1060,7 +1060,7 @@ function booking_studygroups_update_form($node, &$form_state, $sid) {
($committee_flag == 'Y' && $group->booking_is_readinggroup == 'Y') || ($committee_flag == 'Y' && $group->booking_is_readinggroup == 'Y') ||
($manually_allocated_flag == 'Y')) { ($manually_allocated_flag == 'Y')) {
$calculation_messages[] = t('Leader/helper/committee with id !id assigned to session !session (currently with !num people).', $calculation_messages[] = t('Leader/helper/committee/manual allocation with id !id assigned to session !session (currently with !num people).',
array('!id' => $person->booking_node_id, '!session' => $person->booking_session_id, array('!id' => $person->booking_node_id, '!session' => $person->booking_session_id,
'!num' => $session_count[$person->booking_session_id]['total']) '!num' => $session_count[$person->booking_session_id]['total'])
); );
@@ -1068,7 +1068,7 @@ function booking_studygroups_update_form($node, &$form_state, $sid) {
//mark this position as being used //mark this position as being used
$working_list[$person->booking_node_id]->booking_studygroup_role = $person->booking_studygroup_role; $working_list[$person->booking_node_id]->booking_studygroup_role = $person->booking_studygroup_role;
$age = _booking_get_age_years($working_list[$person->booking_node_id]->booking_dob); $age = _booking_get_age_years($working_list[$person->booking_node_id]->booking_dob);
_booking_assign_attendee_group($person->booking_node_id, $session_id, 'male', $age, $working_list, $session_count, $calculation_messages); _booking_assign_attendee_group($person->booking_node_id, $session_id, $gender, $age, $working_list, $session_count, $calculation_messages);
//make sure the leader/helper's partner gets updated now, otherwise they could still end up in different groups //make sure the leader/helper's partner gets updated now, otherwise they could still end up in different groups
if ($spouse_id > 0) if ($spouse_id > 0)