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

Fixed study group matching leader/helper calculations

Browse Source
This commit is contained in:
Nathan Coad
2016-01-20 10:03:30 +11:00
parent 7bbdf57238
commit 4fcd741e97
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
booking.studygroup_leaders.inc
View File

@@ -28,16 +28,30 @@ function booking_studygroups_leaders_calculate() {
$calculation_messages[] = t('Processing eligible Leader/helper with id !id and age !age',
array('!id' => $person->nid, '!age' => $age)
);
foreach ($groups as $studygroup)
{
//watchdog('booking_debug', "<pre>Study Group Element\n@info</pre>", array('@info' => print_r( $studygroup, true)));
if ($age >= 22 && $studygroup->leader_nid == 0)
{
$studygroup->leader_nid = $person->nid;
$calculation_messages[] = t("Study Group Assignment as leader for nid !nid to group !descrip at session id !sid",
array('!nid' => $person->nid, '!descrip' => $studygroup->booking_studygroup_descrip, '!sid' => $studygroup->session_id, '@info' => print_r( $studygroup, true)));
break;
}
elseif ($age < 22 && $studygroup->helper_nid == 0)
{
$studygroup->helper_nid = $person->nid;
$calculation_messages[] = t("Study Group Assignment as helper for nid !nid to group !descrip at session id !sid",
array('!nid' => $person->nid, '!descrip' => $studygroup->booking_studygroup_descrip, '!sid' => $studygroup->session_id, '@info' => print_r( $studygroup, true)));
break;
}
}
//if someone is 22 or over, they're a leader
if ($age >= 22)
{
$next_group_index = $groups[_booking_get_next_studygroup('leader_nid', $groups)];
$calculation_messages[] = t('Assigning id !id to study group !group as a leader',
array('!id' => $person->nid, '!group' => $next_group_index)
);
$groups[$next_group_index]->leader_nid = $person->nid;
}
//$next_group_index = $groups[_booking_get_next_studygroup('leader_nid', $groups)];
//$groups[$next_group_index]->leader_nid = $person->nid;
//if someone is under 22, they're a helper
//left over people become a reserve leader
@@ -152,7 +166,7 @@ function _booking_studygroups_retrieve_groups() {
$new_group = clone $group;
$new_group->session_id = $i;
$new_group->leader_nid = -1;
$new_group->leader_nid = 0;
$new_group->helper_nid = 0;
$new_group->reserve_nid = 0;
$new_group->processed = 0;
@@ -161,7 +175,7 @@ function _booking_studygroups_retrieve_groups() {
}
}
watchdog('booking', "<pre>Study Group Sessions:\n@info</pre>", array('@info' => print_r( $groups, true)));
//watchdog('booking', "<pre>Study Group Sessions:\n@info</pre>", array('@info' => print_r( $groups, true)));
return $groups;
}