From 9e374103fa65062fc7b08f97660fb1fecbb9c293 Mon Sep 17 00:00:00 2001 From: mahdahar <89adham@gmail.com> Date: Thu, 12 Feb 2026 13:02:31 +0700 Subject: [PATCH] feat: auto-generate PDF after second validation - Trigger PDF generation via /report/{accessnumber}/pdf endpoint after VAL2 - Add preview dialog for admin/lab/superuser roles - Update role configs with previewEnabled flag --- TODO.md | 12 ++++-- UAT_GDC_CMOD_Checklist.html | 13 ++++++- app/Views/admin/index.php | 1 + app/Views/lab/index.php | 1 + app/Views/shared/config.php | 5 +++ app/Views/shared/content_requests.php | 32 +++++++++++++++ app/Views/shared/dialog_preview.php | 41 +++++++++++++++++++ app/Views/shared/script_requests.php | 54 ++++++++++++++++++++++++++ app/Views/shared/script_validation.php | 10 +++++ app/Views/superuser/index.php | 7 +++- writable/debugbar/index.html | 11 ------ 11 files changed, 170 insertions(+), 17 deletions(-) create mode 100644 app/Views/shared/dialog_preview.php delete mode 100644 writable/debugbar/index.html diff --git a/TODO.md b/TODO.md index 9f3d6ac..59e96e7 100644 --- a/TODO.md +++ b/TODO.md @@ -1,9 +1,13 @@ # Project Checklist: Glen RME & Lab Management System -**Last Updated:** 20260205 +**Last Updated:** 20260212 Pending: -- Test and fix Reprint label +- 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 Completed: - Update User Role levels (Standardize roles: Superuser, Admin, Lab, Phlebo, CS) @@ -35,4 +39,6 @@ Completed: - Reprint Label (Add functionality to reprint labels) - Create Eng Result UI UX on request dashboard - Test and fix PDF Generation -- Print Result Audit (Track when result reports are printed/exported, log user and timestamp) \ No newline at end of file +- 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 diff --git a/UAT_GDC_CMOD_Checklist.html b/UAT_GDC_CMOD_Checklist.html index a62f929..a9a4490 100644 --- a/UAT_GDC_CMOD_Checklist.html +++ b/UAT_GDC_CMOD_Checklist.html @@ -234,8 +234,17 @@ TC-071Concurrent Validation โšก2 user buka validation dialog bersamaanValidasi berhasil, tidak conflict โœ…FITUR CROSS-ROLE ๐Ÿค โœ…
โŒ TC-072Concurrent Sample Collection โšก2 user collect tube berbeda bersamaanSemua berhasil tercatat โœ…FITUR CROSS-ROLE ๐Ÿงช โœ…
โŒ TC-073Session Timeout โฑ๏ธTunggu session timeoutRedirect ke login ๐Ÿ”„FITUR CROSS-ROLE ๐Ÿ” โœ…
โŒ -TC-074Print Labels ๐Ÿท๏ธPrint individual/collection/allSemua labels tercetak ๐Ÿ–จ๏ธADM, LAB, PHLEB โœ…
โŒ -TC-075Edit Comment โœ๏ธEdit comment di dashboardComment berubah tersimpan ๐Ÿ’พSU โœ…
โŒ +TC-074Password Hashing Security ๐Ÿ”’Buat user โ†’ cek databasePassword dalam HASH bukan plain ๐Ÿ›ก๏ธFITUR CROSS-ROLE ๐Ÿ” โœ…
โŒ +TC-075Legacy Read-Only ๐Ÿ‘€Cek koneksi & fungsi FirebirdHanya READ dari Firebird, TIDAK WRITE ๐Ÿšซโœ๏ธFITUR CROSS-ROLE ๐Ÿ—„๏ธ โœ…
โŒ +TC-076Print Labels ๐Ÿท๏ธPrint individual/collection/allSemua labels tercetak ๐Ÿ–จ๏ธADM, LAB, PHLEB โœ…
โŒ +TC-077Edit Comment โœ๏ธEdit comment di dashboardComment berubah tersimpan ๐Ÿ’พSU โœ…
โŒ + +

๐Ÿ“‹ Next Plan ๐Ÿ“‹

+ + + + +
IDJudul Test CaseLangkah UtamaExpected ResultRoleHasilIssue/Jawaban
NP-001Collect Sample ๐ŸงชBuka dialog sample โ†’ CollectSTATUS=1, COLLECTIONDATE & USERID diset โœ…SU, ADM, LAB โœ…
โŒ
NP-002Un-Collect Sample โ†ฉ๏ธBuka dialog sample โ†’ Un-CollectSTATUS di-reset, audit log tercatat ๐Ÿ“SU, ADM, LAB โœ…
โŒ
NP-004Sample Collection Buttons Enabled โœ…Buka dialog sampleTombol Collect/Un-Coll/Un-Recv enabled ๐Ÿ”˜ADMIN โœ…
โŒ
diff --git a/app/Views/admin/index.php b/app/Views/admin/index.php index 8ec2f92..fa080f9 100644 --- a/app/Views/admin/index.php +++ b/app/Views/admin/index.php @@ -11,6 +11,7 @@ $roleConfig = $config['admin']; include('shared/dialog_unval'); ?> include('shared/dialog_audit'); ?> include('shared/dialog_results_generate'); ?> + include('shared/dialog_preview'); ?> endSection(); ?> diff --git a/app/Views/lab/index.php b/app/Views/lab/index.php index 58f20c3..63d9a00 100644 --- a/app/Views/lab/index.php +++ b/app/Views/lab/index.php @@ -11,6 +11,7 @@ $roleConfig = $config['lab']; include('shared/dialog_unval'); ?> include('shared/dialog_audit'); ?> include('shared/dialog_results_generate'); ?> + include('shared/dialog_preview'); ?> endSection(); ?> diff --git a/app/Views/shared/config.php b/app/Views/shared/config.php index 25b537b..a0b9d4c 100644 --- a/app/Views/shared/config.php +++ b/app/Views/shared/config.php @@ -19,6 +19,7 @@ return [ 'admin' => [ 'title' => 'Admin Dashboard', + 'previewEnabled' => true, 'sampleDialog' => [ 'commentEditable' => true, 'showCollectButtons' => true, @@ -31,6 +32,7 @@ return [ ], 'cs' => [ 'title' => 'CS Dashboard', + 'previewEnabled' => false, 'sampleDialog' => [ 'commentEditable' => false, 'showCollectButtons' => false, @@ -42,6 +44,7 @@ return [ ], 'lab' => [ 'title' => 'Lab Analyst Dashboard', + 'previewEnabled' => true, 'sampleDialog' => [ 'commentEditable' => true, 'showCollectButtons' => true, @@ -54,6 +57,7 @@ return [ ], 'phlebo' => [ 'title' => 'Phlebotomist Dashboard', + 'previewEnabled' => false, 'sampleDialog' => [ 'commentEditable' => false, 'showCollectButtons' => true, @@ -66,6 +70,7 @@ return [ ], 'superuser' => [ 'title' => 'Superuser Dashboard', + 'previewEnabled' => true, 'sampleDialog' => [ 'commentEditable' => true, 'showCollectButtons' => true, diff --git a/app/Views/shared/content_requests.php b/app/Views/shared/content_requests.php index c1697ef..1488abd 100644 --- a/app/Views/shared/content_requests.php +++ b/app/Views/shared/content_requests.php @@ -206,7 +206,32 @@

2:

+ 'superuser', 'admin' => 'admin', 'lab analyst' => 'lab', 'phlebotomist' => 'phlebo', 'customer service' => 'cs']; +$userRole = strtolower(session('userrole') ?? ''); +$configKey = $roleMap[$userRole] ?? ''; +$previewEnabled = $configFile[$configKey]['previewEnabled'] ?? false; +?> + + + + +
diff --git a/app/Views/shared/dialog_preview.php b/app/Views/shared/dialog_preview.php new file mode 100644 index 0000000..8d21190 --- /dev/null +++ b/app/Views/shared/dialog_preview.php @@ -0,0 +1,41 @@ + +
+ +
+
+
Access#:
+
Patient:
+
MRN:
+
Tests:
+
+
+ +
+

Preview Result

+ +
+ +

+ + +

+ + + + +
+ diff --git a/app/Views/shared/script_requests.php b/app/Views/shared/script_requests.php index c8c59fb..87380ec 100644 --- a/app/Views/shared/script_requests.php +++ b/app/Views/shared/script_requests.php @@ -414,6 +414,60 @@ document.addEventListener('alpine:init', () => { .catch(() => this.showToast('Print failed', 'error')); }, + /* + preview dialog methods + */ + isDialogPreviewOpen: false, + previewAccessnumber: null, + previewItem: null, + isPreviewIframeLoaded: false, + isPreviewValidating: false, + openPreviewDialog(item) { + this.previewItem = item; + this.previewAccessnumber = item.SP_ACCESSNUMBER; + this.isPreviewIframeLoaded = false; + this.isPreviewValidating = false; + this.isDialogPreviewOpen = true; + }, + closePreviewDialog() { + this.isDialogPreviewOpen = false; + this.previewItem = null; + this.previewAccessnumber = null; + this.isPreviewIframeLoaded = false; + }, + getPreviewUrl() { + return `${BASEURL}/report/${this.previewAccessnumber}`; + }, + onPreviewIframeLoad() { + this.isPreviewIframeLoaded = true; + }, + validateFromPreview(accessnumber, userid) { + if (!this.isPreviewIframeLoaded || this.isPreviewValidating) return; + + this.isPreviewValidating = true; + fetch(`${BASEURL}/api/requests/validate/${accessnumber}`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' } + }) + .then(res => res.json()) + .then(data => { + this.isPreviewValidating = false; + if (data.val) { + this.showToast(`Validated (val${data.val}): ${accessnumber}`, 'success'); + this.fetchList(); + this.closePreviewDialog(); + } else if (data.message && data.message.includes('already validate')) { + this.showToast('You have already validated this request', 'error'); + } else { + this.showToast(data.message || 'Validation failed', 'error'); + } + }) + .catch(() => { + this.isPreviewValidating = false; + this.showToast('Validation failed', 'error'); + }); + }, + showToast(message, type = 'success') { const toast = document.createElement('div'); toast.className = `alert alert-${type} fixed top-4 right-4 z-50`; diff --git a/app/Views/shared/script_validation.php b/app/Views/shared/script_validation.php index a7bd5ad..5819d14 100644 --- a/app/Views/shared/script_validation.php +++ b/app/Views/shared/script_validation.php @@ -212,6 +212,16 @@ document.addEventListener('alpine:init', () => { }).then(response => response.json()).then(data => { if (data.val === 2) { this.showToast(`Validated (val2): ${accessnumber} - PDF queued`); + // Trigger PDF auto-generation after val2 + fetch(`${BASEURL}/report/${accessnumber}/pdf`).then(res => res.json()).then(pdfData => { + if (pdfData.success) { + console.log('PDF generation queued:', pdfData.jobId); + } else { + console.error('PDF generation failed:', pdfData.error); + } + }).catch(err => { + console.error('PDF generation request failed:', err); + }); } else { this.showToast(`Validated: ${accessnumber}`); } diff --git a/app/Views/superuser/index.php b/app/Views/superuser/index.php index cedb6bc..14b30df 100644 --- a/app/Views/superuser/index.php +++ b/app/Views/superuser/index.php @@ -1,4 +1,8 @@ -extend('shared/layout'); ?> + +extend('shared/layout', ['roleConfig' => $roleConfig]); ?> section('content'); ?>
@@ -7,6 +11,7 @@ include('shared/dialog_unval'); ?> include('shared/dialog_audit'); ?> include('shared/dialog_results_generate'); ?> + include('shared/dialog_preview'); ?>
endSection(); ?> diff --git a/writable/debugbar/index.html b/writable/debugbar/index.html deleted file mode 100644 index b702fbc..0000000 --- a/writable/debugbar/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - 403 Forbidden - - - -

Directory access is forbidden.

- - -