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

use separate query for session data

Browse Source
This commit is contained in:
Nathan Coad
2018-05-05 14:51:37 +10:00
parent 261f0201be
commit ecf0342310
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
booking.variety_admin.inc
View File

@@ -437,19 +437,20 @@ function booking_variety_sessions_view_summary() {
$header = array('First Name', 'Last Name'); $header = array('First Name', 'Last Name');
$rows = array(); $rows = array();
$attributes = array('style' => 'max-width:100%'); $attributes = array('style' => 'max-width:100%');
//@todo - join the variety sessions table to timeslots table to avoid another query
//get variety session timeslot definitions //get variety session timeslot definitions
$timeslot_query = db_select('booking_variety_timeslots', 't'); $timeslot_query = db_select('booking_variety_timeslots', 't');
$timeslot_query->join('booking_variety_sessions', 's', 't.tid = s.booking_variety_timeslot_id');
$timeslot_query->condition('t.booking_eventid', $event->eid, '=') $timeslot_query->condition('t.booking_eventid', $event->eid, '=')
->fields('t') ->fields('t')
->fields('s')
->orderBy('t.booking_variety_start'); ->orderBy('t.booking_variety_start');
$timeslot_list = $timeslot_query->execute()->fetchAllAssoc('tid'); $timeslot_list = $timeslot_query->execute()->fetchAllAssoc('tid');
watchdog('booking_debug', "<pre>Variety Session Report timeslots:\n@info</pre>", array('@info' => print_r( $timeslot_list, true))); //watchdog('booking_debug', "<pre>Variety Session Report timeslots:\n@info</pre>", array('@info' => print_r( $timeslot_list, true)));
//get vareity session definitions
$sessions_query = db_query("SELECT * FROM {booking_variety_sessions} WHERE booking_eventid = :eid",
array(':eid' => $event->eid));
$sessions = $sessions_query->fetchAllAssoc('vid');
foreach ($timeslot_list as $timeslot) { foreach ($timeslot_list as $timeslot) {
$header[] = $timeslot->booking_variety_time_descrip; $header[] = $timeslot->booking_variety_time_descrip;
@@ -468,7 +469,7 @@ function booking_variety_sessions_view_summary() {
if (isset($session_ids[$timeslot->tid])) { if (isset($session_ids[$timeslot->tid])) {
//get details of the person's variety session for this timeslot //get details of the person's variety session for this timeslot
$sid = $session_ids[$timeslot->tid]; $sid = $session_ids[$timeslot->tid];
$text = "Session description goes here"; $text = $sessions[$sid]->booking_variety_descrip;
$newline[] = $text; $newline[] = $text;
} }
else { else {