diff --git a/booking.reports.inc b/booking.reports.inc index 1bf7975..ee22370 100644 --- a/booking.reports.inc +++ b/booking.reports.inc @@ -643,10 +643,11 @@ function booking_csv_report() { 'booking_rtrnflight_destination_ts', 'booking_timestamp', 'booking_flight_datetime_inbound', 'booking_flight_datetime_outbound'); $number_only_fields = array('booking_postcode', 'booking_mobile', 'booking_phone'); + //this isn't required since we already have the info directly as a field + //so there is no need to rewrite the ID field with a user-friendly description //look up room location descriptions for presenting a friendly name rather than an ID - $room_query = db_query("SELECT * FROM {booking_room_locations} WHERE booking_roomlocation_active = 'Y'"); - $room_locations = $room_query->fetchAllAssoc('lid'); - watchdog('booking_debug', "
CSV Room locations description test:\n@info", array('@info' => print_r( $room_locations[3], true))); + //$room_query = db_query("SELECT * FROM {booking_room_locations} WHERE booking_roomlocation_active = 'Y'"); + //$room_locations = $room_query->fetchAllAssoc('lid'); //look up the titles of the study groups and add to array for updating in the header $studygroup_descriptions = array(); @@ -762,12 +763,14 @@ function booking_csv_report() { continue; } + /* + //this is not required since node_load already has the room location description for each attendee //room location if ($key == 'booking_room_location_id') { - //$output[] = _booking_room_location_lookup($value); $output[] = $room_locations[$value]->booking_roomlocation_descrip; continue; - } + } + */ //room bed type if ($key == 'booking_room_bedtype') {