Update dan bUgs FIx

app/Http/Controllers/NotifikasiController.php

@@ -86,7 +86,12 @@ class NotifikasiController extends Controller
 
     public function getNotif(Request $request)
     {
-        $notif = Notifikasi::where(["userid"=>Auth::user()->id,"is_read"=>0])->get();
+        $notif = Notifikasi::where(["userid"=>Auth::user()->id,"is_read"=>0]);
+        $notif = [
+            "jml"=>$notif->count(),
+            "data"=>$notif->orderBy("created_at","desc")->skip(0)->take(5)->get()
+        ];
+
         return response()->json($notif);
     }
 }

app/Http/Controllers/RealisasiBelanjaController.php

@@ -295,7 +295,8 @@ class RealisasiBelanjaController extends Controller
         $idSPS = isset($post["id_sps"])?$post["id_sps"]:"";
         $fReview = isset($post["f_review"])?$post["f_review"]:"";
 
-        $sqlStr = "SELECT x.* FROM BELANJA_REALISASI x LEFT JOIN NEWSIPKD.TROPD z ON x.KODE_SKPD = z.C_OPD 
+        $sqlStr = "SELECT x.* FROM BELANJA_REALISASI x 
+                    LEFT JOIN NEWSIPKD.TROPD z ON x.KODE_SKPD = z.C_OPD 
                     WHERE x.tahun_anggaran='$ta'";
         
         if (getRole()=="skpd"){
@@ -333,13 +334,19 @@ class RealisasiBelanjaController extends Controller
 
         $dataFilter = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM ($sqlStr $filter) x"));
         $dataTotal = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM ($sqlStr) x"));
-        $data = DB::select(DB::raw("SELECT a.*,b.jml FROM (".$sqlStr.$filter.") a 
+        $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
-                                ) b ON a.kode_rsk = b.I_IDRSK  
+                                ) b 
+                                ON a.kode_rsk = b.I_IDRSK 
+                                LEFT JOIN (
+                                    SELECT id_rsk,count(id_rsk) as jml_spd FROM SAMASA.belanja_realisasi_spd 
+                                    GROUP BY id_rsk 
+                                ) c 
+                                ON a.kode_rsk = c.id_rsk  
                                 ORDER BY a.KODE_SKPD, a.KODE_RSK OFFSET ".$offset." ROWS FETCH NEXT ".$limit." ROWS ONLY"));
 
         return response()->json([
@@ -575,7 +582,11 @@ class RealisasiBelanjaController extends Controller
             }
         }
 
-        return view('realisasi_belanja.form_input_spd',compact("SPDs","id","redirect"));
+        $selected = BelanjaRealisasiSPD::where("id_rsk",$id)->get();
+        //$selected = (array) $selected;
+        $selected = json_decode(json_encode($selected), true);
+
+        return view('realisasi_belanja.form_input_spd',compact("SPDs","id","redirect","selected"));
     }
 
     public function inputRealisasi(Request $request, $id)

public/js/app.js

@@ -451,12 +451,12 @@ refreshNotif = ()=>{
       method: "POST",
       success: function(data){
           $("#span_count_notif").hide();
-          if (data.length>0){
+          if (data.jml>0){
-              $("#span_count_notif").html(data.length);
+              $("#span_count_notif").html(data.jml);
               $("#span_count_notif").show();
               $listElm = "";
-              $.each(data, function(x,y){
+              $.each(data.data, function(x,y){
-                  $listElm = `<a href="`+y.url+`" class="dropdown-item">
+                  $listElm += `<a href="`+y.url+`" class="dropdown-item">
                               <div class="media">
                                   <div class="media-body">
                                       <h3 class="dropdown-item-title"><strong>`+ y.jenis +`</strong>

resources/views/realisasi_belanja/form_input_spd.blade.php

@@ -15,7 +15,7 @@
                     <?php 
                         foreach($SPDs as $spd){ ?>
                             <tr>
-                                <td><input type="checkbox" name="spd[]" value="{{ $spd->i_spdno_dok }}"></td>
+                                <td><input type="checkbox" name="spd[]" value="{{ $spd->i_spdno_dok }}" {{ array_search($spd->i_spdno_dok, array_column($selected, "no_spd")) > -1?"checked":"" }}></td>
                                 <td>{{ $spd->i_spdno_dok }}</td>
                                 <td class="text-center">{{ date("d-m-Y",strtotime($spd->d_spdno)) }}</td>
                                 <td class="text-right">{{ separateNumberIndo($spd->jml) }}</td>

resources/views/realisasi_belanja/index.blade.php

@@ -97,7 +97,7 @@
             <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2>
             <div class="card-tools">
                 @php if (Auth::user()->can("Input Realisasi DBH Realisasi Belanja")) { @endphp
-                    <a class="modalButton btn btn-sm btn-success" size="modal-xl" title="Tambah Data Realisasi Belanja" href="{{ URL::to("/realisasi-belanja/create-from-rsk") }}">Tambah Data</a>
+                    <a class="modalButton btn btn-sm btn-success" size="modal-xl" title="Tambah Data Realisasi Belanja" href="{{ URL::to("/realisasi-belanja/create-from-rsk") }}"><i class='fa fa-edit'></i> Tambah Data</a>
                 @php } @endphp
             </div>
         </div>
@@ -118,6 +118,7 @@
                                 "Jumlah Realisasi",
                                 "Volume Realisasi", 
                                 "Unit Realisasi",
+                                "SPD",
                                 "Aksi"
                             );
 
@@ -268,6 +269,7 @@
                     { "data": null, "className":"text-right"},
                     { "data": "volume_satuan_realisasi", "className":"text-center", "defaultContent":"0", "width":50 },  
                     { "data": "unit_satuan_realisasi", "className":"text-center", "defaultContent":"-", "width":50 },
+                    { "data": null},
                     { "data": null}  
                 ],
                 "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) {
@@ -286,7 +288,8 @@
                     $("td:eq(6)", nRow).html(separateNumberIndo(aData["volume_satuan"]));
                     $("td:eq(8)", nRow).html(realisasi);
                     $("td:eq(9)", nRow).html(separateNumberIndo(aData["volume_satuan_realisasi"]));
-                    $("td:eq(11)", nRow).html(`
+                    $("td:eq(11)", nRow).html(<?= getRole()=="bendahara"?'"<a class=\"modalButton\" title=\"Pilih SPD\" href=\"'.URL::to("/").'/realisasi-belanja/"+aData["kode_rsk"]+"/ubah-spd/?redirect=/realisasi-belanja\">"+aData["jml_spd"]+"</a>"':'aData["jml_spd"]' ?>);
+                    $("td:eq(12)", nRow).html(`
                         <form class="form-delete" action="{{ URL::to("/realisasi-belanja") }}/`+ aData["id"] +`" method="POST">   
                             @csrf
                             @method('DELETE')      
@@ -328,7 +331,7 @@
                             .append("<td class='text-right'><strong>"+ separateNumberIndo(sum) +"</strong></td>" )
                             .append("<td colspan='2'></td>") 
                             .append("<td class='text-right'><strong>"+ separateNumberIndo(sum2) +"</strong></td>" )
-                            .append("<td colspan='3'></td>") 
+                            .append("<td colspan='4'></td>") 
                     },
                     startRender: function ( rows, group, index ) {
                         // let group1 = rows.data().pluck("GROUP1");