Fix up studygroups update functions

This commit is contained in:
2014-06-19 09:37:18 +10:00
parent 781acbd9de
commit 478d093bb9
4 changed files with 70 additions and 20 deletions

View File

@@ -395,24 +395,44 @@ function _booking_shuffle_assoc($list) {
*/
function _booking_assign_attendee_group($nid, $session_id, $gender, $age, &$attendee_list, &$session_count)
{
$previous_session = 0;
//check for valid attendee
if (empty($nid))
{
drupal_set_message(t('Attempting to process a non-existent node id.'));
return;
}
//check if this person had already been processsed
if ($attendee_list[$nid]->processed == 1 && $attendee_list[$nid]->session > 0)
{
drupal_set_message(t('Detected re-assignment of id !id previously assigned to session !session.',
array('!id' => $nid, '!session' => $attendee_list[$nid]->session)
));
$previous_session = $attendee_list[$nid]->session;
//update previous session totals
$session_count[$previous_session][$gender]--;
$session_count[$previous_session]['total']--;
if ($age < 20)
$session_count[$previous_session]['under20']--;
elseif($age >= 20 && $age < 25)
$session_count[$previous_session]['20to25']--;
else
$session_count[$previous_session]['over25']--;
}
//mark this person as processed in the working list
$attendee_list[$nid]->processed = 1;
$attendee_list[$nid]->session = $session_id;
//record the category of person
$session_count[$session_id][$gender]++;
$session_count[$session_id]['total']++;
//record the age bracket
//$age = _booking_get_age_years($attendee_list[$nid]->booking_dob);
//process ages
if ($age < 20)
$session_count[$session_id]['under20']++;
elseif($age >= 20 && $age < 25)