KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merged in hotfix/tarikh-sag-hilang (pull request #194)

Browse Source 
fix tarikh di laporan sag hilang

Approved-by: nur amirah zulkipli
This commit is contained in:
Ain Izazi Aziz
2024-10-14 07:03:20 +00:00
committed by nur amirah zulkipli
parent a5a4246b53 91c7fa5934
commit d892a9bb3b
3 changed files with 99 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+24 -6
View File
@@ -3699,6 +3699,11 @@ class KhazanahController extends Controller
public function cetakLaporanSAGHilang(Request $request) 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'); $api_url = config('api.url');
$auth_user = Auth::user(); $auth_user = Auth::user();
@@ -3706,20 +3711,33 @@ class KhazanahController extends Controller
$current = new Carbon(); $current = new Carbon();
$tarikh_cetak = $current->toDateString(); $tarikh_cetak = $current->toDateString();
if($request->datesaghilang == null){ // if($request->datesaghilang == null){
$date = $current->toDateString(); // $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{ }else{
$split_date = explode('-', $request->datesaghilang); $split_date = explode('-', $request->mula_date);
$date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; $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 = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0]; $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() public function NotisLelong()
resources/views/khazanah/laporan/saghilang.blade.php
+63 -46
View File
@@ -13,61 +13,78 @@
</ol> </ol>
</nav> </nav>
<div class="card-body text-center"> <div class="card-body text-center">
<div class="row form-group"> <div class="row form-group">
<div class="col-md-2"> <div class="col-md-2">
</div> </div>
<div class="col-md-10"> <div class="col-md-10">
</div>
</div>
<form action="{{ route('saghilang.laporancetak') }}" target="_blank" method="post">
@csrf
<div class="row">
<div class="col-md-4">
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datesaghilang" name="datesaghilang" aria-describedby="basic-addon1">
{{-- <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak"> --}}
</div>
</div>
<div class="col-md-5">
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Alasan</span>
</div>
<select class="form-control" name="sltalasan">
@foreach($loopalasan as $index=>$lp)
<option value="{{ $lp['alasan'] }}">{{ $lp['alasan'] }}</option>
@endforeach
</select>
</div> </div>
</div> </div>
<div class="col-md-2"> <form action="{{ route('saghilang.laporancetak') }}" target="_blank" method="post">
<input type="submit" class="btn btn-primary" id="submit_button" name="submit_button" value="Cetak"> @csrf
</div> <div class="row">
<div class="col-md-6">
<div class="input-group mb-3">
<div class="input-group-prepend ml-3">
<span class="input-group-text" id="basic-addon1">Mula</span>
</div>
<input type="text" class="form-control col-4" placeholder="Pilih Tarikh"
aria-label="Tarikh" id="mula_date" name="mula_date"
aria-describedby="basic-addon1">
<div class="input-group-prepend ml-2">
<span class="input-group-text" id="basic-addon1">Hingga</span>
</div>
<input type="type" class="form-control col-4" placeholder="Pilih Tarikh"
aria-label="Tarikh" id="hingga_date" name="hingga_date"
aria-describedby="basic-addon1">
</div>
</div>
<div class="col-md-4">
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Alasan</span>
</div>
<select class="form-control" name="sltalasan">
@foreach($loopalasan as $index=>$lp)
<option value="{{ $lp['alasan'] }}">{{ $lp['alasan'] }}</option>
@endforeach
</select>
</div>
</div>
<div class="col-md-2">
<input type="submit" class="btn btn-primary" id="submit_button" name="submit_button"
value="Cetak">
</div>
</div>
</form>
</div> </div>
</form>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> <script type="text/javascript">
<script type="text/javascript"> var api_url = "<?php echo $api_url; ?>";
var api_url = "<?php echo $api_url ?>"; var kodcaw = "<?php echo $cawangan_info['kodcaw']; ?>";
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
var tablecustomers = $('#myTable').DataTable({ var tablecustomers = $('#myTable').DataTable({
"ordering": false "ordering": true
}); });
$(document).ready( function () { $(document).ready(function() {
$('#datesaghilang').datepicker({ $('#mula_date').datepicker({
format: 'dd-mm-yyyy' format: 'dd-mm-yyyy'
}); });
}); $('#hingga_date').datepicker({
format: 'dd-mm-yyyy'
});
}
);
</script> </script>
@endsection @endsection
resources/views/print/laporan_saghilang.blade.php
+12 -12
View File
@@ -193,18 +193,18 @@
<td> </td> <td> </td>
</tr> </tr>
<tr> <tr>
<td style="width:20px"> <b>TARIKH:</b></td> {{-- <th style="width:20px"> <b>TARIKH:</b></th>
<td>@php <th>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $date); $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
$formattedweddingdate = $myDateTime->format('d-m-Y'); $formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate); echo($formattedweddingdate);
@endphp</td> @endphp</th>
{{-- <td style="width:20px"> <b>HINGGA:</b></td> <th style="width:20px"> <b>HINGGA:</b></th>
<td>@php <th>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y'); $formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate); echo($formattedweddingdate);
@endphp</td> --}} @endphp</th> --}}
<td> </td> <td> </td>
<td> </td> <td> </td>
<td> </td> <td> </td>
@@ -227,15 +227,15 @@
@foreach($polis as $index=>$sh) @foreach($polis as $index=>$sh)
<tr> <tr>
<td>{{ $loop->iteration}}</td> <td>{{ $loop->iteration}}</td>
<td> {{ $sh['norujukan'] }}</th> <td> {{ $sh['norujukan'] }}</td>
<td> {{ $sh['komen1'] }}</th> <td> {{ $sh['komen1'] }}</td>
<td> {{ $sh['teller'] }}</th> <td> {{ $sh['teller'] }}</td>
@php @php
$koddaerah = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/daerah/' .$sh['koddaerah'] )->json(); $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(); $kodnegeri = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/negeri/' .$sh['kodnegeri'] )->json();
@endphp @endphp
<td> {{ $koddaerah['namadaerah'] }}</th> <td> {{ $koddaerah['namadaerah'] }}</td>
<td> {{ $kodnegeri['negeri'] }}</th> <td> {{ $kodnegeri['negeri'] }}</td>
</tr> </tr>
@endforeach @endforeach
</table> </table>