diff --git a/app/Controllers/Dashboard.php b/app/Controllers/Dashboard.php
index 203c2a3..32c2ffa 100644
--- a/app/Controllers/Dashboard.php
+++ b/app/Controllers/Dashboard.php
@@ -52,8 +52,8 @@ end STATS
 	order by sr.COLLECTIONDATE desc";
 		$query = $db->query($sql);
 		$results = $query->getResultArray();
-		
 		$data['data'] = $results;
+		$data['count'] = array_count_values(array_column($results, 'STATS'));
         return $this->respond($data,200);
     }
 	
diff --git a/app/Controllers/Tubes.php b/app/Controllers/Tubes.php
index 2daf176..4b81fc9 100644
--- a/app/Controllers/Tubes.php
+++ b/app/Controllers/Tubes.php
@@ -7,6 +7,10 @@ class Tubes extends BaseController {
 	public function collect($access, $sample) {
 		$userid = session()->userid;
 		$db = \Config\Database::connect();
+		$sql = "if (not exists (select * from cmod.dbo.CM_TUBES where ACCESSNUMBER='$access' )) BEGIN
+				INSERT INTO cmod.dbo.CM_TUBES(ACCESSNUMBER, SAMPLETYPE, CREATEDATE) select SP_ACCESSNUMBER, SAMPLETYPE, GETDATE() from SP_TUBES where SP_ACCESSNUMBER='$access'
+			END";
+		$query = $db->query($sql);
 		$sql = "if (not exists (select * from cmod.dbo.CM_TUBES where ACCESSNUMBER='$access' AND SAMPLETYPE='$sample')) BEGIN
 				INSERT INTO cmod.dbo.CM_TUBES(ACCESSNUMBER, SAMPLETYPE, COLLECTIONDATE, COLL_USERID, COLLSTATUS, CREATEDATE) VALUES ('$access','$sample', GETDATE(), '$userid', 1, GETDATE())
 			END ELSE BEGIN
diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php
index b7b06eb..1f0ae98 100644
--- a/app/Views/dashboard.php
+++ b/app/Views/dashboard.php
@@ -90,15 +90,13 @@
 		<div class="table-responsive">
 			<table id="myTable" class="table">
 				<thead>
-					<tr >
-						<th>Order</th>
-						<th>MR</th>
-						<th>Patient</th>
-						<th>Request</th>
-						<th>Hosp</th>
-						<th>Test</th>
-						<th>Status</th>
-					</tr>
+					<th>Order</th>
+					<th>MR</th>
+					<th>Patient</th>
+					<th>Request</th>
+					<th>Hosp</th>
+					<th>Test</th>
+					<th>Status</th>
 				</thead>
 				<tbody id="table-body">
 				</tbody>
@@ -118,7 +116,6 @@
 
 <?= $this->section('script') ?>
 <script>
-var tb = $('#myTable').DataTable();
 index();
 function index() {
 	let url = '<?=base_url('');?>api/dashboard/index';
@@ -126,6 +123,8 @@ function index() {
 		url: url,
 		method: 'GET',
 		success: function(response) {
+			// counter jaka yang ngerjakan
+			// table
 			$("#table-body").html("");
 			var data = response['data'];
 			for (var i = 0; i < data.length; i++) {
@@ -136,20 +135,37 @@ function index() {
 				hon = data[i].HOSTORDERNUMBER;
 				tests = data[i].TESTS;
 				stats = data[i].STATS;
-				if(stats == 'Pend') { statsTD = "<td role='button' class='bg-orange text-center align-middle' onclick='viewAccess("+accessnumber+")'>Pending</td>"; }
-				else if(stats == 'PartColl') { statsTD = "<td role='button' class='bg-peach text-center align-middle' onclick='viewAccess("+accessnumber+")'>Partial Collected</td>"; }
-				else if(stats == 'PartRecv') { statsTD = "<td role='button' class='bg-soft-blue text-center align-middle' onclick='viewAccess("+accessnumber+")'>Partial Received</td>"; }
-				else if(stats == 'PartVal') { statsTD = "<td role='button' class='bg-soft-green text-center align-middle' onclick='viewAccess("+accessnumber+")'>Partial Validated</td>"; }
-				else if(stats == 'Coll') { statsTD = "<td role='button' class='bg-pink text-center align-middle' onclick='viewAccess("+accessnumber+")'>Collected</td>"; }
-				else if(stats == 'Recv') { statsTD = "<td role='button' class='bg-blue text-center align-middle' onclick='viewAccess("+accessnumber+")'>Received</td>"; }
-				else if(stats == 'Inc') { statsTD = "<td role='button' class='bg-soft-green text-center align-middle' onclick='viewAccess("+accessnumber+")'>Incomplete</td>"; }
-				else if(stats == 'Comp') { statsTD = "<td role='button' class='bg-green text-center align-middle' onclick='viewAccess("+accessnumber+")'>Validated</td>"; }
-				let datarow = '<tr class="align-middle">' + 
+				if(stats == 'Pend') { 
+					statsTD = "<td role='button' class='bg-orange text-center align-middle' onclick='viewAccess("+accessnumber+")'>Pending</td>"; 
+					datafilter = "data-filterrow='1'";
+				} else if(stats == 'PartColl') { 
+					statsTD = "<td role='button' class='bg-peach text-center align-middle' onclick='viewAccess("+accessnumber+")'>Partial Collected</td>"; 
+					datafilter = "data-filterrow='2'";
+				} else if(stats == 'Coll') { 
+					statsTD = "<td role='button' class='bg-pink text-center align-middle' onclick='viewAccess("+accessnumber+")'>Collected</td>"; 
+					datafilter = "data-filterrow='3'";
+				} else if(stats == 'PartRecv') { 
+					statsTD = "<td role='button' class='bg-soft-blue text-center align-middle' onclick='viewAccess("+accessnumber+")'>Partial Received</td>"; 
+					datafilter = "data-filterrow='4'";
+				} else if(stats == 'Recv') { 
+					statsTD = "<td role='button' class='bg-blue text-center align-middle' onclick='viewAccess("+accessnumber+")'>Received</td>"; 
+					datafilter = "data-filterrow='5'";
+				} else if(stats == 'Inc') { 
+					statsTD = "<td role='button' class='bg-soft-green text-center align-middle' onclick='viewAccess("+accessnumber+")'>Incomplete</td>"; 
+					datafilter = "data-filterrow='6'";
+				} else if(stats == 'PartVal') { 
+					statsTD = "<td role='button' class='bg-soft-green text-center align-middle' onclick='viewAccess("+accessnumber+")'>Partial Validated</td>"; 
+					datafilter = "data-filterrow='7'";
+				} else if(stats == 'Comp') { 
+					statsTD = "<td role='button' class='bg-green text-center align-middle' onclick='viewAccess("+accessnumber+")'>Validated</td>"; 
+					datafilter = "data-filterrow='8'";
+				}
+				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>' + 
 					statsTD + '</tr>';					
 				$("#table-body").append(datarow);
 			}
-			tb.ajax.reload();
+			$('#myTable').DataTable();
 		},
 		error: function(response) { console.log(response.responseJSON); }
 	});
diff --git a/app/Views/users_index.php b/app/Views/users_index.php
index 9925f6f..2c15fb9 100644
--- a/app/Views/users_index.php
+++ b/app/Views/users_index.php
@@ -79,8 +79,6 @@
 
 <?= $this->section('script') ?>
 <script>
-var tb = $('#mytable').DataTable();
-
 index();
 function index() {
 	let url = '<?=base_url('');?>api/users/index';
@@ -103,7 +101,7 @@ function index() {
 				'</tr>';					
 				$("#table-body").append(datarow);
 			}
-			tb.ajax.reload();
+			$('#myTable').DataTable();
 		},
 		error: function(response) { console.log(response.responseJSON); }
 	});