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

fix reading group handling

Browse Source
This commit is contained in:
Nathan Coad
2016-06-23 14:17:08 +10:00
parent eb71552a84
commit ccac5cd293
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
booking.studygroups.inc
View File

@@ -1586,12 +1586,12 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
drupal_goto('admin/config/booking');
return "";
}
/*
if ($group_id == variable_get('booking_readinggroup_id','7'))
{
$is_reading_group = TRUE;
}
*/
$header = array(
'booking_session_id' => array('data' => t('Study Group Session'), 'field' => 'm.booking_session_id', 'sort' => 'asc'),
'booking_name' => array('data' => t('Name'), 'field' => 'p.booking_lastname'),
@@ -1603,15 +1603,11 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
//'booking_status' => array('data' => t('Booking Status'), 'field' => 'p.booking_status'),
'booking_studygroup_role' => array('data' => t('Studygroup Role'), 'field' => 'p.booking_studygroup_role'),
'booking_committee' => array('data' => t('Committee Member?'), 'field' => 'p.booking_committee_member'),
//'booking_is_leader' => array('data' => t('Leader?'), 'field' => 'm.booking_is_leader'),
//'booking_is_helper' => array('data' => t('Helper?'), 'field' => 'm.booking_is_helper'),
//'booking_is_reserveleader' => array('data' => t('Reserve Leader?'), 'field' => 'm.booking_is_reserveleader'),
);
if ($is_reading_group == TRUE)
{
$header['booking_session_id']['data'] = t('Team Colour');
}
if ($group->booking_is_readinggroup == 'Y') {
$header['booking_session_id']['data'] = t('Team Colour');
}
$query = db_select('booking_person', 'p');
$query->leftJoin('booking_studygroup_mapping', 'm', 'm.booking_node_id = p.nid');
@@ -1660,7 +1656,7 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
}
} //end class calculation
$session = $is_reading_group == TRUE ? _booking_readinggroup_colour_lookup($data->booking_session_id) : $data->booking_session_id;
$session = $group->booking_is_readinggroup == 'Y' ? _booking_readinggroup_colour_lookup($data->booking_session_id) : $data->booking_session_id;
$rows[] = array (
'data' => array(