diff --git a/TODO.md b/TODO.md index 59e96e7..e33f6a3 100644 --- a/TODO.md +++ b/TODO.md @@ -3,9 +3,6 @@ **Last Updated:** 20260212 Pending: -- preview result for validate for su adm lab -- auto generate pdf after 2 val -- add datetime val1 val2 - sample other for MCU is annoying - report2 go to cmod @@ -41,4 +38,7 @@ Completed: - Test and fix PDF Generation - Print Result Audit (Track when result reports are printed/exported, log user and timestamp) - Test and fix Reprint label -- fasten the load of val page \ No newline at end of file +- fasten the load of val page +- preview result for validate for su adm lab +- auto generate pdf after 2 val from preview +- add datetime val1 val2 \ No newline at end of file diff --git a/app/Libraries/ReportHelper.php b/app/Libraries/ReportHelper.php index dc6b35e..1404732 100644 --- a/app/Libraries/ReportHelper.php +++ b/app/Libraries/ReportHelper.php @@ -46,6 +46,8 @@ class ReportHelper 'valBy' => $valBy, 'val1User' => $valData['VAL1USER'] ?? '', 'val2User' => $valData['VAL2USER'] ?? '', + 'val1Date' => isset($valData['VAL1DATE']) ? date('d-m-Y H:i', strtotime($valData['VAL1DATE'])) : '', + 'val2Date' => isset($valData['VAL2DATE']) ? date('d-m-Y H:i', strtotime($valData['VAL2DATE'])) : '', 'date' => date('d-m-Y H:i'), 'collectionDate' => $collectionDate ]; diff --git a/app/Views/report/template.php b/app/Views/report/template.php index 35f9322..35773c6 100644 --- a/app/Views/report/template.php +++ b/app/Views/report/template.php @@ -84,7 +84,7 @@ $i = 1;
Collected on = esc($collData) ?> Received on = esc($recvData) ?> -Val1 By : = esc($val1User) ?> | Val2 By : = esc($val2User) ?> +Val1 By : = esc($val1User) ?> (= esc($val1Date) ?>) | Val2 By : = esc($val2User) ?> (= esc($val2Date) ?>) Page = $i ?>/= $npage ?> Printed By : = esc($valBy) ?> = esc($date) ?>