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

rename booking_event_id in booking_person table

Browse Source
This commit is contained in:
Nathan Coad
2016-05-03 22:49:45 +10:00
parent 80cd8d157a
commit 3ce77ebea6
14 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
booking.rooms.inc
View File

@@ -12,7 +12,7 @@ function _booking_rooms_name_autocomplete($string) {
$query = db_select('booking_person', 'p')
->fields('p', array('nid', 'booking_firstname', 'booking_lastname'));
$db_or = db_or()->condition('p.booking_lastname', '%' . db_like($string) . '%', 'LIKE')->condition('p.booking_firstname', '%' . db_like($string) . '%', 'LIKE');
$db_and = db_and()->condition($db_or)->condition('p.booking_event_id', $event->eid, '=');
$db_and = db_and()->condition($db_or)->condition('p.booking_eventid', $event->eid, '=');
$result = $query->condition($db_and)
->execute();
@@ -53,7 +53,7 @@ function booking_rooms_allocate_test_form($node, &$form_state, $location_id) {
//query for existing room allocations
$query = db_select('booking_person', 'p');
$query->leftJoin('booking_room_mapping', 'm', 'm.booking_nodeid = p.nid');
$query->condition('p.booking_event_id', $event->eid, '=');
$query->condition('p.booking_eventid', $event->eid, '=');
$query->fields('p', array('booking_lastname', 'booking_firstname'))->fields('m');
$room_mapping = $query->execute()->fetchAllAssoc('booking_nodeid');
@@ -156,7 +156,7 @@ function booking_rooms_allocate_test_form_submit($form, &$form_state) {
//query for existing room allocations
$query = db_select('booking_person', 'p');
$query->leftJoin('booking_room_mapping', 'm', 'm.booking_nodeid = p.nid');
$query->condition('p.booking_event_id', $event->eid, '=');
$query->condition('p.booking_eventid', $event->eid, '=');
$query->fields('p', array('booking_lastname', 'booking_firstname'))->fields('m');
$room_mapping = $query->execute()->fetchAllAssoc('booking_nodeid');