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

10
booking.studygroups.inc
View File

@@ -91,7 +91,7 @@ function booking_available_leadhelp_select_form($node, &$form_state, $group_id)
//also restrict to males from the current event
$db_and = db_and();
$db_and->condition('p.booking_event_id', $event->eid, '=');
$db_and->condition('p.booking_eventid', $event->eid, '=');
$db_and->condition('p.booking_gender', 'M', '=');
$db_and->condition($db_or);
@@ -653,7 +653,7 @@ function booking_studygroups_calculate() {
$max_people = (int) ($limit / $firstgroup->booking_num_group_sessions) + 2;
//select all the attendees booked in
$query = db_query("SELECT * FROM {booking_person} WHERE booking_event_id = :eid",
$query = db_query("SELECT * FROM {booking_person} WHERE booking_eventid = :eid",
array(':eid' => $event->eid));
$attendees = $query->fetchAllAssoc('nid');
@@ -1010,7 +1010,7 @@ function booking_studygroups_update_form($node, &$form_state, $sid) {
$max_people = (int) ($limit / $firstgroup->booking_num_group_sessions) + $fudge_factor;
//select all the attendees for this event
$query = db_query("SELECT * FROM {booking_person} WHERE booking_event_id = :eid",
$query = db_query("SELECT * FROM {booking_person} WHERE booking_eventid = :eid",
array(':eid' => $event->eid));
$attendees = $query->fetchAllAssoc('nid');
@@ -1513,7 +1513,7 @@ function booking_studygroups_printview_form($node, &$form_state, $group_id) {
$query = db_select('booking_person', 'p');
$query->leftJoin('booking_studygroup_mapping', 'm', 'm.booking_node_id = p.nid');
$db_and = db_and();
$db_and->condition('p.booking_event_id', $event->eid, '=');
$db_and->condition('p.booking_eventid', $event->eid, '=');
$db_and->condition('m.booking_studygroup_id', $group_id, '=');
$query->condition($db_and);
$query->fields('p')->fields('m');
@@ -1660,7 +1660,7 @@ function booking_studygroups_view_form($node, &$form_state, $group_id) {
$query->leftJoin('booking_studygroup_mapping', 'm', 'm.booking_node_id = p.nid');
$db_and = db_and();
$db_and->condition('p.booking_event_id', $event->eid, '=');
$db_and->condition('p.booking_eventid', $event->eid, '=');
$db_and->condition('m.booking_studygroup_id', $group_id, '=');
$query->condition($db_and);