test result

This commit is contained in:
Nathan Coad
2018-05-04 22:56:50 +10:00
parent b82360598f
commit 9ac93d701c

View File

@@ -393,12 +393,12 @@ function booking_varietysessions_csv_report($timeslot_id) {
$variety_sessions = db_select('booking_variety_sessions', 'v') $variety_sessions = db_select('booking_variety_sessions', 'v')
->condition($db_and) ->condition($db_and)
->fields('v') ->fields('v');
->execute(); $variety_sessions_result = $variety_sessions->execute();
watchdog('booking_debug', 'booking_varietysessions_csv_report variety sessions: <pre>@info</pre>', array('@info' => print_r( $variety_sessions, true))); watchdog('booking_debug', 'booking_varietysessions_csv_report variety sessions: <pre>@info</pre>', array('@info' => print_r( $variety_sessions_result, true)));
if ($variety_sessions->rowCount() == 0) { if ($variety_sessions_result->rowCount() == 0) {
drupal_set_message("Error: Could not find matching variety session timeslot. Unable to view session membership.", 'error', FALSE); drupal_set_message("Error: Could not find matching variety session timeslot. Unable to view session membership.", 'error', FALSE);
drupal_goto('admin/config/booking/variety'); drupal_goto('admin/config/booking/variety');
return ""; return "";
@@ -451,7 +451,7 @@ function booking_varietysessions_csv_report($timeslot_id) {
foreach ($header_array as $column) { foreach ($header_array as $column) {
$maximums[] = count($data[$column]); $maximums[] = count($data[$column]);
//make the column headings a bit more user friendly //make the column headings a bit more user friendly
$column_headings[] = $variety_sessions[$column]->booking_variety_descrip; $column_headings[] = $variety_sessions_result[$column]->booking_variety_descrip;
} }
//add the column headings to the CSV //add the column headings to the CSV