change columns more

cron/ftpwriter.php

@@ -23,7 +23,8 @@ $stmt = $dbh->prepare(
 	INNER JOIN file_row USING(id_file_row)
 	INNER JOIN file USING(id_file)
 	INNER JOIN company USING(id_company)
-	WHERE date_modified > DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 7 DAY)");
+	WHERE date_modified > DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 7 DAY)
+	OR file.date_processed > DATE_SUB(CURRENT_TIMESTAMP, INTERVAL 7 DAY)");
 
 $stmt->execute();
 $companies = $stmt->fetchAll(PDO::FETCH_ASSOC);

db.php

@@ -77,6 +77,7 @@ function getRowsByCompany($id_company, $week_number = null)
 			TIME_FORMAT(time_ready, '%h:%i %p') time_ready,
 			TIME_FORMAT(time_close, '%h:%i %p') time_close,
 			
+			
 			(SELECT DATE_FORMAT(IFNULL(time_pickup, file_row.time_pickup), '%m/%d/%Y %h:%i %p')
 				FROM file_row_update
 				WHERE id_file_row = file_row.id_file_row
@@ -84,12 +85,42 @@ function getRowsByCompany($id_company, $week_number = null)
 				ORDER BY date_modified DESC
 				LIMIT 1) time_pickup,
 				
+			(SELECT DATE_FORMAT(IFNULL(time_pickup, file_row.time_pickup), '%m/%d/%Y')
+				FROM file_row_update
+				WHERE id_file_row = file_row.id_file_row
+				AND time_pickup IS NOT NULL
+				ORDER BY date_modified DESC
+				LIMIT 1) time_pickup_date,
+				
+			(SELECT DATE_FORMAT(IFNULL(time_pickup, file_row.time_pickup), '%h:%i %p')
+				FROM file_row_update
+				WHERE id_file_row = file_row.id_file_row
+				AND time_pickup IS NOT NULL
+				ORDER BY date_modified DESC
+				LIMIT 1) time_pickup_time,
+				
+				
 			(SELECT DATE_FORMAT(IFNULL(time_depart, file_row.time_depart), '%m/%d/%Y %h:%i %p')
 				FROM file_row_update
 				WHERE id_file_row = file_row.id_file_row
 				AND time_depart IS NOT NULL
 				ORDER BY date_modified DESC
 				LIMIT 1) time_depart,
+				
+			(SELECT DATE_FORMAT(IFNULL(time_depart, file_row.time_depart), '%m/%d/%Y')
+				FROM file_row_update
+				WHERE id_file_row = file_row.id_file_row
+				AND time_depart IS NOT NULL
+				ORDER BY date_modified DESC
+				LIMIT 1) time_depart_date,
+				
+			(SELECT DATE_FORMAT(IFNULL(time_depart, file_row.time_depart), '%h:%i %p')
+				FROM file_row_update
+				WHERE id_file_row = file_row.id_file_row
+				AND time_depart IS NOT NULL
+				ORDER BY date_modified DESC
+				LIMIT 1) time_depart_time,
+				
 			
 			(SELECT DATE_FORMAT(IFNULL(bol_delivered, file_row.bol_delivered), '%m/%d/%Y %h:%i %p')
 				FROM file_row_update
@@ -97,6 +128,20 @@ function getRowsByCompany($id_company, $week_number = null)
 				AND bol_delivered IS NOT NULL
 				ORDER BY date_modified DESC
 				LIMIT 1) bol_delivered,
+				
+			(SELECT DATE_FORMAT(IFNULL(bol_delivered, file_row.bol_delivered), '%m/%d/%Y')
+				FROM file_row_update
+				WHERE id_file_row = file_row.id_file_row
+				AND bol_delivered IS NOT NULL
+				ORDER BY date_modified DESC
+				LIMIT 1) bol_delivered_date,
+				
+			(SELECT DATE_FORMAT(IFNULL(bol_delivered, file_row.bol_delivered), '%h:%i %p')
+				FROM file_row_update
+				WHERE id_file_row = file_row.id_file_row
+				AND bol_delivered IS NOT NULL
+				ORDER BY date_modified DESC
+				LIMIT 1) bol_delivered_time,
 			
 			dispatch_reference,
 			ctns, weight, cube,
@@ -106,11 +151,19 @@ function getRowsByCompany($id_company, $week_number = null)
 		INNER JOIN file USING(id_file)
 		WHERE id_company = :id_company
 		" . ($week_number ? 
-		" AND id_file_row IN
+		" AND
 		(
-			SELECT id_file_row
-			FROM file_row_update
-			WHERE WEEK(date_modified) = :week_number
+			id_file_row IN
+			(
+				SELECT id_file_row
+				FROM file_row_update
+				WHERE WEEK(date_modified) = :week_number
+			) OR id_file_row IN
+			(
+				SELECT id_file_row
+				FROM file_row_update
+				WHERE WEEK(date_processed) = :week_number
+			)
 		) " : "") .
 		"LIMIT 5000";
 	
@@ -160,8 +213,8 @@ function getRowsByCompanyCSV($id_company, $f, $week_number = null)
 
 	$headers = array('Division', 'Consignee', 'Called In', 'Dispatch #', 'Shipper', 'Ready', 'Address 1', 'Address 2', 'City', 'ST', 'Zip', 'Phone',
 						'', '', '', '',
-						'Acknowledged', 'Pickup Time', 'Depart Time', 'BOL Delivered',
-						'', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+						'Acknowledgement', 'Pickup Date', 'Pickup Time', 'Depart Date', 'Depart Time', 'BOL Delivered Date', 'BOL Delivered Time',
+						'', '', '', '', '', '', '', '', '', '', '', '',
 						'Dispatch Reference',
 						'', '', '', '', '', '', '', '',
 						'Ctns', 'Weight', 'Cube');
@@ -173,8 +226,8 @@ 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['date_processed'], $row['time_pickup'], $row['time_depart'], $row['bol_delivered'],
-			'', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+			$row['date_processed'], $row['time_pickup_date'], $row['time_pickup_time'], $row['time_depart_date'], $row['time_depart_time'], $row['bol_delivered_date'], $row['bol_delivered_time'],
+			'', '', '', '', '', '', '', '', '', '', '', '',
 			$row['dispatch_reference'],
 			'', '', '', '', '', '', '', '',
 			$row['ctns'], $row['weight'], $row['cube']));