diff --git a/booking.variety_form.inc b/booking.variety_form.inc index 945009b..b4b2431 100644 --- a/booking.variety_form.inc +++ b/booking.variety_form.inc @@ -84,6 +84,29 @@ function booking_variety_regn_form($node, &$form_state) ); } +/** + * Function to calculate available variety sessions for ajax enabled form booking_variety_regn_form() + * @param $timeslot_id - the timeslot ID to query + * @return array containing the variety sessions for specified timeslot that still have capacity + */ +function _booking_get_variety_timeslot_options($timeslot_id) { + $session_options = array(); + $session_options[] = "--"; + + $session_query = db_query("SELECT * FROM {booking_variety_options} WHERE booking_variety_timeslot_id = :tid AND booking_variety_status = 1", + array(':tid' => $timeslot_id)); + + // Only add sessions that aren't full to the return result + foreach($session_query as $session) { + if ($session->booking_variety_regncount < $session->booking_variety_maxsize) { + $session_options[$session->vid] = $session->booking_variety_descrip; + } + } + //watchdog('booking_debug', "
Variety Session Options:\n@info", array('@info' => print_r( $session_options, true))); + + return $session_options; +} + /** * Callback function to rebuild the variety session fieldset diff --git a/deprecated.php b/deprecated.php index 61dea98..5aa6d06 100644 --- a/deprecated.php +++ b/deprecated.php @@ -92,28 +92,6 @@ function booking_variety_session_callback($form, &$form_state) { } -/** - * Function to calculate available variety sessions for ajax enabled form booking_variety_regn_form() - * @param $timeslot_id - the timeslot ID to query - * @return array containing the variety sessions for specified timeslot that still have capacity - */ -function _booking_get_variety_timeslot_options($timeslot_id) { - $session_options = array(); - $session_options[] = "--"; - - $session_query = db_query("SELECT * FROM {booking_variety_options} WHERE booking_variety_timeslot_id = :tid AND booking_variety_status = 1", - array(':tid' => $timeslot_id)); - - // Only add sessions that aren't full to the return result - foreach($session_query as $session) { - if ($session->booking_variety_regncount < $session->booking_variety_maxsize) { - $session_options[$session->vid] = $session->booking_variety_descrip; - } - } - //watchdog('booking_debug', "
Variety Session Options:\n@info", array('@info' => print_r( $session_options, true))); - - return $session_options; -} /** * Callback function to verify if barcode was valid