diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 47431d7..16838c9 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -3699,6 +3699,11 @@ class KhazanahController extends Controller public function cetakLaporanSAGHilang(Request $request) { + // return $request->all(); + // $request->validate([ + // 'mula_date' => 'required|date_format:Y-m-d', + // 'hingga_date' => 'required|date_format:Y-m-d|after_or_equal:mula_date', + // ]); $api_url = config('api.url'); $auth_user = Auth::user(); @@ -3706,20 +3711,33 @@ class KhazanahController extends Controller $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - if($request->datesaghilang == null){ - $date = $current->toDateString(); + // if($request->datesaghilang == null){ + // $date = $current->toDateString(); + // }else{ + // $split_date = explode('-', $request->datesaghilang); + // $date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + // } + + if($request->mula_date == null){ + $mula_date = $current->toDateString(); }else{ - $split_date = explode('-', $request->datesaghilang); - $date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + $split_date = explode('-', $request->mula_date); + $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } + if($request->hingga_date == null){ + $hingga_date = $current->toDateString(); + }else{ + $split_date = explode('-', $request->hingga_date); + $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + } - $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/polis/laporan/',['kodcaw' => $auth_user['cawangan'], 'alasan' => $request->sltalasan, 'tarikh' => $date])->json(); + $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/polis/laporan/',['kodcaw' => $auth_user['cawangan'], 'alasan' => $request->sltalasan, 'tarikh_mula' => $mula_date, 'tarikh_akhir' => $hingga_date])->json(); $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - return view('print.laporan_saghilang', compact('polis','cawangan_detail','date','tarikh_cetak','api_url')); + return view('print.laporan_saghilang', compact('polis','cawangan_detail','mula_date','hingga_date','tarikh_cetak','api_url')); } public function NotisLelong() diff --git a/resources/views/khazanah/laporan/saghilang.blade.php b/resources/views/khazanah/laporan/saghilang.blade.php index 5b2ccf4..3c224c4 100644 --- a/resources/views/khazanah/laporan/saghilang.blade.php +++ b/resources/views/khazanah/laporan/saghilang.blade.php @@ -13,61 +13,78 @@ -
-
-
-
-
-
-
-
- @csrf -
-
-
-
- Tarikh -
- - {{-- --}} -
- -
-
-
-
- Alasan -
- +
+
+
+
+
-
- -
+ + @csrf +
+ +
+
+
+ Mula +
+ + +
+ Hingga +
+ +
+
+ +
+
+
+ Alasan +
+ +
+
+ +
+ +
+
+ +
-
- - @endsection diff --git a/resources/views/print/laporan_saghilang.blade.php b/resources/views/print/laporan_saghilang.blade.php index 41dca23..898d01c 100644 --- a/resources/views/print/laporan_saghilang.blade.php +++ b/resources/views/print/laporan_saghilang.blade.php @@ -193,18 +193,18 @@ - TARIKH: - @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $date); + {{-- TARIKH: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate); - @endphp - {{-- HINGGA: - @php + @endphp + HINGGA: + @php $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate); - @endphp --}} + @endphp --}} @@ -227,15 +227,15 @@ @foreach($polis as $index=>$sh) {{ $loop->iteration}} - {{ $sh['norujukan'] }} - {{ $sh['komen1'] }} - {{ $sh['teller'] }} + {{ $sh['norujukan'] }} + {{ $sh['komen1'] }} + {{ $sh['teller'] }} @php $koddaerah = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/daerah/' .$sh['koddaerah'] )->json(); $kodnegeri = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/negeri/' .$sh['kodnegeri'] )->json(); @endphp - {{ $koddaerah['namadaerah'] }} - {{ $kodnegeri['negeri'] }} + {{ $koddaerah['namadaerah'] }} + {{ $kodnegeri['negeri'] }} @endforeach