diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 4ddcd66e..59d46330 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -51,16 +51,34 @@ class LelongController extends Controller */ public function index() { - $lelong = Lelong::all(); + // $lelong = Lelong::all(); - foreach($lelong as $lel) + // foreach($lelong as $lel) + // { + // $caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + // ->where('lelong_id', $lel['id']) + // ->get()->toArray(); + // } + $arrayinfo = []; + + $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelong as $info) { - $caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('lelong_id', $lel['id']) - ->get()->toArray(); + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + } - return view('lelong.senarailelong',compact('lelong', 'caw_lelong')); + return view('lelong.senarailelong',compact('lelong', 'arrayinfo')); } public function show($id) @@ -810,22 +828,49 @@ class LelongController extends Controller public function lapbrglelongindex (Request $request){ - // $user = Auth::user(); - - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - // ->where('cawangan.caw_code','=',$user->kodcaw) - ->get(); + $arraydetails = []; - return view('lelong.laporanlelong',compact('lelongid')); + $laporanpembida= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($laporanpembida as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + + return view('lelong.laporanlelong', compact('arraydetails')); } public function senaraibrglelong($lelong_id){ - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + + + $arraydetails = []; + $arrayinfo = []; + + + $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->get(); + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get()->toArray(); + + foreach($lelongid as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); + } + $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) @@ -853,7 +898,7 @@ class LelongController extends Controller - return view('lelong.senaraibrglelong',compact('lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman')); + return view('lelong.senaraibrglelong',compact('arrayinfo','lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman')); } @@ -911,6 +956,7 @@ class LelongController extends Controller $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->get(); + return view('lelong.laporanbidaanindex',compact('lelongid')); } @@ -925,6 +971,7 @@ class LelongController extends Controller ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) ->get(); + $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') ->select('lelongbid_id','norujukan','hargaasas') diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 6aa495e6..81ad2daf 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -277,9 +277,28 @@ class SimulasiController extends Controller public function senaraisimulasi() { - $simulasi = Simulasi::all(); + // $simulasi = Simulasi::all(); - return view('simulasi.senaraisimulasi',compact('simulasi')); + $arrayinfo = []; + + $simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id') + ->select('simulasi_id','tarikh_lelong') + ->groupBy('simulasi_id') + ->get() + ->toArray(); + + foreach($simulasi as $info) + { + $detailsinfo = CawanganSimulasi::join('cawangan','cawangan_simulasi.caw_id','=','cawangan.id') + ->where('simulasi_id',$info['simulasi_id']) + ->get() + ->toArray(); + + array_push($arrayinfo, ['info'=> $info, 'detailsinfo'=>$detailsinfo]); + + } + + return view('simulasi.senaraisimulasi',compact('simulasi','arrayinfo')); } public function show($id) diff --git a/database/migrations/2021_12_13_053311_create_cawangans_table.php b/database/migrations/2021_12_13_053311_create_cawangans_table.php index e0fb2e7f..08b9e31f 100644 --- a/database/migrations/2021_12_13_053311_create_cawangans_table.php +++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php @@ -30,7 +30,7 @@ class CreateCawangansTable extends Migration $table->string('nofaks')->nullable(); $table->string('lokasi')->nullable(); $table->string('pkb_jmc')->nullable(); - $table->string('para2')->nullable(); + // $table->string('para2')->nullable(); $table->timestamps(); }); diff --git a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php index d42b42af..d788ae2a 100644 --- a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php +++ b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php @@ -14,7 +14,7 @@ class AddPara2ToCawanganTable extends Migration public function up() { Schema::table('cawangan', function (Blueprint $table) { - $table->string('para2'); + $table->string('para2')->nullable(); }); } @@ -26,7 +26,7 @@ class AddPara2ToCawanganTable extends Migration public function down() { Schema::table('cawangan', function (Blueprint $table) { - $table->dropColumn('para2'); + $table->dropColumn('para2') ; }); } } diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php index 317eca76..8b6e4705 100644 --- a/resources/views/lelong/laporanlelong.blade.php +++ b/resources/views/lelong/laporanlelong.blade.php @@ -16,25 +16,31 @@ - + - + - @foreach ($lelongid as $bid) + @foreach ($arraydetails as $laporan) - - - - - + + + - + + + + @endforeach diff --git a/resources/views/lelong/senaraibrglelong.blade.php b/resources/views/lelong/senaraibrglelong.blade.php index 313ec2ec..5199206f 100644 --- a/resources/views/lelong/senaraibrglelong.blade.php +++ b/resources/views/lelong/senaraibrglelong.blade.php @@ -4,12 +4,18 @@
- @foreach ($lelongid as $info) + @foreach ($arrayinfo as $laporan) + Laporan Barang Lelong - Lelong ID: {{ $lelong_id}} - Cawangan: {{ $info->caw_name}} - Tarikh Lelong: {{ $info->tarikh_lelong}}
+ Lelong ID: {{ $laporan['laporan']['lelong_id']}} + Tarikh Lelong: {{ $laporan['laporan']['tarikh_lelong']}} + @foreach($laporan['details'] as $details) + Cawangan: {{ $details['caw_name']}} @endforeach +
+ @endforeach + + @if ($message = Session::get('success'))
@@ -85,7 +91,7 @@ "info": false, "lengthChange": false, - "pageLength": 10, + "pageLength": 99999999999, dom: 'Bfrtip', buttons: [ diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index d002cc9e..4ec82c05 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -15,9 +15,10 @@
No Lelong IDCawangan Tarikh LelongCawangan Action
{{ $bid->lelong_id}}{{ $bid->caw_name}}{{ $bid->tarikh_lelong }} - + {{ $loop->iteration }}{{ $laporan['laporan']['lelong_id']}}{{ $laporan['laporan']['tarikh_lelong']}} + @foreach($laporan['details'] as $details) + {{ $details['caw_name']}}
+ @endforeach
+ +
- - + + + @@ -27,41 +28,50 @@ - @foreach ($lelong as $lel) + @foreach ($arrayinfo as $lel) - - - - - - - + + + + + + + + + @endforeach + + +
CawanganNoLelong ID Tarikh LelongCawangan Masa Tamat Lelong Harga Emas Asas JBG
{{ $caw_lelong[0]['caw_name'] }}{{ $lel->tarikh_lelong }}{{ $lel->masatamat_lelong }}{{ $lel->harga_emas_asas }}{{ $lel->jbg }}{{ $lel->cajlelong }}{{$loop->iteration}}{{ $lel['info']['lelong_id'] }}{{ $lel['info']['tarikh_lelong']}} + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
+ @endforeach + 		{{$lel['info']['masatamat_lelong']}}{{$lel['info']['harga_emas_asas']}}{{$lel['info']['jbg']}}{{$lel['info']['cajlelong']}} @hasrole('jurulelong') - @if($lel->sts_lelong == 0) - - - - - @elseif ($lel->sts_lelong == 2) - - @elseif ($lel->sts_lelong == 3) - + @if($lel['info']['sts_lelong'] == 0) + + + + + @elseif ($lel['info']['sts_lelong'] == 2) + + @elseif ($lel['info']['sts_lelong'] == 3) + @else - + @endif @endhasrole @hasrole('operasi') - @if($lel->sts_lelong == 0) - - + @if($lel['info']['sts_lelong'] == 0) + + @endif @endhasrole
@@ -108,7 +118,7 @@ // "ordering": false, "info": false, "lengthChange": false, - "pageLength": 15, + "pageLength": 99999999, dom: 'Bfrtip', buttons: [ // 'copy', 'excel', 'pdf' diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index 034d2a2f..3a388d9f 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -15,30 +15,32 @@ - + + - - - + - @foreach ($simulasi as $sim) + @foreach ($arrayinfo as $info) - - - - - - + + + + + @endforeach
NoLelong ID Tarikh LelongCawanganJBGCaj LelongCawangan Action
{{ $sim->tarikh_lelong }}{{ $sim->harga_emas_asas }}{{ $sim->jbg }}{{ $sim->cajlelong }} - - {{-- --}} - - - + {{$loop->iteration}}{{$info['info']['simulasi_id']}}{{$info['info']['tarikh_lelong']}} + @foreach($info['detailsinfo'] as $info2) + {{$info2['caw_name']}}
+ @endforeach 		+ + + + +