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

Update +7 Interval Waktu WIB

Browse Source
This commit is contained in:
mikael-zakaria 2025-11-19 09:50:56 +07:00
parent 8833f7f79f
commit 0f800e567e
4 changed files with 79 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/Controllers/Equipment.php
View File

@ -57,29 +57,49 @@ class Equipment extends BaseController {
$results = $query->getResultArray(); $results = $query->getResultArray();
$data['testcount'] = $results[0]['testcount']; $data['testcount'] = $results[0]['testcount'];
$sql = "SELECT DATEDIFF( $timezone = 7;
MAX(ResultDateTime), if ($timezone == 7) {
MIN(ResultDateTime)) as days, $data['timezone'] = "WIB";
MIN(ResultDateTime) as firstdate, } else if ($timezone == 8) {
MAX(ResultDateTime) as lastdate $data['timezone'] = "WITA";
} else if ($timezone == 9) {
$data['timezone'] = "WIT";
} else {
$data['timezone'] = "";
}
$sql = "SELECT
DATEDIFF(
MAX(ResultDateTime + INTERVAL $timezone HOUR),
MIN(ResultDateTime + INTERVAL $timezone HOUR)
) AS days,
MIN(ResultDateTime + INTERVAL $timezone HOUR) AS firstdate,
MAX(ResultDateTime + INTERVAL $timezone HOUR) AS lastdate
FROM patres FROM patres
WHERE EquipmentID='$EquipmentID';"; WHERE EquipmentID = '$EquipmentID'";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$data['days'] = $results[0]['days']; $data['days'] = $results[0]['days'];
$data['firstdate'] = $results[0]['firstdate']; $data['firstdate'] = $results[0]['firstdate'];
$data['lastdate'] = $results[0]['lastdate']; $data['lastdate'] = $results[0]['lastdate'];
$sql = "SELECT YEAR(ResultDateTime) AS year, MONTH(ResultDateTime) AS month, COUNT(*) AS count $sql = "SELECT
YEAR(ResultDateTime + INTERVAL 7 HOUR) AS year,
MONTH(ResultDateTime + INTERVAL 7 HOUR) AS month,
COUNT(*) AS count
FROM patres FROM patres
WHERE EquipmentID = '$EquipmentID' WHERE EquipmentID = '$EquipmentID'
GROUP BY YEAR(ResultDateTime), MONTH(ResultDateTime) GROUP BY
ORDER BY YEAR(ResultDateTime), MONTH(ResultDateTime);"; YEAR(ResultDateTime + INTERVAL 7 HOUR),
MONTH(ResultDateTime + INTERVAL 7 HOUR)
ORDER BY
YEAR(ResultDateTime + INTERVAL 7 HOUR),
MONTH(ResultDateTime + INTERVAL 7 HOUR)";
$query = $db->query($sql); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$data['counts'] = $results; $data['counts'] = $results;
$sql = "SELECT SampleID,TestTechCode,Result,ResultDateTime,CreateDate FROM patres $sql = "SELECT ResultDateTime + INTERVAL $timezone HOUR AS ResultDateTime, CreateDate + INTERVAL $timezone HOUR AS CreateDate FROM patres
WHERE EquipmentID='$EquipmentID' WHERE EquipmentID='$EquipmentID'
ORDER BY ResultID DESC ORDER BY ResultID DESC
LIMIT 3000"; LIMIT 3000";

66
app/Controllers/Home.php
View File

@ -39,37 +39,50 @@ class Home extends BaseController {
]; ];
// Mengelompokkan Data Khusus 1024i // Mengelompokkan Data Khusus 1024i
} else if ($item["productaliasid"] == 18) { }
$productList1024i[] = [ // else if ($item["productaliasid"] == 18) {
"productaliasid" => $item["productaliasid"], // $productList1024i[] = [
"productnumber" => $item["productnumber"], // "productaliasid" => $item["productaliasid"],
"sitename" => $item["sitename"] // "productnumber" => $item["productnumber"],
]; // "sitename" => $item["sitename"]
// ];
// Mengelompokkan Data Khusus 24i // // Mengelompokkan Data Khusus 24i
} else if ($item["productaliasid"] == 19) { // } else if ($item["productaliasid"] == 19) {
$productList24i[] = [ // $productList24i[] = [
"productaliasid" => $item["productaliasid"], // "productaliasid" => $item["productaliasid"],
"productnumber" => $item["productnumber"], // "productnumber" => $item["productnumber"],
"sitename" => $item["sitename"] // "sitename" => $item["sitename"]
]; // ];
// Mengelompokkan Data Khusus 50i // // Mengelompokkan Data Khusus 50i
} else if ($item["productaliasid"] == 21) { // } else if ($item["productaliasid"] == 21) {
$productList50i[] = [ // $productList50i[] = [
"productaliasid" => $item["productaliasid"], // "productaliasid" => $item["productaliasid"],
"productnumber" => $item["productnumber"], // "productnumber" => $item["productnumber"],
"sitename" => $item["sitename"] // "sitename" => $item["sitename"]
]; // ];
// } else {
// $productList30i = null;
// $productList1024i = null;
// $productList24i = null;
// $productList50i = null;
// }
}
$timezone = 7;
if ($timezone == 7) {
$data['timezone'] = "WIB";
} else if ($timezone == 8) {
$data['timezone'] = "WITA";
} else if ($timezone == 9) {
$data['timezone'] = "WIT";
} else { } else {
$productList30i = null; $data['timezone'] = "";
$productList1024i = null;
$productList24i = null;
$productList50i = null;
}
} }
$sql = "SELECT EquipmentID, COUNT(*) AS patresCount, MAX(ResultDateTime) AS lastResultDate $sql = "SELECT EquipmentID, COUNT(*) AS patresCount,
DATE_ADD(MAX(ResultDateTime), INTERVAL $timezone HOUR) AS lastResultDate
FROM patres FROM patres
GROUP BY EquipmentID GROUP BY EquipmentID
ORDER BY patresCount DESC"; ORDER BY patresCount DESC";
@ -107,7 +120,6 @@ class Home extends BaseController {
} }
// kalau tidak ada data, $tms30i akan tetap berupa array kosong [] // kalau tidak ada data, $tms30i akan tetap berupa array kosong []
// $data['tms30i'] = $tms30i;
$data['tms30i'] = $tms30i ?? []; $data['tms30i'] = $tms30i ?? [];
return view('home_dashboard.php', $data); return view('home_dashboard.php', $data);

22
app/Views/equipment_detail_test.php
View File

@ -48,19 +48,7 @@
<div class="card shadow-none"> <div class="card shadow-none">
<div class="card-header"> <div class="card-header">
<?php if ($EquipmentID == '6011310722') : ?> -
<div class="fw-bold">National Hospital Surabaya<span class="float-end p-0">TMS 30i &nbsp;<i class="bi bi-pc-display-horizontal"></i></span></div>
<?php elseif ($EquipmentID == '6015090124') : ?>
<div class="fw-bold">Persada Hospital</div>
<?php elseif ($EquipmentID == '6011320722') : ?>
<div class="fw-bold">RS Mardi Rahayu Kudus</div>
<?php elseif ($EquipmentID == '6005840519') : ?>
<div class="fw-bold">RS dr. Oen Kandang Sapi Solo</div>
<?php elseif ($EquipmentID == '6006100619') : ?>
<div class="fw-bold">RS Permata Cibubur</div>
<?php elseif ($EquipmentID == '6015560324') : ?>
<div class="fw-bold">ScanMe Labs Jakarta Kelapa Gading</div>
<?php endif; ?>
</div> </div>
<div class="card-body p-4"> <div class="card-body p-4">
@ -149,10 +137,10 @@
<div class="col-12 mb-3"> <div class="col-12 mb-3">
<div class="row text-center p-2 mt-1"> <div class="row text-center p-2 mt-1">
<div class="col-12 col-md-6"> <div class="col-12 col-md-6">
Tanggal Awal : <span class="fw-bold"><?=$formatedFirstDate;?></span> Tanggal Awal : <span class="fw-bold"><?=$formatedFirstDate;?> (<?=$timezone;?>)</span>
</div> </div>
<div class="col-12 col-md-6"> <div class="col-12 col-md-6">
Tanggal Akhir : <span class="fw-bold"><?=$formatedLastDate;?></span> Tanggal Akhir : <span class="fw-bold"><?=$formatedLastDate;?> (<?=$timezone;?>)</span>
</div> </div>
</div> </div>
</div> </div>
@ -176,8 +164,8 @@
<th scope="col">Sample ID</th> <th scope="col">Sample ID</th>
<th scope="col">Test Code</th> <th scope="col">Test Code</th>
<th scope="col">Result</th> <th scope="col">Result</th>
<th scope="col">Result Date</th> <th scope="col">Result Date (<?=$timezone;?>)</th>
<th scope="col">Create Date</th> <th scope="col">Create Date (<?=$timezone;?>)</th>
</thead> </thead>
<tbody> <tbody>

2
app/Views/home_dashboard.php
View File

@ -219,7 +219,7 @@
<?php <?php
$dateObject = new DateTime($value['lastResultDate']); $dateObject = new DateTime($value['lastResultDate']);
$formattedDate = $dateObject->format('D, d M Y - H:i:s.v'); $formattedDate = $dateObject->format('D, d M Y - H:i:s.v');
echo($formattedDate); echo($formattedDate." (". $timezone .")");
?> ?>
</em> </em>
</footer> </footer>