diff --git a/app/Controllers/API_DictChapters.php b/app/Controllers/API_DictChapters.php index 003a2ad..53aa9a9 100644 --- a/app/Controllers/API_DictChapters.php +++ b/app/Controllers/API_DictChapters.php @@ -9,7 +9,8 @@ class API_DictChapters extends ResourceController { public function index() { $db = \Config\Database::connect(); $sql = "select dc.CHAPCODE, dc.SHORTTEXT, cdc.TEXT1, cdc.TEXT2 from DICT_CHAPTERS dc - left join cmod.dbo.CM_DICT_CHAPTERS cdc on dc.CHAPCODE=cdc.CHAPCODE"; + left join cmod.dbo.CM_DICT_CHAPTERS cdc on dc.CHAPCODE=cdc.CHAPCODE + where left(dc.SHORTTEXT,2)<>'CH'"; $query = $db->query($sql); $results = $query->getResultArray(); $data['dictChapters'] = $results; diff --git a/app/Views/admin/dashboard.php b/app/Views/admin/dashboard.php index 325589b..f031342 100644 --- a/app/Views/admin/dashboard.php +++ b/app/Views/admin/dashboard.php @@ -125,7 +125,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'; @@ -144,7 +144,7 @@ function index() { datafilter = "data-filterrow='7'"; stattext = 'Validated'; } - let datarow = "" + + let datarow = "" + '' + colldate + ' ' + patnumber + ' ' + accessnumber + ' ' + patname + ' ' + hon + ' ' + tests + '' + ""+stattext+"" + "

" +''; diff --git a/public/assets/css/styles.css b/public/assets/css/styles.css index 7e363de..fbbee97 100644 --- a/public/assets/css/styles.css +++ b/public/assets/css/styles.css @@ -11106,7 +11106,7 @@ body { #layoutSidenav_content { background-color: #F4F6FF; } - +/* @media (min-width: 992px) { #layoutSidenav #layoutSidenav_nav { transform: translateX(0); @@ -11125,6 +11125,7 @@ body { display: none; } } +*/ .sb-nav-fixed .sb-topnav { z-index: 1039; }