add date on dashboard

app/Config/Filters.php

@@ -72,12 +72,15 @@ class Filters extends BaseFilters
         'before' => [
 			'role' => [ 'except' => [
 				'auth/*', 'setup', 'api/*'
-			]]
+			]],
             // 'honeypot',
             // 'csrf',
             // 'invalidchars',
         ],
         'after' => [
+			'toolbar' => [
+				'except' => ['api/*', 'prints/*', 'prints/result_test/*'],
+			],
             // 'honeypot',
             // 'secureheaders',
         ],

app/Config/Routes.php

@@ -23,7 +23,7 @@ $routes->get('/', 'Auth::redirects');
 $routes->get('changePass/', 'Auth::changePass');
 
 // API - Dashboard
-$routes->get('/api/dashboard/index', 'API_Dashboard::index');
+$routes->POST('/api/dashboard/index', 'API_Dashboard::index');
 
 // API - Tubes
 $routes->get('/tubes/collect/(:any)/(:any)', 'API_Tubes::collect/$1/$2');
@@ -80,6 +80,6 @@ $routes->group('fo', ['filter' => 'role:fo'], static function ($routes) {
 });
 
 // Printers
-$routes->get('/prints/single_sample/(:any)/(:any)', 'PrinterController::printSingleSampleBarcode/$1/$2');
+$routes->get('prints/single_sample/(:any)/(:any)', 'PrinterController::printSingleSampleBarcode/$1/$2');
-$routes->get('/prints/all_sample', 'PrinterController::printAllSampleBarcode');
+$routes->get('prints/all_sample', 'PrinterController::printAllSampleBarcode');
-$routes->get('/prints/result_test/(:any)', 'PrinterController::printResultTest/$1');
+$routes->get('prints/result_test/(:any)', 'PrinterController::printResultTest/$1');

app/Config/Toolbar.php

@@ -119,4 +119,5 @@ class Toolbar extends BaseConfig
     public array $watchedExtensions = [
         'php', 'css', 'js', 'html', 'svg', 'json', 'env',
     ];
+	
 }

app/Controllers/API_Dashboard.php

@@ -8,6 +8,8 @@ class API_Dashboard extends ResourceController {
     
 	public function index() {
 		$db = \Config\Database::connect();
+		$date1 = $this->request->getPost('date1');
+		$date2 = $this->request->getPost('date2');
 		$sql = "select sr.COLLECTIONDATE, sr.SP_ACCESSNUMBER, sr.HOSTORDERNUMBER, p.PATNUMBER, p.NAME,
 	TESTS=stuff(( select ', '+'('+T.SP_TESTCODE+')' from
 			( select T.SP_TESTCODE from SP_TESTS T 
@@ -49,7 +51,7 @@ end STATS
 	from SP_REQUESTS sr
 	left join PATIENTS p on p.PATID=sr.PATID
 	left join REQUESTS r on r.ACCESSNUMBER=sr.SP_ACCESSNUMBER
-	where sr.COLLECTIONDATE between '2024-11-13 00:00' and '2024-11-21 23:59'
+	where sr.COLLECTIONDATE between '$date1 00:00' and '$date2 23:59'
 	order by sr.COLLECTIONDATE desc";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();

app/Controllers/PrinterController.php

@@ -244,7 +244,7 @@ P1
 		$headPage = "
 		<div id='page'>
 			<div id='pagetop' style='height:0.01cm'> </div>
-			<img src='http://cmod.id/assets/img/padma-header.png' class='img' />
+			<img src='".base_url()."assets/img/padma-header.png' class='img' />
 	
 			<div id='dinfo'>
 	
@@ -415,7 +415,7 @@ P1
 	}
 
     public function printResultTest($access) {
-    
+		
         $data_mentah = [
             [
                 "chapter_eng" => "IMUNOLOGY 4 PANEL",

app/Views/admin/dashboard.php

@@ -7,6 +7,7 @@
 
 <div class="card border-0">
 	<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">
 				<thead>
@@ -37,13 +38,21 @@
 
 <?= $this->section('script') ?>
 <script>
+let curDate = new Date().toJSON().slice(0, 10);
+console.log(curDate);
+$('.date1').val(curDate);
+$('.date2').val(curDate);
+
 index();
 function index() {
 	let url = '<?=base_url('');?>api/dashboard/index';
+	date1 = $('.date1').val();
+	date2 = $('.date2').val();
 	$.ajax({
 		url: url,
-		method: 'GET',
+		method: 'POST',
-		success: function(response) {
+		data : {date1:date1, date2:date2},
+		success: function(response) {	
 			/*
 			// counter
 			*/
@@ -73,6 +82,7 @@ function index() {
 			/*
 			// table
 			*/
+			$("#myTable").DataTable().destroy();
 			$("#table-body").html("");
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {

app/Views/dashboard.php

@@ -41,7 +41,7 @@ function index() {
 	let url = '<?=base_url('');?>api/dashboard/index';
 	$.ajax({
 		url: url,
-		method: 'GET',
+		method: 'POST',
 		success: function(response) {
 			/*
 			// counter

app/Views/fo/dashboard.php

@@ -1,4 +1,4 @@
-<?= $this->extend('user/layout/main.php') ?>
+<?= $this->extend('admin/layout/main.php') ?>
 
 <?= $this->section('content') ?>
 
@@ -7,6 +7,7 @@
 
 <div class="card border-0">
 	<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">
 				<thead>
@@ -17,6 +18,7 @@
 					<th>Hosp</th>
 					<th>Test</th>
 					<th>Status</th>
+					<th></th>
 				</thead>
 				<tbody id="table-body">
 				</tbody>
@@ -36,13 +38,21 @@
 
 <?= $this->section('script') ?>
 <script>
+let curDate = new Date().toJSON().slice(0, 10);
+console.log(curDate);
+$('.date1').val(curDate);
+$('.date2').val(curDate);
+
 index();
 function index() {
 	let url = '<?=base_url('');?>api/dashboard/index';
+	date1 = $('.date1').val();
+	date2 = $('.date2').val();
 	$.ajax({
 		url: url,
-		method: 'GET',
+		method: 'POST',
-		success: function(response) {
+		data : {date1:date1, date2:date2},
+		success: function(response) {	
 			/*
 			// counter
 			*/
@@ -72,6 +82,7 @@ function index() {
 			/*
 			// table
 			*/
+			$("#myTable").DataTable().destroy();
 			$("#table-body").html("");
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
@@ -117,7 +128,8 @@ function index() {
 				}
 				let datarow = '<tr class="align-middle" ' + 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>" + '</tr>';					
+					"<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>';					
 				$("#table-body").append(datarow);
 			}
 			$('#myTable').DataTable();
@@ -164,10 +176,14 @@ function index() {
 }
 
 function viewAccess(access) {
-	let url = '<?=base_url();?>fo/dashboard/viewAccess/'+access;
+	let url = '<?=base_url();?>admin/dashboard/viewAccess/'+access;
 	$('.modal-content').load(url, function(){
 		$('#modal').modal('show');
 	});
 }
+function resultPdfAccess(access) {
+	let url = '<?=base_url();?>prints/result_test/'+access;
+	window.open(url, '_blank');
+}
 </script>
 <?= $this->endSection() ?>

app/Views/result_report.php

@@ -5,10 +5,8 @@
 	<link rel='stylesheet' href='<?=base_url();?>assets/css/pdf.css' />
 </head>
 
-<body style='-webkit-print-color-adjust:exact;'>
+<body style='-webkit-print-color-adjust:exact;'>	
-	
     <?php echo $data; ?>
-
 </body>
 
 </html>

app/Views/user/dashboard.php

@@ -1,4 +1,4 @@
-<?= $this->extend('user/layout/main.php') ?>
+<?= $this->extend('admin/layout/main.php') ?>
 
 <?= $this->section('content') ?>
 
@@ -7,6 +7,7 @@
 
 <div class="card border-0">
 	<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">
 				<thead>
@@ -17,6 +18,7 @@
 					<th>Hosp</th>
 					<th>Test</th>
 					<th>Status</th>
+					<th></th>
 				</thead>
 				<tbody id="table-body">
 				</tbody>
@@ -36,13 +38,21 @@
 
 <?= $this->section('script') ?>
 <script>
+let curDate = new Date().toJSON().slice(0, 10);
+console.log(curDate);
+$('.date1').val(curDate);
+$('.date2').val(curDate);
+
 index();
 function index() {
 	let url = '<?=base_url('');?>api/dashboard/index';
+	date1 = $('.date1').val();
+	date2 = $('.date2').val();
 	$.ajax({
 		url: url,
-		method: 'GET',
+		method: 'POST',
-		success: function(response) {
+		data : {date1:date1, date2:date2},
+		success: function(response) {	
 			/*
 			// counter
 			*/
@@ -72,6 +82,7 @@ function index() {
 			/*
 			// table
 			*/
+			$("#myTable").DataTable().destroy();
 			$("#table-body").html("");
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
@@ -117,7 +128,8 @@ function index() {
 				}
 				let datarow = '<tr class="align-middle" ' + 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>" + '</tr>';					
+					"<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>';					
 				$("#table-body").append(datarow);
 			}
 			$('#myTable').DataTable();
@@ -164,10 +176,14 @@ function index() {
 }
 
 function viewAccess(access) {
-	let url = '<?=base_url();?>user/dashboard/viewAccess/'+access;
+	let url = '<?=base_url();?>admin/dashboard/viewAccess/'+access;
 	$('.modal-content').load(url, function(){
 		$('#modal').modal('show');
 	});
 }
+function resultPdfAccess(access) {
+	let url = '<?=base_url();?>prints/result_test/'+access;
+	window.open(url, '_blank');
+}
 </script>
 <?= $this->endSection() ?>