diff --git a/app/Http/Controllers/Admin/MstPenggunaController.php b/app/Http/Controllers/Admin/MstPenggunaController.php
index 1b32a81..5bd7769 100644
--- a/app/Http/Controllers/Admin/MstPenggunaController.php
+++ b/app/Http/Controllers/Admin/MstPenggunaController.php
@@ -48,6 +48,7 @@ class MstPenggunaController extends Controller
         $user->roles()->detach();
         //$user->removeRole($requestAll["opt_role"]);
         $user->assignRole($requestAll["opt_role"]);
+        app()->make(\Spatie\Permission\PermissionRegistrar::class)->forgetCachedPermissions();
      
         return redirect()->route('users.index')
                         ->with('success','User berhasil dibuat.');
@@ -80,6 +81,7 @@ class MstPenggunaController extends Controller
         $user->roles()->detach();
         // $user->removeRole($requestAll["opt_role"]);
         $user->assignRole($requestAll["opt_role"]);
+        app()->make(\Spatie\Permission\PermissionRegistrar::class)->forgetCachedPermissions();
         
         return redirect()->route('users.index')
                         ->with('success','User berhasil diubah!');
diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php
index cb2ccf7..afae4d5 100644
--- a/app/Http/Controllers/RealisasiBelanjaController.php
+++ b/app/Http/Controllers/RealisasiBelanjaController.php
@@ -286,7 +286,7 @@ class RealisasiBelanjaController extends Controller
         $post = $request->all();
         $offset = $post["start"];
         $limit = $post["length"];
-        //$src = $post["src"];
+        $src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]):"";
         $ta = $post["ta"];
         $JenisDana = isset($post["jenis_dana"])?$post["jenis_dana"]:"";
         $SubJenisDana = isset($post["sub_jenis_dana"])?$post["sub_jenis_dana"]:"";
@@ -319,9 +319,9 @@ class RealisasiBelanjaController extends Controller
             $filter.= " AND x.SUB_JENIS_DANA = ".$SubJenisDana;
         }
 
-        if (!empty($subkeg)){
-            $filter.= " AND x.KODE_SUB_KEGIATAN = '".$subkeg."'";
-        }
+        // if (!empty($subkeg)){
+        //     $filter.= " AND x.KODE_SUB_KEGIATAN = '".$subkeg."'";
+        // }
 
         if (!empty($idSPS)){
             $filter.= " AND x.id_sps = ".$idSPS;
@@ -332,6 +332,13 @@ class RealisasiBelanjaController extends Controller
             $filter.= " AND x.f_view_sbpk = $fReview";
         }
 
+        if (!empty($src)){
+            $src = strtolower($src);
+            $filter.=" AND ( LOWER(NAMA_PROGRAM) LIKE '%".$src."%' OR 
+                            LOWER(NAMA_SUB_KEGIATAN) LIKE '%".$src."%' OR 
+                            LOWER(NAMA_RSK) LIKE '%".$src."%' ) ";
+        }
+
         $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,NVL(c.jml_spd,0) AS jml_spd FROM (".$sqlStr.$filter.") a 
diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php
index 28f8b06..09ee316 100644
--- a/resources/views/realisasi_belanja/index.blade.php
+++ b/resources/views/realisasi_belanja/index.blade.php
@@ -251,7 +251,7 @@
                 "columnDefs": [
                     //{ className: "td-nowrap", "targets": [ 1 ] }
                 ],
-                "dom": "<\"top\" <\"row\"<\"col-md-6\"l><\"col-md-6 text-right\"B>>>rt<\"bottom\" <\"row\"<\"col-md-6\"i><\"col-md-6\"p>> ><\"clear\">",
+                "dom": "<\"top\" <\"row\"<\"col-md-6\"l><\"col-md-2 ml-auto \"f><\"col-md-1 text-right\"B>>>rt<\"bottom\" <\"row\"<\"col-md-6\"i><\"col-md-6\"p>> ><\"clear\">",
                 "lengthMenu": [
                     [ 10, 25, 50 ],
                     [ "10", "25", "50" ]
diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php
index d96b797..f25974e 100644
--- a/resources/views/realisasi_pendapatan/index.blade.php
+++ b/resources/views/realisasi_pendapatan/index.blade.php
@@ -76,6 +76,8 @@
     <script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-buttons/js/buttons.colVis.min.js"></script>
     <script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-fixedcolumns/js/dataTables.fixedColumns.min.js"></script>
     <script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-fixedcolumns/js/fixedColumns.bootstrap4.min.js"></script>
+    <script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-rowgroup/js/dataTables.rowGroup.min.js"></script>
+    <script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-rowgroup/js/rowGroup.bootstrap4.min.js"></script>
     <script type="text/javascript">
         $(document).ready(function(){
             var srcDate1 = null, srcDate2 = null;
@@ -218,6 +220,34 @@
                         ],
                     }
                 ],
+                rowGroup: {
+                    endRender: function ( rows, group, index ) {
+                        let sum = rows.data().pluck("simtrad4_kotor").reduce( function (a, b) {
+                            return a + b * 1;
+                        }, 0);
+
+                        let sum2 = rows.data().pluck("simtrad4_potongan").reduce( function (a, b) {
+                            return a + b * 1;
+                        }, 0);
+
+                        let sum3 = rows.data().pluck("simtrad4_bersih").reduce( function (a, b) {
+                            return a + b * 1;
+                        }, 0);
+
+                        let textmuted = index == 1 ? "text-muted":"";
+                        let labelGroup = index == 1 ?"JUMLAH | " + group : "TOTAL";
+                        return $("<tr/>") 
+                            .append("<td></td>")   
+                            .append("<td class=\'text-left " + textmuted +"\'><strong>"+labelGroup+"</strong></td>")
+                            .append("<td class='text-right'><strong>"+ separateNumberIndo(sum) +"</strong></td>" )
+                            .append("<td class='text-right'><strong>"+ separateNumberIndo(sum2) +"</strong></td>" )
+                            .append("<td class='text-right'><strong>"+ separateNumberIndo(sum3) +"</strong></td>" )
+                            .append("<td colspan='5'></td>") 
+                    },
+                    startRender: function ( rows, group, index ) {
+                    },
+                    dataSrc: ["tahun_anggaran"],
+                },
             });
         });
     </script>