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

add more preselection messages

Browse Source
This commit is contained in:
Nathan Coad
2016-06-03 15:17:38 +10:00
parent 48d2c4ad32
commit ce8bfedda1
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
booking.emails_admin.inc
View File

@@ -286,7 +286,8 @@ function booking_manual_email_form($form, &$form_state)
$preselection_options['---'] = "---"; $preselection_options['---'] = "---";
$preselection_options['bookedin'] = 'People who are booked-in'; $preselection_options['bookedin'] = 'People who are booked-in';
$preselection_options['unpaid'] = 'People booked-in with outstanding balance'; $preselection_options['unpaid'] = 'People booked-in with outstanding balance';
$preselection_options['notravelform'] = "People who haven't submitted travel form"; $preselection_options['notravelform'] = "People booked-in no travel form received";
$preselection_options['notravelforminclwaiting'] = "People booked-in/waiting no travel form received";
$preselection_options['test'] = 'Testing'; $preselection_options['test'] = 'Testing';
$header = array( $header = array(
@@ -314,15 +315,7 @@ function booking_manual_email_form($form, &$form_state)
$email_options_array['customlogistics' . $i] = variable_get('booking_email_subject_customlogistics' . $i, $email_options_array['customlogistics' . $i] = variable_get('booking_email_subject_customlogistics' . $i,
$event->booking_eventname . ' logistics custom ' . $i) . " **Logistics**"; $event->booking_eventname . ' logistics custom ' . $i) . " **Logistics**";
} }
/*
//add some indication of which people have been pre-selected, if any
if ($input_option == 'unpaid') {
$prefix .= t("<p><b>Pre-selecting people with outstanding payments.</b></p>");
}
elseif ($input_option == 'bookedin') {
$prefix .= t("<p><b>Pre-selecting only people with a status of booked-in.</b></p>");
}
*/
//attach css so we can customise colours for some people //attach css so we can customise colours for some people
$form['#attached']['css'] = array( $form['#attached']['css'] = array(
drupal_get_path('module', 'booking') . '/booking.css', drupal_get_path('module', 'booking') . '/booking.css',
@@ -372,7 +365,8 @@ function booking_manual_email_form($form, &$form_state)
$form['booking-email-preselection'] = array( $form['booking-email-preselection'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => t('Preselect Attendees'), '#title' => t('Pre-select attendees from list'),
'#description' => t('Use this to select a large group of people based on pre-defined criteria.')
'#options' => $preselection_options, '#options' => $preselection_options,
'#default_value' => '---', '#default_value' => '---',
'#suffix' => '<div id="booking_email_preselection_suffix_wrapper"></div>', '#suffix' => '<div id="booking_email_preselection_suffix_wrapper"></div>',
@@ -507,7 +501,12 @@ function _booking_email_get_default_selection_callback($form, $form_state) {
} }
break; break;
case 'notravelform': case 'notravelform':
if ($person->tid == 0) { if ($person->booking_status == 1 && $person->tid == 0) {
$defaults[] = $person->nid;
}
break;
case 'notravelforminclwaiting':
if (($person->booking_status == 1 || $person->booking_status == 2) && $person->tid == 0) {
$defaults[] = $person->nid; $defaults[] = $person->nid;
} }
break; break;