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

Minor tweaks

Browse Source
This commit is contained in:
Nathan Coad
2014-06-30 17:40:26 +10:00
parent 53ea1fd2fe
commit ad131989b5
7 changed files with 91 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
booking.rooms.inc
View File

@@ -148,7 +148,7 @@ function booking_room_edit_form($node, &$form_state, $nid) {
//person must exist in database, load all the bits
$person = node_load($nid);
$prefix = t("<p>Manually assign/update room allocation for !first !last.<br /><b>Note:&nbsp;Still under testing!</b></p>",
$prefix = t("<p>Manually assign/update room allocation for !first !last.<br /></p>",
array('!first' => $person->booking_firstname, '!last' => $person->booking_lastname));
//***form starts here***
@@ -681,7 +681,7 @@ function booking_rooms_allocate_form($node, &$form_state, $location_id) {
$room_mapping = $room_mapping_query->fetchAllAssoc('booking_nodeid');
//query for room definitions
$room_query = db_query("SELECT * FROM {booking_room_definition} WHERE booking_room_location_id = :lid",
$room_query = db_query("SELECT * FROM {booking_room_definition} WHERE booking_room_location_id = :lid ORDER BY booking_room_number",
array(':lid' => $location_id));
//query for attendees
@@ -1055,9 +1055,10 @@ function booking_rooms_view_form($node, &$form_state, $location_id) {
$room_mapping = $room_mapping_query->fetchAllAssoc('booking_nodeid');
//query for attendees
//status 1 is coming, status 5 is hosts
$attendees = 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",
" WHERE booking_event_id = :eid and (booking_status=1 or booking_status=5) order by booking_lastname, booking_firstname",
array(':eid' => $event->eid))->fetchAllAssoc('nid');
//define the header