perbaikan semua dashboard admin_user_fo

This commit is contained in:
mikael-zakaria 2024-12-07 17:00:21 +08:00
parent 86046bdff7
commit 55762ca7fb
5 changed files with 105 additions and 52 deletions

View File

@ -12,9 +12,21 @@
</div>
<div class="card border-0">
<!-- div.card-head -->
<div class="card-body">
Date : <input class='date1' type='date' value=''> - <input class='date2' type='date'> <button onclick='index()'>search</button> <br/>
<div class="table-responsive">
<div class="row d-flex align-items-center">
<div class="col col-auto">
<b>Date</b>&nbsp; &nbsp;:&nbsp; &nbsp;<input class='date1' type='date' value=''> - <input class='date2' type='date'>
</div>
<div class="col col-auto">
<button class='btn btn-sm btn-primary py-1 px-2 d-flex align-items-center' onclick='index()'><i class="bi bi-calendar2-event"></i>&nbsp;&nbsp;Search</button>
</div>
</div>
<div class="table-responsive mt-3">
<table id="myTable" class="table table-hover">
<thead>
<th>Order</th>
@ -45,7 +57,6 @@
<?= $this->section('script') ?>
<script>
let curDate = new Date().toJSON().slice(0, 10);
console.log(curDate);
$('.date1').val(curDate);
$('.date2').val(curDate);
@ -78,7 +89,7 @@ function index() {
'<div class="col-3 text-start '+statcolor[index]+'"> <h5 class="m-0"><i class="bi '+staticon[index]+'"></i></h5> </div>' +
'<div class="col-9 text-end pe-3"> <h2 class="m-0 custom-card-title">'+count[item]+'</h2> </div>' +
'</div>' +
'<hr class="text-orange">' +
"<hr class='"+statcolor[index]+"'>" +
'<h3 class="custom-card-text m-0 p-0 '+statcolor[index]+'">'+ stattext[index] +'</h3>' +
'</div>' +
'</div>';

View File

@ -2,14 +2,32 @@
<?= $this->section('content') ?>
<style>
#myTable {
cursor: pointer;
}
</style>
<div id='stats' class="d-flex justify-content-between p-0">
</div>
<div class="card border-0">
<!-- div.card-head -->
<div class="card-body">
Date : <input class='date1' type='date' value=''> - <input class='date2' type='date'> <button onclick='index()'>search</button> <br/>
<div class="table-responsive">
<table id="myTable" class="table">
<div class="row d-flex align-items-center">
<div class="col col-auto">
<b>Date</b>&nbsp; &nbsp;:&nbsp; &nbsp;<input class='date1' type='date' value=''> - <input class='date2' type='date'>
</div>
<div class="col col-auto">
<button class='btn btn-sm btn-primary py-1 px-2 d-flex align-items-center' onclick='index()'><i class="bi bi-calendar2-event"></i>&nbsp;&nbsp;Search</button>
</div>
</div>
<div class="table-responsive mt-3">
<table id="myTable" class="table table-hover">
<thead>
<th>Order</th>
<th>MR</th>
@ -39,7 +57,6 @@
<?= $this->section('script') ?>
<script>
let curDate = new Date().toJSON().slice(0, 10);
console.log(curDate);
$('.date1').val(curDate);
$('.date2').val(curDate);
@ -72,7 +89,7 @@ function index() {
'<div class="col-3 text-start '+statcolor[index]+'"> <h5 class="m-0"><i class="bi '+staticon[index]+'"></i></h5> </div>' +
'<div class="col-9 text-end pe-3"> <h2 class="m-0 custom-card-title">'+count[item]+'</h2> </div>' +
'</div>' +
'<hr class="text-orange">' +
"<hr class='"+statcolor[index]+"'>" +
'<h3 class="custom-card-text m-0 p-0 '+statcolor[index]+'">'+ stattext[index] +'</h3>' +
'</div>' +
'</div>';
@ -126,10 +143,10 @@ function index() {
datafilter = "data-filterrow='7'";
stattext = 'Validated';
}
let datarow = '<tr class="align-middle" ' + 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 role='button' class='"+bgcolor+" text-center align-middle' onclick='viewAccess("+accessnumber+")'>"+stattext+"</td>" +
"<td role='button' class='text-center align-middle' onclick='resultPdfAccess("+accessnumber+")'> <i class='bi bi-filetype-pdf'></i> </td>" +'</tr>';
"<td role='button' class='"+bgcolor+" text-center align-middle'>"+stattext+"</td>" +
"<td role='button' class='text-center align-middle' onclick='resultPdfAccess("+accessnumber+")'> <h4 class='p-0 m-0'><i class='bi bi-filetype-pdf'></i></h4> </td>" +'</tr>';
$("#table-body").append(datarow);
}
$('#myTable').DataTable();

View File

@ -25,6 +25,19 @@ $name = $row['NAME'];
<div class="card-title"><h3>Sample List</h3></div>
<table class='table'>
<tr> <th class='text-center'>Coll.</th> <th class='text-center'>Recv.</th> <th>Sample Name</th> <th>Action</th> <th>Comment</th> </tr>
<tr>
<td></td> <td></td> <td>All</td>
<td>
<button type='button' class='btn btn-dark m-0 px-2 py-1' onclick='printAllLabel()'> <h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6> </button>
<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collectAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Coll.</h6></button>
<!-- <button class='badge bg-black text-white m-0 px-2 py-1' onclick='uncollectAll(<?=$accessnumber;?>)'>un-collect</button> -->
<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button>
</td>
</tr>
<tr>
<td></td> <td></td> <td>Collection</td>
<td><button type='button' class='btn btn-dark m-0 px-2 py-1'><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
</tr>
<?php
foreach($data as $row) {
$sampletype = $row['SAMPLETYPE'];
@ -45,24 +58,16 @@ $name = $row['NAME'];
}
echo "<td>$sampletext</td>";
echo "<td>
<button class='badge text-bg-dark' onclick='printSingleLabel($sampletype, $accessnumber)'><i class='bi bi-printer'></i></button>
<button class='badge text-bg-success' onclick='collect($sampletype, $accessnumber)'>Coll.</button>
<button type='button' class='btn btn-dark m-0 px-2 py-1' onclick='printSingleLabel($sampletype, $accessnumber)'><h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6></button>
<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Coll.</h6></button>
<button type='button' class='btn btn-warning m-0 px-2 py-1' onclick='uncollect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Coll.</h6></button>
<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceive($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Rec.</h6></button>
</td> ";
echo "<td id='comment$sampletype'>$comment <i class='bi bi-pencil-square' role='button' onclick='comment($sampletype, $accessnumber, \"$sampletext\", \"$comment\")'></i></td>";
echo "<td id='comment$sampletype'>$comment <h6 class='p-0 m-0'><i class='bi bi-pencil-square' role='button' onclick='comment($sampletype, $accessnumber, \"$sampletext\", \"$comment\")'></i></h6></td>";
echo " </tr>";
}
?>
<tr>
<td></td> <td></td> <td>Collection</td>
<td> <button class='badge badge-dark'><i class='bi bi-printer'></i></button> </td>
</tr>
<tr>
<td></td> <td></td> <td>All</td>
<td>
<button class='badge text-bg-dark' onclick='printAllLabel()'><i class='bi bi-printer'></i></button>
<button class='badge text-bg-success' onclick='collectAll(<?=$accessnumber;?>)'>Coll.</button>
</td>
</tr>
</table>
</div>
</div>
@ -112,6 +117,7 @@ function printAllLabel() {
console.error('Error:', error);
});
}
function collect(sample, access) {
sample = sample.toString().padStart(3,'0');
const url = '<?=base_url();?>tubes/collect/'+access+'/'+sample;

View File

@ -2,14 +2,32 @@
<?= $this->section('content') ?>
<style>
#myTable {
cursor: pointer;
}
</style>
<div id='stats' class="d-flex justify-content-between p-0">
</div>
<div class="card border-0">
<!-- div.card-head -->
<div class="card-body">
Date : <input class='date1' type='date' value=''> - <input class='date2' type='date'> <button onclick='index()'>search</button> <br/>
<div class="table-responsive">
<table id="myTable" class="table">
<div class="row d-flex align-items-center">
<div class="col col-auto">
<b>Date</b>&nbsp; &nbsp;:&nbsp; &nbsp;<input class='date1' type='date' value=''> - <input class='date2' type='date'>
</div>
<div class="col col-auto">
<button class='btn btn-sm btn-primary py-1 px-2 d-flex align-items-center' onclick='index()'><i class="bi bi-calendar2-event"></i>&nbsp;&nbsp;Search</button>
</div>
</div>
<div class="table-responsive mt-3">
<table id="myTable" class="table table-hover">
<thead>
<th>Order</th>
<th>MR</th>
@ -39,7 +57,6 @@
<?= $this->section('script') ?>
<script>
let curDate = new Date().toJSON().slice(0, 10);
console.log(curDate);
$('.date1').val(curDate);
$('.date2').val(curDate);
@ -72,7 +89,7 @@ function index() {
'<div class="col-3 text-start '+statcolor[index]+'"> <h5 class="m-0"><i class="bi '+staticon[index]+'"></i></h5> </div>' +
'<div class="col-9 text-end pe-3"> <h2 class="m-0 custom-card-title">'+count[item]+'</h2> </div>' +
'</div>' +
'<hr class="text-orange">' +
"<hr class='"+statcolor[index]+"'>" +
'<h3 class="custom-card-text m-0 p-0 '+statcolor[index]+'">'+ stattext[index] +'</h3>' +
'</div>' +
'</div>';
@ -126,10 +143,10 @@ function index() {
datafilter = "data-filterrow='7'";
stattext = 'Validated';
}
let datarow = '<tr class="align-middle" ' + 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 role='button' class='"+bgcolor+" text-center align-middle' onclick='viewAccess("+accessnumber+")'>"+stattext+"</td>" +
"<td role='button' class='text-center align-middle' onclick='resultPdfAccess("+accessnumber+")'> <i class='bi bi-filetype-pdf'></i> </td>" +'</tr>';
"<td role='button' class='"+bgcolor+" text-center align-middle'>"+stattext+"</td>" +
"<td role='button' class='text-center align-middle' onclick='resultPdfAccess("+accessnumber+")'> <h4 class='p-0 m-0'><i class='bi bi-filetype-pdf'></i></h4> </td>" +'</tr>';
$("#table-body").append(datarow);
}
$('#myTable').DataTable();

View File

@ -25,6 +25,19 @@ $name = $row['NAME'];
<div class="card-title"><h3>Sample List</h3></div>
<table class='table'>
<tr> <th class='text-center'>Coll.</th> <th class='text-center'>Recv.</th> <th>Sample Name</th> <th>Action</th> <th>Comment</th> </tr>
<tr>
<td></td> <td></td> <td>All</td>
<td>
<button type='button' class='btn btn-dark m-0 px-2 py-1' onclick='printAllLabel()'> <h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6> </button>
<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collectAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Coll.</h6></button>
<!-- <button class='badge bg-black text-white m-0 px-2 py-1' onclick='uncollectAll(<?=$accessnumber;?>)'>un-collect</button> -->
<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceiveAll(<?=$accessnumber;?>)'><h6 class='p-0 m-0'>Un-Rec.</h6></button>
</td>
</tr>
<tr>
<td></td> <td></td> <td>Collection</td>
<td><button type='button' class='btn btn-dark m-0 px-2 py-1'><h6 class='p-0 m-0'> <i class='bi bi-printer'></i></h6></button></td>
</tr>
<?php
foreach($data as $row) {
$sampletype = $row['SAMPLETYPE'];
@ -45,28 +58,16 @@ $name = $row['NAME'];
}
echo "<td>$sampletext</td>";
echo "<td>
<button class='badge text-bg-dark' onclick='printSingleLabel($sampletype, $accessnumber)'><i class='bi bi-printer'></i></button>
<button class='badge text-bg-success' onclick='collect($sampletype, $accessnumber)'>Coll.</button>
<button class='badge text-bg-warning' onclick='uncollect($sampletype, $accessnumber)'>Un-Coll.</button>
<button class='badge text-bg-primary' onclick='unreceive($sampletype, $accessnumber)'>Un-Rec.</button>
<button type='button' class='btn btn-dark m-0 px-2 py-1' onclick='printSingleLabel($sampletype, $accessnumber)'><h6 class='p-0 m-0'><i class='bi bi-printer'></i></h6></button>
<button type='button' class='btn btn-success m-0 px-2 py-1' onclick='collect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Coll.</h6></button>
<button type='button' class='btn btn-warning m-0 px-2 py-1' onclick='uncollect($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Coll.</h6></button>
<button type='button' class='btn btn-primary m-0 px-2 py-1' onclick='unreceive($sampletype, $accessnumber)'><h6 class='p-0 m-0'>Un-Rec.</h6></button>
</td> ";
echo "<td id='comment$sampletype'>$comment <i class='bi bi-pencil-square' role='button' onclick='comment($sampletype, $accessnumber, \"$sampletext\", \"$comment\")'></i></td>";
echo "<td id='comment$sampletype'>$comment <h6 class='p-0 m-0'><i class='bi bi-pencil-square' role='button' onclick='comment($sampletype, $accessnumber, \"$sampletext\", \"$comment\")'></i></h6></td>";
echo " </tr>";
}
?>
<tr>
<td></td> <td></td> <td>Collection</td>
<td> <button class='badge badge-dark'><i class='bi bi-printer'></i></button> </td>
</tr>
<tr>
<td></td> <td></td> <td>All</td>
<td>
<button class='badge text-bg-dark' onclick='printAllLabel()'><i class='bi bi-printer'></i></button>
<button class='badge text-bg-success' onclick='collectAll(<?=$accessnumber;?>)'>Coll.</button>
<!-- <button class='badge bg-black text-white' onclick='uncollectAll(<?=$accessnumber;?>)'>un-collect</button> -->
<button class='badge text-bg-primary' onclick='unreceiveAll(<?=$accessnumber;?>)'>Un-Rec.</button>
</td>
</tr>
</table>
</div>
</div>
@ -116,6 +117,7 @@ function printAllLabel() {
console.error('Error:', error);
});
}
function collect(sample, access) {
sample = sample.toString().padStart(3,'0');
const url = '<?=base_url();?>tubes/collect/'+access+'/'+sample;