mahdahar/pbmc-cmod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Perbaikan Collection Datetime dan Laporan Hasil

Browse Source
This commit is contained in:
mikael-zakaria 2025-03-10 16:37:58 +07:00
parent 4fc51b8250
commit 670a3367a6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Controllers/PrintResult.php
View File

@ -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

4
public/assets/css/pdf_new.css
View File

@ -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);
}