drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Tidy up some code

Browse Source
This commit is contained in:
Nathan Coad
2014-06-10 11:28:44 +08:00
parent 07baa0b2a7
commit 01c24601c3
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
booking.rooms.inc
View File

@@ -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'])) 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 //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)) 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 //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->fetchAll();
$room_mapping = $room_mapping_query->fetchAllAssoc('booking_nodeid'); $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} " . //query for room definitions
"where booking_event_id = :eid and booking_status=1 order by booking_lastname, booking_firstname", $room_query = db_query("SELECT * FROM {booking_room_definition} WHERE booking_room_location_id = :lid",
array(':eid' => $event->eid)); 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 //make a list of all attendees that are booked in
$attendee_select[] = ''; $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; $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', "<pre>Loading existing room allocations:\n@info</pre>", array('@info' => print_r( $room_mapping, true))); watchdog('booking', "<pre>Loading existing room allocations:\n@info</pre>", array('@info' => print_r( $room_mapping, true)));
//attach the custom css //attach the custom css