Bläddra i källkod

fix ISO-8601 compliance for week number

Jad Meouchy 8 år sedan
förälder
incheckning
2770401c65
2 ändrade filer med 5 tillägg och 5 borttagningar
  1. 2 2
      cron/ftpwriter.php
  2. 3 3
      db.php

+ 2 - 2
cron/ftpwriter.php

@@ -38,14 +38,14 @@ $stmt = $dbh->prepare(
 		(
 			SELECT id_file_row
 			FROM file_row_update
-			WHERE WEEK(date_modified) = WEEK(CURRENT_TIMESTAMP)
+			WHERE WEEKOFYEAR(date_modified) = WEEKOFYEAR(CURRENT_TIMESTAMP)
 			AND YEAR(date_modified) = YEAR(CURRENT_TIMESTAMP)
 		
 			UNION
 			
 			SELECT id_file_row
 			FROM file_row
-			WHERE WEEK(date_processed) = WEEK(CURRENT_TIMESTAMP)
+			WHERE WEEKOFYEAR(date_processed) = WEEKOFYEAR(CURRENT_TIMESTAMP)
 			AND YEAR(date_processed) = YEAR(CURRENT_TIMESTAMP)
 		)
 	)");

+ 3 - 3
db.php

@@ -160,14 +160,14 @@ function getRowsByCompany($id_company, $year = null, $week_number = null)
 			(
 				SELECT id_file_row
 				FROM file_row_update
-				WHERE WEEK(date_modified) = :week_number
+				WHERE WEEKOFYEAR(date_modified) = :week_number
 				AND YEAR(date_modified) = :year
 			
 				UNION
 				
 				SELECT id_file_row
 				FROM file_row
-				WHERE WEEK(date_processed) = :week_number
+				WHERE WEEKOFYEAR(date_processed) = :week_number
 				AND YEAR(date_processed) = :year
 			)
 		) " : "") .
@@ -220,7 +220,7 @@ function getRowUpdatesByCompany($id_company)
 function getRowsByCompanyCSV($id_company, $f, $year, $week_number = null)
 {
 	$file_rows = getRowsByCompany($id_company, $year, $week_number);
-
+	
 	$headers = array('Division', 'Consignee', 'Called In', 'Dispatch #', 'Shipper', 'Ready', 'Address 1', 'Address 2', 'City', 'ST', 'Zip', 'Phone',
 						'', '', '', '',
 						'Acknowledgement', 'Pickup Date', 'Pickup Time', 'Depart Date', 'Depart Time', 'BOL Delivered Date', 'BOL Delivered Time',