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

Added randomisation to study group calculations

Browse Source
This commit is contained in:
Nathan Coad
2014-01-19 00:40:05 +11:00
parent 822d911fc6
commit 8d33ec2d2f
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
booking.studygroups.inc
View File

@@ -201,6 +201,19 @@ function clone_array($copied_array) {
}, $copied_array);
}
//taken from http://stackoverflow.com/questions/4102777/php-random-shuffle-array-maintaining-key-value
function shuffle_assoc($list) {
if (!is_array($list)) return $list;
$keys = array_keys($list);
shuffle($keys);
$random = array();
foreach ($keys as $key) {
$random[$key] = $list[$key];
}
return $random;
}
/**
* Function for calculating who belongs to which study group
*/
@@ -242,7 +255,7 @@ function booking_studygroups_calculate() {
//create a temporary copy of the attendee list to work with for this study group
$working_list = array();
$working_list = clone_array($attendees);
$working_list = shuffle_assoc(clone_array($attendees));
//set up the iterator
$obj = new ArrayObject( $working_list );
$it = $obj->getIterator();
@@ -296,7 +309,7 @@ function booking_studygroups_calculate() {
//watchdog('booking', 'Attendee before leader check has id !id.', array('!id' => $it->key()));
//check if this attendee is a leader
if ($current->processed == 0 && $current->booking_available_lead > 0)
if ($current->processed == 0 && $current->booking_available_lead > 0 && $leader_found == FALSE)
{
drupal_set_message(t('Found available leader with id !id for session !session.', array('!id' => $it->key(), '!session' => $session_id)));
@@ -322,7 +335,7 @@ function booking_studygroups_calculate() {
}
}
//check if this attendee is a helper
elseif ($current->processed == 0 && $current->booking_available_help > 0)
elseif ($current->processed == 0 && $current->booking_available_help > 0 && $helper_found == FALSE)
{
drupal_set_message(t('Found available helper with id !id for session !session.', array('!id' => $it->key(), '!session' => $session_id)));
@@ -408,7 +421,8 @@ function booking_studygroups_calculate() {
}
//move to the next attendee in the list
//move to the next unprocessed attendee in the list
while ($it->valid() && $it->current()->processed == 1)
$it->next();
} //finished looping through session list