mahdahar/pbmc-cmod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into zakaria

Browse Source
This commit is contained in:
mikael-zakaria 2024-12-08 15:16:14 +08:00
commit d8cc5730b4
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/API_DictChapters.php
View File

@ -9,7 +9,8 @@ class API_DictChapters extends ResourceController {
public function index() { public function index() {
$db = \Config\Database::connect(); $db = \Config\Database::connect();
$sql = "select dc.CHAPCODE, dc.SHORTTEXT, cdc.TEXT1, cdc.TEXT2 from DICT_CHAPTERS dc $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); $query = $db->query($sql);
$results = $query->getResultArray(); $results = $query->getResultArray();
$data['dictChapters'] = $results; $data['dictChapters'] = $results;

4
app/Views/admin/dashboard.php
View File

@ -125,7 +125,7 @@ function index() {
stattext = 'Collected'; stattext = 'Collected';
} else if(stat == 'PartRecv') { } else if(stat == 'PartRecv') {
bgcolor = 'bg-soft-blue'; bgcolor = 'bg-soft-blue';
datafilter = "data-filterrow='2'"; datafilter = "data-filterrow='3'";
stattext = 'Part Received'; stattext = 'Part Received';
} else if(stat == 'Recv') { } else if(stat == 'Recv') {
bgcolor = 'bg-blue'; bgcolor = 'bg-blue';
@ -144,7 +144,7 @@ function index() {
datafilter = "data-filterrow='7'"; datafilter = "data-filterrow='7'";
stattext = 'Validated'; stattext = 'Validated';
} }
let datarow = "<tr onclick='viewAccess("+accessnumber+")' class='align-middle main_table" + datafilter +" ' >" + let datarow = "<tr onclick='viewAccess("+accessnumber+")' class='align-middle main_table'" + datafilter +" >" +
'<td>' + colldate + '</td> <td>' + patnumber + '</td> <td>' + accessnumber + '</td> <td>' + patname + '</td> <td>' + hon + '</td> <td>' + tests + '</td>' + '<td>' + colldate + '</td> <td>' + patnumber + '</td> <td>' + accessnumber + '</td> <td>' + patname + '</td> <td>' + hon + '</td> <td>' + tests + '</td>' +
"<td role='button' class='"+bgcolor+" text-center align-middle'>"+stattext+"</td>" + "<td role='button' class='"+bgcolor+" text-center align-middle'>"+stattext+"</td>" +
"<td role='button' class='text-center align-middle' onclick='resultPdfAccess("+accessnumber+ ",event" +")'> <h4 class='p-0 m-0'><i class='bi bi-filetype-pdf'></i></h4> </td>" +'</tr>'; "<td role='button' class='text-center align-middle' onclick='resultPdfAccess("+accessnumber+ ",event" +")'> <h4 class='p-0 m-0'><i class='bi bi-filetype-pdf'></i></h4> </td>" +'</tr>';

3
public/assets/css/styles.css
View File

@ -11106,7 +11106,7 @@ body {
#layoutSidenav_content { #layoutSidenav_content {
background-color: #F4F6FF; background-color: #F4F6FF;
} }
/*
@media (min-width: 992px) { @media (min-width: 992px) {
#layoutSidenav #layoutSidenav_nav { #layoutSidenav #layoutSidenav_nav {
transform: translateX(0); transform: translateX(0);
@ -11125,6 +11125,7 @@ body {
display: none; display: none;
} }
} }
*/
.sb-nav-fixed .sb-topnav { .sb-nav-fixed .sb-topnav {
z-index: 1039; z-index: 1039;
} }