diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php
index da6bb34..cb70f40 100644
--- a/app/Http/Controllers/JadwalSalurdanaController.php
+++ b/app/Http/Controllers/JadwalSalurdanaController.php
@@ -26,7 +26,7 @@ class JadwalSalurdanaController extends Controller
 
     protected function queryJadwalSalurDana($ta)
     {
-        return 'SELECT kode_rekening,nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4,
+        $sqlstr = 'SELECT kode_rekening,nama_rekening,spsbulan1,spsbulan2,spsbulan3,spsbulan4,
                     spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12,
                     SUBSTR(KODE_REKENING,1,12) AS kodegrup,SUBSTR(KODE_REKENING,1,9) AS groupall,
                     NVL("1",0) AS "REAL1",NVL("2",0) AS "REAL2",NVL("3",0) AS "REAL3",
@@ -46,8 +46,16 @@ class JadwalSalurdanaController extends Controller
                         SUM(RKUD_JUMLAH) 
                         FOR BULAN IN(1,2,3,4,5,6,7,8,9,10,11,12)
                     )
-                )y ON x.ID = y.ID_SPS
+                )y ON x.ID = y.ID_SPS 
+                LEFT JOIN 
+                NEWSIPKD.TROPD z ON x.SKPD_ID = z.I_ID  
                 WHERE x.TAHUN = '.$ta.' AND x.SKPD_ID=980 AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\'';
+
+        // if (getRole()=="skpd"){
+        //     $sqlstr.=" AND z.C_OPD='".Auth::user()->nrk."'";
+        // }
+
+        return $sqlstr;
     }
 
     public function datatable(Request $request)
@@ -175,6 +183,10 @@ class JadwalSalurdanaController extends Controller
                     ) y
                     ON x.KODE_RSK = y.IDRSK 
                     WHERE x.TAHUN_ANGGARAN = \''.$ta.'\''.$typeDanaFilter;
+        
+        // if (getRole()=="skpd"){
+        //     $sqlstr.=" AND KODE_SKPD='".Auth::user()->nrk."'";
+        // }
         $data = DB::connection('oracle')->select(DB::raw($sqlstr.' ORDER BY x.id OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY'));
         $dataTotal = count(DB::connection('oracle')->select(DB::raw($sqlstr)));
         // if (!empty($src)){
diff --git a/database/migrations/2022_07_15_094519_create_temp_realisasi_belanja_table.php b/database/migrations/2022_07_15_094519_create_temp_realisasi_belanja_table.php
index 30d2fcc..bab3460 100644
--- a/database/migrations/2022_07_15_094519_create_temp_realisasi_belanja_table.php
+++ b/database/migrations/2022_07_15_094519_create_temp_realisasi_belanja_table.php
@@ -16,22 +16,23 @@ class CreateTempRealisasiBelanjaTable extends Migration
         Schema::create('temp_realisasi_belanja', function (Blueprint $table) {
             $table->id();
             $table->string("tahun_anggaran",4);
-            $table->string("jenis_belanja",50);
-            $table->string("sub_jenis_belanja",50);
+            $table->string("jenis_belanja",400);
+            $table->string("sub_jenis_belanja",400);
             $table->string("kode_program",50);
-            $table->string("nama_program",150);
+            $table->string("nama_program",400);
             $table->string("kode_skpd",50);
-            $table->string("nama_skpd",150);
+            $table->string("nama_skpd",400);
             $table->string("kode_kegiatan",50);
-            $table->string("nama_kegiatan",150);
+            $table->string("nama_kegiatan",400);
             $table->string("kode_sub_kegiatan",50);
-            $table->string("nama_sub_kegiatan",150);
+            $table->string("nama_sub_kegiatan",400);
             $table->string("kode_rsk",50);
-            $table->text("nama_rsk");
+            $table->string("nama_rsk",400);
             $table->string("kode_rekening",50)->nullable();
-            $table->string("nama_rekening",150)->nullable();
+            $table->string("nama_rekening",400)->nullable();
             $table->decimal('jumlah_anggaran', 19, 2);
-            $table->tinyInteger('volume_satuan');
+            $table->integer('volume_satuan')->nullable();
+            $table->string('unit_satuan',30)->nullable();
             $table->enum('jenis_dana',["DBH","DAK"]);
             $table->enum('sub_jenis_dana',["All","CHT","Fisik","Non-Fisik"]);
             $table->uuid('userid');
@@ -49,3 +50,4 @@ class CreateTempRealisasiBelanjaTable extends Migration
         Schema::dropIfExists('temp_realisasi_belanja');
     }
 }
+
diff --git a/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php b/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php
index e791c6f..ba7ef0a 100644
--- a/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php
+++ b/database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php
@@ -16,27 +16,29 @@ class CreateBelanjaRealisasiTable extends Migration
         Schema::create('belanja_realisasi', function (Blueprint $table) {
             $table->uuid('id')->primary();
             $table->string("tahun_anggaran",4);
-            $table->string("jenis_belanja",50);
-            $table->string("sub_jenis_belanja",50);
+            $table->string("jenis_belanja",400);
+            $table->string("sub_jenis_belanja",400);
             $table->string("kode_program",50);
-            $table->string("nama_program",150);
+            $table->string("nama_program",400);
             $table->string("kode_skpd",50);
-            $table->string("nama_skpd",150);
+            $table->string("nama_skpd",400);
             $table->string("kode_kegiatan",50);
-            $table->string("nama_kegiatan",150);
+            $table->string("nama_kegiatan",400);
             $table->string("kode_sub_kegiatan",50);
-            $table->string("nama_sub_kegiatan",150);
+            $table->string("nama_sub_kegiatan",400);
             $table->string("kode_rsk",50);
-            $table->text("nama_rsk");
+            $table->string("nama_rsk",400);
             $table->string("kode_rekening",50)->nullable();
-            $table->string("nama_rekening",150)->nullable();
+            $table->string("nama_rekening",400)->nullable();
             $table->decimal('jumlah_anggaran', 19, 2);
-            $table->tinyInteger('volume_satuan');
-            $table->string('unit_satuan',30);
-            $table->decimal('jumlah_realisasi', 19, 2);
-            $table->tinyInteger('volume_satuan_realisasi')->nullable();
+            $table->integer('volume_satuan')->nullable();
+            $table->string('unit_satuan',30)->nullable();
+            $table->decimal('jumlah_realisasi', 19, 2)->nullable();
+            $table->integer('volume_satuan_realisasi')->nullable();
             $table->string('unit_satuan_realisasi',30)->nullable();
-            $table->string("no_sp2d",30);
+            $table->string("no_sp2d",30)->nullable();
+            $table->string("jenis_dana",50);
+            $table->string("sub_jenis_dana",50);
             $table->uuid('realisasi_by')->nullable();
             $table->uuid('created_by')->nullable();
             $table->timestamps();
diff --git a/resources/views/jadwal_salurdana/index_cht.blade.php b/resources/views/jadwal_salurdana/index_cht.blade.php
index af602d2..d619b48 100644
--- a/resources/views/jadwal_salurdana/index_cht.blade.php
+++ b/resources/views/jadwal_salurdana/index_cht.blade.php
@@ -371,12 +371,14 @@
                     $("td:eq(1)", nRow).html("<div class='text-wrap width-200'>" + aData["kode_rsk"] + " | " + aData["nama_rsk"] + "</div>");
                     $("td:eq(2)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
                     $.each(akb, function(i,x){
-                        $("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(parseFloat(akb[i])));
+                        let nAKB = akb[i] == null ? 0 : parseFloat(akb[i]);
+                        let nReal = real[i] == null ? 0 : parseFloat(real[i]);
+                        $("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(nAKB));
                         Jadwalcol++;
-                        $("td:eq("+(Jadwalcol)+")", nRow).html(separateNumberIndo(parseFloat(real[i])));
-                        total+=parseFloat(akb[i]);
-                        totalReal+=parseFloat(real[i]);
+                        $("td:eq("+(Jadwalcol)+")", nRow).html(separateNumberIndo(nReal));
                         Jadwalcol++;
+                        total+=parseFloat(nAKB);
+                        totalReal+=parseFloat(nReal);
                     })
                     $("td:eq(27)", nRow).html(separateNumberIndo(total));
                     $("td:eq(28)", nRow).html(separateNumberIndo(totalReal));
diff --git a/resources/views/jadwal_salurdana/index_dak.blade.php b/resources/views/jadwal_salurdana/index_dak.blade.php
index 5872bcf..8dace82 100644
--- a/resources/views/jadwal_salurdana/index_dak.blade.php
+++ b/resources/views/jadwal_salurdana/index_dak.blade.php
@@ -19,7 +19,7 @@
         <div class="card-header border-0">
             <h2 class="card-title"><i class="fa fa-search mr-2"></i> Filter Pencarian</h2>
             <div class="card-tools">
-                <button type="button" class="btn btn-secondary btn-sm" data-card-widget="collapse" title="Collapse">
+                <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
                     <i class="fas fa-minus"></i>
                 </button>
             </div>
@@ -56,7 +56,7 @@
         <div class="card-header">
             <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> Jadwal Salur</h2>
             <div class="card-tools">
-                <button type="button" class="btn btn-secondary btn-sm" data-card-widget="collapse" title="Collapse">
+                <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
                     <i class="fas fa-minus"></i>
                 </button>
             </div>
@@ -497,12 +497,14 @@
                     $("td:eq(1)", nRow).html("<div class='text-wrap width-200'>" + aData["kode_rsk"] + " | " + aData["nama_rsk"] + "</div>");
                     $("td:eq(2)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
                     $.each(akb, function(i,x){
-                        $("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(parseFloat(akb[i])));
+                        let nAKB = akb[i] == null ? 0 : parseFloat(akb[i]);
+                        let nReal = real[i] == null ? 0 : parseFloat(real[i]);
+                        $("td:eq("+Jadwalcol+")", nRow).html(separateNumberIndo(nAKB));
                         Jadwalcol++;
-                        $("td:eq("+(Jadwalcol)+")", nRow).html(separateNumberIndo(parseFloat(real[i])));
-                        total+=parseFloat(akb[i]);
-                        totalReal+=parseFloat(real[i]);
+                        $("td:eq("+(Jadwalcol)+")", nRow).html(separateNumberIndo(nReal));
                         Jadwalcol++;
+                        total+=parseFloat(nAKB);
+                        totalReal+=parseFloat(nReal);
                     })
                     $("td:eq(27)", nRow).html(separateNumberIndo(total));
                     $("td:eq(28)", nRow).html(separateNumberIndo(totalReal));
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 237136d..18781c9 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -21,7 +21,7 @@
         </div>
       </section>
 
-      <section class="content">
+      <section class="content pt-1">
         @if ($errors->any())
           <div class="alert alert-danger">
               <strong>Whoops!</strong> There were some problems with your input.<br><br>
diff --git a/resources/views/layouts/empty.blade.php b/resources/views/layouts/empty.blade.php
index 9355344..8f88c27 100644
--- a/resources/views/layouts/empty.blade.php
+++ b/resources/views/layouts/empty.blade.php
@@ -21,7 +21,7 @@
         </div>
       </section>
 
-      <section class="content">
+      <section class="content pt-1">
         @if ($errors->any())
           <div class="alert alert-danger">
               <strong>Whoops!</strong> There were some problems with your input.<br><br>
diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php
index 017a3f5..09c19f4 100644
--- a/resources/views/realisasi_belanja/index.blade.php
+++ b/resources/views/realisasi_belanja/index.blade.php
@@ -178,7 +178,7 @@
                     { "data": "jumlah_anggaran", "className":"text-right", "defaultContent":"0" },  
                     { "data": "volume_satuan", "className":"text-center", "defaultContent":"0", "width":50 },  
                     { "data": "unit_satuan", "className":"text-center", "defaultContent":"-", "width":50 },  
-                    { "data": null},
+                    { "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}  
@@ -191,7 +191,9 @@
                     let btnInput = "";
                     $("td:eq(0)", nRow).html(index);
                     $("td:eq(5)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
+                    $("td:eq(6)", nRow).html(separateNumberIndo(aData["volume_satuan"]));
                     $("td:eq(8)", nRow).html(separateNumberIndo(aData["jml_realisasi_sp2d"]));
+                    $("td:eq(9)", nRow).html(separateNumberIndo(aData["volume_satuan_realisasi"]));
                     $("td:eq(11)", nRow).html('<a href="{{ $baseUrl }}/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+btnInput);
                     
                     return nRow;
diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php
index 44bc599..6f33f14 100644
--- a/resources/views/realisasi_belanja/submit.blade.php
+++ b/resources/views/realisasi_belanja/submit.blade.php
@@ -21,8 +21,8 @@
             <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> DETAIL {{ strtoupper($sitesubTitle) }}</h2>
             <div class="card-tools">
                 {{-- @if(auth()->user()->can('Tambah SKPP')) --}}
-                    <button class="btn btn-sm btn-default" onclick="location.href='{{ url('/realisasi-belanja') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
-                    <button type="button" class="btn btn-secondary btn-sm" data-card-widget="collapse" title="Collapse">
+                    <button class="btn btn-tool" onclick="location.href='{{ url('/realisasi-belanja') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
+                    <button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
                         <i class="fas fa-minus"></i>
                     </button>
                 {{-- @endif --}}
@@ -246,7 +246,7 @@
 
             $("input[name=anggaran]").val("{{ separateNumberIndo($BelanjaRealisasi->jumlah_anggaran) }}");
             $("input[name=anggaran]").attr("readonly", true);
-            $("input[name=vol]").val("{{ isset($BelanjaRealisasi->volume_satuan)?$BelanjaRealisasi->volume_satuan:0 }}");
+            $("input[name=vol]").val("{{ isset($BelanjaRealisasi->volume_satuan)?separateNumberIndo($BelanjaRealisasi->volume_satuan):0 }}");
             $("input[name=vol]").attr("readonly", true);
             $("input[name=unit]").val("{{ $BelanjaRealisasi->unit_satuan }}");
             $("input[name=unit]").attr("readonly", true);
diff --git a/resources/views/realisasi_belanja/upload.blade.php b/resources/views/realisasi_belanja/upload.blade.php
index b673655..77cecc6 100644
--- a/resources/views/realisasi_belanja/upload.blade.php
+++ b/resources/views/realisasi_belanja/upload.blade.php
@@ -81,7 +81,7 @@
             <h2 class="card-title"><i class="fa fa-check mr-2"></i> Validasi Data Rencana Belanja</h2>
             <div class="card-tools">
                 {{-- @if(auth()->user()->can('Tambah SKPP')) --}}
-                    <button id="upload_validated" class="btn btn-sm btn-warning"><i class="fa fa-save"></i>  Upload Data</button>
+                    <button id="upload_validated" class="btn btn-tool btn-warning"><i class="fa fa-save"></i>  Upload Data</button>
                 {{-- @endif --}}
             </div>
         </div>
diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php
index 14eb92e..eaf46ea 100644
--- a/resources/views/realisasi_pendapatan/index.blade.php
+++ b/resources/views/realisasi_pendapatan/index.blade.php
@@ -19,7 +19,7 @@
         <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2>
         <div class="card-tools">
             @if(auth()->user()->can('Create DBH Realisasi Pendapatan'))
-                <button class="btn btn-sm btn-success" onclick="location.href='{{ route('realisasi-pendapatan.create') }}'"><i class="fa fa-edit"></i>  Tambah Data</button>
+                <button class="btn btn-tool" onclick="location.href='{{ route('realisasi-pendapatan.create') }}'"><i class="fa fa-edit"></i>  Tambah Data</button>
             @endif
         </div>
     </div>
diff --git a/resources/views/realisasi_pendapatan/show.blade.php b/resources/views/realisasi_pendapatan/show.blade.php
index 64cfe9a..6c7e089 100644
--- a/resources/views/realisasi_pendapatan/show.blade.php
+++ b/resources/views/realisasi_pendapatan/show.blade.php
@@ -14,7 +14,7 @@
     <div class="card-header">
         <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2>
         <div class="card-tools">
-            <button class="btn btn-sm btn-default" onclick="location.href='{{ url('/realisasi-pendapatan') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
+            <button class="btn btn-tool" onclick="location.href='{{ url('/realisasi-pendapatan') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
         </div>
     </div>
     <div id="detail_realisasi_pendapatan" class="card-body">