From 2d0a3e0f689340ef5db2392ed914c488b87031d6 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Thu, 8 Dec 2022 15:18:58 +0800
Subject: [PATCH] senarai simulasi all

---
 app/Http/Controllers/SimulasiController.php | 37 ++++++++++++++++-----
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 583f2f05..d15e6193 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -2050,7 +2050,7 @@ class SimulasiController extends Controller
 
         $arrayinfo = [];
 
-        $simulasi = Simulasi::select('kali')
+        $simulasi = Simulasi::select('kali','id')
         ->groupBy('kali')
         ->get();
         // ->toArray();
@@ -2076,11 +2076,14 @@ class SimulasiController extends Controller
     public function showsimulasiall(Request $request, $kali)
     {
         $kali = $kali;
+        // $simulasi_id = $request->id;
+        // dd($simulasi_id);
         $simulasi = Simulasi::where('kali','=',$kali)->first();
        
         // dd($t_simulasi);
         $cawangansim = CawanganSimulasi::where('kali','=',$kali)->get();
         // dd($cawangansim);
+        // dd($cawangansim);
         // $simkarat = SimKarat::where('simulasi_id','=',$id)->get();
         // $jeniskarat = JenisKarat::all();
 
@@ -2115,14 +2118,27 @@ class SimulasiController extends Controller
         foreach($cawangansim as $cawsim)
         {
             $cawangan = Cawangan::where('id','=',$cawsim->caw_id)->first();
-            $databid = SimulasiBid::join('cawangan_simulasi','cawangan_simulasi.caw_id','=','simulasibid.caw_id')
+            // $databid = SimulasiBid::join('cawangan_simulasi','cawangan_simulasi.caw_id','=','simulasibid.caw_id')
+            // ->select('simulasibid.id','simulasibid.berat','simulasibid.marhun','simulasibid.cajlelong','simulasibid.baki','simulasibid.nilaimarhun',
+            // 'simulasibid.pinjaman','simulasibid.hargaasas','simulasibid.cajlelong','simulasibid.bakiupah','cawangan_simulasi.kali','norujukan')
+            // ->where('cawangan_simulasi.simulasi_id','=', $cawsim->simulasi_id)
+            // ->where('cawangan_simulasi.caw_id','=', $cawsim->caw_id)
+            // ->where('cawangan_simulasi.kali','=',$kali)
+            // ->get()->toArray();
+            // dump($cawsim->simulasi_id);
+
+            $databid = SimulasiBid::   join('cawangan_simulasi', function ($join) {
+                $join->on('cawangan_simulasi.caw_id', '=', 'simulasibid.caw_id')
+                     ->on('cawangan_simulasi.simulasi_id', '=', 'simulasibid.simulasi_id');
+            })
+
             ->select('simulasibid.id','simulasibid.berat','simulasibid.marhun','simulasibid.cajlelong','simulasibid.baki','simulasibid.nilaimarhun',
-            'simulasibid.pinjaman','simulasibid.hargaasas','simulasibid.cajlelong','simulasibid.bakiupah')
-            ->where('cawangan_simulasi.caw_id','=', $cawsim->caw_id)
+            'simulasibid.pinjaman','simulasibid.hargaasas','simulasibid.cajlelong','simulasibid.bakiupah','cawangan_simulasi.kali','norujukan')
             ->where('cawangan_simulasi.simulasi_id','=', $cawsim->simulasi_id)
-            ->get();
-            // ->toArray();
-            // dd($databid);
+            ->where('cawangan_simulasi.caw_id','=', $cawsim->caw_id)
+            ->where('cawangan_simulasi.kali','=',$kali)
+            ->get()->toArray();
+
             $t_simulasi = Simulasi::join('cawangan_simulasi','cawangan_simulasi.simulasi_id','=','simulasi.id')
             ->where('cawangan_simulasi.simulasi_id','=', $cawsim->simulasi_id)
             ->where('cawangan_simulasi.kali','=',$kali)->first();
@@ -2146,7 +2162,11 @@ class SimulasiController extends Controller
             {
                 // $t_lelong = $bid['t_lelong'];
                 // dd($bid['id']);
-                $marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get();
+                $marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])
+                ->join('simulasibid','simulasibidmarhun.simulasibid_id','=','simulasibid.id')
+                ->join('simulasi','simulasibid.simulasi_id','=','simulasi.id')
+                ->where('kali','=',$kali)
+                ->get();
                 $berat = $berat + $bid['berat'];
                 // $nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun'));
                 $nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
@@ -2181,6 +2201,7 @@ class SimulasiController extends Controller
             }
 
             array_push($arraycaw,[
+                
                 'id_cawangan'=> $cawangan['id'],
                 'cawangan'=>$cawangan['caw_name'],
                 't_lelong'=>$simulasi['tarikh_lelong'],