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

laporan backdate scan barcode (khazanah/penilai)

Browse Source
This commit is contained in:
Amirah22
2022-10-26 10:51:50 +08:00
parent ed45841c40
commit f16d9f44d3
10 changed files with 690 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+77 -9
View File
@@ -1978,7 +1978,8 @@ class MarhunController extends Controller
if($request->jenis == 'keluar')
{
$scan=ScanSemak::where('kodcaw','=',$kodcaw)
$scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw)
->join('users','scan_semak.khazanah_id','=','users.id')
->where([['scan_keluar','>=',$request->datemula],['scan_keluar','<=',$request->datehingga]])
->get();
@@ -1988,7 +1989,8 @@ class MarhunController extends Controller
else if($request->jenis == 'masuk'){
$scan=ScanSemak::where('kodcaw','=',$kodcaw)
$scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw)
->join('users','scan_semak.khazanah_id','=','users.id')
->where([['scan_masuk','>=',$request->datemula],['scan_masuk','<=',$request->datehingga]])
->get();
// dd($scan);
@@ -1997,15 +1999,81 @@ class MarhunController extends Controller
}
// else{
// $scan=ScanJual::where('kodcaw','=',$kodcaw)
// ->where([['serah_marhun','>=',$request->datemula],['serah_marhun','<=',$request->datehingga]])
// ->where('serahkpdpembida','=',1)
// ->get();
else if($request->jenis == 'pembida'){
$scan=ScanJual::where('scan_jual.kodcaw','=',$kodcaw)
->join('users','scan_jual.khazanah_id','=','users.id')
->where([['serah_marhun','>=',$request->datemula],['serah_marhun','<=',$request->datehingga]])
->where('serahkpdpembida','=',1)
->get();
// return view('pdf.laporanscanserah', compact('scan','auth_user','tarikh_cetak','cawangan'));
return view('pdf.laporanscanserahpembida', compact('scan','auth_user','tarikh_cetak','cawangan'));
// }
}
}
public function senaraiterimaserah(Request $request){
$auth_user = Auth::user();
$auth_user = ScanSemak::where('kodcaw','=',$auth_user['kodcaw'] )
->get();
return view('marhun.senaraiterimaserah', compact('auth_user','auth_user'));
}
public function cetakterimaserah(Request $request)
{
$auth_user = Auth::user();
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datemula == null){
$mula_date = '2017-01-01';
}else{
$split_date = explode('-', $request->datemula);
$mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
if($request->datehingga == null){
$hingga_date = $current->toDateString();
}else{
$split_date = explode('-', $request->datehingga);
$hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$kodcaw = $auth_user['kodcaw'];
$cawangan = Cawangan::where('caw_code','=',$kodcaw)
->first();
if($request->jenis == 'terima')
{
$scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw)
->join('users','scan_semak.penilai_id','=','users.id')
->where([['terima_marhun','>=',$request->datemula],['terima_marhun','<=',$request->datehingga]])
->get();
return view('pdf.laporanscanterima', compact('scan','auth_user','tarikh_cetak','cawangan'));
}
else if($request->jenis == 'serah'){
$scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw)
->join('users','scan_semak.penilai_id','=','users.id')
->where([['serah_marhun','>=',$request->datemula],['serah_marhun','<=',$request->datehingga]])
->get();
// dd($scan);
return view('pdf.laporanscanserah', compact('scan','auth_user','tarikh_cetak','cawangan'));
}
}
resources/views/includes/sidebar.blade.php
+6
View File
@@ -77,6 +77,12 @@
<li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
<a href="{{url('marhun/senarailelongmarhun')}}">Semakan Marhun</a>
</li>
<li class="{{ (request()->is('marhun/senarailelongmarhun') || request()->is('marhun/senarailelongmarhun/*')) ? 'active' : '' }}">
<a href="{{url('marhun/senarailelongmarhun')}}">Semakan Marhun</a>
</li>
<li class="{{ (request()->is('marhun/senaraiscanbarcode') )}}">
<a href="{{url('marhun/senaraiterimaserah')}}">Laporan Scan Barcode</a>
</li>
@endhasrole
@hasrole('pengurus-cawangan')
resources/views/marhun/senaraiscanbarcode.blade.php
+2 -2
View File
@@ -109,8 +109,8 @@
<input autocomplete="off" type="radio" name="jenis" id="option2" value="masuk" autocomplete="off">
<span>SAG Masuk</span>
{{-- <input autocomplete="off" type="radio" name="jenis" id="option3" value="serah" autocomplete="off">
<span>SAG Serah</span> --}}
<input autocomplete="off" type="radio" name="jenis" id="option3" value="pembida" autocomplete="off">
<span>SAG Serah Kepada Pembida</span>
</div>
</div>
resources/views/marhun/senaraiterimaserah.blade.php
+160
View File
@@ -0,0 +1,160 @@
@extends('layouts.app')
<style>
.radiostyle .radio-green {
background-color: #27ae60;
color:white;
box-shadow: 5px 10px #888888;
width:200px;
margin-right:5px;
transition: 0.5s ease;
}
.radiostyle .radio-red {
background-color: #e74c3c;
color:white;
width:200px;
margin-right:5px;
box-shadow: 5px 10px #888888;
transition: 0.5s ease;
}
.radiostyle .radio-yellow {
background-color: #3498db;
color:white;
width:200px;
margin-right:5px;
box-shadow: 5px 10px #888888;
transition: 0.5s ease;
}
.radiostyle .radio-green:hover {
box-shadow: 5px 5px #888888;
}
.radiostyle .radio-red:hover {
box-shadow: 5px 5px #888888;
}
.radiostyle .radio-yellow:hover {
box-shadow: 5px 5px #888888;
}
.radiostyle .radio-green input[type="radio"]:checked{
box-shadow: 5px 10px #888888;
}
.radiostyle .radio-yellow input[type="radio"]:checked{
box-shadow: 5px 10px #888888;
}
.radiostyle .radio-red input[type="radio"]:checked{
box-shadow: 5px 10px #888888;
}
</style>
@section('content')
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-body text-center">
<div class="row form-group">
<div class="col-md-4">
<h4> Laporan Terima Serah Marhun</h4>
</div>
<div class="col-md-10">
</div>
</div>
<div class="container">
<div class="row">
<div class="col-md-8 mx-auto">
<form action="{{ route('marhun.cetakterimaserah') }}" target="_blank" method="post">
@csrf
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Mula</span>
</div>
<input type="date" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datemula" name="datemula">
<div class="input-group-prepend ml-2">
<span class="input-group-text" id="basic-addon1">Hingga</span>
</div>
<input type="date" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datehingga" name="datehingga">
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
</div>
</div>
</div>
<br><br>
<div class="row">
<div class="col-md-12 col-sm-12 mb-4">
<input autocomplete="off" type="radio" name="jenis" id="option1" value="terima" autocomplete="off" checked>
<span>SAG Terima</span>
<input autocomplete="off" type="radio" name="jenis" id="option2" value="serah" autocomplete="off">
<span>SAG Serah</span>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
<script type="text/javascript">
var tablecustomers = $('#myTable').DataTable({
"ordering": false
});
$(document).ready( function () {
var today = new Date();
var dateObject = '';
$('#datemula').datepicker({
maxViewMode:1,
format: 'dd-mm-yyyy',
autoclose:true,
endDate: "today",
maxDate: today
});
$('#datehingga').datepicker({
maxViewMode:1,
format: 'dd-mm-yyyy',
autoclose:true,
endDate: "today",
maxDate: today
});
$('#datemula').change(function() {
$('#datehingga').datepicker('option', 'maxDate', new Date($(this).val()));
console.log($(this).val());
});
});
</script>
@endsection
resources/views/pdf/laporanscankeluar.blade.php
+6 -1
View File
@@ -109,6 +109,7 @@ tr:nth-child(even) {
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>Nama Khazanah</th>
<th>Tarikh/Masa Scan Keluar</th>
</tr>
</thead>
@@ -117,7 +118,11 @@ tr:nth-child(even) {
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $keluar['norujukan'] }}</td>
<td>{{ $keluar['scan_keluar'] }}</td>
<td>{{ $keluar['name'] }}</td>
<td>@php $datekeluar = DateTime::createFromFormat('Y-m-d H:i:s', $keluar['scan_keluar']);
$t_keluar = $datekeluar->format('d-m-Y h:i:s');
echo($t_keluar);
@endphp</td>
</tr>
resources/views/pdf/laporanscanmasuk.blade.php
+7 -1
View File
@@ -109,6 +109,7 @@ tr:nth-child(even) {
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>Nama Khazanah</th>
<th>Tarikh/Masa Scan Masuk</th>
</tr>
</thead>
@@ -117,7 +118,12 @@ tr:nth-child(even) {
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $masuk['norujukan'] }}</td>
<td>{{ $masuk['scan_masuk'] }}</td>
<td>{{ $masuk['name']}} </td>
<td>@php $datemasuk = DateTime::createFromFormat('Y-m-d H:i:s', $masuk['scan_masuk']);
$t_masuk = $datemasuk->format('d-m-Y h:i:s');
echo($t_masuk);
@endphp</td>
</tr>
resources/views/pdf/laporanscanserah.blade.php
+141
View File
@@ -0,0 +1,141 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<style>
#sim {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size:10px;
border-collapse: collapse;
width: 100%;
}
#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
border: 0px solid;
padding: 1px;
text-align: left;
}
#sim tr:nth-child(even){}
#sim tr:hover {}
#sim th {
text-align: left;
border: 0px solid;
table-layout:auto;
color: black;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
* {
box-sizing: border-box;
}
.row {
margin-left:-5px;
margin-right:-5px;
}
.column {
float: left;
width: 100%;
padding: 5px;
}
/* Clearfix (clear floats) */
.row::after {
content: "";
clear: both;
display: table;
}
table {
border-collapse: collapse;
border-spacing: 0;
width: 200%;
border: 0px solid #ddd;
}
td {
text-align: left;
padding: 16px;
}
th{
text-align: left;
padding: 16px;
background-color:gainsboro;
}
tr:nth-child(even) {
background-color: #f2f2f2;
}
</style>
<body>
<table width="100%" border="0" id="sim">
<tr>
<td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
</tr>
<tr>
<td colspan="2"><u><b>LAPORAN SCAN SERAH MARHUN</b></u></td>
</tr>
</table>
<table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
<thead>
<br>
<tr>
<td>Cawangan : {{$cawangan->caw_name}}
<td>Tarikh Cetak:@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
</thead>
</table>
<br>
<table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
<thead>
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>Nama Penilai </th>
<th>Tarikh/Masa Scan Serah</th>
</tr>
</thead>
@foreach ($scan as $serah)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $serah['norujukan'] }}</td>
<td>{{ $serah['name']}} </td>
<td>@php $dateserah = DateTime::createFromFormat('Y-m-d H:i:s', $serah['serah_marhun']);
$t_serah = $dateserah->format('d-m-Y h:i:s');
echo($t_serah);
@endphp</td>
</tr>
@endforeach
</table>
</tbody>
resources/views/pdf/laporanscanserahpembida.blade.php
+147
View File
@@ -0,0 +1,147 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<style>
#sim {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size:10px;
border-collapse: collapse;
width: 100%;
}
#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
border: 0px solid;
padding: 1px;
text-align: left;
}
#sim tr:nth-child(even){}
#sim tr:hover {}
#sim th {
text-align: left;
border: 0px solid;
table-layout:auto;
color: black;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
* {
box-sizing: border-box;
}
.row {
margin-left:-5px;
margin-right:-5px;
}
.column {
float: left;
width: 100%;
padding: 5px;
}
/* Clearfix (clear floats) */
.row::after {
content: "";
clear: both;
display: table;
}
table {
border-collapse: collapse;
border-spacing: 0;
width: 200%;
border: 0px solid #ddd;
}
td {
text-align: left;
padding: 16px;
}
th{
text-align: left;
padding: 16px;
background-color:gainsboro;
}
tr:nth-child(even) {
background-color: #f2f2f2;
}
</style>
<body>
<table width="100%" border="0" id="sim">
<tr>
<td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
</tr>
<tr>
<td colspan="2"><u><b>LAPORAN SERAH MARHUN KEPADA PEMBIDA</b></u></td>
</tr>
</table>
<table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
<thead>
<br>
<tr>
<td>Cawangan : {{$cawangan->caw_name}}
<td>Tarikh Cetak:@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
</thead>
</table>
<br>
<table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
<thead>
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>Nama Khazanah </th>
<th>Tarikh/Masa Scan Serah</th>
<th>Status Serah </th>
</tr>
</thead>
@foreach ($scan as $serah)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $serah['norujukan'] }}</td>
<td>{{ $serah['name']}} </td>
<td>@php $dateserah = DateTime::createFromFormat('Y-m-d H:i:s', $serah['serah_marhun']);
$t_serah = $dateserah->format('d-m-Y h:i:s');
echo($t_serah);
@endphp</td>
@if($serah['serahkpdpembida'] == 1)
<td>Serah Kepada Pembida</td>
@else
<td>Belum Serah</td>
@endif
</tr>
@endforeach
</table>
</tbody>
resources/views/pdf/laporanscanterima.blade.php
+141
View File
@@ -0,0 +1,141 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<style>
#sim {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size:10px;
border-collapse: collapse;
width: 100%;
}
#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
border: 0px solid;
padding: 1px;
text-align: left;
}
#sim tr:nth-child(even){}
#sim tr:hover {}
#sim th {
text-align: left;
border: 0px solid;
table-layout:auto;
color: black;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
* {
box-sizing: border-box;
}
.row {
margin-left:-5px;
margin-right:-5px;
}
.column {
float: left;
width: 100%;
padding: 5px;
}
/* Clearfix (clear floats) */
.row::after {
content: "";
clear: both;
display: table;
}
table {
border-collapse: collapse;
border-spacing: 0;
width: 200%;
border: 0px solid #ddd;
}
td {
text-align: left;
padding: 16px;
}
th{
text-align: left;
padding: 16px;
background-color:gainsboro;
}
tr:nth-child(even) {
background-color: #f2f2f2;
}
</style>
<body>
<table width="100%" border="0" id="sim">
<tr>
<td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
</tr>
<tr>
<td colspan="2"><u><b>LAPORAN SCAN TERIMA MARHUN</b></u></td>
</tr>
</table>
<table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
<thead>
<br>
<tr>
<td>Cawangan : {{$cawangan->caw_name}}
<td>Tarikh Cetak:@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
</thead>
</table>
<br>
<table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
<thead>
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>Nama Penilai</th>
<th>Tarikh/Masa Scan Terima</th>
</tr>
</thead>
@foreach ($scan as $terima)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $terima['norujukan'] }}</td>
<td>{{ $terima['name']}} </td>
<td>@php $dateterima = DateTime::createFromFormat('Y-m-d H:i:s', $terima['terima_marhun']);
$t_terima = $dateterima->format('d-m-Y h:i:s');
echo($t_terima);
@endphp</td>
</tr>
@endforeach
</table>
</tbody>
routes/web.php
+3
View File
@@ -281,6 +281,9 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
Route::post('/deletephotomarhun',['as'=>'marhun.deletephotomarhun','uses'=>'MarhunController@deletePhotoMarhun']);
Route::post('/updatephotomarhun',['as'=>'marhun.updatephotomarhun','uses'=>'MarhunController@updatePhotoMarhun']);
Route::get('/cetakterimaserahmarhun/{lelong_id}',['as'=>'marhun.cetakterimaserahmarhun','uses'=>'MarhunController@cetakterimaserahmarhun']);
Route::get('/senaraiterimaserah',['as'=>'marhun.senaraiterimaserah','uses'=>'MarhunController@senaraiterimaserah']);
Route::post('/cetakterimaserah',['as'=>'marhun.cetakterimaserah','uses'=>'MarhunController@cetakterimaserah']);
//khazanah
Route::get('/cetakkeluarscanbarcode/{lelong_id}',['as'=>'marhun.cetakkeluarscanbarcode','uses'=>'MarhunController@cetakkeluarscanbarcode']);