logic change in studygroup calculations for committee members
This commit is contained in:
@@ -740,11 +740,11 @@ function booking_studygroups_update_form($node, &$form_state, $sid) {
|
|||||||
//if the study group id matches the group we're currently looking at
|
//if the study group id matches the group we're currently looking at
|
||||||
if ($person->booking_studygroup_id == $group->sid) {
|
if ($person->booking_studygroup_id == $group->sid) {
|
||||||
//if they have a role defined
|
//if they have a role defined
|
||||||
//or if they are a committee member and this is the readings group
|
//or if they are a committee member
|
||||||
//or if the manually allocated flag is set
|
//or if the manually allocated flag is set
|
||||||
//then make sure they stay where they are
|
//then make sure they stay where they are
|
||||||
if (($person->booking_studygroup_role > 0) ||
|
if (($person->booking_studygroup_role > 0) ||
|
||||||
($committee_flag == 'Y' && $group->booking_is_readinggroup == 'Y') ||
|
($committee_flag == 'Y') ||
|
||||||
($manually_allocated_flag == 'Y')) {
|
($manually_allocated_flag == 'Y')) {
|
||||||
|
|
||||||
$calculation_messages[] = t('Leader/helper/committee/manual allocation 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).',
|
||||||
|
Reference in New Issue
Block a user