From 4550028fd638253de2c121f4912df8070cfdb3a9 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Mon, 27 Jun 2016 10:41:43 +1000
Subject: [PATCH] re-arrange travel report columns

---
 booking.admin.inc   | 5 ++---
 booking.reports.inc | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/booking.admin.inc b/booking.admin.inc
index aae3fdc..e6b9f59 100644
--- a/booking.admin.inc
+++ b/booking.admin.inc
@@ -4,8 +4,7 @@
  * The administration menu implementations for the booking module configuration pages
  */
 
-function booking_admin()
-{
+function booking_admin() {
   $form = array();
   
   //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);
   //make sure we update our custom sql view every time we change something on the admin page
   $form = system_settings_form($form);
-  $form['#submit'][] = '_booking_node_create_mysqlview';
+  //$form['#submit'][] = '_booking_node_create_mysqlview';
   return $form;  
   
 }
diff --git a/booking.reports.inc b/booking.reports.inc
index 2f8964f..a81d25a 100644
--- a/booking.reports.inc
+++ b/booking.reports.inc
@@ -438,8 +438,8 @@ function booking_report_travel() {
 	//define sorting information with the header
 	//as per http://www.drup-all.com/blog/table-sort-pagination-drupal-7
 	$header = array();
-	$header[] = array('data' => t('Edit'), 'field' => 'nid', 'sort' => 'asc');
 	$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('Transport Type'), 'field' => 'booking_transport_type');
 	$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();
 
 		//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('!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[] = _booking_status_generate($person->booking_status);