diff --git a/app/Http/Controllers/Admin/MappingDbhSkpdController.php b/app/Http/Controllers/Admin/MappingDbhSkpdController.php index 54f0a29..a2086ce 100644 --- a/app/Http/Controllers/Admin/MappingDbhSkpdController.php +++ b/app/Http/Controllers/Admin/MappingDbhSkpdController.php @@ -12,7 +12,7 @@ use Illuminate\Support\Facades\DB; class MappingDbhSkpdController extends Controller { public function __construct(){ - $this->siteTitle = "Data Mapping DBH/DAK SKPD"; + $this->siteTitle = "Data Mapping Rekening SKPD"; parent::__construct(); } diff --git a/app/helpers.php b/app/helpers.php index 0f2af48..354d9a0 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -133,4 +133,9 @@ function getAlphabetCell($idx) function getTA() { return Session::get('Tahun_Anggaran')!==null?Session::get('Tahun_Anggaran'):date("Y"); +} + +function getJenisDana() +{ + return ["DBH","DAK","DID","DAU"]; } \ No newline at end of file diff --git a/database/migrations/2022_09_10_023755_create_mst_jenis_dana_table.php b/database/migrations/2022_09_10_023755_create_mst_jenis_dana_table.php index 87e22ac..bd61469 100644 --- a/database/migrations/2022_09_10_023755_create_mst_jenis_dana_table.php +++ b/database/migrations/2022_09_10_023755_create_mst_jenis_dana_table.php @@ -16,7 +16,7 @@ class CreateMstJenisDanaTable extends Migration Schema::create('mst_jenis_dana', function (Blueprint $table) { $table->id(); $table->string('name', 50); - $table->enum('grup',["DBH","DAK"])->default("DBH"); + $table->enum('grup',["DBH","DAK","DID","DAU"])->default("DBH"); $table->timestamps(); }); } diff --git a/public/js/app.js b/public/js/app.js index 8fcc5e6..8f209bd 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -363,7 +363,7 @@ let subJenisDana = (idGrup)=>{ } $('.sps_search').select2({ - placeholder: 'Pilih DBH / DAK', + placeholder: 'Pilih Kode Rekening', allowClear: true, ajax: { url: Url+'/item-search-sps?ta='+ta, diff --git a/resources/views/admin/mst_jenis_belanja/create.blade.php b/resources/views/admin/mst_jenis_belanja/create.blade.php index 15bbe36..743073d 100644 --- a/resources/views/admin/mst_jenis_belanja/create.blade.php +++ b/resources/views/admin/mst_jenis_belanja/create.blade.php @@ -27,8 +27,9 @@
Grup
diff --git a/resources/views/admin/mst_jenis_belanja/edit.blade.php b/resources/views/admin/mst_jenis_belanja/edit.blade.php index a855fa8..7dcd0df 100644 --- a/resources/views/admin/mst_jenis_belanja/edit.blade.php +++ b/resources/views/admin/mst_jenis_belanja/edit.blade.php @@ -27,8 +27,9 @@
Grup
diff --git a/resources/views/admin/mst_jenis_dana/create.blade.php b/resources/views/admin/mst_jenis_dana/create.blade.php index e228f69..2ff8394 100644 --- a/resources/views/admin/mst_jenis_dana/create.blade.php +++ b/resources/views/admin/mst_jenis_dana/create.blade.php @@ -27,8 +27,9 @@
Grup
diff --git a/resources/views/admin/mst_jenis_dana/edit.blade.php b/resources/views/admin/mst_jenis_dana/edit.blade.php index e6749ef..a59fff0 100644 --- a/resources/views/admin/mst_jenis_dana/edit.blade.php +++ b/resources/views/admin/mst_jenis_dana/edit.blade.php @@ -27,8 +27,9 @@
Grup
diff --git a/resources/views/jadwal_salurdana/index.blade.php b/resources/views/jadwal_salurdana/index.blade.php index 2514299..4d3e81c 100644 --- a/resources/views/jadwal_salurdana/index.blade.php +++ b/resources/views/jadwal_salurdana/index.blade.php @@ -43,7 +43,7 @@ --}}
- +
@@ -122,7 +122,7 @@ var srcDate1 = null, srcDate2 = null; $('#txt_id_sps').select2({ - placeholder: 'Pilih DBH / DAK', + placeholder: 'Pilih Kode Rekening', allowClear: true, ajax: { url: '{{ $baseUrl }}/item-search-sps?ta='+$("#srcTA").val(), diff --git a/resources/views/jadwal_salurdana/index_dak.blade.php b/resources/views/jadwal_salurdana/index_dak.blade.php index ff8460f..f81cc99 100644 --- a/resources/views/jadwal_salurdana/index_dak.blade.php +++ b/resources/views/jadwal_salurdana/index_dak.blade.php @@ -36,7 +36,7 @@
- +
diff --git a/resources/views/realisasi_belanja/form.blade.php b/resources/views/realisasi_belanja/form.blade.php index c8b5e79..9a641d3 100644 --- a/resources/views/realisasi_belanja/form.blade.php +++ b/resources/views/realisasi_belanja/form.blade.php @@ -3,8 +3,9 @@
@@ -12,7 +13,7 @@
- +
diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php index 3bdf63b..4ecf5dd 100644 --- a/resources/views/realisasi_belanja/index.blade.php +++ b/resources/views/realisasi_belanja/index.blade.php @@ -42,25 +42,22 @@
- +
- +
@@ -280,11 +277,14 @@ let info = dtTable.page.info(); let numStart = info.page; let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1; - let realisasi = aData["jml"] > 0 ? ""+separateNumberIndo(aData["jml"])+"":""; + let realisasi = aData["jml"] > 0 ? ""+separateNumberIndo(aData["jml"])+"":""; // let btnInput = parseInt(aData["f_view_sbpk"]) == 0 ? ` // `:``; let btnInput = ` `; + let volume_satuan_realisasi = aData["volume_satuan_realisasi"] > 0 ? ""+separateNumberIndo(aData["volume_satuan_realisasi"])+"":""; + let unit_satuan_realisasi = aData["unit_satuan_realisasi"] != null ? ""+aData["unit_satuan_realisasi"]+"":""; + $(nRow).addClass("c_row_"+aData["kode_rsk"]); $("td:eq(0)", nRow).html(index); $("td:eq(1)", nRow).html("
"+aData["kode_skpd"]+" | "+aData["nama_skpd"]+"
"); @@ -294,7 +294,8 @@ $("td:eq(5)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"])); $("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(9)", nRow).html(volume_satuan_realisasi); + $("td:eq(10)", nRow).html(unit_satuan_realisasi); $("td:eq(11)", nRow).html("+aData["jml_spd"]+""':'aData["jml_spd"]' ?>); $("td:eq(12)", nRow).html(aData["jenis_dana"]+"::"+aData["nama_subjenis_dana"]); $("td:eq(13)", nRow).html(` diff --git a/resources/views/realisasi_pendapatan/form.blade.php b/resources/views/realisasi_pendapatan/form.blade.php index 46880cd..13c62ea 100644 --- a/resources/views/realisasi_pendapatan/form.blade.php +++ b/resources/views/realisasi_pendapatan/form.blade.php @@ -146,7 +146,7 @@ }) $('#txt_id_sps').select2({ - placeholder: 'Pilih DBH / DAK', + placeholder: 'Pilih Kode Rekening', ajax: { url: '{{ $baseUrl }}/item-search-sps?ta='+$("#txt_ta").val(), dataType: 'json', diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php index f25974e..cb8c2a1 100644 --- a/resources/views/realisasi_pendapatan/index.blade.php +++ b/resources/views/realisasi_pendapatan/index.blade.php @@ -19,7 +19,7 @@

{{ $sitesubTitle }}

@if(auth()->user()->can('Create DBH Realisasi Pendapatan')) - + @endif
@@ -37,7 +37,7 @@
- +
@@ -93,7 +93,7 @@ }); $('#txt_id_sps').select2({ - placeholder: 'Pilih DBH / DAK', + placeholder: 'Pilih Kode Rekening', allowClear: true, ajax: { url: '{{ $baseUrl }}/item-search-sps?ta='+$("#srcTA").val(), @@ -173,7 +173,8 @@ $("td:eq(3)", nRow).html(separateNumberIndo(aData["simtrad4_potongan"])); $("td:eq(4)", nRow).html(separateNumberIndo(aData["simtrad4_bersih"])); $("td:eq(6)", nRow).html(setIndoDateOracle(aData["simtrad4_tgl_sp2d_bun"])); - $("td:eq(8)", nRow).html(setIndoDateOracle(aData["rkud_tgl"])); + $("td:eq(7)", nRow).html(aData["rkud_no_sts"] == null?"-":""+aData["rkud_no_sts"]+""); + $("td:eq(8)", nRow).html(aData["rkud_tgl"] == null?"-":""+setIndoDateOracle(aData["rkud_tgl"])+""); $("td:eq(9)", nRow).html( "
"+ ""+