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

study group bugfixes

Browse Source
This commit is contained in:
Nathan Coad
2014-02-04 09:24:16 +11:00
parent 2cb87c2863
commit b20d525d81
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
booking.studygroups.inc
View File

@@ -38,8 +38,10 @@ function booking_available_leadhelp_select_form() {
'booking_gender' => array('data' => t('Gender')), 'booking_gender' => array('data' => t('Gender')),
'booking_baptised' => array('data' => t('Baptised?')), 'booking_baptised' => array('data' => t('Baptised?')),
'booking_age' => array('data' => t('Age at start of event')), 'booking_age' => array('data' => t('Age at start of event')),
'booking_lead_sessions' => array('data' => t('Number of groups to lead currently')), 'booking_lead_sessions' => array('data' => t('Total number of groups to lead')),
'booking_help_sessions' => array('data' => t('Number of groups to help currently')), 'booking_available_lead' => array('data' => t('Remaining slots')),
'booking_help_sessions' => array('data' => t('Total number of groups to help')),
'booking_available_help' => array('data' => t('Remaining slots')),
); );
$result = db_query("SELECT * FROM {booking_person} p left outer join {booking_leadhelp_list} l on p.nid = l.booking_node_id WHERE p.booking_event_id = :eid ORDER BY p.booking_gender DESC, p.booking_dob, p.booking_baptised", $result = db_query("SELECT * FROM {booking_person} p left outer join {booking_leadhelp_list} l on p.nid = l.booking_node_id WHERE p.booking_event_id = :eid ORDER BY p.booking_gender DESC, p.booking_dob, p.booking_baptised",
@@ -54,7 +56,9 @@ function booking_available_leadhelp_select_form() {
'booking_baptised' => $data->booking_baptised == 'Y' ? 'Yes' : 'No', 'booking_baptised' => $data->booking_baptised == 'Y' ? 'Yes' : 'No',
'booking_age' => _booking_avg_age($data->booking_dob, 1, $event->booking_event_start), 'booking_age' => _booking_avg_age($data->booking_dob, 1, $event->booking_event_start),
'booking_lead_sessions' => $data->booking_total_lead === NULL ? '0' : $data->booking_total_lead, 'booking_lead_sessions' => $data->booking_total_lead === NULL ? '0' : $data->booking_total_lead,
'booking_available_lead' => $data->booking_available_lead === NULL ? '0' : $data->booking_available_lead,
'booking_help_sessions' => $data->booking_total_help === NULL ? '0' : $data->booking_total_help, 'booking_help_sessions' => $data->booking_total_help === NULL ? '0' : $data->booking_total_help,
'booking_available_help' => $data->booking_available_help === NULL ? '0' : $data->booking_available_help,
); );
} }
@@ -579,7 +583,7 @@ function booking_studygroups_view_summary() {
//output everything //output everything
$output .= t("<h3>!event Study Groups</h3>", array('!event' => $event->booking_eventname)); $output .= t("<h3>!event Study Groups</h3>", array('!event' => $event->booking_eventname));
$output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => $stats_attributes)); $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => $attributes));
return $output; return $output;