From b20d525d813e6142ad0c386671c4be25873e7801 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Tue, 4 Feb 2014 09:24:16 +1100 Subject: [PATCH] study group bugfixes --- booking.studygroups.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/booking.studygroups.inc b/booking.studygroups.inc index b4431dc..0579c3c 100644 --- a/booking.studygroups.inc +++ b/booking.studygroups.inc @@ -38,8 +38,10 @@ function booking_available_leadhelp_select_form() { 'booking_gender' => array('data' => t('Gender')), 'booking_baptised' => array('data' => t('Baptised?')), 'booking_age' => array('data' => t('Age at start of event')), - 'booking_lead_sessions' => array('data' => t('Number of groups to lead currently')), - 'booking_help_sessions' => array('data' => t('Number of groups to help currently')), + 'booking_lead_sessions' => array('data' => t('Total number of groups to lead')), + '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", @@ -54,7 +56,9 @@ function booking_available_leadhelp_select_form() { 'booking_baptised' => $data->booking_baptised == 'Y' ? 'Yes' : 'No', '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_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_available_help' => $data->booking_available_help === NULL ? '0' : $data->booking_available_help, ); } @@ -579,7 +583,7 @@ function booking_studygroups_view_summary() { //output everything $output .= t("

!event Study Groups

", 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;