Merge branch 'nisha' into 'main'

block start lelong jika ada belum semak

See merge request online-sistem1/lelong!150
This commit is contained in:
Nur Izzati Zulkifli
2022-08-09 02:13:15 +00:00
3 changed files with 58 additions and 14 deletions
+20 -5
View File
@@ -43,6 +43,7 @@ class HomeController extends Controller
$dateTime = date('Y-m-d');
$arrayinfo = [];
$semakCountArray = [];
$lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->select('lelong.fasa','cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong')
@@ -59,6 +60,20 @@ class HomeController extends Controller
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
foreach($detailsinfo as $det)
{
$cawsemak = LelongBid::where('status_semak', 0)
->where('lelong_id',$det['lelong_id'])
->where('caw_id',$det['caw_id'])
->get();
$semakCount = $cawsemak->count();
array_push($semakCountArray,$semakCount);
}
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
@@ -89,21 +104,21 @@ class HomeController extends Controller
}
if($caw <> NULL) {
if($caw <> NULL) { //staf cwgn
$sag = LelongBid::where('status_semak', 0) //belum disemak
->where('kodcaw', $caw['caw_code'])
->get();
//dd($sag);
}
else {
else { //operasi,jurulelong
$sag = LelongBid::where('status_semak', 0) //belum disemak
->get();
}
return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag'));
return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray'));
}
+25 -9
View File
@@ -82,8 +82,9 @@
@endempty
@isset($arrayinfo)
@foreach ($arrayinfo as $lel)
<br><strong>LELONGAN HARI INI</strong>
@foreach ($arrayinfo as $lel)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{ $lel['info']['lelong_id'] }}</td>
@@ -99,13 +100,23 @@
@endforeach
</td>
<td align = 'center'>
@foreach($lel['detailsinfo'] as $details)
@if($details['status_online'] == '0')
<a class="startlelongcawangan" href="{{ route('lelong.startcawangan',[$lel['info']['lelong_id'],'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Cawangan"><i class="fa fa-play"></i></a><br>
@foreach($lel['detailsinfo'] as $index=>$details)
@if($details['status_online'] == '0')
@elseif($details['status_online'] == '1')
<a class="stoplelongcawangan" href="{{ route('lelong.stopcawangan',[$lel['info']['lelong_id'],'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong Cawangan"><i class="fa fa-stop"></i></a> <br>
@endif
@if($semakCountArray[$index] > 0)
<a class="startlelongcawangan" href="" data-toggle="tooltip" data-placement="top" title="Mula Lelong Cawangan"><button class="btn btn-danger float-right " id="btnstart" disabled>Offline</button></a><br>
@elseif($semakCountArray[$index] == 0)
<a class="startlelongcawangan" href="" data-toggle="tooltip" data-placement="top" title="Mula Lelong Cawangan"><button class="btn btn-danger float-right " id="btnstart">Offline</button></a><br>
@endif
@elseif($details['status_online'] == '1')
<a class="startlelongcawangan" href="" data-toggle="tooltip" data-placement="top" title="Tamat Lelong Cawangan"><button class="btn btn-success float-right " id="btnstart">Online</button></a><br>
@endif
@endforeach
</td>
<td> @foreach($lel['detailsinfo'] as $details)
@@ -120,7 +131,10 @@
<!-- @if($lel['info']['sts_lelong'] == 0) -->
<!-- <a href="{{ route('lelong.refreshhome',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> -->
<a class="startlelongall" href="{{ route('lelong.startall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Semua" style="margin-right:40px"><button class="btn btn-success float-right " id="btnstart" >Online</button></a>
@if(sizeof($sag) == 0)
<a class="startlelongall" href="{{ route('lelong.startall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Semua" style="margin-right:40px"><button class="btn btn-danger float-right " id="btnstart" >Offline</button></a>
@endif
<a href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
<!-- <a href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang" style="margin-right:40px"><i class="fas fa-users-cog"></i></a> -->
<a href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang" style="margin-right:40px"><i class="fas fa-trophy"></i></a>
@@ -132,8 +146,10 @@
<!-- @elseif ($lel['info']['sts_lelong'] == 3) -->
<a href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
<!-- @else -->
@if(sizeof($sag) == 0)
<a class="stoplelongall" href="{{ route('lelong.stopall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><button class="btn btn-danger float-right " id="btnstart" >Offline</button></a></a>
<!-- @endif -->
@endif
<!-- @endif -->
@endhasrole
<!-- @hasrole('operasi')
+13
View File
@@ -260,6 +260,19 @@
#loader-image {position: absolute;top: 40%;left: 45%;z-index: 100}
.button {
background-color: #E09215;
border: none;
color: white;
padding: 10px 24px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 14px;
margin: 4px 2px;
cursor: pointer;
}
/* ---------------------------------------------------