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

Fix the way study group sessions were queried

Browse Source
This commit is contained in:
Nathan Coad
2015-07-23 20:04:29 +10:00
parent 35d41db948
commit fa24cb3350
4 changed files with 79 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
booking.helper.inc
View File

@@ -1399,16 +1399,17 @@ function _booking_studygroup_email_summary($node) {
array(':eid' => $event->eid));
$studygroups = $studygroups_query->fetchAllAssoc('sid');
for ($i = 1; $i <= variable_get('booking_studygroup_count','0'); $i++)
//for ($i = 1; $i <= variable_get('booking_studygroup_count','0'); $i++)
foreach ($studygroups as $studygroup)
{
//calculate the session references
$sessionid = "session" . $i;
$sessionid = "session" . $studygroup->sid;
$roleid = $sessionid . "_role";
//check that this study group session has been defined for this attendee
if (!empty($node->$sessionid))
{
$rows[] = t($studygroups[$i]->booking_studygroup_descrip . ": Group " . $node->$sessionid . ", " . _booking_studygroup_role_lookup($node->$roleid));
$rows[] = t($studygroup->booking_studygroup_descrip . ": Group " . $node->$sessionid . ", " . _booking_studygroup_role_lookup($node->$roleid));
}
}
}
@@ -1435,16 +1436,23 @@ function _booking_leader_helper_email_summary($node) {
array(':eid' => $event->eid));
$studygroups = $studygroups_query->fetchAllAssoc('sid');
for ($i = 1; $i <= variable_get('booking_studygroup_count','0'); $i++)
//for ($i = 1; $i <= variable_get('booking_studygroup_count','0'); $i++)
//for ($i = 1; $i <= count($studygroups); $i++)
foreach ($studygroups as $studygroup)
{
//don't print info about the readings groups
//if ($i == variable_get('booking_readinggroup_id','7'))
// continue;
if ($studygroups[$i]->booking_is_readinggroup == 'Y')
continue;
//if ($studygroups[$i]->booking_is_readinggroup == 'Y')
// continue;
if ($studygroup->booking_is_readinggroup == 'Y')
continue;
//calculate the session references
$sessionid = "session" . $i;
//$sessionid = "session" . $i;
$sessionid = "session" . $studygroup->sid;
$roleid = $sessionid . "_role";
$otherperson_name = "TBA";
$otherperson_email = "";