From e90d02f46e422e52630b5e86f0ae77898d11c296 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Thu, 29 Jun 2017 12:10:19 +1000 Subject: [PATCH] start work on admin page for early access codes --- booking.earlyaccess_admin.inc | 41 +++++++++++++++++++++++++++++++++++ booking.module | 12 +++++++++- booking.regn_form.inc | 6 ++--- booking.reports.inc | 1 + 4 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 booking.earlyaccess_admin.inc diff --git a/booking.earlyaccess_admin.inc b/booking.earlyaccess_admin.inc new file mode 100644 index 0000000..5a9edc3 --- /dev/null +++ b/booking.earlyaccess_admin.inc @@ -0,0 +1,41 @@ + 'max-width:60%'); + //$attributes = array(); + + //get study groups + $query = db_select('booking_studygroup_list', 's') + ->fields('s') + ->condition('s.booking_eventid', $event->eid, '='); + $result = $query->execute(); + + foreach ($result as $group) { + $rows[] = array( + $group->booking_studygroup_descrip, + $group->booking_num_group_sessions, + $group->booking_is_readinggroup == 'Y' ? 'Yes' : 'No', + l(t('Edit Group Definition', array('!id' => $group->sid)), t('admin/config/booking/studygroups/!id/edit', array('!id' => $group->sid))), + ); + } + + //output everything + $output .= t("

!event Study Groups

", array('!event' => $event->booking_eventname)); + $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => $attributes)); + + return $output; +} \ No newline at end of file diff --git a/booking.module b/booking.module index 66e1034..1b94a0b 100644 --- a/booking.module +++ b/booking.module @@ -707,7 +707,17 @@ function booking_menu() { 'page arguments' => array('booking_event_form', false, 4), 'access arguments' => array('access administration pages'), 'type' => MENU_CALLBACK, - ); + ); + + //manage early access codes + $items['admin/config/booking/earlyaccess'] = array( + 'title' => 'Booking module Early Access Codes', + 'description' => 'Define and configure Early Access Codes for the Booking module', + 'page callback' => 'booking_earlyaccess_admin', + 'access arguments' => array('administer site configuration'), + 'file' => 'booking.earlyaccess_admin.inc', + 'type' => MENU_NORMAL_ITEM, + ); //the paypal IPN $items[BOOKING_PAYPAL_IPN_PATH] = array( diff --git a/booking.regn_form.inc b/booking.regn_form.inc index c6398ab..c6a0e22 100644 --- a/booking.regn_form.inc +++ b/booking.regn_form.inc @@ -113,9 +113,9 @@ function booking_form($node, &$form_state, $inserting = FALSE, $early_access_all ); $form['early-access']['booking_earlyaccess_explanation'] = array( '#type' => 'container', - '#children' => t("If you have been given an early-access code for registration, please enter it below." . - "Without this code, your registration will not be accepted. " . - "
NOTE: each early-access code can only be used once, so don't pass it along to your friends!"), + '#children' => t("

If you have been given an early-access code for registration, please enter it below. " . + "Without this code, your registration will not be accepted.

" . + "

NOTE: each early-access code can only be used once, so don't pass it along to your friends!

"), ); $form['early-access']['booking_regn_earlyaccess_code'] = array( '#type' => 'textfield', diff --git a/booking.reports.inc b/booking.reports.inc index 565849f..1c1e4b9 100644 --- a/booking.reports.inc +++ b/booking.reports.inc @@ -718,6 +718,7 @@ function booking_csv_report() { $nullToMysqlNull = true; $delimiter_esc = preg_quote($delimiter, '/'); $enclosure_esc = preg_quote($enclosure, '/'); + $readinggroup_id = ""; //$readinggroup = "session" . variable_get('booking_readinggroup_id','7');