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

tidy ups

Browse Source
This commit is contained in:
Nathan Coad
2018-07-16 17:06:25 +10:00
parent 5020b3466e
commit 9c8ff253e4
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
booking.module
View File

@@ -64,7 +64,7 @@ module_load_include('inc', 'booking', 'booking.studygroups_admin');
module_load_include('inc', 'booking', 'booking.studygroups_report'); module_load_include('inc', 'booking', 'booking.studygroups_report');
module_load_include('inc', 'booking', 'booking.studygroup_leaders'); module_load_include('inc', 'booking', 'booking.studygroup_leaders');
// Load the include for the travel form // Load the include for the travel form
//module_load_include('inc', 'booking', 'booking.travel'); module_load_include('inc', 'booking', 'booking.travel');
// Load the include for managing room bookings and definitions // Load the include for managing room bookings and definitions
module_load_include('inc', 'booking', 'booking.rooms'); module_load_include('inc', 'booking', 'booking.rooms');
// load the include for mass-allocating people to rooms // load the include for mass-allocating people to rooms
@@ -76,7 +76,7 @@ module_load_include('inc', 'booking', 'booking.stripe');
// Load the include for miscellaneous functions // Load the include for miscellaneous functions
module_load_include('inc', 'booking', 'booking.misc'); module_load_include('inc', 'booking', 'booking.misc');
// Load the include for the extended mail system // Load the include for the extended mail system
module_load_include('inc', 'booking', 'booking.MailSystemInterface'); //module_load_include('inc', 'booking', 'booking.MailSystemInterface');
function booking_init() { function booking_init() {
date_default_timezone_set(date_default_timezone(FALSE)); date_default_timezone_set(date_default_timezone(FALSE));

7
booking.reports.inc
View File

@@ -682,6 +682,7 @@ function booking_waitinglist_page() {
return $output; return $output;
} }
/*
function ucname($string) { function ucname($string) {
$string =ucwords(strtolower($string)); $string =ucwords(strtolower($string));
@@ -692,7 +693,7 @@ function ucname($string) {
} }
return $string; return $string;
} }
*/
/** /**
* Generate a CSV file as a report of all current registrations * Generate a CSV file as a report of all current registrations
@@ -710,6 +711,8 @@ function booking_csv_report() {
$delimiter_esc = preg_quote($delimiter, '/'); $delimiter_esc = preg_quote($delimiter, '/');
$enclosure_esc = preg_quote($enclosure, '/'); $enclosure_esc = preg_quote($enclosure, '/');
$readinggroup_id = ""; $readinggroup_id = "";
module_load_include('php', 'booking', 'libraries/xlsxwriter.class');
//$readinggroup = "session" . variable_get('booking_readinggroup_id','7'); //$readinggroup = "session" . variable_get('booking_readinggroup_id','7');
@@ -798,7 +801,7 @@ function booking_csv_report() {
//capitalise street name and suburb name //capitalise street name and suburb name
if ($key == 'booking_street' || $key == 'booking_suburb') { if ($key == 'booking_street' || $key == 'booking_suburb') {
$value = ucname($value); $value = _booking_ucname($value);
} }
//handle dates //handle dates

1
booking.variety_admin.inc
View File

@@ -512,7 +512,6 @@ function booking_varietysessions_csv_report($timeslot_id) {
$data = array(); $data = array();
$rows = array(); $rows = array();
//include_once("./libraries/xlsxwriter.class.php");
module_load_include('php', 'booking', 'libraries/xlsxwriter.class'); module_load_include('php', 'booking', 'libraries/xlsxwriter.class');
//verify that $timeslot_id is a number //verify that $timeslot_id is a number