From 7d70f8d71220a47c0b6e6f85d6d430c6e35b1cf9 Mon Sep 17 00:00:00 2001 From: Amir Date: Wed, 29 Mar 2023 14:59:17 +0800 Subject: [PATCH] Fix homepage operasi and juru lelong --- app/Http/Controllers/HomeController.php | 46 ++-- resources/views/homeoperasi.blade.php | 314 +++++++++++++++++------- 2 files changed, 249 insertions(+), 111 deletions(-) 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') }} @endif + @hasrole('jurulelong') + @if(count($arrayinfo)> 0) + @foreach ($arrayinfo as $lel) +
+
+
+
+ +
+
+ @php + $date_lelong = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); + $date_lelong_converted = $date_lelong->format('d-m-Y'); + @endphp + +
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+
RM
+
+ +
+
+
+
+
+
+ +
+
+ @if($lel['info']['sts_lelong'] == 1) + + @else + + @endif +
+
+ +
+
+ +
+
+
+
+
+
+ @if($lel['info']['sts_lelong'] == 0) + @if($lel['info']->lelong_bid_belum_semak_count == 0) + Mula Lelong Semua Cawangan + @else + @endif + @elseif ($lel['info']['sts_lelong'] == 1) + Tamat Lelong Semua Cawangan + @elseif ($lel['info']['sts_lelong'] == 2) + Jana Pemenang + @else + + @endif +
+
+ + + + + + + + + + + + @foreach($lel['detailsinfo'] as $cawangan_detail) + + + + + + + + @endforeach + +
NoCawanganStatusMasa Tamat CawanganTindakan
{{$loop->iteration}}{{$cawangan_detail['caw_name']}} + @if($cawangan_detail['status_online'] == 1) + + @else + + @endif + {{$cawangan_detail['masatamat_lelong']}} + @if($lel['info']['sts_lelong'] == 1 || $lel['info']['sts_lelong'] == 0) + @if($cawangan_detail['status_online'] == 0 && $cawangan_detail['belum_semak'] == 0) + Mula Lelong + @elseif($cawangan_detail['status_online'] == 1) + Tamat Lelong + @endif + @elseif($lel['info']['sts_lelong'] == 2) + @endif +
+
+
+ @endforeach + @endif + @endhasrole
-
-

SAG Belum Disemak : {{ sizeof($sag) }}

-
-
+ @foreach($sag as $lelong) + @if($lelong['lelong_bid_belum_semak_count'] > 0) +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ @endif + @endforeach
@hasrole('operasi') @@ -127,6 +286,7 @@ TUNGGU PENGESAHAN @else BELUM SELESAI + @endif @else BELUM SELESAI @@ -149,92 +309,72 @@ @endif @endhasrole - @hasrole('jurulelong') - @if(count($arrayinfo)> 0) - - - - - - - - - - - - - - - - - - @empty($arrayinfo) - - - - @endempty - - @isset($arrayinfo) - -
LELONGAN HARI INI - @foreach ($arrayinfo as $lel) - - - - - - - - - - - - - - @endforeach - @endisset - -
NoBatch LelongT.LelongFasaCawanganStatusMasa TamatHarga EmasTempohTindakan
Tiada maklumat
{{$loop->iteration}}{{ $lel['info']['lelong_id'] }}@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphp{{$lel['info']['fasa']}} - @foreach($lel['detailsinfo'] as $details) - {{$details['caw_name']}}
- @endforeach - 		- @foreach($lel['detailsinfo'] as $index=>$details) - - @if($details['status_online'] == '0') - - @if($semakCountArray[$index] > 0) -
- @elseif($semakCountArray[$index] == 0) -
- - @endif - - @elseif($details['status_online'] == '1') -
- @endif - - @endforeach - 		@foreach($lel['detailsinfo'] as $details) - {{$details['masatamat_lelong']}}
- @endforeach - 		{{$lel['info']['harga_emas_asas']}}{{$lel['info']['jbg']}} - @if($semakCountArray[$index] == 0) - - @endif - - - -
- @endif - @endhasrole
+ + @endsection \ No newline at end of file