diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index dac3d03..4cc7ca3 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -102,10 +102,17 @@ class ItemSearchController extends Controller if($request->has('q')){ $search = strtolower($request->q); $ta = $request->ta; + $jenis = $request->jenis; $select = DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"); $sps = Sps_pendapatan::select($select) - ->whereRaw("TAHUN=$ta AND SKPD_ID = 980 AND (LOWER(KODE_REKENING) LIKE '%$search%' OR LOWER(NAMA_REKENING) LIKE '%$search%')") - ->get(); + ->whereRaw("TAHUN=$ta AND SKPD_ID = 980 AND (LOWER(KODE_REKENING) LIKE '%$search%' OR LOWER(NAMA_REKENING) LIKE '%$search%')"); + + if ($jenis == "dbh"){ + $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,12)='4.2.01.01.01') "); + }else if($jenis == "dak"){ + $sps->whereRaw(" (SUBSTR(KODE_REKENING,1,12)='4.2.01.01.03' AND SUBSTR(KODE_REKENING,1,12)='4.2.01.01.04') "); + } + $sps = $sps->get(); } return response()->json($sps); } diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index de44658..f1461e5 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -28,40 +28,34 @@ class JadwalSalurdanaController extends Controller $limit = $post["length"]; $src = $post["src"]; $ta = $post["ta"]; - $dataFilter=0; - $data = DB::select(DB::raw('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", - NVL("4",0) AS "REAL4",NVL("5",0) AS "REAL5",NVL("6",0) AS "REAL6", - NVL("7",0) AS "REAL7",NVL("8",0) AS "REAL8",NVL("9",0) AS "REAL9", - NVL("10",0) AS "REAL10",NVL("11",0) AS "REAL11",NVL("12",0) AS "REAL12" - FROM PROKSI.SPS_PENDAPATAN x - LEFT JOIN - ( - SELECT * FROM ( - SELECT ID_SPS,extract(month from RKUD_TGL) AS BULAN,RKUD_JUMLAH - FROM SAMASA.DBH_PENDAPATAN_REALISASI - WHERE TAHUN=\''.$ta.'\' - ) - PIVOT + $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", + NVL("4",0) AS "REAL4",NVL("5",0) AS "REAL5",NVL("6",0) AS "REAL6", + NVL("7",0) AS "REAL7",NVL("8",0) AS "REAL8",NVL("9",0) AS "REAL9", + NVL("10",0) AS "REAL10",NVL("11",0) AS "REAL11",NVL("12",0) AS "REAL12" + FROM PROKSI.SPS_PENDAPATAN x + LEFT JOIN ( - 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 - WHERE x.TAHUN = '.$ta.' AND x.SKPD_ID=980 AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\' - ORDER BY kode_rekening')); - // var_dump($data); exit; - // ->where("SKPD_ID",980) - // ->where("TAHUN",$ta) - // ->whereRaw("SUBSTR(KODE_REKENING,1,3)='4.2'"); + SELECT * FROM ( + SELECT ID_SPS,extract(month from RKUD_TGL) AS BULAN,RKUD_JUMLAH + FROM SAMASA.DBH_PENDAPATAN_REALISASI + WHERE TAHUN=\''.$ta.'\' + ) + PIVOT + ( + 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 + WHERE x.TAHUN = '.$ta.' AND x.SKPD_ID=980 AND SUBSTR(x.KODE_REKENING,1,3)=\'4.2\''; + $data = DB::select(DB::raw($sqlstr.'ORDER BY kode_rekening OFFSET '.$offset.' ROWS FETCH NEXT '.$limit.' ROWS ONLY')); if (!empty($src)){ $data->whereRaw("(LOWER(NAMA_REKENING) LIKE '%".strtolower($src)."%' OR LOWER(KODE_REKENING) LIKE '%".strtolower($src)."%')"); } - $dataFilter = count($data); + $dataFilter = count(DB::select(DB::raw($sqlstr))); $dataTotal = Sps_pendapatan::where("SKPD_ID",980) ->where("TAHUN",$ta) diff --git a/database/migrations/2022_07_07_113246_create_salur_dana_table.php b/database/migrations/2022_07_07_113246_create_salur_dana_table.php deleted file mode 100644 index 1405a5a..0000000 --- a/database/migrations/2022_07_07_113246_create_salur_dana_table.php +++ /dev/null @@ -1,37 +0,0 @@ -uuid('id')->primary(); - $table->date('tgl_salur'); - $table->string('kode_skpd', 50); - $table->string('kode_sub_kegiatan', 50); - $table->double('jumlah', 19, 2); - $table->datetime('approved_at'); - $table->string('approved_by',36); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('salur_dana'); - } -} diff --git a/database/migrations/2022_07_07_113716_create_salur_dana_details_table.php b/database/migrations/2022_07_07_113716_create_salur_dana_details_table.php deleted file mode 100644 index 806b22a..0000000 --- a/database/migrations/2022_07_07_113716_create_salur_dana_details_table.php +++ /dev/null @@ -1,37 +0,0 @@ -uuid('id')->primary(); - $table->string('salur_dana_id', 36); - $table->string('kode_rsk', 50); - $table->string('kode_rekening', 50); - $table->double('jumlah_salur_anggaran', 19, 2); - $table->double('jumlah_salur_skpd', 19, 2); - $table->double('jumlah_salur_realisasi', 19, 2); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('salur_dana_details'); - } -} diff --git a/database/migrations/2022_07_08_130852_create_jadwal_salur_table.php b/database/migrations/2022_07_08_130852_create_jadwal_salur_table.php deleted file mode 100644 index 27eb015..0000000 --- a/database/migrations/2022_07_08_130852_create_jadwal_salur_table.php +++ /dev/null @@ -1,44 +0,0 @@ -uuid('id')->primary(); - $table->string('id_pendapatan_jadwal_salur', 50); - $table->string('tahun', 4); - $table->string('kode_akun', 50); - $table->string('nama_akun', 150); - $table->decimal('perpres', 19, 2); - $table->decimal('apbd', 19, 2); - $table->string('pmk', 50); - $table->string('pmk_pasal', 30); - $table->tinyInteger('pmk_I'); - $table->tinyInteger('pmk_II'); - $table->tinyInteger('pmk_III'); - $table->tinyInteger('pmk_IV'); - $table->decimal('jumlah', 19, 2); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('jadwal_salur'); - } -} diff --git a/public/css/app.css b/public/css/app.css index 850fc80..ccaddef 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -292,4 +292,12 @@ hr{ table.dataTable tr.dtrg-group.dtrg-level-1 td{ font-size: 1em !important; + } + + table.dataTable tr.dtrg-group.dtrg-level-1 td{ + padding-left: 10px !important; + } + + .table td, .table th{ + padding: 0.5rem; } \ No newline at end of file diff --git a/resources/views/jadwal_salurdana/index.blade.php b/resources/views/jadwal_salurdana/index.blade.php index d3d9b33..7455d49 100644 --- a/resources/views/jadwal_salurdana/index.blade.php +++ b/resources/views/jadwal_salurdana/index.blade.php @@ -151,8 +151,8 @@ ], "dom": "<\"top\" <\"row\"<\"col-md-6\"l><\"col-md-6 text-right\">>>rt<\"bottom\" <\"row\"<\"col-md-6\"i><\"col-md-6\"p>> ><\"clear\">", "lengthMenu": [ - [ 50, 75, 100 ], - [ "50", "75", "100" ] + [ 20, 50, 75, 100 ], + [ "20", "50", "75", "100" ] ], "paging": true, // Table pagination "columns": [ @@ -249,8 +249,9 @@ } let textmuted = index == 1 ? "text-muted":""; let labelGroup = index == 1 ?"JUMLAH | " + group : "TOTAL"; - return $("") - .append( ""+labelGroup+"") + return $("") + .append( "") + .append( ""+labelGroup+"") .append( ""+ separateNumberIndo(sum[0]) +"" ) .append( ""+ separateNumberIndo(sumReal[0]) +"" ) .append( ""+ separateNumberIndo(sum[1]) +"" ) diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 0da7ac2..83070f6 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -54,38 +54,38 @@ - {{--
  • +

  • Dana Alokasi Khusus

     -
    • --}} + @if ($role == "admin" || $role == "superadmin")
  • MASTER DATA

  • Pengguna

    • diff --git a/resources/views/realisasi_pendapatan/form.blade.php b/resources/views/realisasi_pendapatan/form.blade.php index 02927aa..f0c6e6d 100644 --- a/resources/views/realisasi_pendapatan/form.blade.php +++ b/resources/views/realisasi_pendapatan/form.blade.php @@ -12,7 +12,7 @@
    - +
    @@ -149,9 +149,9 @@ }) $('#txt_id_sps').select2({ - placeholder: 'Pilih DBH / DAK', + placeholder: 'Pilih DBH', ajax: { - url: '/item-search-sps?ta='+$("#txt_ta").val(), + url: '/item-search-sps?ta='+$("#txt_ta").val()+'&jenis=dbh', dataType: 'json', delay: 250, processResults: function (data) {