From 01c24601c36c48b0dcadd8eda9632c05e206fc97 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Tue, 10 Jun 2014 11:28:44 +0800 Subject: [PATCH] Tidy up some code --- booking.rooms.inc | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/booking.rooms.inc b/booking.rooms.inc index 3bf6154..fa90195 100644 --- a/booking.rooms.inc +++ b/booking.rooms.inc @@ -315,7 +315,7 @@ function booking_room_edit_form_validate($form, &$form_state) { if ($check && ($check->booking_roomid == $details->rid && $check->booking_room_bedtype == $values['booking_room_bedtype'])) { - drupal_set_message('Not validating room capacity because this person is already allocated this bed in this room.'); + //drupal_set_message('Not validating room capacity because this person is already allocated this bed in this room.'); } //there was no existing mapping for this person, so check that there's capacity in this room elseif (! _booking_room_capacity_check($details->rid, $values['booking_room_bedtype'], $details)) @@ -730,13 +730,20 @@ function booking_rooms_allocate_form($node, &$form_state, $location_id) { } //query for existing room allocations - $room_mapping_query = db_query("SELECT * FROM {booking_room_mapping} WHERE booking_eventid = :eid", array(':eid' => $event->eid)); + $room_mapping_query = db_query("SELECT * FROM {booking_room_mapping} WHERE booking_eventid = :eid", + array(':eid' => $event->eid)); //$room_mapping = $room_mapping_query->fetchAll(); $room_mapping = $room_mapping_query->fetchAllAssoc('booking_nodeid'); - - $query = db_query("SELECT nid, booking_firstname, booking_lastname, booking_gender, booking_dob, booking_partner_id FROM {booking_person} " . - "where booking_event_id = :eid and booking_status=1 order by booking_lastname, booking_firstname", - array(':eid' => $event->eid)); + + //query for room definitions + $room_query = db_query("SELECT * FROM {booking_room_definition} WHERE booking_room_location_id = :lid", + array(':lid' => $location_id)); + + //query for attendees + $query = db_query("SELECT nid, booking_firstname, booking_lastname, booking_gender, booking_dob, booking_partner_id " . + " FROM {booking_person} " . + " WHERE booking_event_id = :eid and booking_status=1 order by booking_lastname, booking_firstname", + array(':eid' => $event->eid)); //make a list of all attendees that are booked in $attendee_select[] = ''; @@ -749,13 +756,7 @@ function booking_rooms_allocate_form($node, &$form_state, $location_id) { $attendee_select[$row->nid] = $assigned_flag . $row->booking_firstname . ' ' . $row->booking_lastname . ' ['. $age . ' ' . $row->booking_gender . ']' . $married; } - - //query for room definitions - $room_query = db_query("SELECT * FROM {booking_room_definition} WHERE booking_room_location_id = :lid", - array(':lid' => $location_id)); - - watchdog('booking', "
Loading existing room allocations:\n@info
", array('@info' => print_r( $room_mapping, true))); //attach the custom css