Merge branch 'atie' into 'main'

update tab dlm tangguh lelong operasi

See merge request online-sistem1/lelong!416
This commit is contained in:
Nur Izzati Zulkifli
2023-03-15 06:36:29 +00:00
2 changed files with 120 additions and 42 deletions
@@ -913,6 +913,8 @@ class TangguhLelongController extends Controller
public function senaraitlhtangguh()
{
$arrayinfo = [];
$arraysms = [];
$arraysls = [];
$lelong = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id')
->join('cawangan','cawangan.caw_code','=','tangguhlelong.kodcaw')
@@ -938,10 +940,17 @@ class TangguhLelongController extends Controller
->count();
$tangguh[$index]['bilsag'] = $sag;
array_push($arrayinfo,['info'=>$info, 'sag'=>$sag]);
if($info['sts_lelong'] == '0' )
{
array_push($arraysms,['info'=>$info, 'sag'=>$sag]);
} else {
array_push($arraysls,['info'=>$info, 'sag'=>$sag]);
}
// array_push($arrayinfo,['info'=>$info, 'sag'=>$sag]);
}
return view('tangguhlelong.senleltlhtangguh',compact('lelong', 'arrayinfo'));
return view('tangguhlelong.senleltlhtangguh',compact('arraysms','arraysls','lelong', 'arrayinfo'));
}
@@ -17,9 +17,24 @@
<p>{{ $message }}</p>
</div>
@endif
<ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="belum-lelong-tab" data-toggle="tab" href="#belum-lelong" role="tab" aria-controls="belum-lelong" aria-selected="false">
Lelongan Semasa
</a>
</li>
<li class="nav-item">
<a class="nav-link" id="selesai-lelong-tab" data-toggle="tab" href="#selesai-lelong" role="tab" aria-controls="selesai-lelong" aria-selected="false">
Lelongan Selesai
</a>
</li>
</ul>
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table text-center table-bordered" id="tablelelong" style="width:100%">
<div class="tab-content" style="overflow-x: auto;" id="myTabContent">
<div class="tab-pane fade show active" id="belum-lelong" role="tabpanel" aria-labelledby="sedang-lelong-tab">
<div style="overflow-x: auto;">
<table class="table text-center table-bordered" id="tablestatusbelumlelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -33,7 +48,60 @@
</tr>
</thead>
<tbody>
@foreach ($arrayinfo as $lel)
@foreach ($arraysms as $lel)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $lel['info']['lelong_id']}}</td>
<td> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']);
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp</td>
<td align = 'left'><span class="m-2">{{$lel['info']['caw_name']}}</span></td>
<td>{{$lel['sag']}}</td>
<td>{{$lel['info']['jbg']}}</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
<button class="btn btn-primary btn-sm" disabled>LELONG BELUM BERMULA</button>
@elseif($lel['info']['sts_lelong'] == 1)
<button class="btn btn-warning btn-sm" disabled>LELONG BERMULA</button>
@elseif($lel['info']['sts_lelong'] == 2)
<button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
@elseif($lel['info']['sts_lelong'] == 3)
<button class="btn btn-warning btn-sm" disabled>LELONG SELESAI</button>
@endif
</td>
<td>
<div class="row justify-content-center">
<a class="btn m-1 btn-primary" href="{{ route('pengesahan.opsenaraitangguh', [$lel['info']['lelong_id'], $lel['info']['caw_code']]) }}" title="Carian"><i class="far fa-edit"></i></a>
</div>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
<div class="tab-pane fade" id="selesai-lelong" role="tabpanel" aria-labelledby="selesai-lelong-tab">
<div style="overflow-x: auto;">
<table class="table text-center table-bordered" id="tablestatusselesailelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Batch Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Bil SAG</th>
<th>Tempoh</th>
<th>Status Lelong</th>
<th class="text-center">Tindakan</th>
</tr>
</thead>
<tbody>
@foreach ($arraysls as $lel)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $lel['info']['lelong_id']}}</td>
@@ -97,44 +165,45 @@
}
});
var tablelelong = $('#tablelelong').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 99999999,
dom: 'Bfrtip',
buttons: [
// 'copy', 'excel', 'pdf'
// { text: 'copy', className: 'btn btn-primary' },
// {
// className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
// text: '<i class="fas fa-plus" id="test"></i>',
// titleAttr: 'Tambah Simulasi',
// action: function ( e, dt, node, config ) {
// alert( 'Button activated' );
// }
// },
// {
// className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export',
// titleAttr: 'Export to CSV',
// text: '<i class="fas fa-download"></i>',
// action: function ( e, dt, node, config ) {
// $("#exportform").submit();
// }
// }
]
});
var tablestatusbelumlelong = $('#tablestatusbelumlelong').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
});
var tablestatusselesailelong = $('#tablestatusselesailelong').DataTable({
"columnDefs": [
{
"targets": 0,
"orderable": false
},
{
"targets": 7,
"orderable": false
}
],
order: [[1, 'asc']],
// "ordering": false,
"info": false,
"lengthChange": false,
"pageLength": 15,
dom: 'Bfrtip',
});
$('.addsim').tooltip();
$('.export').tooltip();