From 55569e96d15b28fc2be9a3b3b38730e541704910 Mon Sep 17 00:00:00 2001 From: mikael-zakaria Date: Wed, 12 Mar 2025 23:10:34 +0800 Subject: [PATCH] Change Dashboard(Reff# menjadi Visit#, Hilangkan 0 pada Patnumber) dan Header Laporan REF menjadi Visit --- app/Views/admin/dashboard.php | 6 ++++-- app/Views/fo/dashboard.php | 7 ++++--- app/Views/sampling/dashboard.php | 5 +++-- app/Views/user/dashboard.php | 5 +++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/Views/admin/dashboard.php b/app/Views/admin/dashboard.php index 08ee331..4299c1f 100644 --- a/app/Views/admin/dashboard.php +++ b/app/Views/admin/dashboard.php @@ -111,8 +111,10 @@ function index() { colltime = data[i].COLLECTIONDATE.slice(10,16); if (data[i].PATNUMBER != null) { - patnumber = data[i].PATNUMBER.substr(-16,16); - patnumber = patnumber.substring(patnumber.length - 10); + // patnumber = data[i].PATNUMBER; + patnumber = data[i].PATNUMBER.replace(/^0+/, ''); + // patnumber = data[i].PATNUMBER.substr(-16,16); + // patnumber = patnumber.substring(patnumber.length - 10); } else { patnumber = ' NULL '; } diff --git a/app/Views/fo/dashboard.php b/app/Views/fo/dashboard.php index 92d8366..1382d86 100644 --- a/app/Views/fo/dashboard.php +++ b/app/Views/fo/dashboard.php @@ -33,7 +33,7 @@ Patient# Patient Name Access# - Reff# + Visit# Test Status @@ -111,8 +111,9 @@ function index() { colltime = data[i].COLLECTIONDATE.slice(10,16); if (data[i].PATNUMBER != null) { - patnumber = data[i].PATNUMBER.substr(-16,16); - patnumber = patnumber.substring(patnumber.length - 10); + patnumber = data[i].PATNUMBER.replace(/^0+/, ''); + // patnumber = data[i].PATNUMBER.substr(-16,16); + // patnumber = patnumber.substring(patnumber.length - 10); } else { patnumber = ' NULL '; } diff --git a/app/Views/sampling/dashboard.php b/app/Views/sampling/dashboard.php index a37b8f0..151ca5f 100644 --- a/app/Views/sampling/dashboard.php +++ b/app/Views/sampling/dashboard.php @@ -111,8 +111,9 @@ function index() { colltime = data[i].COLLECTIONDATE.slice(10,16); if (data[i].PATNUMBER != null) { - patnumber = data[i].PATNUMBER.substr(-16,16); - patnumber = patnumber.substring(patnumber.length - 10); + patnumber = data[i].PATNUMBER.replace(/^0+/, ''); + // patnumber = data[i].PATNUMBER.substr(-16,16); + // patnumber = patnumber.substring(patnumber.length - 10); } else { patnumber = ' NULL '; } diff --git a/app/Views/user/dashboard.php b/app/Views/user/dashboard.php index 4345edc..381fb27 100644 --- a/app/Views/user/dashboard.php +++ b/app/Views/user/dashboard.php @@ -111,8 +111,9 @@ function index() { colltime = data[i].COLLECTIONDATE.slice(10,16); if (data[i].PATNUMBER != null) { - patnumber = data[i].PATNUMBER.substr(-16,16); - patnumber = patnumber.substring(patnumber.length - 10); + patnumber = data[i].PATNUMBER.replace(/^0+/, ''); + // patnumber = data[i].PATNUMBER.substr(-16,16); + // patnumber = patnumber.substring(patnumber.length - 10); } else { patnumber = ' NULL '; }