From 8992598156a218f3ac3f530c27cc3c42a4d3b152 Mon Sep 17 00:00:00 2001 From: Amir Date: Tue, 22 Nov 2022 11:40:53 +0800 Subject: [PATCH] Fix homepage pc, sag belum semak by lelong_id --- app/Http/Controllers/HomeController.php | 33 +++++--- resources/views/home.blade.php | 78 +++++++++++++++++-- .../views/lelong/senarailelong.blade.php | 6 +- resources/views/lelong/showlelong.blade.php | 10 ++- .../views/pengurusanpengguna/index.blade.php | 47 +++++------ 5 files changed, 126 insertions(+), 48 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index b8d94992..9587aace 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -18,6 +18,7 @@ use App\Models\Payment; use App\Models\User; use App\Models\LelongBidder; use Hash; +use DateTime; class HomeController extends Controller { @@ -132,18 +133,28 @@ class HomeController extends Controller array_push($arrayinfomutu,['info'=>$infomutu, 'detailsinfo'=>$detailsinfo]); } - - if($caw <> NULL) { //staf cwgn - $sag = LelongBid::where('status_semak', 0) //belum disemak - ->where('kodcaw', $caw['caw_code']) - ->get(); - //dd($sag); - + $all_lelong = Lelong::select('id', 'tarikh_lelong')->where('sts_lelong', 0)->get()->keyBy('id'); + foreach ($all_lelong as $data) { + $data->tarikh_lelong = DateTime::createFromFormat('Y-m-d', $data->tarikh_lelong); + $data->tarikh_lelong = $data->tarikh_lelong->format('d-m-Y'); } - else { //operasi,jurulelong + + if ($caw <> NULL) { //staf cwgn $sag = LelongBid::where('status_semak', 0) //belum disemak - ->get(); - + ->where('kodcaw', $caw['caw_code']) + ->get(); + + $sag_by_lelong_id = $sag->groupBy('lelong_id'); + + foreach ($sag_by_lelong_id as $index => $lelong) { + if ($all_lelong[$index]); { + $all_lelong[$index]['sag_belum_semak'] = $lelong->count(); + } + } + + } else { //operasi,jurulelong + $sag = LelongBid::where('status_semak', 0) //belum disemak + ->get(); } //paparan pemenang lelongan harini @@ -245,7 +256,7 @@ class HomeController extends Controller //endpaparan untuk account page - return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray','arrayinfomenang','arrayinfoaccount')); + return view('home',compact('all_lelong','lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray','arrayinfomenang','arrayinfoaccount')); } diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 8a96a168..932e769b 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -7,7 +7,6 @@
{{ __('Dashboard') }}
-
@if (session('status'))