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

commence work on manual allocation flag

Browse Source
This commit is contained in:
Nathan Coad
2016-06-23 16:25:55 +10:00
parent ccac5cd293
commit f7c5a15108
3 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
booking.studygroups.inc
View File

@@ -560,6 +560,7 @@ function booking_studygroups_edit_form_submit($form, &$form_state) {
foreach ($reading_groups as $group) {
if ($group->sid == $key) {
booking_studygroups_process_colours();
break;
}
}
}
@@ -585,6 +586,7 @@ function booking_studygroups_edit_form_submit($form, &$form_state) {
foreach ($reading_groups as $group) {
if ($group->sid == $key) {
booking_studygroups_process_colours();
break;
}
}
} //end new value check
@@ -1550,7 +1552,7 @@ function booking_studygroups_printview_form($node, &$form_state, $group_id) {
*/
function booking_studygroups_view_form($node, &$form_state, $group_id) {
global $event;
$is_reading_group = FALSE;
//$is_reading_group = FALSE;
$form = array();
$options = array();
$rows = array();
@@ -1580,18 +1582,12 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
array(':eid' => $event->eid, ':sid' => $group_id))
->fetchObject();
if (! $group)
{
if (! $group) {
drupal_set_message("Error: Could not find matching study group ID. Unable to view group membership.", 'error', FALSE);
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'),