diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 8bf01fc6..087bc91a 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -584,47 +584,45 @@ class HomeController extends Controller
                 }
             }
         } else {
-            $sag = LelongBid::where('status_semak', 0)
-            ->get();
+            $sag = Lelong::select('id', 'tarikh_lelong', 'fasa')->withCount('lelongBidBelumSemak')->where('sts_lelong', 0)->get();
+            foreach ($sag as $data) {
+                $data->tarikh_lelong = DateTime::createFromFormat('Y-m-d', $data->tarikh_lelong);
+                $data->tarikh_lelong =  $data->tarikh_lelong->format('d-m-Y');
+            }
         }
 
         if ($user->hasAnyRole('operasi', 'pengurus-operasi', 'jurulelong')) {
 
             $arrayinfo = [];
-            $semakCountArray = [];
 
-            $lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id')
-            ->where('lelong.tarikh_lelong', '=', $dateTime)
+            $lelong = Lelong::where('lelong.tarikh_lelong', '=', $dateTime)
                 ->select(
-                    'lelong.fasa',
-                    'lelong.id AS lelong_id',
-                    'lelong.tarikh_lelong',
-                    'lelong.masatamat_lelong',
-                    'lelong.harga_emas_asas',
-                    'lelong.jbg',
-                    'lelong.cajlelong',
-                    'lelong.sts_lelong'
+                    'fasa',
+                    'id',
+                    'tarikh_lelong',
+                    'masatamat_lelong',
+                    'harga_emas_asas',
+                    'jbg',
+                    'cajlelong',
+                    'sts_lelong'
                 )
-                ->groupBy('cawangan_lelong.lelong_id')
-                ->get()->toArray();
+                ->withCount('lelongBidBelumSemak')
+                ->get();
 
             foreach ($lelong as $info) {
 
                 $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->select('batchlel', 'lelong_id', 'cawangan_lelong.caw_id', 'cawangan.caw_name', 'cawangan.caw_code', 'status_online', 'cawangan_lelong.masamula_lelong', 'cawangan_lelong.masatamat_lelong')
-                ->where('lelong_id', $info['lelong_id'])
+                ->where('lelong_id', $info['id'])
                 ->get()
-                    ->toArray();
-
-                foreach ($detailsinfo as $det) {
+                ->toArray();
+                foreach ($detailsinfo as $index50 => $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);
+                    ->count();
+                    $detailsinfo[$index50]['belum_semak'] =$cawsemak;
                 }
 
 
@@ -694,7 +692,7 @@ class HomeController extends Controller
                 array_push($arrayinfomenang, ['detail' => $details, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
             }
 
-            return view('homeoperasi', compact('sag', 'arrayinfomenang', 'arrayinfo', 'semakCountArray'));
+            return view('homeoperasi', compact('sag', 'arrayinfomenang', 'arrayinfo'));
         } else if ($user->hasAnyRole('pengurus-cawangan', 'khazanah', 'penilai', 'pengurus-cawangan-khas',)) {
 
             $arrayinfomutu = [];
diff --git a/resources/views/homeoperasi.blade.php b/resources/views/homeoperasi.blade.php
index 1e3cdce9..bf497034 100644
--- a/resources/views/homeoperasi.blade.php
+++ b/resources/views/homeoperasi.blade.php
@@ -12,13 +12,172 @@
                         {{ session('status') }}
                     </div>
                     @endif
+                    @hasrole('jurulelong')
+                    @if(count($arrayinfo)> 0)
+                    @foreach ($arrayinfo as $lel)
+                    <div class="card container my-4">
+                        <div class="row mt-4">
+                            <div class="col-md-12 col-lg-6">
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Tarikh Lelong</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            @php
+                                            $date_lelong = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
+                                            $date_lelong_converted = $date_lelong->format('d-m-Y');
+                                            @endphp
+                                            <input type="text" readonly class="form-control bg-light" value="{{ $date_lelong_converted }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Batch Lelong</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value="{{ $lel['info']['id'] }}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-12 col-lg-6">
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Fasa</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value="{{ $lel['info']['fasa'] }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Harga Emas</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <div class="input-group-prepend">
+                                                <div class="input-group-text">RM</div>
+                                            </div>
+                                            <input type="text" readonly class="form-control bg-light" value="{{$lel['info']['harga_emas_asas']}}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-12">
+                                <div class="form-group row">
+                                    <label class="col-lg-3 col-6 col-form-label" style="margin-bottom: 1rem;">Status Keseluruhan</label>
+                                    <div class="col-lg-3 col-6">
+                                        <div class="input-group col-form-label">
+                                            @if($lel['info']['sts_lelong'] == 1)
+                                            <button class="badge badge-success" disabled>Online</button>
+                                            @else
+                                            <button class="badge badge-danger" disabled>Offline</button>
+                                            @endif
+                                        </div>
+                                    </div>
+                                    <label class="col-lg-3 col-6 col-form-label" style="margin-bottom: 1rem;">Masa Tamat Keseluruhan</label>
+                                    <div class="col-lg-3 col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value="{{$lel['info']['masatamat_lelong']}}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="mb-2 d-flex justify-content-end">
+                            @if($lel['info']['sts_lelong'] == 0)
+                            @if($lel['info']->lelong_bid_belum_semak_count == 0)
+                            <a class="startlelongall btn btn-success" href="{{ route('lelong.startall',$lel['info']['id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Semua">Mula Lelong Semua Cawangan</a>
+                            @else
+                            @endif
+                            @elseif ($lel['info']['sts_lelong'] == 1)
+                            <a class="stoplelongall btn btn-danger" href="{{ route('lelong.stopall',$lel['info']['id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong">Tamat Lelong Semua Cawangan</a>
+                            @elseif ($lel['info']['sts_lelong'] == 2)
+                            <a class="janapemenangall btn btn-success" href="{{ route('lelong.janapemenangallcaw',$lel['info']['id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang">Jana Pemenang <i class="fas fa-users-cog"></i></a>
+                            @else
+                            <a href="{{ route('lelong.listpemenang') }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
+                            @endif
+                        </div>
+                        <div style="overflow-x: auto;">
+                            <table class="table table-bordered text-center">
+                                <thead class="bg-primary text-white">
+                                    <tr>
+                                        <th>No</th>
+                                        <th class="text-left">Cawangan</th>
+                                        <th>Status</th>
+                                        <th>Masa Tamat Cawangan</th>
+                                        <th>Tindakan</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($lel['detailsinfo'] as $cawangan_detail)
+                                    <tr>
+                                        <td>{{$loop->iteration}}</td>
+                                        <td class="text-left">{{$cawangan_detail['caw_name']}}</td>
+                                        <td>
+                                            @if($cawangan_detail['status_online'] == 1)
+                                            <button class="badge badge-pill badge-success" disabled>Online</button>
+                                            @else
+                                            <button class="badge badge-pill badge-danger" disabled>Offline</button>
+                                            @endif
+                                        </td>
+                                        <td>{{$cawangan_detail['masatamat_lelong']}}</td>
+                                        <td>
+                                            @if($lel['info']['sts_lelong'] == 1 || $lel['info']['sts_lelong'] == 0)
+                                            @if($cawangan_detail['status_online'] == 0 && $cawangan_detail['belum_semak'] == 0)
+                                            <a class="btn btn-success btn-sm" href="{{ route('lelong.startcawangan',[$lel['info']['id'], 'cawid'=>$cawangan_detail['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong Cawangan">Mula Lelong</a>
+                                            @elseif($cawangan_detail['status_online'] == 1)
+                                            <a class="btn btn-danger btn-sm" href="{{ route('lelong.stopcawangan',[$lel['info']['id'], 'cawid'=>$cawangan_detail['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong Cawangan">Tamat Lelong</a>
+                                            @endif
+                                            @elseif($lel['info']['sts_lelong'] == 2)
+                                            @endif
+                                        </td>
+                                    </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                    @endforeach
+                    @endif
+                    @endhasrole
                     <div class="container">
                         <div class="row">
-                            <div class="col-6 col-sm-4">
-                                <p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
-                            </div>
-                            <div class="col-6 col-sm-4">
+                            @foreach($sag as $lelong)
+                            @if($lelong['lelong_bid_belum_semak_count'] > 0)
+                            <div class="col-lg-6 col-md-12 card p-4">
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Batch Lelong</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value="{{ $lelong->id }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Tarikh Lelong</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value="{{ $lelong->tarikh_lelong }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Fasa</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value="{{ $lelong->fasa }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 text-danger col-form-label">SAG Belum Disemak</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light text-danger" value="{{ $lelong->lelong_bid_belum_semak_count }}">
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
+                            @endif
+                            @endforeach
                         </div>
                     </div>
                     @hasrole('operasi')
@@ -127,6 +286,7 @@
                                     TUNGGU PENGESAHAN
                                     @else
                                     BELUM SELESAI
+
                                     @endif
                                     @else
                                     BELUM SELESAI
@@ -149,92 +309,72 @@
                     </table>
                     @endif
                     @endhasrole
-                    @hasrole('jurulelong')
-                    @if(count($arrayinfo)> 0)
-                    <table class=" table table-bordered  table-xl text-center" id="tablelelong" style="width:100%">
-
-                        <thead class="bg-primary text-white">
-                            <tr>
-                                <th>No</th>
-                                <th>Batch Lelong</th>
-                                <th>T.Lelong</th>
-                                <th>Fasa</th>
-                                <th>Cawangan</th>
-                                <th>Status</th>
-                                <th>Masa Tamat</th>
-                                <th>Harga Emas</th>
-                                <th>Tempoh</th>
-                                <th class="text-center">Tindakan</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @empty($arrayinfo)
-                            <tr>
-                                <td colspan=10>Tiada maklumat</td>
-                            </tr>
-                            @endempty
-
-                            @isset($arrayinfo)
-
-                            <br><strong>LELONGAN HARI INI</strong>
-                            @foreach ($arrayinfo 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'] );
-                                    $t_lelong = $myDateTime->format('d-m-Y');
-                                    echo($t_lelong);
-                                    @endphp</td>
-                                <td>{{$lel['info']['fasa']}}</td>
-                                <td align='left'>
-                                    @foreach($lel['detailsinfo'] as $details)
-                                    <span class="m-2">{{$details['caw_name']}}</span><br>
-                                    @endforeach
-                                </td>
-                                <td align='center'>
-                                    @foreach($lel['detailsinfo'] as $index=>$details)
-
-                                    @if($details['status_online'] == '0')
-
-                                    @if($semakCountArray[$index] > 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"><button class="badge badge-pill badge-danger" id="btnstart" disabled>Offline</button></a><br>
-                                    @elseif($semakCountArray[$index] == 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"><button class="badge badge-pill badge-danger" id="btnstart">Offline</button></a><br>
-
-                                    @endif
-
-                                    @elseif($details['status_online'] == '1')
-                                    <a class="startlelongcawangan" href="{{ route('lelong.stopcawangan',[$lel['info']['lelong_id'], 'cawid'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong Cawangan"><button class="badge badge-pill badge-success" id="btnstart">Online</button></a><br>
-                                    @endif
-
-                                    @endforeach
-                                </td>
-                                <td> @foreach($lel['detailsinfo'] as $details)
-                                    <span class="m-2">{{$details['masatamat_lelong']}}</span><br>
-                                    @endforeach
-                                </td>
-                                <td>{{$lel['info']['harga_emas_asas']}}</td>
-                                <td>{{$lel['info']['jbg']}}</td>
-                                <td class="text-center">
-                                    @if($semakCountArray[$index] == 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.janapemenangallcaw',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a>
-                                    <a href="{{ route('lelong.listpemenang') }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
-                                    <a class="stoplelongall" href="{{ route('lelong.stopall',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><button class="btn btn-success float-right " id="btnstart">Online</button></a></a>
-                                </td>
-                            </tr>
-                            @endforeach
-                            @endisset
-                        </tbody>
-                    </table>
-                    @endif
-                    @endhasrole
                 </div>
             </div>
         </div>
     </div>
 </div>
+
+<script>
+    $(function() {
+        $('[data-toggle="tooltip"]').tooltip()
+    });
+
+    $('a.startlelongall').confirm({
+        title: 'Mula Lelong Semua Cawangan',
+        content: 'Adakah anda pasti?',
+        type: 'green',
+        typeAnimated: true,
+        buttons: {
+            Kembali: {
+                btnClass: 'btn-default',
+                action: function() {}
+            },
+            Teruskan: {
+                btnClass: 'btn-success',
+                action: function() {
+                    location.href = this.$target.attr('href');
+                }
+            },
+        }
+    });
+
+    $('a.stoplelongall').confirm({
+        title: 'Tamat Lelong Semua Cawangan',
+        content: 'Adakah anda pasti?',
+        type: 'red',
+        typeAnimated: true,
+        buttons: {
+            Kembali: {
+                btnClass: 'btn-default',
+                action: function() {}
+            },
+            Teruskan: {
+                btnClass: 'btn-danger',
+                action: function() {
+                    location.href = this.$target.attr('href');
+                }
+            },
+        }
+    });
+
+    $('a.janapemenangall').confirm({
+        title: 'Jana Pemenang',
+        content: 'Adakah anda pasti?',
+        type: 'green',
+        typeAnimated: true,
+        buttons: {
+            Kembali: {
+                btnClass: 'btn-default',
+                action: function() {}
+            },
+            Teruskan: {
+                btnClass: 'btn-success',
+                action: function() {
+                    location.href = this.$target.attr('href');
+                }
+            },
+        }
+    });
+</script>
 @endsection
\ No newline at end of file