Fix homepage operasi and juru lelong

This commit is contained in:
Amir
2023-03-29 14:59:17 +08:00
parent 39355b9ea9
commit 7d70f8d712
2 changed files with 249 additions and 111 deletions
+22 -24
View File
@@ -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 = [];