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

fix missing references to reserve helper

Browse Source
This commit is contained in:
Nathan Coad
2016-06-29 16:45:32 +10:00
parent af95616e87
commit 9ceabb97c7
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
booking.studygroups.inc
View File

@@ -1279,6 +1279,7 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
1 => "leader-row", 1 => "leader-row",
2 => "helper-row", 2 => "helper-row",
3 => "reserveleader-row", 3 => "reserveleader-row",
4 => "reservehelper-row",
); );
//attach the custom css //attach the custom css
@@ -1348,11 +1349,9 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
$class = $class_array[$data->booking_studygroup_role]; $class = $class_array[$data->booking_studygroup_role];
//only add the lines separating groups if we're sorting by the session id //only add the lines separating groups if we're sorting by the session id
if ($sort['sql'] == "m.booking_session_id") if ($sort['sql'] == "m.booking_session_id") {
{
//Add a different id for first entry of new session, with a border-top to distinguish it //Add a different id for first entry of new session, with a border-top to distinguish it
if ($last_session <> $data->booking_session_id) if ($last_session <> $data->booking_session_id) {
{
switch ($data->booking_studygroup_role) { switch ($data->booking_studygroup_role) {
case 1: case 1:
$class = "leader-new-group-row"; $class = "leader-new-group-row";
@@ -1363,6 +1362,9 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
case 3: case 3:
$class = "reserveleader-new-group-row"; $class = "reserveleader-new-group-row";
break; break;
case 4:
$class = "reservehelper-new-group-row";
break;
default: default:
$class = "new-group-row"; $class = "new-group-row";
@@ -1394,14 +1396,6 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
} }
$prefix = t("<h2>Study Group !descrip</h2>", array('!descrip' => $group->booking_studygroup_descrip)); $prefix = t("<h2>Study Group !descrip</h2>", array('!descrip' => $group->booking_studygroup_descrip));
/*
$form['table'] = array (
'#type' => 'tableselect',
'#header' => $header,
'#options' => $options,
//'#attributes' => array('id' => 'sort-table'),
);
*/
return array ( return array (
'#attached' => array ( '#attached' => array (
'css' => array(drupal_get_path('module', 'booking') . '/booking.css') 'css' => array(drupal_get_path('module', 'booking') . '/booking.css')
@@ -1416,8 +1410,7 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
'#rows' => $rows, '#rows' => $rows,
'#attributes' => array('id' => 'sort-table'), '#attributes' => array('id' => 'sort-table'),
//'#sticky' => FALSE, //'#sticky' => FALSE,
) )
//'form' => $form,
); );
} }