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

Tweaks for trave lform

Browse Source
This commit is contained in:
Nathan Coad
2014-06-11 23:53:44 +10:00
parent 5267f368b2
commit 7751058348
4 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
booking.travel.inc
View File

@@ -154,6 +154,7 @@ function travel_form($node, &$form_state, $inserting = FALSE, $nid = 0)
$form['travel']['booking_flight_datetime_inbound'] = array(
'#type' => 'date_select',
'#title' => t('Date and Time of flight arrival into Sydney Airport'),
'#description' => t('Note: 24 hour time - 12:00 is midday'),
'#default_value' => empty($data->booking_flight_datetime_inbound) ? '' : date("Y-m-d H:i:s", $data->booking_flight_datetime_inbound),
'#date_format' => 'd/m/Y H:i',
'#date_year_range' => '0:0',
@@ -177,6 +178,7 @@ function travel_form($node, &$form_state, $inserting = FALSE, $nid = 0)
$form['travel']['booking_flight_datetime_outbound'] = array(
'#type' => 'date_select',
'#title' => t('Date and Time of flight departure from Sydney Airport'),
'#description' => t('Note: 24 hour time - 12:00 is midday'),
'#default_value' => empty($data->booking_flight_datetime_outbound) ? '' : date("Y-m-d H:i:s", $data->booking_flight_datetime_outbound),
'#date_format' => 'd/m/Y H:i',
'#date_year_range' => '0:0',
@@ -349,6 +351,14 @@ function travel_form_validate($form, &$form_state) {
//check to make sure flight info is entered if it is selected
if (isset($form_state['values']['booking_transport_type']) && $form_state['values']['booking_transport_type'] == 'Flying')
{
$arrival_time = _datetime_to_ts($form_state['values']['booking_flight_datetime_inbound']);
$departure_time = _datetime_to_ts($form_state['values']['booking_flight_datetime_outbound']);
watchdog('booking', "Travel form flying arrival ts !arrival, departing ts !depart", array('!arrival' => $arrival_time, '!depart' => $departure_time));
watchdog('booking', "<pre>Travel form raw data:\n@info</pre>",
array('@info' => print_r( $form_state['values'], true)));
if ( (! isset($form_state['values']['booking_flightnum_inbound'])) || ($form_state['values']['booking_flightnum_inbound'] == '') )
{
form_set_error('booking_flightnum_inbound',
@@ -395,7 +405,16 @@ function travel_form_validate($form, &$form_state) {
watchdog('booking', "<pre>Travel form missing flight departure time\n@info</pre>", array('@info' => print_r( $form_state['values'], true)));
}
}
//check for arrival time after departure time
if (_datetime_to_ts($form_state['values']['booking_flight_datetime_inbound']) > _datetime_to_ts($form_state['values']['booking_flight_datetime_outbound']))
{
form_set_error('booking_flight_datetime_inbound',
t('You have entered an arrival flight time that is after your departure flight time.')
);
watchdog('booking', "<pre>Travel form seems to have arrival flight after departure flight\n@info</pre>", array('@info' => print_r( $form_state['values'], true)));
}
} //end check for flying
}