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

Add token for leader-helper pairs

Browse Source
This commit is contained in:
Nathan Coad
2014-06-20 13:07:46 +10:00
parent 1293dae510
commit e83db04800
5 changed files with 147 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
booking.studygroups.inc
View File

@@ -1484,10 +1484,11 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
);
//attach the custom css
/*
$form['#attached']['css'] = array(
drupal_get_path('module', 'booking') . '/booking.css',
);
*/
//verify that $group_id is a number
if (! preg_match('/^[0-9]+$/', $group_id)) {
drupal_set_message("Error: Invalid study group ID '" . $group_id . "' supplied. Unable to view group membership.", 'error', FALSE);
@@ -1515,8 +1516,14 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
$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'),
'booking_status' => array('data' => t('Booking Status'), 'field' => 'p.booking_status'),
'booking_gender' => array('data' => t('Gender'), 'field' => 'p.booking_gender'),
'booking_age' => array('data' => t('Age'), 'field' => 'p.booking_dob'),
'booking_baptised' => array('data' => t('Baptised?'), 'field' => 'p.booking_baptised'),
'booking_married' => array('data' => t('Married?'), 'field' => 'p.booking_married'),
'booking_phone' => array('data' => t('Phone Number'), 'field' => 'p.booking_mobile'),
//'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'),
@@ -1581,37 +1588,66 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
}
$session = $is_reading_group == TRUE ? _booking_readinggroup_colour_lookup($data->booking_session_id) : $data->booking_session_id;
/*
$options[$data->nid] = array (
'booking_session_id' => $session,
'booking_name' => l(t('!first !last', array('!first' => $data->booking_firstname, '!last' => $data->booking_lastname)),
t('admin/booking/!id/edit-studygroup', array('!id' => $data->nid))),
'booking_status' => _booking_status_generate($data->booking_status),
'booking_studygroup_role' => _booking_studygroup_role_lookup($data->booking_studygroup_role),
'booking_committee' => $data->booking_committee_member == 'Y' ? 'Yes' : 'No',
//'booking_is_leader' => $data->booking_is_leader == 'Y' ? 'Yes' : 'No',
//'booking_is_helper' => $data->booking_is_helper == 'Y' ? 'Yes' : 'No',
//'booking_is_reserveleader' => $data->booking_is_reserveleader == 'Y' ? 'Yes' : 'No',
'#attributes' => array('id' => array($class))
);
*/
$rows[] = array (
'data' => array(
$session,
l(t('!first !last', array('!first' => $data->booking_firstname, '!last' => $data->booking_lastname)),
t('admin/booking/!id/edit-studygroup', array('!id' => $data->nid))),
//_booking_status_generate($data->booking_status),
$data->booking_gender == 'M' ? 'Male' : 'Female',
_booking_get_age_years($data->booking_dob),
$data->booking_baptised == 'Y' ? 'Yes' : 'No',
$data->booking_married == 'Y' ? 'Yes' : 'No',
$data->booking_mobile,
_booking_studygroup_role_lookup($data->booking_studygroup_role),
$data->booking_committee_member == 'Y' ? 'Yes' : 'No',
),
'id' => array($class),
);
$last_session = $data->booking_session_id;
}
$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 (
'#attached' => array (
'css' => array(drupal_get_path('module', 'booking') . '/booking.css')
),
'first_para' => array (
'#type' => 'markup',
'#markup' => $prefix,
),
'form' => $form,
'table' => array (
'#theme' => 'table',
'#header' => $header,
'#rows' => $rows,
'#attributes' => array('id' => 'sort-table'),
//'#sticky' => FALSE,
)
//'form' => $form,
);
}