fix

db.php

@@ -100,7 +100,7 @@ function getRowsByCompany($id_company, $week_number = null)
 			
 			dispatch_reference,
 			ctns, weight, cube,
-			DATE_FORMAT(file.date_processed, '%m/%d/%Y %h:%i %p') date_processed
+			DATE_FORMAT(file_row.date_processed, '%m/%d/%Y') date_processed
 
 		FROM file_row
 		INNER JOIN file USING(id_file)
@@ -140,9 +140,10 @@ function getRowUpdatesByCompany($id_company)
 				DATE_FORMAT(fru.time_depart, '%m/%d/%Y %h:%i %p') time_depart,
 				DATE_FORMAT(fru.bol_delivered, '%m/%d/%Y %h:%i %p') bol_delivered
 		FROM file_row_update fru
-		INNER JOIN user USING(id_user)
 		INNER JOIN file_row fr USING(id_file_row)
-		WHERE id_company = :id_company
+		INNER JOIN file USING(id_file)
+		INNER JOIN user USING(id_user)		
+		WHERE file.id_company = :id_company
 		ORDER BY date_created DESC
 		LIMIT 200");
 	
@@ -158,14 +159,12 @@ function getRowsByCompanyCSV($id_company, $f, $week_number = null)
 	$file_rows = getRowsByCompany($id_company, $week_number);
 
 	$headers = array('Division', 'Consignee', 'Called In', 'Dispatch #', 'Shipper', 'Ready', 'Address 1', 'Address 2', 'City', 'ST', 'Zip', 'Phone',
-						'', '',
-						'Ready Time', 'Close Time', 'Pickup Time', 'Depart Time', 'BOL Delivered',
+						'',
+						'Acknowledgement', 'Ready Time', 'Close Time', 'Pickup Time', 'Depart Time', 'BOL Delivered',
 						'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
 						'Dispatch Refere',
 						'', '', '', '', '', '', '', '',
-						'Ctns', 'Weight', 'Cube',
-						'',
-						'Acknowledged');
+						'Ctns', 'Weight', 'Cube');
 						
 	fputcsv($f, $headers);
 
@@ -173,15 +172,12 @@ function getRowsByCompanyCSV($id_company, $f, $week_number = null)
 	{
 		fputcsv($f,
 			array($row['division'], $row['consignee'], $row['date_called_in'], $row['dispatch_number'], $row['shipper'], $row['date_ready'], $row['address_1'], $row['address_2'], $row['city'], $row['state'], $row['zip'], $row['phone'],
-			'', '',
-			$row['time_ready'], $row['time_close'], $row['time_pickup'], $row['time_depart'], $row['bol_delivered'],
+			'',
+			$row['date_processed'], $row['time_ready'], $row['time_close'], $row['time_pickup'], $row['time_depart'], $row['bol_delivered'],
 			'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
 			$row['dispatch_reference'],
 			'', '', '', '', '', '', '', '',
-			$row['ctns'], $row['weight'], $row['cube'],
-			'',
-			$row['date_processed']
-			));
+			$row['ctns'], $row['weight'], $row['cube']));
 	}
 }
 

www/js/routes.js

@@ -191,7 +191,8 @@ function createTable(id_company, table_dom)
 			
 			{ 'title': 'Pickup Time', 'data': 'time_pickup', 'defaultContent': ' ', 'className': 'time_pickup' },
 			{ 'title': 'Depart Time', 'data': 'time_depart', 'defaultContent': ' ', 'className': 'time_depart' },
-			{ 'title': 'BOL Delivered', 'data': 'bol_delivered', 'defaultContent': ' ', 'className': 'bol_delivered' }
+			{ 'title': 'BOL Delivered', 'data': 'bol_delivered', 'defaultContent': ' ', 'className': 'bol_delivered' },
+			{ 'title': 'Acknowledged', 'data': 'date_processed', 'defaultContent': ' ', 'className': 'date_processed' }
 		],
 		'language':
 		{
@@ -204,7 +205,7 @@ function createTable(id_company, table_dom)
 		'fixedColumns':
 		{
 			leftColumns: 0,
-			rightColumns: 3
+			rightColumns: 4
 		}
 	});
 	
@@ -263,7 +264,7 @@ function createTable(id_company, table_dom)
 					})
 					.fail(function(err, xhr, text)
 					{
-						console.log(err['responseText'])
+						console.log(err['responseText']);
 						
 						//TODO: handle error
 					});