diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index afae4d5..0a128c2 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -233,8 +233,17 @@ class RealisasiBelanjaController extends Controller } } - $BelanjaRealisasiDetail = BelanjaRealisasiDetail::where("belanja_realisasi_id",$BelanjaRealisasi->id)->orderBy("semester")->get(); - // var_dump($BelanjaRealisasi->kode_rsk,$BelanjaRealisasi->kode_sub_kegiatan); exit; + // GET BELANJA SEMESTER ====================================================== + $BelanjaRealisasiDetail = BelanjaRealisasiDetail::where("belanja_realisasi_id",$BelanjaRealisasi->id)->get(); + $BelanjaRealisasiDetail = json_decode(json_encode($BelanjaRealisasiDetail),true); + $semester1 = array_search(1,array_column($BelanjaRealisasiDetail,"semester")); + $semester1 = $semester1 > -1 ? $BelanjaRealisasiDetail[$semester1] : []; + $semester2 = array_search(2,array_column($BelanjaRealisasiDetail,"semester")); + $semester2 = $semester2 > -1 ? $BelanjaRealisasiDetail[$semester2] : []; + $BelanjaRealisasiDetail = []; + $BelanjaRealisasiDetail[0] = $semester1; + $BelanjaRealisasiDetail[1] = $semester2; + $this->setTitle("Realisasi Belanja"); $this->setSubtitle("Realisasi Belanja :: ".$BelanjaRealisasi->jenis_dana." ".$BelanjaRealisasi->nama_jenis_dana); if ($request->isMethod('post')) { @@ -343,10 +352,10 @@ class RealisasiBelanjaController extends Controller $dataTotal = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM ($sqlStr) x")); $data = DB::select(DB::raw("SELECT a.*,b.jml,NVL(c.jml_spd,0) AS jml_spd FROM (".$sqlStr.$filter.") a LEFT JOIN ( - SELECT I_IDRSK,SUM(V_SPP) as jml - FROM NEWSIPKD.V_SPPBLJRSK - WHERE D_SP2D_SAH IS NOT NULL AND C_ANGG_TAHUN = $ta - GROUP BY I_IDRSK + SELECT I_IDRSK, SUM(REALISASI_1) AS jml + FROM NEWSIPKD.VW_REALISASI_BELANJA_PERBULAN + WHERE C_ANGG_TAHUN = $ta + GROUP BY I_IDRSK ) b ON a.kode_rsk = b.I_IDRSK LEFT JOIN ( diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php index d276318..d5f5f38 100644 --- a/resources/views/realisasi_belanja/submit.blade.php +++ b/resources/views/realisasi_belanja/submit.blade.php @@ -258,15 +258,15 @@