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

prepare for release

Browse Source
This commit is contained in:
Nathan Coad
2016-05-31 18:55:05 +10:00
parent 1c47838b73
commit 8f2c8fe32a
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
booking.admin.inc
View File

@@ -524,10 +524,18 @@ function booking_admin()
'#maxlength' => 2000
);
$form['management']['booking_export_include_fields_dynamic'] = array(
'#type' => 'select',
'#multiple' => TRUE,
'#title' => t('Not In Use - Select database fields'),
'#description' => t('Select database fields to export to CSV. Ensure you hold down control/command when selecting multiple options.'),
'#options' => _booking_get_person_fields(),
'#default_value' => variable_get('booking_export_include_fields_dynamic', ''),
);
$form['management']['booking_import_include_fields_dynamic'] = array(
'#type' => 'select',
'#multiple' => TRUE,
'#title' => t('Select database fields'),
'#title' => t('Not In Use - Select database fields'),
'#description' => t('Select database fields to import from an uploaded CSV file. Ensure you hold down control/command when selecting multiple options.'),
'#options' => _booking_get_person_fields(),
'#default_value' => variable_get('booking_import_include_fields_dynamic', ''),

12
booking.regn_node.inc
View File

@@ -13,8 +13,7 @@ function booking_node_presave($node) {
}
/**
* Function to create a mysql view of a complete person
* This is still in test phase and does not return any value
* Function to create a mysql view of all information relating to an attendee
*
* @param
* @return
@@ -123,7 +122,7 @@ function booking_load_query($node_ids = NULL, $fetchAssoc = FALSE)
$result = db_query("SELECT * FROM {booking_person_view}")->fetchAllAssoc('nid');
}
watchdog('booking', "<pre>Loading node query output:\n@info</pre>", array('@info' => print_r( $result, true)));
//watchdog('booking', "<pre>Loading node query output:\n@info</pre>", array('@info' => print_r( $result, true)));
return $result;
}
@@ -238,6 +237,13 @@ function booking_load_query_old($node_ids = NULL, $fetchAssoc = FALSE)
return $result;
}
/**
* Function implementing hook_load for the node-type booking
* @see booking_load_query
*
* @param $nodes - An array of the nodes being loaded, keyed by nid
* @return nothing
*/
function booking_load($nodes) {
global $event;

2
booking.tokens.inc
View File

@@ -613,6 +613,6 @@ function booking_define_personspecific_tokens($node)
$tokens['room-allocation'] = _booking_room_email_summary($node);
$tokens['bed-type'] = _booking_room_bedtype_lookup(empty($node->booking_room_bedtype) ? '0' : $node->booking_room_bedtype);
}
watchdog('booking_debug', "<pre>Person specific tokens:\n@info</pre>", array('@info' => print_r( $tokens, true)));
//watchdog('booking_debug', "<pre>Person specific tokens:\n@info</pre>", array('@info' => print_r( $tokens, true)));
return $tokens;
}