diff --git a/app/Controllers/API_Dashboard.php b/app/Controllers/API_Dashboard.php
index 233253c..1bd5c14 100644
--- a/app/Controllers/API_Dashboard.php
+++ b/app/Controllers/API_Dashboard.php
@@ -20,7 +20,7 @@ class API_Dashboard extends ResourceController {
$date1 = $this->request->getPost('date1');
$date2 = $this->request->getPost('date2');
$sql = "SELECT
- sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, tr.REQNUMBER as HOSTORDERNUMBER, tr.REQSTATUS, p.PATNUMBER, concat(p.FIRSTNAMESK, ' ', p.NAME) as NAME,
+ sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, sr.HOSTORDERNUMBER as REFFID, tr.REQNUMBER as HOSTORDERNUMBER, tr.REQSTATUS, p.PATNUMBER, concat(p.FIRSTNAMESK, ' ', p.NAME) as NAME,
TESTS=stuff(( select ', '+'('+T.SP_TESTCODE+')' from
( select T.SP_TESTCODE from SP_TESTS T
where T.SP_ACCESSNUMBER=sr.SP_ACCESSNUMBER
diff --git a/app/Views/admin/dashboard.php b/app/Views/admin/dashboard.php
index d9f109e..324bf4a 100644
--- a/app/Views/admin/dashboard.php
+++ b/app/Views/admin/dashboard.php
@@ -33,9 +33,10 @@
@@ -135,6 +136,15 @@ function index() {
testing_test = "";
}
}
+ if (data[i].REFFID != null) {
+ // patnumber = data[i].PATNUMBER;
+ reffid = data[i].REFFID;
+ // patnumber = data[i].PATNUMBER.substr(-16,16);
+ // patnumber = patnumber.substring(patnumber.length - 10);
+ } else {
+ reffid = ' NULL ';
+ }
+
tests = data[i].TESTS;
stat = data[i].STATS;
reqstatus = String(data[i].REQSTATUS);
@@ -179,10 +189,7 @@ function index() {
datafilter = "data-filterrow='8'";
stattext = 'Cancelled';
}
- let datarow = "" +
- "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | " + tests + ' | ' +
- ""+stattext+" | " +
- " | " +'
';
+ let datarow = "" + "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | "+reffid+" | " + tests + ' | ' + ""+stattext+" | " + " | " +'
';
$("#table-body").append(datarow);
}
$('#myTable').DataTable({
diff --git a/app/Views/fo/dashboard.php b/app/Views/fo/dashboard.php
index bcad1e5..8890f20 100644
--- a/app/Views/fo/dashboard.php
+++ b/app/Views/fo/dashboard.php
@@ -33,9 +33,10 @@
Patient# |
Patient Name |
Access# |
- Visit# |
+ Visit# |
+ HIS# |
Test |
- Status |
+ Status |
|
@@ -130,6 +131,14 @@ function index() {
} else {
testing_test = "";
}
+ if (data[i].REFFID != null) {
+ // patnumber = data[i].PATNUMBER;
+ reffid = data[i].REFFID;
+ // patnumber = data[i].PATNUMBER.substr(-16,16);
+ // patnumber = patnumber.substring(patnumber.length - 10);
+ } else {
+ reffid = ' NULL ';
+ }
tests = data[i].TESTS;
stat = data[i].STATS;
reqstatus = String(data[i].REQSTATUS);
@@ -174,10 +183,7 @@ function index() {
datafilter = "data-filterrow='8'";
stattext = 'Cancelled';
}
- let datarow = "" +
- "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | " + tests + ' | ' +
- ""+stattext+" | " +
- " | " +'
';
+ let datarow = "" + "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | "+reffid+" | " + tests + ' | ' + ""+stattext+" | " + " | " +'
';
$("#table-body").append(datarow);
}
$('#myTable').DataTable({
diff --git a/app/Views/sampling/dashboard.php b/app/Views/sampling/dashboard.php
index 8d97299..f946495 100644
--- a/app/Views/sampling/dashboard.php
+++ b/app/Views/sampling/dashboard.php
@@ -33,9 +33,10 @@
Patient# |
Patient Name |
Access# |
- Visit# |
+ Visit# |
+ HIS# |
Test |
- Status |
+ Status |
|
@@ -129,6 +130,14 @@ function index() {
} else {
testing_test = "";
}
+ if (data[i].REFFID != null) {
+ // patnumber = data[i].PATNUMBER;
+ reffid = data[i].REFFID;
+ // patnumber = data[i].PATNUMBER.substr(-16,16);
+ // patnumber = patnumber.substring(patnumber.length - 10);
+ } else {
+ reffid = ' NULL ';
+ }
tests = data[i].TESTS;
stat = data[i].STATS;
reqstatus = String(data[i].REQSTATUS);
@@ -173,10 +182,7 @@ function index() {
datafilter = "data-filterrow='8'";
stattext = 'Cancelled';
}
- let datarow = "" +
- "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | " + tests + ' | ' +
- ""+stattext+" | " +
- " | " +'
';
+ let datarow = "" + "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | "+reffid+" | " + tests + ' | ' + ""+stattext+" | " + " | " +'
';
$("#table-body").append(datarow);
}
$('#myTable').DataTable({
diff --git a/app/Views/user/dashboard.php b/app/Views/user/dashboard.php
index 84fd473..7a7a5b7 100644
--- a/app/Views/user/dashboard.php
+++ b/app/Views/user/dashboard.php
@@ -33,9 +33,10 @@
Patient# |
Patient Name |
Access# |
- Visit# |
+ Visit# |
+ HIS# |
Test |
- Status |
+ Status |
|
@@ -129,6 +130,14 @@ function index() {
} else {
testing_test = "";
}
+ if (data[i].REFFID != null) {
+ // patnumber = data[i].PATNUMBER;
+ reffid = data[i].REFFID;
+ // patnumber = data[i].PATNUMBER.substr(-16,16);
+ // patnumber = patnumber.substring(patnumber.length - 10);
+ } else {
+ reffid = ' NULL ';
+ }
tests = data[i].TESTS;
stat = data[i].STATS;
reqstatus = String(data[i].REQSTATUS);
@@ -173,10 +182,7 @@ function index() {
datafilter = "data-filterrow='8'";
stattext = 'Cancelled';
}
- let datarow = "" +
- "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | " + tests + ' | ' +
- ""+stattext+" | " +
- " | " +'
';
+ let datarow = "" + "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | "+reffid+" | " + tests + ' | ' + ""+stattext+" | " + " | " +'
';
$("#table-body").append(datarow);
}
$('#myTable').DataTable({