Merged in hotfix/tarikh-sag-hilang (pull request #194)
fix tarikh di laporan sag hilang Approved-by: nur amirah zulkipli
This commit is contained in:
Ain Izazi Aziz
@@ -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()
|
||||
|
||||
@@ -13,61 +13,78 @@
|
||||
</ol>
|
||||
</nav>
|
||||
|
||||
<div class="card-body text-center">
|
||||
<div class="row form-group">
|
||||
<div class="col-md-2">
|
||||
</div>
|
||||
<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 class="card-body text-center">
|
||||
<div class="row form-group">
|
||||
<div class="col-md-2">
|
||||
</div>
|
||||
<div class="col-md-10">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<input type="submit" class="btn btn-primary" id="submit_button" name="submit_button" value="Cetak">
|
||||
</div>
|
||||
<form action="{{ route('saghilang.laporancetak') }}" target="_blank" method="post">
|
||||
@csrf
|
||||
<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>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
var api_url = "<?php echo $api_url ?>";
|
||||
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
|
||||
<script type="text/javascript">
|
||||
var api_url = "<?php echo $api_url; ?>";
|
||||
var kodcaw = "<?php echo $cawangan_info['kodcaw']; ?>";
|
||||
|
||||
var tablecustomers = $('#myTable').DataTable({
|
||||
"ordering": false
|
||||
});
|
||||
var tablecustomers = $('#myTable').DataTable({
|
||||
"ordering": true
|
||||
});
|
||||
|
||||
$(document).ready( function () {
|
||||
$('#datesaghilang').datepicker({
|
||||
format: 'dd-mm-yyyy'
|
||||
});
|
||||
});
|
||||
$(document).ready(function() {
|
||||
$('#mula_date').datepicker({
|
||||
format: 'dd-mm-yyyy'
|
||||
});
|
||||
$('#hingga_date').datepicker({
|
||||
format: 'dd-mm-yyyy'
|
||||
});
|
||||
}
|
||||
);
|
||||
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
@@ -193,18 +193,18 @@
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="width:20px"> <b>TARIKH:</b></td>
|
||||
<td>@php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $date);
|
||||
{{-- <th style="width:20px"> <b>TARIKH:</b></th>
|
||||
<th>@php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
|
||||
$formattedweddingdate = $myDateTime->format('d-m-Y');
|
||||
echo($formattedweddingdate);
|
||||
@endphp</td>
|
||||
{{-- <td style="width:20px"> <b>HINGGA:</b></td>
|
||||
<td>@php
|
||||
@endphp</th>
|
||||
<th style="width:20px"> <b>HINGGA:</b></th>
|
||||
<th>@php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
|
||||
$formattedweddingdate = $myDateTime->format('d-m-Y');
|
||||
echo($formattedweddingdate);
|
||||
@endphp</td> --}}
|
||||
@endphp</th> --}}
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
@@ -227,15 +227,15 @@
|
||||
@foreach($polis as $index=>$sh)
|
||||
<tr>
|
||||
<td>{{ $loop->iteration}}</td>
|
||||
<td> {{ $sh['norujukan'] }}</th>
|
||||
<td> {{ $sh['komen1'] }}</th>
|
||||
<td> {{ $sh['teller'] }}</th>
|
||||
<td> {{ $sh['norujukan'] }}</td>
|
||||
<td> {{ $sh['komen1'] }}</td>
|
||||
<td> {{ $sh['teller'] }}</td>
|
||||
@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
|
||||
<td> {{ $koddaerah['namadaerah'] }}</th>
|
||||
<td> {{ $kodnegeri['negeri'] }}</th>
|
||||
<td> {{ $koddaerah['namadaerah'] }}</td>
|
||||
<td> {{ $kodnegeri['negeri'] }}</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user