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

re-arrange travel report columns

Browse Source
This commit is contained in:
Nathan Coad
2016-06-27 10:41:43 +10:00
parent 91efbb80d6
commit 4550028fd6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
booking.admin.inc
View File

@@ -4,8 +4,7 @@
* The administration menu implementations for the booking module configuration pages * The administration menu implementations for the booking module configuration pages
*/ */
function booking_admin() function booking_admin() {
{
$form = array(); $form = array();
//regenerate all our menu hooks when loading this form //regenerate all our menu hooks when loading this form
@@ -564,7 +563,7 @@ $form['management']['booking_import_include_fields_dynamic'] = array(
//return system_settings_form($form); //return system_settings_form($form);
//make sure we update our custom sql view every time we change something on the admin page //make sure we update our custom sql view every time we change something on the admin page
$form = system_settings_form($form); $form = system_settings_form($form);
$form['#submit'][] = '_booking_node_create_mysqlview'; //$form['#submit'][] = '_booking_node_create_mysqlview';
return $form; return $form;
} }

6
booking.reports.inc
View File

@@ -438,8 +438,8 @@ function booking_report_travel() {
//define sorting information with the header //define sorting information with the header
//as per http://www.drup-all.com/blog/table-sort-pagination-drupal-7 //as per http://www.drup-all.com/blog/table-sort-pagination-drupal-7
$header = array(); $header = array();
$header[] = array('data' => t('Edit'), 'field' => 'nid', 'sort' => 'asc');
$header[] = array('data' => t('Name'), 'field' => 'booking_lastname'); $header[] = array('data' => t('Name'), 'field' => 'booking_lastname');
//$header[] = array('data' => t('Edit'), 'field' => 'nid', 'sort' => 'asc');
$header[] = array('data' => t('State'), 'field' => 'booking_state'); $header[] = array('data' => t('State'), 'field' => 'booking_state');
$header[] = array('data' => t('Transport Type'), 'field' => 'booking_transport_type'); $header[] = array('data' => t('Transport Type'), 'field' => 'booking_transport_type');
$header[] = array('data' => t('Catching train from airport?'), 'field' => 'booking_transport_from_morriset_reqd'); $header[] = array('data' => t('Catching train from airport?'), 'field' => 'booking_transport_from_morriset_reqd');
@@ -469,10 +469,10 @@ function booking_report_travel() {
$this_row = array(); $this_row = array();
//define the row for this person //define the row for this person
$this_row[] = $travel_link = l(t('Travel'), t('node/!id', array('!id' => $person->tid))); //$this_row[] = $travel_link = l(t('Travel'), t('node/!id', array('!id' => $person->tid)));
//$this_row[] = l(t('Edit !id', array('!id' => $person->nid)), t('node/!id/edit', array('!id' => $person->nid))); //$this_row[] = l(t('Edit !id', array('!id' => $person->nid)), t('node/!id/edit', array('!id' => $person->nid)));
$this_row[] = l(t('!first !last', array('!first' => ucwords($person->booking_firstname), '!last' => ucwords($person->booking_lastname))), $this_row[] = l(t('!first !last', array('!first' => ucwords($person->booking_firstname), '!last' => ucwords($person->booking_lastname))),
t('node/!id', array('!id' => $person->nid)) t('node/!id', array('!id' => $person->tid))
); );
$this_row[] = t('!state', array('!state' => $person->booking_state)); $this_row[] = t('!state', array('!state' => $person->booking_state));
//$this_row[] = _booking_status_generate($person->booking_status); //$this_row[] = _booking_status_generate($person->booking_status);