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

Code to cleanup room allocations

Browse Source
This commit is contained in:
Nathan Coad
2014-05-28 15:25:21 +10:00
parent bdd980f13e
commit 6e1c8633dc
4 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
booking.rooms.inc
View File

@@ -194,18 +194,24 @@ function booking_rooms_allocate_form($node, &$form_state, $location_id) {
return "";
}
//make a list of all attendees
$attendee_select[] = '';
//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 = $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));
//make a list of all attendees that are booked in
$attendee_select[] = '';
foreach($query as $row)
{
$married = $row->booking_partner_id > 0 ? ' *' : '';
$age = _booking_get_age_years($row->booking_dob);
$attendee_select[$row->nid] = $row->booking_firstname . ' ' . $row->booking_lastname . ' ['. $age . ' ' . $row->booking_gender . ']' . $married;
$assigned_flag = empty($room_mapping[$row->nid]) ? '' : ' - ';
$attendee_select[$row->nid] = $assigned_flag . $row->booking_firstname . ' ' . $row->booking_lastname . ' ['. $age . ' ' . $row->booking_gender . ']' . $married;
}
@@ -213,11 +219,9 @@ function booking_rooms_allocate_form($node, &$form_state, $location_id) {
$room_query = db_query("SELECT * FROM {booking_room_definition} WHERE booking_room_location_id = :lid",
array(':lid' => $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 = $room_mapping_query->fetchAll();
//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
$form['#attached']['css'] = array(