From cbd52e10d5b5df53d61d5506b561233f47cdb8fc Mon Sep 17 00:00:00 2001
From: Pusdatin BPKD Jkt <updi.dev@gmail.com>
Date: Mon, 12 Sep 2022 15:00:00 +0700
Subject: [PATCH] Update dan Bugs Fix

---
 app/Http/Controllers/ItemSearchController.php    |  2 +-
 .../Controllers/RealisasiBelanjaController.php   |  4 ++--
 ..._18_090432_create_belanja_realisasi_table.php |  9 ++++-----
 public/js/app.js                                 |  2 +-
 .../views/jadwal_salurdana/index_cht.blade.php   |  2 +-
 resources/views/realisasi_belanja/edit.blade.php | 16 +++++++---------
 .../views/realisasi_belanja/index.blade.php      |  7 +++----
 .../views/realisasi_belanja/submit.blade.php     |  2 +-
 8 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php
index b34f3bd..6466265 100644
--- a/app/Http/Controllers/ItemSearchController.php
+++ b/app/Http/Controllers/ItemSearchController.php
@@ -206,7 +206,7 @@ class ItemSearchController extends Controller
     public function subjenisDana(Request $request)
     {
     	$sk = [];
-        $select = DB::raw("NAME AS ID_NAME, NAME");
+        $select = DB::raw("ID, NAME");
         $idGrup = $request->id_grup;
         if($request->has('q')){
             $search = $request->q;
diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php
index a6ec8bc..136900f 100644
--- a/app/Http/Controllers/RealisasiBelanjaController.php
+++ b/app/Http/Controllers/RealisasiBelanjaController.php
@@ -220,7 +220,7 @@ class RealisasiBelanjaController extends Controller
     {
         // $BelanjaRealisasi = BelanjaRealisasi::where("id", $id)->firstOrNew();
         $BelanjaRealisasi = DB::select(DB::raw(
-                "SELECT * FROM SAMASA.VW_BELANJA_REALISASI WHERE id='$id' " 
+                "SELECT * FROM SAMASA.VW_BELANJA_REALISASI WHERE ID='$id' " 
         ));
         $BelanjaRealisasi = $BelanjaRealisasi[0];
 
@@ -239,7 +239,7 @@ class RealisasiBelanjaController extends Controller
         $BelanjaRealisasiDetail = BelanjaRealisasiDetail::where("belanja_realisasi_id",$BelanjaRealisasi->id)->get();
         // var_dump($BelanjaRealisasi->kode_rsk,$BelanjaRealisasi->kode_sub_kegiatan); exit;
         $this->setTitle("Realisasi Belanja");
-        $this->setSubtitle("Realisasi Belanja :: ".$BelanjaRealisasi->jenis_dana." ".$BelanjaRealisasi->sub_jenis_dana);
+        $this->setSubtitle("Realisasi Belanja :: ".$BelanjaRealisasi->jenis_dana." ".$BelanjaRealisasi->nama_jenis_dana);
         if ($request->isMethod('post')) {
             $req = $request->all();
             $data["volume_satuan"] = $req["vol"];
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 791e5d6..6902b52 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,8 +16,11 @@ class CreateBelanjaRealisasiTable extends Migration
         Schema::create('belanja_realisasi', function (Blueprint $table) {
             $table->uuid('id')->primary();
             $table->string("tahun_anggaran",4);
+            $table->enum("jenis_dana",["DBH","DAK"]);
+            $table->tinyInteger("sub_jenis_dana");
             $table->tinyInteger("jenis_belanja");
             $table->tinyInteger("sub_jenis_belanja");
+            $table->integer('id_sps')->nullable();
             $table->string("kode_program",50);
             $table->string("nama_program",400);
             $table->string("kode_skpd",50);
@@ -33,16 +36,12 @@ class CreateBelanjaRealisasiTable extends Migration
             $table->decimal('jumlah_anggaran', 19, 2);
             $table->integer('volume_satuan')->nullable();
             $table->string('unit_satuan',30)->nullable();
+            $table->smallInteger('jml_rencana_kontrak')->default(0);
             $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)->nullable();
-            $table->smallInteger('jml_rencana_kontrak')->default(0);
-            $table->string("jenis_dana",50);
-            $table->string("sub_jenis_dana",50);
             $table->uuid('realisasi_by')->nullable();
             $table->uuid('created_by')->nullable();
-            $table->integer('id_sps')->nullable();
             $table->tinyInteger('f_view_sbpk')->default(0);
             $table->timestamps();
         });
diff --git a/public/js/app.js b/public/js/app.js
index 93f163b..a90924d 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -349,7 +349,7 @@ let subJenisDana = (idGrup)=>{
                     results: $.map(data, function (item) {
                         return {
                             text: item.name,
-                            id: item.id_name
+                            id: item.id
                         }
                     })
                 };
diff --git a/resources/views/jadwal_salurdana/index_cht.blade.php b/resources/views/jadwal_salurdana/index_cht.blade.php
index f90cbee..4caa4d2 100644
--- a/resources/views/jadwal_salurdana/index_cht.blade.php
+++ b/resources/views/jadwal_salurdana/index_cht.blade.php
@@ -15,7 +15,7 @@
 @endsection
 
 @section('content')
-    <div class="card">
+    <div class="card" style="display: none;">
         <div class="card-header">
             <h2 class="card-title"><i class="fa fa-search mr-2"></i> Filter Pencarian</h2>
             <div class="card-tools">
diff --git a/resources/views/realisasi_belanja/edit.blade.php b/resources/views/realisasi_belanja/edit.blade.php
index 7438aa1..6228d30 100644
--- a/resources/views/realisasi_belanja/edit.blade.php
+++ b/resources/views/realisasi_belanja/edit.blade.php
@@ -10,14 +10,12 @@
 @section('content')
     <div class="card">
         <div class="card-header">
-            <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> TAMBAH {{ strtoupper($sitesubTitle) }}</h2>
+            <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> UBAH {{ strtoupper($sitesubTitle) }}</h2>
             <div class="card-tools">
-                {{-- @if(auth()->user()->can('Tambah SKPP')) --}}
-                    <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 --}}
+                <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>
             </div>
         </div>
         <div class="card-body">
@@ -25,7 +23,7 @@
                 @csrf
                 @method("PUT")
                 @include('realisasi_belanja.form')
-                <input id="btnSubmit" class="btn btn-sm btn-success" type="submit" value="SIMPAN">
+                <button id="btnSubmit" class="btn btn-sm btn-success" type="submit"><i class='fa fa-save'></i> SIMPAN</i></button>
             </form>
         </div>
     </div> 
@@ -37,7 +35,7 @@
 
             $("select[name=jenis_dana]").val("{{ $realisasi_belanja->jenis_dana }}");
 
-            let $newOptionSubJenisDana = $("<option selected='selected'></option>").val("{{ $realisasi_belanja->sub_jenis_dana }}").text("{{ $realisasi_belanja->sub_jenis_dana }}")
+            let $newOptionSubJenisDana = $("<option selected='selected'></option>").val("{{ $realisasi_belanja->sub_jenis_dana }}").text("{{ $realisasi_belanja->nama_jenis_dana }}")
             $("select[name=sub_jenis_dana]").val("{{ $realisasi_belanja->sub_jenis_dana }}");
             $("select[name=sub_jenis_dana]").append($newOptionSubJenisDana).trigger('change');
 
diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php
index 1962982..2f41447 100644
--- a/resources/views/realisasi_belanja/index.blade.php
+++ b/resources/views/realisasi_belanja/index.blade.php
@@ -247,8 +247,8 @@
                     let numStart = info.page;
                     let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1;
                     let realisasi = aData["jml"] > 0 ? "<span class='bg-warning p-1'>"+separateNumberIndo(aData["jml"])+"</span>":"";
-                    //let btnInput = {{ empty(Auth::user()->can("Input Realisasi DBH Realisasi Belanja"))?"false":Auth::user()->can("Input Realisasi DBH Realisasi Belanja") }}?'<a class="btn btn-sm btn-success modalButton" title="Input Realisasi" href="/dbh/realisasi-belanja/'+aData["id"]+'/inputRealisasi"><i class="fa fa-paper-plane"></i> Input Realisasi</a>':''; 
-                    let btnInput = "";
+                    let btnInput = parseInt(aData["f_view_sbpk"]) == 0 ? `<a class="btn btn-warning btn-sm" href="{{ URL::to("/realisasi-belanja") }}/`+ aData["id"] +`/edit" title="Ubah"><i class="fa fa-edit"></i></a>
+                                <button type="submit" class="btn btn-danger btn-sm"title="Hapus"><i class="fa fa-trash"></i></button>`:``;
                     $("td:eq(0)", nRow).html(index);
                     $("td:eq(1)", nRow).html("<div style='width:200px;'>"+aData["kode_skpd"]+" | "+aData["nama_skpd"]+"</div>");
                     $("td:eq(2)", nRow).html("<div style='width:200px;'>"+aData["kode_program"]+" | "+aData["nama_program"]+"</div>");
@@ -264,8 +264,7 @@
                             @method('DELETE')      
                             <a href="{{ URL::to("/realisasi-belanja") }}/` + aData["id"] +`/submit" class="btn btn-sm btn-info"><i class="fa fa-eye"></i></a>
                             @php if (Auth::user()->can("Input Realisasi DBH Realisasi Belanja")) { @endphp
-                                <a class="btn btn-warning btn-sm" href="{{ URL::to("/realisasi-belanja") }}/`+ aData["id"] +`/edit" title="Ubah"><i class="fa fa-edit"></i></a>
-                                <button type="submit" class="btn btn-danger btn-sm"title="Hapus"><i class="fa fa-trash"></i></button>
+                                ` + btnInput + `
                             @php } @endphp
                         </form>`); 
 
diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php
index 6c06e39..44260a4 100644
--- a/resources/views/realisasi_belanja/submit.blade.php
+++ b/resources/views/realisasi_belanja/submit.blade.php
@@ -315,7 +315,7 @@
             $("select[name=jenis_dana]").val("{{ $BelanjaRealisasi->jenis_dana }}");
             $("select[name=jenis_dana]").attr("disabled", true);
 
-            let $newOptionSubJenisDana = $("<option selected='selected'></option>").val("{{ $BelanjaRealisasi->sub_jenis_dana }}").text("{{ $BelanjaRealisasi->sub_jenis_dana }}")
+            let $newOptionSubJenisDana = $("<option selected='selected'></option>").val("{{ $BelanjaRealisasi->sub_jenis_dana }}").text("{{ $BelanjaRealisasi->nama_jenis_dana }}")
             $("select[name=sub_jenis_dana]").val("{{ $BelanjaRealisasi->sub_jenis_dana }}");
             $("select[name=sub_jenis_dana]").append($newOptionSubJenisDana).trigger('change');
             $("select[name=sub_jenis_dana]").attr("disabled", true);