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

Merge branch 'zakaria'

Browse Source
This commit is contained in:
mikael-zakaria 2025-01-21 16:39:48 +07:00
commit d4d2d9c64d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/PrintResult.php
View File

@ -391,7 +391,7 @@ class PrintResult extends BaseController {
if ($cityid == 1) { if ($cityid == 1) {
$filter_query_result = " r.MAX_RESDATE AS RESULTDATE "; $filter_query_result = " r.MAX_RESDATE AS RESULTDATE ";
} elseif ($cityid == 2) { } elseif ($cityid == 2) {
$filter_query_result = " FORMAT(DATEADD(HOUR, -1, r.MAX_RESDATE), 'yyyy-MM-dd hh:mm:ss.fff') AS RESULTDATE "; $filter_query_result = " FORMAT(DATEADD(HOUR, -1, r.MAX_RESDATE), 'yyyy-MM-dd HH:mm:ss.fff') AS RESULTDATE ";
} }
// Untuk Header // Untuk Header
$sql = "SELECT $sql = "SELECT
@ -431,15 +431,15 @@ class PrintResult extends BaseController {
// Memisahkan Waktu yang ditampilkan pada laporan hasil // Memisahkan Waktu yang ditampilkan pada laporan hasil
$filter_query_collection=""; $filter_query_collection="";
if ($cityid == 1) { if ($cityid == 1) {
$filter_query_collection = " FORMAT(ct.COLLECTIONDATE, 'hh:mm') AS colltime "; $filter_query_collection = " FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS colltime ";
} elseif ($cityid == 2) { } 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 colltime ";
} }
// Untuk Collection // Untuk Collection
$sql = "SELECT $sql = "SELECT
ds.SHORTTEXT, ds.SHORTTEXT,
FORMAT(tu.COLLECTIONDATE, 'dd-MM-yyyy') AS recvdate, FORMAT(tu.COLLECTIONDATE, 'dd-MM-yyyy') AS recvdate,
FORMAT(tu.COLLECTIONDATE, 'hh:mm') AS recvtime, FORMAT(tu.COLLECTIONDATE, 'HH:mm') AS recvtime,
FORMAT(ct.COLLECTIONDATE, 'dd-MM-yyyy') AS colldate, FORMAT(ct.COLLECTIONDATE, 'dd-MM-yyyy') AS colldate,
".$filter_query_collection." ".$filter_query_collection."
FROM FROM