diff --git a/app/Controllers/API_Dashboard.php b/app/Controllers/API_Dashboard.php
index f44d062..233253c 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, p.PATNUMBER, concat(p.FIRSTNAMESK, ' ', p.NAME) as NAME,
+ sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, 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 76f9373..43f3b4a 100644
--- a/app/Views/admin/dashboard.php
+++ b/app/Views/admin/dashboard.php
@@ -136,48 +136,57 @@ function index() {
}
tests = data[i].TESTS;
stat = data[i].STATS;
- if(stat == 'Pend') {
- bgcolor = 'bg-orange';
- datafilter = "data-filterrow='0'";
- stattext = 'Pending';
- } else if(stat == 'PartColl') {
- bgcolor = 'bg-peach';
- datafilter = "data-filterrow='1'";
- stattext = 'Part Collected';
- } else if(stat == 'Coll') {
- bgcolor = 'bg-pink';
- datafilter = "data-filterrow='2'";
- stattext = 'Collected';
- } else if(stat == 'PartRecv') {
- bgcolor = 'bg-soft-blue';
- datafilter = "data-filterrow='3'";
- stattext = 'Part Received';
- } else if(stat == 'Recv') {
- bgcolor = 'bg-blue';
- datafilter = "data-filterrow='4'";
- stattext = 'Received';
- } else if(stat == 'Inc') {
- bgcolor = 'bg-grey';
- datafilter = "data-filterrow='5'";
- stattext = 'Incomplete';
- } else if(stat == 'PartVal') {
- bgcolor = 'bg-soft-green';
- datafilter = "data-filterrow='6'";
- stattext = 'Part Validated';
- } else if(stat == 'Comp') {
- bgcolor = 'bg-green';
- datafilter = "data-filterrow='7'";
- stattext = 'Validated';
+ reqstatus = String(data[i].REQSTATUS);
+ trcolor = '';
+ if (reqstatus != '1') {
+ if(stat == 'Pend') {
+ bgcolor = 'bg-orange';
+ datafilter = "data-filterrow='0'";
+ stattext = 'Pending';
+ } else if(stat == 'PartColl') {
+ bgcolor = 'bg-peach';
+ datafilter = "data-filterrow='1'";
+ stattext = 'Part Collected';
+ } else if(stat == 'Coll') {
+ bgcolor = 'bg-pink';
+ datafilter = "data-filterrow='2'";
+ stattext = 'Collected';
+ } else if(stat == 'PartRecv') {
+ bgcolor = 'bg-soft-blue';
+ datafilter = "data-filterrow='3'";
+ stattext = 'Part Received';
+ } else if(stat == 'Recv') {
+ bgcolor = 'bg-blue';
+ datafilter = "data-filterrow='4'";
+ stattext = 'Received';
+ } else if(stat == 'Inc') {
+ bgcolor = 'bg-grey';
+ datafilter = "data-filterrow='5'";
+ stattext = 'Incomplete';
+ } else if(stat == 'PartVal') {
+ bgcolor = 'bg-soft-green';
+ datafilter = "data-filterrow='6'";
+ stattext = 'Part Validated';
+ } else if(stat == 'Comp') {
+ bgcolor = 'bg-green';
+ datafilter = "data-filterrow='7'";
+ stattext = 'Validated';
+ }
+ } else {
+ trcolor = ' table-danger-custom ';
+ bgcolor = ' table-danger-custom ';
+ datafilter = "data-filterrow='8'";
+ stattext = 'Cancelled';
}
- let datarow = "
" +
+ let datarow = "
" +
"" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | " + tests + ' | ' +
""+stattext+" | " +
" | " +'
';
$("#table-body").append(datarow);
}
$('#myTable').DataTable({
- "pageLength": 25, // Ganti sesuai kebutuhan
- "lengthMenu": [25, 50, 100] // Pilihan dropdown entries per halaman
+ "pageLength": 50, // Ganti sesuai kebutuhan
+ "lengthMenu": [50, 75, 100] // Pilihan dropdown entries per halaman
});
// datatable filter
diff --git a/app/Views/admin/dashboard_viewAccess.php b/app/Views/admin/dashboard_viewAccess.php
index 3322859..e21a0ff 100644
--- a/app/Views/admin/dashboard_viewAccess.php
+++ b/app/Views/admin/dashboard_viewAccess.php
@@ -99,7 +99,7 @@ if(isset($data[0])) {
-
+
";
echo "";
echo " ";
diff --git a/app/Views/fo/dashboard.php b/app/Views/fo/dashboard.php
index b6a05b3..79473d9 100644
--- a/app/Views/fo/dashboard.php
+++ b/app/Views/fo/dashboard.php
@@ -132,48 +132,57 @@ function index() {
}
tests = data[i].TESTS;
stat = data[i].STATS;
- if(stat == 'Pend') {
- bgcolor = 'bg-orange';
- datafilter = "data-filterrow='0'";
- stattext = 'Pending';
- } else if(stat == 'PartColl') {
- bgcolor = 'bg-peach';
- datafilter = "data-filterrow='1'";
- stattext = 'Part Collected';
- } else if(stat == 'Coll') {
- bgcolor = 'bg-pink';
- datafilter = "data-filterrow='2'";
- stattext = 'Collected';
- } else if(stat == 'PartRecv') {
- bgcolor = 'bg-soft-blue';
- datafilter = "data-filterrow='3'";
- stattext = 'Part Received';
- } else if(stat == 'Recv') {
- bgcolor = 'bg-blue';
- datafilter = "data-filterrow='4'";
- stattext = 'Received';
- } else if(stat == 'Inc') {
- bgcolor = 'bg-grey';
- datafilter = "data-filterrow='5'";
- stattext = 'Incomplete';
- } else if(stat == 'PartVal') {
- bgcolor = 'bg-soft-green';
- datafilter = "data-filterrow='6'";
- stattext = 'Part Validated';
- } else if(stat == 'Comp') {
- bgcolor = 'bg-green';
- datafilter = "data-filterrow='7'";
- stattext = 'Validated';
+ reqstatus = String(data[i].REQSTATUS);
+ trcolor = '';
+ if (reqstatus != '1') {
+ if(stat == 'Pend') {
+ bgcolor = 'bg-orange';
+ datafilter = "data-filterrow='0'";
+ stattext = 'Pending';
+ } else if(stat == 'PartColl') {
+ bgcolor = 'bg-peach';
+ datafilter = "data-filterrow='1'";
+ stattext = 'Part Collected';
+ } else if(stat == 'Coll') {
+ bgcolor = 'bg-pink';
+ datafilter = "data-filterrow='2'";
+ stattext = 'Collected';
+ } else if(stat == 'PartRecv') {
+ bgcolor = 'bg-soft-blue';
+ datafilter = "data-filterrow='3'";
+ stattext = 'Part Received';
+ } else if(stat == 'Recv') {
+ bgcolor = 'bg-blue';
+ datafilter = "data-filterrow='4'";
+ stattext = 'Received';
+ } else if(stat == 'Inc') {
+ bgcolor = 'bg-grey';
+ datafilter = "data-filterrow='5'";
+ stattext = 'Incomplete';
+ } else if(stat == 'PartVal') {
+ bgcolor = 'bg-soft-green';
+ datafilter = "data-filterrow='6'";
+ stattext = 'Part Validated';
+ } else if(stat == 'Comp') {
+ bgcolor = 'bg-green';
+ datafilter = "data-filterrow='7'";
+ stattext = 'Validated';
+ }
+ } else {
+ trcolor = ' table-danger-custom ';
+ bgcolor = ' table-danger-custom ';
+ datafilter = "data-filterrow='8'";
+ stattext = 'Cancelled';
}
- let datarow = "" +
- "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber + " Disalin" +" | " + testing_test + hon + " Disalin | " + tests + ' | ' +
+ let datarow = "
" +
+ "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | " + tests + ' | ' +
""+stattext+" | " +
" | " +'
';
$("#table-body").append(datarow);
}
$('#myTable').DataTable({
- "pageLength": 25, // Ganti sesuai kebutuhan
- "lengthMenu": [25, 50, 100] // Pilihan dropdown entries per halaman
+ "pageLength": 50, // Ganti sesuai kebutuhan
+ "lengthMenu": [50, 75, 100] // Pilihan dropdown entries per halaman
});
// datatable filter
diff --git a/app/Views/sampling/dashboard.php b/app/Views/sampling/dashboard.php
index 3ea1cc6..06b2cc6 100644
--- a/app/Views/sampling/dashboard.php
+++ b/app/Views/sampling/dashboard.php
@@ -131,48 +131,57 @@ function index() {
}
tests = data[i].TESTS;
stat = data[i].STATS;
- if(stat == 'Pend') {
- bgcolor = 'bg-orange';
- datafilter = "data-filterrow='0'";
- stattext = 'Pending';
- } else if(stat == 'PartColl') {
- bgcolor = 'bg-peach';
- datafilter = "data-filterrow='1'";
- stattext = 'Part Collected';
- } else if(stat == 'Coll') {
- bgcolor = 'bg-pink';
- datafilter = "data-filterrow='2'";
- stattext = 'Collected';
- } else if(stat == 'PartRecv') {
- bgcolor = 'bg-soft-blue';
- datafilter = "data-filterrow='3'";
- stattext = 'Part Received';
- } else if(stat == 'Recv') {
- bgcolor = 'bg-blue';
- datafilter = "data-filterrow='4'";
- stattext = 'Received';
- } else if(stat == 'Inc') {
- bgcolor = 'bg-grey';
- datafilter = "data-filterrow='5'";
- stattext = 'Incomplete';
- } else if(stat == 'PartVal') {
- bgcolor = 'bg-soft-green';
- datafilter = "data-filterrow='6'";
- stattext = 'Part Validated';
- } else if(stat == 'Comp') {
- bgcolor = 'bg-green';
- datafilter = "data-filterrow='7'";
- stattext = 'Validated';
+ reqstatus = String(data[i].REQSTATUS);
+ trcolor = '';
+ if (reqstatus != '1') {
+ if(stat == 'Pend') {
+ bgcolor = 'bg-orange';
+ datafilter = "data-filterrow='0'";
+ stattext = 'Pending';
+ } else if(stat == 'PartColl') {
+ bgcolor = 'bg-peach';
+ datafilter = "data-filterrow='1'";
+ stattext = 'Part Collected';
+ } else if(stat == 'Coll') {
+ bgcolor = 'bg-pink';
+ datafilter = "data-filterrow='2'";
+ stattext = 'Collected';
+ } else if(stat == 'PartRecv') {
+ bgcolor = 'bg-soft-blue';
+ datafilter = "data-filterrow='3'";
+ stattext = 'Part Received';
+ } else if(stat == 'Recv') {
+ bgcolor = 'bg-blue';
+ datafilter = "data-filterrow='4'";
+ stattext = 'Received';
+ } else if(stat == 'Inc') {
+ bgcolor = 'bg-grey';
+ datafilter = "data-filterrow='5'";
+ stattext = 'Incomplete';
+ } else if(stat == 'PartVal') {
+ bgcolor = 'bg-soft-green';
+ datafilter = "data-filterrow='6'";
+ stattext = 'Part Validated';
+ } else if(stat == 'Comp') {
+ bgcolor = 'bg-green';
+ datafilter = "data-filterrow='7'";
+ stattext = 'Validated';
+ }
+ } else {
+ trcolor = ' table-danger-custom ';
+ bgcolor = ' table-danger-custom ';
+ datafilter = "data-filterrow='8'";
+ stattext = 'Cancelled';
}
- let datarow = "" +
- "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber + " Disalin" +" | " + testing_test + hon + " Disalin | " + tests + ' | ' +
+ let datarow = "
" +
+ "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | " + tests + ' | ' +
""+stattext+" | " +
" | " +'
';
$("#table-body").append(datarow);
}
$('#myTable').DataTable({
- "pageLength": 25, // Ganti sesuai kebutuhan
- "lengthMenu": [25, 50, 100] // Pilihan dropdown entries per halaman
+ "pageLength": 50, // Ganti sesuai kebutuhan
+ "lengthMenu": [50, 75, 100] // Pilihan dropdown entries per halaman
});
// datatable filter
diff --git a/app/Views/sampling/dashboard_viewAccess.php b/app/Views/sampling/dashboard_viewAccess.php
index 532ece9..1a2e365 100644
--- a/app/Views/sampling/dashboard_viewAccess.php
+++ b/app/Views/sampling/dashboard_viewAccess.php
@@ -99,7 +99,7 @@ if(isset($data[0])) {
-
+
";
echo "";
echo " ";
diff --git a/app/Views/user/dashboard.php b/app/Views/user/dashboard.php
index 2cc12c0..f872367 100644
--- a/app/Views/user/dashboard.php
+++ b/app/Views/user/dashboard.php
@@ -131,48 +131,57 @@ function index() {
}
tests = data[i].TESTS;
stat = data[i].STATS;
- if(stat == 'Pend') {
- bgcolor = 'bg-orange';
- datafilter = "data-filterrow='0'";
- stattext = 'Pending';
- } else if(stat == 'PartColl') {
- bgcolor = 'bg-peach';
- datafilter = "data-filterrow='1'";
- stattext = 'Part Collected';
- } else if(stat == 'Coll') {
- bgcolor = 'bg-pink';
- datafilter = "data-filterrow='2'";
- stattext = 'Collected';
- } else if(stat == 'PartRecv') {
- bgcolor = 'bg-soft-blue';
- datafilter = "data-filterrow='3'";
- stattext = 'Part Received';
- } else if(stat == 'Recv') {
- bgcolor = 'bg-blue';
- datafilter = "data-filterrow='4'";
- stattext = 'Received';
- } else if(stat == 'Inc') {
- bgcolor = 'bg-grey';
- datafilter = "data-filterrow='5'";
- stattext = 'Incomplete';
- } else if(stat == 'PartVal') {
- bgcolor = 'bg-soft-green';
- datafilter = "data-filterrow='6'";
- stattext = 'Part Validated';
- } else if(stat == 'Comp') {
- bgcolor = 'bg-green';
- datafilter = "data-filterrow='7'";
- stattext = 'Validated';
+ reqstatus = String(data[i].REQSTATUS);
+ trcolor = '';
+ if (reqstatus != '1') {
+ if(stat == 'Pend') {
+ bgcolor = 'bg-orange';
+ datafilter = "data-filterrow='0'";
+ stattext = 'Pending';
+ } else if(stat == 'PartColl') {
+ bgcolor = 'bg-peach';
+ datafilter = "data-filterrow='1'";
+ stattext = 'Part Collected';
+ } else if(stat == 'Coll') {
+ bgcolor = 'bg-pink';
+ datafilter = "data-filterrow='2'";
+ stattext = 'Collected';
+ } else if(stat == 'PartRecv') {
+ bgcolor = 'bg-soft-blue';
+ datafilter = "data-filterrow='3'";
+ stattext = 'Part Received';
+ } else if(stat == 'Recv') {
+ bgcolor = 'bg-blue';
+ datafilter = "data-filterrow='4'";
+ stattext = 'Received';
+ } else if(stat == 'Inc') {
+ bgcolor = 'bg-grey';
+ datafilter = "data-filterrow='5'";
+ stattext = 'Incomplete';
+ } else if(stat == 'PartVal') {
+ bgcolor = 'bg-soft-green';
+ datafilter = "data-filterrow='6'";
+ stattext = 'Part Validated';
+ } else if(stat == 'Comp') {
+ bgcolor = 'bg-green';
+ datafilter = "data-filterrow='7'";
+ stattext = 'Validated';
+ }
+ } else {
+ trcolor = ' table-danger-custom ';
+ bgcolor = ' table-danger-custom ';
+ datafilter = "data-filterrow='8'";
+ stattext = 'Cancelled';
}
- let datarow = "" +
- "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber + " Disalin" +" | " + testing_test + hon + " Disalin | " + tests + ' | ' +
+ let datarow = "
" +
+ "" + colldate + ' '+ colltime +' | ' + patnumber + ' | ' + patname.trim() + " | " + accessnumber +" Disalin" +" | " + testing_test + hon +" Disalin | " + tests + ' | ' +
""+stattext+" | " +
" | " +'
';
$("#table-body").append(datarow);
}
$('#myTable').DataTable({
- "pageLength": 25, // Ganti sesuai kebutuhan
- "lengthMenu": [25, 50, 100] // Pilihan dropdown entries per halaman
+ "pageLength": 50, // Ganti sesuai kebutuhan
+ "lengthMenu": [50, 75, 100] // Pilihan dropdown entries per halaman
});
// datatable filter
diff --git a/app/Views/user/dashboard_viewAccess.php b/app/Views/user/dashboard_viewAccess.php
index 532ece9..c7a8f55 100644
--- a/app/Views/user/dashboard_viewAccess.php
+++ b/app/Views/user/dashboard_viewAccess.php
@@ -99,7 +99,7 @@ if(isset($data[0])) {
-
+
";
echo "";
echo " ";
diff --git a/public/assets/css/styles.css b/public/assets/css/styles.css
index b5f4358..3f72295 100644
--- a/public/assets/css/styles.css
+++ b/public/assets/css/styles.css
@@ -1911,6 +1911,20 @@ progress {
border-color: var(--bs-table-border-color);
}
+.table-danger-custom {
+ --bs-table-color: #000;
+ --bs-table-bg: #e72838d0;
+ --bs-table-border-color: #dfc2c4;
+ --bs-table-striped-bg: #eccccf;
+ --bs-table-striped-color: #000;
+ --bs-table-active-bg: #dfc2c4;
+ --bs-table-active-color: #000;
+ --bs-table-hover-bg: #e5c7ca;
+ --bs-table-hover-color: #000;
+ color: var(--bs-table-color);
+ border-color: var(--bs-table-border-color);
+}
+
.table-light {
--bs-table-color: #000;
--bs-table-bg: #f8f9fa;