From 670a3367a67bd1993bd5a869d3c99f2cfba88759 Mon Sep 17 00:00:00 2001
From: mikael-zakaria <mzi3721s@gmail.com>
Date: Mon, 10 Mar 2025 16:37:58 +0700
Subject: [PATCH] Perbaikan Collection Datetime dan Laporan Hasil

---
 app/Controllers/PrintResult.php | 18 +++++++++---------
 public/assets/css/pdf_new.css   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/PrintResult.php b/app/Controllers/PrintResult.php
index 61c1f6e..ac31e58 100644
--- a/app/Controllers/PrintResult.php
+++ b/app/Controllers/PrintResult.php
@@ -775,7 +775,7 @@ class PrintResult extends BaseController {
                 $i++;
 
 				// Melebihi batas Kertas
-				if($i % 21 == 0) {
+				if($i % 25 == 0) {
 					$resultTest .= "</table></div>";
 					$fullPage .= $headPage.$resultTest.$footerPage.$lastDiv;
 					$i=0;
@@ -815,7 +815,7 @@ class PrintResult extends BaseController {
             }
 
             // Melebihi batas Kertas
-            if($i % 21 == 0 && $i!=0) {
+            if($i % 25 == 0 && $i!=0) {
                 $resultTest .= "</table></div>";
                 $fullPage .= $headPage.$resultTest.$footerPage.$lastDiv;
                 $i=0;
@@ -924,7 +924,7 @@ class PrintResult extends BaseController {
 			}
 			
             // Melebihi batas Kertas
-            if($i % 21 == 0 && $i != 0) {
+            if($i % 25 == 0 && $i != 0) {
                 $resultTest .= "</table></div>";
                 $fullPage .= $headPage.$resultTest.$footerPage.$lastDiv;
                 $i=0;
@@ -996,18 +996,18 @@ class PrintResult extends BaseController {
 		// Memisahkan Waktu yang ditampilkan pada laporan hasil
 		$filter_query_collection="";
 		if ($cityid == 1) {
-			$filter_query_collection = " FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS colltime ";
+			$filter_query_collection = " FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS recvtime ";
 		} elseif ($cityid == 2) {
-			$filter_query_collection = " FORMAT(DATEADD(HOUR, -1, ct.COLLECTIONDATE), 'HH:mm') AS colltime ";
+			$filter_query_collection = " FORMAT(DATEADD(HOUR, -1, ct.COLLECTIONDATE), 'HH:mm') AS recvtime ";
 		} else {
-			$filter_query_collection = " FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS colltime ";
+			$filter_query_collection = " FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS recvtime ";
 		}
 		// Untuk Collection
 		$sql = "SELECT 
 					ds.SHORTTEXT, 
-					FORMAT(tu.COLLECTIONDATE, 'dd-MM-yyyy') AS recvdate, 
-					FORMAT(tu.COLLECTIONDATE, 'HH:mm') AS recvtime, 
-					FORMAT(ct.COLLECTIONDATE, 'dd-MM-yyyy') AS colldate,
+					FORMAT(tu.COLLECTIONDATE, 'dd-MM-yyyy') AS colldate, 
+					FORMAT(tu.COLLECTIONDATE, 'HH:mm') AS colltime, 
+					FORMAT(ct.COLLECTIONDATE, 'dd-MM-yyyy') AS recvdate, 
 					".$filter_query_collection."
 				FROM 
 					SP_TUBES tu
diff --git a/public/assets/css/pdf_new.css b/public/assets/css/pdf_new.css
index b6a2c10..a14d724 100644
--- a/public/assets/css/pdf_new.css
+++ b/public/assets/css/pdf_new.css
@@ -63,8 +63,8 @@ table {
 }
 th,td { 
 	/* padding-left: 1rem; */
-	padding-top: 5px ;
-	padding-bottom: 5px ;
+	padding-top: 4px;
+	padding-bottom: 4px ;
 	line-height:1.5;
 	border: 1px solid rgb(0, 0, 0);
 }