diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php
index 24560a5..46a8175 100644
--- a/app/Http/Controllers/RealisasiBelanjaController.php
+++ b/app/Http/Controllers/RealisasiBelanjaController.php
@@ -354,11 +354,11 @@ class RealisasiBelanjaController extends Controller
         $ta = $post["ta"];
 
         $dataFilter = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM VW_BELANJA_REALISASI ".$this->tableFilter($request)));
-        $dataTotal = BelanjaRealisasi::count();
+        $dataTotal = BelanjaRealisasi::where("tahun_anggaran",$ta)->count();
         if (getRole()=="skpd"){
-            $dataTotal = BelanjaRealisasi::whereRaw("KODE_SKPD='".Auth::user()->nrk."'")->count();
+            $dataTotal = BelanjaRealisasi::where("tahun_anggaran",$ta)->whereRaw("KODE_SKPD='".Auth::user()->nrk."'")->count();
         }elseif (getRole()=="sbpk"){
-            $dataTotal = BelanjaRealisasi::whereRaw("KODE_SKPD IN (SELECT C_OPD FROM NEWSIPKD.TROPD WHERE C_WIL_SP2DPROSES=".Auth::user()->wilayah.")");
+            $dataTotal = BelanjaRealisasi::where("tahun_anggaran",$ta)->whereRaw("KODE_SKPD IN (SELECT C_OPD FROM NEWSIPKD.TROPD WHERE C_WIL_SP2DPROSES=".Auth::user()->wilayah.")");
         }
         $data = DB::select(DB::raw(BelanjaRealisasi::tableData($ta, $this->tableFilter($request), $offset, $limit)));
 
@@ -976,46 +976,46 @@ class RealisasiBelanjaController extends Controller
         
         $fileName = 'Realisasi-belanja.xlsx';  
         $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();    
-        $sheet->setCellValue(getAlphabetCell(0).'1', 'Kode SKPD');
-        $sheet->setCellValue(getAlphabetCell(1).'1', 'Nama SKPD');
-        $sheet->setCellValue(getAlphabetCell(2).'1', 'Kode Program');
-        $sheet->setCellValue(getAlphabetCell(3).'1', 'Nama Program');
-        $sheet->setCellValue(getAlphabetCell(4).'1', 'Kode Sub Kegiatan');
-        $sheet->setCellValue(getAlphabetCell(5).'1', 'Sub Kegiatan');
-        $sheet->setCellValue(getAlphabetCell(6).'1', 'Kode Rinci Sub Kegiatan');
-        $sheet->setCellValue(getAlphabetCell(7).'1', 'Rinci Sub Kegiatan');
-        $sheet->setCellValue(getAlphabetCell(8).'1', 'Kode Rekening');
-        $sheet->setCellValue(getAlphabetCell(9).'1', 'Nama Rekening');
-        $sheet->setCellValue(getAlphabetCell(10).'1', 'Anggaran');
-        $sheet->setCellValue(getAlphabetCell(11).'1', 'Volume');
-        $sheet->setCellValue(getAlphabetCell(12).'1', 'Unit');
-        $sheet->setCellValue(getAlphabetCell(13).'1', 'Realisasi');
-        $sheet->setCellValue(getAlphabetCell(14).'1', 'Volume');
-        $sheet->setCellValue(getAlphabetCell(15).'1', 'Unit');
-        $sheet->setCellValue(getAlphabetCell(16).'1', 'Jenis Belanja');
-        $sheet->setCellValue(getAlphabetCell(17).'1', 'Sub Jenis Belanja');
+        $sheet = $spreadsheet->getActiveSheet();   
+        $arrCol = [
+            'Kode SKPD'=>'kode_skpd',
+            'Nama SKPD'=>'nama_skpd',
+            'Kode Program'=>'kode_program',
+            'Nama Program'=>'nama_program',
+            'Kode Sub Kegiatan'=>'kode_sub_kegiatan',
+            'Sub Kegiatan'=>'nama_sub_kegiatan',
+            'Kode RSK'=>'kode_rsk',
+            'Nama RSK'=>'nama_rsk',
+            'Kode Rekening'=>'kode_rekening',
+            'Nama Rekening'=>'nama_rekening',
+            'Anggaran'=>'jumlah_anggaran',
+            'Alokasi Anggaran'=>'alokasi_anggaran',
+            'Volume'=>'volume_satuan',
+            'Unit'=>'unit_satuan',
+            'Realisasi'=>'jml',
+            'Volume'=>'volume_satuan_realisasi',
+            'Unit'=>'unit_satuan_realisasi',
+            'Jenis Belanja'=>'nama_jenis_belanja',
+            'Sub Jenis Belanja'=>'nama_sub_jenis_belanja',
+        ]; 
+        
+        foreach(GetBulan() as $key=>$namaBulan){
+            $arrCol+=[$namaBulan=>"jumlah_realisasi_".($key+1)];
+        }
+
+        $i=0;
+        foreach($arrCol as $key=>$fieldVal){
+            $sheet->setCellValue(getAlphabetCell($i).'1', $key);
+            $i++;
+        }
 
         $rows = 2; 
         foreach ($data as $val){
-            $sheet->setCellValue(getAlphabetCell(0) . $rows, $val["kode_skpd"]);
-            $sheet->setCellValue(getAlphabetCell(1) . $rows, $val["nama_skpd"]);
-            $sheet->setCellValue(getAlphabetCell(2) . $rows, $val["kode_program"]);
-            $sheet->setCellValue(getAlphabetCell(3) . $rows, $val["nama_program"]);
-            $sheet->setCellValue(getAlphabetCell(4) . $rows, $val["kode_sub_kegiatan"]);
-            $sheet->setCellValue(getAlphabetCell(5) . $rows, $val["nama_sub_kegiatan"]);
-            $sheet->setCellValue(getAlphabetCell(6) . $rows, $val["kode_rsk"]);
-            $sheet->setCellValue(getAlphabetCell(7) . $rows, $val["nama_rsk"]);
-            $sheet->setCellValue(getAlphabetCell(8) . $rows, $val["kode_rekening"]);
-            $sheet->setCellValue(getAlphabetCell(9) . $rows, $val["nama_rekening"]);
-            $sheet->setCellValue(getAlphabetCell(10) . $rows, $val["jumlah_anggaran"]);
-            $sheet->setCellValue(getAlphabetCell(11) . $rows, $val["volume_satuan"]);
-            $sheet->setCellValue(getAlphabetCell(12) . $rows, $val["unit_satuan"]);
-            $sheet->setCellValue(getAlphabetCell(13) . $rows, $val["jml"]);
-            $sheet->setCellValue(getAlphabetCell(14) . $rows, $val["volume_satuan_realisasi"]);
-            $sheet->setCellValue(getAlphabetCell(15) . $rows, $val["unit_satuan_realisasi"]);
-            $sheet->setCellValue(getAlphabetCell(16) . $rows, $val["nama_jenis_belanja"]);
-            $sheet->setCellValue(getAlphabetCell(17) . $rows, $val["nama_sub_jenis_belanja"]);
+            $i=0;
+            foreach($arrCol as $key=>$fieldVal){
+                $sheet->setCellValue(getAlphabetCell($i) . $rows, $val[$fieldVal]);
+                $i++;
+            }
             $rows++;
         } 
         
diff --git a/app/Models/BelanjaRealisasi.php b/app/Models/BelanjaRealisasi.php
index 870b911..5610e24 100644
--- a/app/Models/BelanjaRealisasi.php
+++ b/app/Models/BelanjaRealisasi.php
@@ -70,8 +70,12 @@ class BelanjaRealisasi extends Eloquent
         $ta = getTA();
         $sqlstr = "SELECT a.*,NVL(b.jml,0) as jml,
                     CASE WHEN a.jenis_dana = 'DBH' AND a.nama_subjenis_dana<>'CHT' 
-                    THEN NVL(d.jml_spd, 0) ELSE NVL(c.jml_spd, 0) END AS jml_spd
-                    FROM VW_BELANJA_REALISASI a  
+                    THEN NVL(d.jml_spd, 0) ELSE NVL(c.jml_spd, 0) END AS jml_spd,
+                    jumlah_realisasi_1,jumlah_realisasi_2,jumlah_realisasi_3,jumlah_realisasi_4,jumlah_realisasi_5,jumlah_realisasi_6,jumlah_realisasi_7,
+                    jumlah_realisasi_8,jumlah_realisasi_9,jumlah_realisasi_10,jumlah_realisasi_11,jumlah_realisasi_12 
+                FROM VW_BELANJA_REALISASI a  
+                LEFT JOIN BELANJA_REALISASI_RINCI a1 
+                    ON a.id=a1.belanja_realisasi_id 
                 LEFT JOIN (
                     SELECT I_IDRSK,SUM(REALISASI) AS jml 
                     FROM MV_ANGGARAN_REALISASI_RSK 
diff --git a/resources/views/admin/mst_jenis_belanja/index.blade.php b/resources/views/admin/mst_jenis_belanja/index.blade.php
index cacb950..f98d62c 100644
--- a/resources/views/admin/mst_jenis_belanja/index.blade.php
+++ b/resources/views/admin/mst_jenis_belanja/index.blade.php
@@ -20,7 +20,7 @@
         <div class="card-header">
             <h5 class="card-title"><i class="fa fa-th-list"></i> @php echo $sitesubTitle; @endphp</h5>
             <div class="card-tools">
-                <a class="btn btn-tool btn-default" href="{{ URL::to("/admin/MstJenisBelanja/create") }}"><i class="fa fa-edit"></i> Tambah Data</a>
+                <a class="btn btn-tool btn-dark" href="{{ URL::to("/admin/MstJenisBelanja/create") }}"><i class="fa fa-edit"></i> Tambah Data</a>
             </div>
         </div>
         <div class="card-body">
diff --git a/resources/views/admin/mst_jenis_belanja/show.blade.php b/resources/views/admin/mst_jenis_belanja/show.blade.php
index 244fcd4..9b4b1a7 100644
--- a/resources/views/admin/mst_jenis_belanja/show.blade.php
+++ b/resources/views/admin/mst_jenis_belanja/show.blade.php
@@ -49,7 +49,7 @@
         <div class="card-header">
             <h5 class="card-title"><i class="fa fa-th-list"></i> DATA SUB JENIS BELANJA</h5>
             <div class="card-tools">
-                <a class="btn btn-tool btn-default" href="{{ URL::to("/admin/MstJenisBelanja/".$MstJenisBelanja->id."/create-sub") }}"><i class="fa fa-edit"></i> Tambah Data</a>
+                <a class="btn btn-tool btn-dark" href="{{ URL::to("/admin/MstJenisBelanja/".$MstJenisBelanja->id."/create-sub") }}"><i class="fa fa-edit"></i> Tambah Data</a>
             </div>
         </div>
         <div class="card-body">
diff --git a/resources/views/admin/mst_jenis_dana/index.blade.php b/resources/views/admin/mst_jenis_dana/index.blade.php
index 054a4d8..d5049c0 100644
--- a/resources/views/admin/mst_jenis_dana/index.blade.php
+++ b/resources/views/admin/mst_jenis_dana/index.blade.php
@@ -20,7 +20,7 @@
         <div class="card-header">
             <h5 class="card-title"><i class="fa fa-th-list"></i> @php echo $sitesubTitle; @endphp</h5>
             <div class="card-tools">
-                <a class="btn btn-tool btn-default" href="{{ URL::to("/admin/MstJenisDana/create") }}"><i class="fa fa-edit"></i> Tambah Data</a>
+                <a class="btn btn-tool btn-dark" href="{{ URL::to("/admin/MstJenisDana/create") }}"><i class="fa fa-edit"></i> Tambah Data</a>
             </div>
         </div>
         <div class="card-body">
diff --git a/resources/views/admin/mst_jenis_dana/show.blade.php b/resources/views/admin/mst_jenis_dana/show.blade.php
index 244fcd4..9b4b1a7 100644
--- a/resources/views/admin/mst_jenis_dana/show.blade.php
+++ b/resources/views/admin/mst_jenis_dana/show.blade.php
@@ -49,7 +49,7 @@
         <div class="card-header">
             <h5 class="card-title"><i class="fa fa-th-list"></i> DATA SUB JENIS BELANJA</h5>
             <div class="card-tools">
-                <a class="btn btn-tool btn-default" href="{{ URL::to("/admin/MstJenisBelanja/".$MstJenisBelanja->id."/create-sub") }}"><i class="fa fa-edit"></i> Tambah Data</a>
+                <a class="btn btn-tool btn-dark" href="{{ URL::to("/admin/MstJenisBelanja/".$MstJenisBelanja->id."/create-sub") }}"><i class="fa fa-edit"></i> Tambah Data</a>
             </div>
         </div>
         <div class="card-body">
diff --git a/resources/views/admin/mst_pengguna/index.blade.php b/resources/views/admin/mst_pengguna/index.blade.php
index e09b159..461ccca 100644
--- a/resources/views/admin/mst_pengguna/index.blade.php
+++ b/resources/views/admin/mst_pengguna/index.blade.php
@@ -20,9 +20,9 @@
         <div class="card-header">
             <h5 class="card-title"><i class="fa fa-th-list"></i> @php echo $sitesubTitle; @endphp</h5>
             <div class="card-tools">
-                <a class="btn btn-tool btn-default" href="{{ route('users.create') }}"><i class="fa fa-edit"></i> Tambah Data</a>
-                <button id="btn_lock_all" type="button" class="btn btn-tool btn-default"><i class="fa fa-lock"></i> Lock Upload Data</button>
-                <button id="btn_reset_lock_all" type="button" class="btn btn-tool btn-default"><i class="fa fa-unlock"></i> unLock Upload Data</button>
+                <a class="btn btn-tool btn-dark" href="{{ route('users.create') }}"><i class="fa fa-edit"></i> Tambah Data</a>
+                <button id="btn_lock_all" type="button" class="btn btn-tool btn-dark"><i class="fa fa-lock"></i> Lock Upload Data</button>
+                <button id="btn_reset_lock_all" type="button" class="btn btn-tool btn-dark"><i class="fa fa-unlock"></i> unLock Upload Data</button>
             </div>
         </div>
         <div class="card-body">
diff --git a/resources/views/admin/mst_satuan/index.blade.php b/resources/views/admin/mst_satuan/index.blade.php
index 8b13529..2423205 100644
--- a/resources/views/admin/mst_satuan/index.blade.php
+++ b/resources/views/admin/mst_satuan/index.blade.php
@@ -20,7 +20,7 @@
         <div class="card-header">
             <h5 class="card-title"><i class="fa fa-th-list"></i> @php echo $sitesubTitle; @endphp</h5>
             <div class="card-tools">
-                <a class="btn btn-tool btn-default" href="{{ URL::to("/admin/MstSatuan/create") }}"><i class="fa fa-edit"></i> Tambah Data</a>
+                <a class="btn btn-tool btn-dark" href="{{ URL::to("/admin/MstSatuan/create") }}"><i class="fa fa-edit"></i> Tambah Data</a>
             </div>
         </div>
         <div class="card-body">
diff --git a/resources/views/admin/mst_satuan/show.blade.php b/resources/views/admin/mst_satuan/show.blade.php
index 244fcd4..9b4b1a7 100644
--- a/resources/views/admin/mst_satuan/show.blade.php
+++ b/resources/views/admin/mst_satuan/show.blade.php
@@ -49,7 +49,7 @@
         <div class="card-header">
             <h5 class="card-title"><i class="fa fa-th-list"></i> DATA SUB JENIS BELANJA</h5>
             <div class="card-tools">
-                <a class="btn btn-tool btn-default" href="{{ URL::to("/admin/MstJenisBelanja/".$MstJenisBelanja->id."/create-sub") }}"><i class="fa fa-edit"></i> Tambah Data</a>
+                <a class="btn btn-tool btn-dark" href="{{ URL::to("/admin/MstJenisBelanja/".$MstJenisBelanja->id."/create-sub") }}"><i class="fa fa-edit"></i> Tambah Data</a>
             </div>
         </div>
         <div class="card-body">
diff --git a/resources/views/admin/mst_sub_jenis_belanja/show.blade.php b/resources/views/admin/mst_sub_jenis_belanja/show.blade.php
index 0032b6d..d5d1321 100644
--- a/resources/views/admin/mst_sub_jenis_belanja/show.blade.php
+++ b/resources/views/admin/mst_sub_jenis_belanja/show.blade.php
@@ -45,7 +45,7 @@
         <div class="card-header">
             <h5 class="card-title"><i class="fa fa-th-list"></i> DATA SUB JENIS BELANJA</h5>
             <div class="card-tools">
-                <a class="btn btn-tool btn-default" href="{{ URL::to("/admin/MstJenisBelanja/".$MstJenisBelanja->id."/create-sub") }}"><i class="fa fa-edit"></i> Tambah Data</a>
+                <a class="btn btn-tool btn-dark" href="{{ URL::to("/admin/MstJenisBelanja/".$MstJenisBelanja->id."/create-sub") }}"><i class="fa fa-edit"></i> Tambah Data</a>
             </div>
         </div>
         <div class="card-body">