From 934c90c412bfd0539f9e76e3768e6b33f1cea49c Mon Sep 17 00:00:00 2001
From: Dwi Swandhana <swandhana17@gmail.com>
Date: Thu, 5 Mar 2026 12:07:34 +0700
Subject: [PATCH] update

---
 .../app/Http/Controllers/DokterController.php | 32 ++++++++--------
 .../cetak/rekappenerimaansample.blade.php     | 12 ++++--
 htdocs/resources/views/pendaftaran.blade.php  | 37 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php
index 6e404ef3..de796d21 100644
--- a/htdocs/app/Http/Controllers/DokterController.php
+++ b/htdocs/app/Http/Controllers/DokterController.php
@@ -107,12 +107,8 @@ class DokterController extends Controller
 		if ($nmppdsjunior != ''){
 			$ppds		= $ppds.'<br />'.$nmppdsjunior;
 		}
-		if ($nmppdsmiddle2 != ''){
-			$ppds		= $ppds.'<br />'.$nmppdsmiddle2;
-		}
-		if ($nmppdsjunior2 != ''){
-			$ppds		= $ppds.'<br />'.$nmppdsjunior2;
-		}
+		
+		
 		$tandatangananalis		= '';
 		if ($analis){
 			$getttd 			= Xfiles::where('xmarking', 'LIKE', '%-Photo-'.$analis)->where('xjenis', 'Tandatangan')->first();
@@ -2265,25 +2261,28 @@ class DokterController extends Controller
 		$nofoto			= $arrnofoto[0];
 		if ($statuse == 'Pemeriksaan awal' OR $statuse == 'Penerimaan Sampel'){
 			Periksa::where('id', $id)->update([
-				'status' 	=> 'Pemeriksaan Sampel',
-				'tgldraft' 	=> date('Y-m-d H:i:s'),
-				'excutor' 	=> $idpemeriksa,
+				'status' 		=> 'Pemeriksaan Sampel',
+				'tgldraft' 		=> date('Y-m-d H:i:s'),
+				'excutor' 		=> $idpemeriksa,
+				'nmppdsmiddle2' => Session('nama')
 			]);
 			return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Success', 'message' => 'Status Updated']);
 			return back();
 		} else if ($statuse == 'Pemeriksaan Sampel'){
 			Periksa::where('id', $id)->update([
-				'status' 	=> 'Pemeriksaan awal',
-				'tgldraft' 	=> date('Y-m-d H:i:s'),
-				'excutor' 	=> $idpemeriksa,
+				'status' 		=> 'Pemeriksaan awal',
+				'tgldraft' 		=> date('Y-m-d H:i:s'),
+				'excutor' 		=> $idpemeriksa,
+				'nmppdsmiddle2' => Session('nama')
 			]);
 			return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Success', 'message' => 'Status Updated']);
 			return back();
 		} else {
 			Periksa::where('id', $id)->whereNull('status')->update([
-				'status' 	=> 'Pemeriksaan awal',
-				'tgldraft' 	=> date('Y-m-d H:i:s'),
-				'excutor' 	=> $idpemeriksa,
+				'status' 		=> 'Pemeriksaan awal',
+				'tgldraft' 		=> date('Y-m-d H:i:s'),
+				'excutor' 		=> $idpemeriksa,
+				'nmppdsmiddle2' => Session('nama')
 			]);
 			return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Success', 'message' => 'Status Updated']);
 			return back();
@@ -3228,7 +3227,8 @@ class DokterController extends Controller
 			$periksa        =   Periksa::where('id', $rid)->first();
 			if (isset($periksa->id)){
 				Periksa::where('id', $periksa->id)->whereNull('status')->update([
-					'status' 	=> 'Penerimaan Sampel',
+					'status' 		=> 'Penerimaan Sampel',
+					'nmppdsjunior2' => Session('nama')
 				]);
 				if ($kanan == ''){
 					$kolomttd 	= '<td><font color="grey">'.$nomor.'</font></td><td>&nbsp;</td>';
diff --git a/htdocs/resources/views/cetak/rekappenerimaansample.blade.php b/htdocs/resources/views/cetak/rekappenerimaansample.blade.php
index ee652a0f..3199319a 100644
--- a/htdocs/resources/views/cetak/rekappenerimaansample.blade.php
+++ b/htdocs/resources/views/cetak/rekappenerimaansample.blade.php
@@ -41,9 +41,15 @@
                                         <td>{{ $r['status'] }}</td>
                                         <td>{{ $r['tgldraft'] }}</td>
                                         <td>
-                                            @php 
-                                                $petugas = App\Models\User::where('id', $r['excutor'])->first();
-                                                echo $petugas ? $petugas->nama : '';
+                                            @php
+                                                $petugas = '';
+                                                if ($r['nmppdsmiddle2'] != '') {
+                                                    $petugas = $r['nmppdsmiddle2'];
+                                                }
+                                                if ($r['nmppdsjunior2'] != '') {
+                                                    $petugas = $petugas.' '.$r['nmppdsjunior2'];
+                                                }
+                                                echo $petugas;
                                             @endphp
                                         </td>
                                     </tr>
diff --git a/htdocs/resources/views/pendaftaran.blade.php b/htdocs/resources/views/pendaftaran.blade.php
index 4e277c42..f7f78340 100644
--- a/htdocs/resources/views/pendaftaran.blade.php
+++ b/htdocs/resources/views/pendaftaran.blade.php
@@ -300,9 +300,10 @@
 							<button type="button" class="btn btn-primary" id="btndaftarbaru"><i class="fa fa-plus"></i></button>
 						</div>
 						<div class="form-group col-lg-2">
-							<button type="button" class="btn btn-success" id="btntandaterima"><i class="fa fa-print"></i> Cetak Form Tanda Terima</button>
+							<button type="button" class="btn btn-info" id="btnkirimsample"><i class="fa fa-rocket"></i> Kirim Ke Analis</button>
 						</div>
-						<div class="form-group col-lg-3">
+						<div class="form-group col-lg-2">
+							<button type="button" class="btn btn-success" id="btntandaterima"><i class="fa fa-print"></i> Cetak Form Tanda Terima</button>
 						</div>
 						<div class="form-group col-lg-4 btn-group">
 						</div>
@@ -1383,6 +1384,38 @@
 				});
 			}
 		});
+		$("#btnkirimsample").click(function(){
+			var rowsgridcetak = $("#gridpemeriksaan").jqxGrid('selectedrowindexes');
+			var selectedRecords = new Array();
+			for (var m = 0; m < rowsgridcetak.length; m++) {
+				var row = $("#gridpemeriksaan").jqxGrid('getrowdata', rowsgridcetak[m]);
+				selectedRecords.push(row.id);
+			}
+			var token	= document.getElementById('token').value;
+			if (m == '0'){
+				swal({
+					title: 'Stop',
+					text: 'Please Select / Checkist First',
+					type: 'warning',
+				})
+			} else {
+				$("html, body").animate({ scrollTop: 0 }, "slow");
+				$.post('{{ route("exTandaTerima") }}', { set01: selectedRecords,  _token: token },
+				function(data){
+					$.toast({
+						heading		: 'Success',
+						text		: 'Sample has been sent to the laboratory',
+						position	: 'top-right',
+						loaderBg	: '#5ba035',
+						icon		: 'success',
+						hideAfter	: 15000,
+						stack		: 1
+					});
+					openedpage();
+					return false;
+				});
+			}
+		});
     });
 </script>
 @endpush