diff --git a/app/Controllers/FoController.php b/app/Controllers/FoController.php
index c16c0c1..fd04d92 100644
--- a/app/Controllers/FoController.php
+++ b/app/Controllers/FoController.php
@@ -40,7 +40,7 @@ class FoController extends BaseController {
$data['accessnumber'] = $accessnumber;
- return view('admin/dashboard_viewAccess', $data);
+ return view('fo/dashboard_viewAccess', $data);
}
public function changePass() {
diff --git a/app/Controllers/SamplingController.php b/app/Controllers/SamplingController.php
index 23734f6..022e444 100644
--- a/app/Controllers/SamplingController.php
+++ b/app/Controllers/SamplingController.php
@@ -40,7 +40,7 @@ class SamplingController extends BaseController {
$data['accessnumber'] = $accessnumber;
- return view('admin/dashboard_viewAccess', $data);
+ return view('sampling/dashboard_viewAccess', $data);
}
public function changePass() {
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index 3e07f0b..5f92430 100644
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -40,7 +40,7 @@ class UserController extends BaseController {
$data['accessnumber'] = $accessnumber;
- return view('admin/dashboard_viewAccess', $data);
+ return view('user/dashboard_viewAccess', $data);
}
public function changePass() {
diff --git a/app/Views/admin/dashboard.php b/app/Views/admin/dashboard.php
index beb7e42..410a1fa 100644
--- a/app/Views/admin/dashboard.php
+++ b/app/Views/admin/dashboard.php
@@ -28,17 +28,17 @@
-
- | Order |
- MR |
- Patient |
- Request |
- Hosp |
+
+ Order Date |
+ Patient# |
+ Patient Name |
+ Access# |
+ Visit# |
Test |
Status |
|
-
+
@@ -109,6 +109,7 @@ function index() {
for (var i = 0; i < data.length; i++) {
colldate = data[i].COLLECTIONDATE.substr(0,10);
patnumber = data[i].PATNUMBER.substr(-16,16);
+ patnumber = patnumber.substring(patnumber.length - 10);
accessnumber = data[i].SP_ACCESSNUMBER;
patname = data[i].NAME;
hon = data[i].HOSTORDERNUMBER;
@@ -148,7 +149,7 @@ function index() {
stattext = 'Validated';
}
let datarow = "" +
- '| ' + colldate + ' | ' + patnumber + ' | ' + patname + ' | ' + accessnumber + ' | ' + hon + ' | ' + tests + ' | ' +
+ "" + colldate + ' | ' + patnumber + ' | ' + patname + " | " + accessnumber + ' | ' + hon + ' | ' + tests + ' | ' +
""+stattext+" | " +
" | " +'
';
$("#table-body").append(datarow);
diff --git a/app/Views/admin/dashboard_viewAccess.php b/app/Views/admin/dashboard_viewAccess.php
index af11fbb..519d4a8 100644
--- a/app/Views/admin/dashboard_viewAccess.php
+++ b/app/Views/admin/dashboard_viewAccess.php
@@ -15,7 +15,7 @@ $name = $row['NAME'];
- | Access# |
+ Access Number |
: |
=$accessnumber;?> |
@@ -25,7 +25,7 @@ $name = $row['NAME'];
- | MR# |
+ Patient Number |
: |
=$patnumber;?> |
diff --git a/app/Views/fo/dashboard.php b/app/Views/fo/dashboard.php
index 08e38c3..fd02c5a 100644
--- a/app/Views/fo/dashboard.php
+++ b/app/Views/fo/dashboard.php
@@ -28,17 +28,17 @@
-
- | Order |
- MR |
- Patient |
- Request |
- Hosp |
+
+ Order Date |
+ Patient# |
+ Patient Name |
+ Access# |
+ Visit# |
Test |
Status |
|
-
+
@@ -59,12 +59,12 @@
let curDate = new Date().toJSON().slice(0, 10);
$('.date1').val(curDate);
$('.date2').val(curDate);
+index();
document.addEventListener('keydown', function(event) {
if (event.key === 'F5') { event.preventDefault(); index(); }
});
-index();
function index() {
let url = '=base_url('');?>api/dashboard/index';
date1 = $('.date1').val();
@@ -109,6 +109,7 @@ function index() {
for (var i = 0; i < data.length; i++) {
colldate = data[i].COLLECTIONDATE.substr(0,10);
patnumber = data[i].PATNUMBER.substr(-16,16);
+ patnumber = patnumber.substring(patnumber.length - 10);
accessnumber = data[i].SP_ACCESSNUMBER;
patname = data[i].NAME;
hon = data[i].HOSTORDERNUMBER;
@@ -128,7 +129,7 @@ function index() {
stattext = 'Collected';
} else if(stat == 'PartRecv') {
bgcolor = 'bg-soft-blue';
- datafilter = "data-filterrow='2'";
+ datafilter = "data-filterrow='3'";
stattext = 'Part Received';
} else if(stat == 'Recv') {
bgcolor = 'bg-blue';
@@ -147,8 +148,8 @@ function index() {
datafilter = "data-filterrow='7'";
stattext = 'Validated';
}
- let datarow = "
" +
- '| ' + colldate + ' | ' + patnumber + ' | ' + accessnumber + ' | ' + patname + ' | ' + hon + ' | ' + tests + ' | ' +
+ let datarow = "
" +
+ "| " + colldate + ' | ' + patnumber + ' | ' + patname + " | " + accessnumber + ' | ' + hon + ' | ' + tests + ' | ' +
""+stattext+" | " +
" | " +'
';
$("#table-body").append(datarow);
diff --git a/app/Views/fo/dashboard_viewAccess.php b/app/Views/fo/dashboard_viewAccess.php
index 323669e..519d4a8 100644
--- a/app/Views/fo/dashboard_viewAccess.php
+++ b/app/Views/fo/dashboard_viewAccess.php
@@ -15,7 +15,7 @@ $name = $row['NAME'];
- | Access# |
+ Access Number |
: |
=$accessnumber;?> |
@@ -25,7 +25,7 @@ $name = $row['NAME'];
- | MR# |
+ Patient Number |
: |
=$patnumber;?> |
@@ -91,7 +91,7 @@ $name = $row['NAME'];
}
echo "$sampletext | ";
echo "
-
+
@@ -109,10 +109,10 @@ $name = $row['NAME'];
|