gitea/sidata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Update dan Bugs Fix

Browse Source
This commit is contained in:
Pusdatin BPKD Jkt
2022-09-12 11:49:56 +07:00
parent 145f9d4c48
commit 35b4c72eb3
11 changed files with 130 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ItemSearchController.php
+25 -18
View File
@@ -34,26 +34,33 @@ class ItemSearchController extends Controller
public function skpd(Request $request)
{
$tropd = [];
if($request->has('q')){
$ta = $request->ta;
$search = strtoupper($request->q);
if($request->has('realisasi-belanja')){
$sqlStr = "SELECT DISTINCT x.KODE_SKPD AS ID,x.KODE_SKPD||' | '||x.NAMA_SKPD as name
FROM SAMASA.BELANJA_REALISASI x
LEFT JOIN NEWSIPKD.TROPD y ON x.KODE_SKPD = y.C_OPD
WHERE TAHUN_ANGGARAN = $ta AND
NAMA_SKPD LIKE '%$search%' ";
$ta = $request->ta;
$search = strtoupper($request->q);
if($request->has('realisasi-belanja')){
$sqlStr = "SELECT DISTINCT x.KODE_SKPD AS ID,x.KODE_SKPD||' | '||x.NAMA_SKPD as name
FROM SAMASA.BELANJA_REALISASI x
LEFT JOIN NEWSIPKD.TROPD y ON x.KODE_SKPD = y.C_OPD
WHERE TAHUN_ANGGARAN = $ta ";
if (getRole()=="sbpk"){
$sqlStr.= " AND y.C_WIL_SP2DPROSES=".Auth::user()->wilayah;
}
$tropd = DB::select(DB::raw($sqlStr." ORDER BY x.KODE_SKPD "));
}else{
$select = DB::raw("C_OPD AS ID,C_OPD||' | '||N_OPD as name");
$tropd = Tropd::select($select)
->where('N_OPD', 'LIKE', "%$search%")
->get();
if (getRole()=="sbpk"){
$sqlStr.= " AND y.C_WIL_SP2DPROSES=".Auth::user()->wilayah;
}
if($request->has('q')){
$search = strtolower($request->q);
$sqlStr.= " AND LOWER(x.NAMA_SKPD) LIKE '%$search%' ";
}
$tropd = DB::select(DB::raw($sqlStr." ORDER BY x.KODE_SKPD "));
}else{
$select = DB::raw("C_OPD AS ID,C_OPD||' | '||N_OPD as name");
$tropd = Tropd::select($select);
if($request->has('q')){
$search = strtolower($request->q);
$tropd->whereRaw("LOWER(x.NAMA_SKPD) LIKE '%$search%'");
}
$tropd->orderBy("C_OPD");
$tropd->get();
}
return response()->json($tropd);
}
app/Http/Controllers/JadwalSalurdanaController.php
+10 -1
View File
@@ -67,6 +67,15 @@ class JadwalSalurdanaController extends Controller
if (getRole()=="skpd"){
$filter.=" AND x.kode_skpd='".Auth::user()->nrk."'";
}
$idSPS = 0;
if ($request->has("id_sps"))
{
if ($request->id_sps > 0)
{
$filter.=" AND x.id_sps=".$request->id_sps;
$idSPS = $request->id_sps;
}
}
$dataAkbRealisasi = DB::select(DB::raw("SELECT x.kode_skpd, x.nama_skpd, x.kode_rsk, x.nama_rsk, x.jumlah_anggaran, y.*
FROM SAMASA.BELANJA_REALISASI x
@@ -79,7 +88,7 @@ class JadwalSalurdanaController extends Controller
return (array)$value;
}, $dataAkbRealisasi);
return view("jadwal_salurdana.index_".$typeDana, compact("dataAkbRealisasi"));
return view("jadwal_salurdana.index_".$typeDana, compact("dataAkbRealisasi","idSPS"));
}
public function datatable_cht_dak(Request $request, $typeDana)
app/Http/Controllers/RealisasiBelanjaController.php
+22 -10
View File
@@ -48,7 +48,7 @@ class RealisasiBelanjaController extends Controller
return redirect(URL::to("/realisasi-belanja"))
->with('error','Data dengan RSK yand dipilih sudah ada!');
}
$VwDpaRsk = VwDpaRsk::where("I_ID",$get["rsk"])->firstorCreate();
$VwDpaRsk = VwDpaRsk::where("I_ID",$get["rsk"])->first();
$unitSatuan = UnitSatuan::orderBy("id")->get();
return view('realisasi_belanja.create', compact("unitSatuan","VwDpaRsk"));
}
@@ -111,7 +111,7 @@ class RealisasiBelanjaController extends Controller
]);
$req = $request->all();
$VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->firstorCreate();
$VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->first();
try{
DB::beginTransaction();
@@ -155,9 +155,9 @@ class RealisasiBelanjaController extends Controller
public function edit(VwBelanjaRealisasi $realisasi_belanja)
{
$VwDpaRsk = VwDpaRsk::where("I_ID",$realisasi_belanja->kode_rsk)->firstorCreate();
$VwDpaRsk = VwDpaRsk::where("I_ID",$realisasi_belanja->kode_rsk)->first();
$unitSatuan = UnitSatuan::orderBy("id")->get();
$sps = Sps_pendapatan::select(DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"))->where("ID", $realisasi_belanja->id_sps)->firstorCreate();
$sps = Sps_pendapatan::select(DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"))->where("ID", $realisasi_belanja->id_sps)->first();
return view('realisasi_belanja.edit', compact("realisasi_belanja","sps","unitSatuan","VwDpaRsk"));
}
@@ -176,7 +176,7 @@ class RealisasiBelanjaController extends Controller
]);
$req = $request->all();
$VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->firstorCreate();
$VwDpaRsk = VwDpaRsk::where("I_ID",$req["rsk"])->first();
try{
DB::beginTransaction();
@@ -223,12 +223,19 @@ class RealisasiBelanjaController extends Controller
"SELECT * FROM SAMASA.VW_BELANJA_REALISASI WHERE id='$id' "
));
$BelanjaRealisasi = $BelanjaRealisasi[0];
if (getRole()=="sbpk"){
$sbpkUpdate = BelanjaRealisasi::where("id", $id)->firstOrNew();
$sbpkUpdate->update(["f_view_sbpk"=>date("Y-m-d H:i")]);
}
if (getRole()=="skpd"){
if ($BelanjaRealisasi->kode_skpd != Auth::user()->nrk)
{
abort(403, 'Tidak diperbolehkan mengunjungi halaman ini!');
}
}
$BelanjaRealisasiDetail = BelanjaRealisasiDetail::where("belanja_realisasi_id",$BelanjaRealisasi->id)->get();
// var_dump($BelanjaRealisasi->kode_rsk,$BelanjaRealisasi->kode_sub_kegiatan); exit;
$this->setTitle("Realisasi Belanja");
@@ -261,7 +268,7 @@ class RealisasiBelanjaController extends Controller
$unitSatuan = UnitSatuan::orderBy("id")->get();
$jmlRealisasi1 = $this->getRealisasi($BelanjaRealisasi->kode_rsk, 1);
$jmlRealisasi2 = $this->getRealisasi($BelanjaRealisasi->kode_rsk, 2);
$sps = Sps_pendapatan::select(DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"))->where("ID", $BelanjaRealisasi->id_sps)->firstorCreate();
$sps = Sps_pendapatan::select(DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"))->where("ID", $BelanjaRealisasi->id_sps)->first();
return view('realisasi_belanja.submit', compact("BelanjaRealisasi","BelanjaRealisasiDetail","BelanjaRealisasiKontrak","vwAKB","vwSPD","vwSP2D","unitSatuan","jmlRealisasi1","jmlRealisasi2","sps"));
}
@@ -276,6 +283,7 @@ class RealisasiBelanjaController extends Controller
$SubJenisDana = isset($post["sub_jenis_dana"])?$post["sub_jenis_dana"]:"";
$skpd = isset($post["skpd"])?$post["skpd"]:"";
$subkeg = isset($post["subkeg"])?$post["subkeg"]:"";
$idSPS = isset($post["id_sps"])?$post["id_sps"]:"";
$sqlStr = "SELECT x.* FROM BELANJA_REALISASI x LEFT JOIN NEWSIPKD.TROPD z ON x.KODE_SKPD = z.C_OPD
WHERE x.tahun_anggaran='$ta'";
@@ -284,10 +292,10 @@ class RealisasiBelanjaController extends Controller
$sqlStr.=" AND KODE_SKPD='".Auth::user()->nrk."'";
}elseif (getRole()=="sbpk"){
$sqlStr.=" AND z.C_WIL_SP2DPROSES=".Auth::user()->wilayah;
}else{
if (!empty($skpd)){
$sqlStr.=" AND KODE_SKPD='".$skpd."'";
}
}
if (!empty($skpd)){
$sqlStr.=" AND KODE_SKPD='".$skpd."'";
}
$filter="";
@@ -303,6 +311,10 @@ class RealisasiBelanjaController extends Controller
$filter.= " AND x.KODE_SUB_KEGIATAN = '".$subkeg."'";
}
if (!empty($idSPS)){
$filter.= " AND x.id_sps = ".$idSPS;
}
$dataFilter = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM ($sqlStr $filter) x"));
$dataTotal = DB::select(DB::raw("SELECT COUNT(ID) as JML FROM ($sqlStr) x"));
$data = DB::select(DB::raw("SELECT a.*,b.jml FROM (".$sqlStr.$filter.") a
app/Models/BelanjaRealisasi.php
+2 -1
View File
@@ -40,6 +40,7 @@ class BelanjaRealisasi extends Eloquent
"created_by",
"jenis_dana",
"sub_jenis_dana",
"id_sps"
"id_sps",
"f_view_sbpk"
];
}
database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php
+1
View File
@@ -43,6 +43,7 @@ class CreateBelanjaRealisasiTable extends Migration
$table->uuid('realisasi_by')->nullable();
$table->uuid('created_by')->nullable();
$table->integer('id_sps')->nullable();
$table->tinyInteger('f_view_sbpk')->default(0);
$table->timestamps();
});
}
public/js/app.js
Vendored
+2 -1
View File
@@ -361,6 +361,7 @@ let subJenisDana = (idGrup)=>{
$('.sps_search').select2({
placeholder: 'Pilih DBH / DAK',
allowClear: true,
ajax: {
url: Url+'/item-search-sps?ta='+ta,
dataType: 'json',
@@ -375,7 +376,7 @@ $('.sps_search').select2({
})
};
},
cache: true
cache: true,
}
});
resources/views/jadwal_salurdana/index_dak.blade.php
+24 -72
View File
@@ -171,38 +171,6 @@
<td>AKB</td>
<td>Realisasi</td>
</tr>
<!--<tr class="drop-search">
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>-->
</thead>
<tbody>
<?php
@@ -260,6 +228,27 @@
$(document).ready(function(){
var srcDate1 = null, srcDate2 = null;
optionDAK = () =>{
$.ajax({
url: '{{ $baseUrl }}/item-search-sps?ta='+$("#srcTA").val()+'&jenis=dak',
dataType: 'json',
async: false,
success: function (data) {
$('#txt_id_sps').empty();
$('#txt_id_sps').append($('<option>',{value:"",text:""}));
$.map(data, function (item) {
$('#txt_id_sps').append($('<option>', {
value: item.id,
text : item.name
}));
})
},
});
}
optionDAK();
$('#txt_id_sps').val({{ $idSPS }});
$("#src").keyup(function(e){
if (e.keyCode == 13){
e.preventDefault();
@@ -304,27 +293,6 @@
},
scrollX: true,
scrollY: "350px",
// initComplete: function () {
// this.api().columns([1]).every( function () {
// var column = this;
// // console.log(this.index())
// var select = $('<select><option value=""></option></select>')
// .appendTo( $('.drop-search th:eq(' + this.index() + ')') )
// .on( 'change', function () {
// var val = $.fn.dataTable.util.escapeRegex(
// $(this).val()
// );
// column
// .search( val ? '^'+val+'$' : '', true, false )
// .draw();
// } );
// column.data().unique().sort().each( function ( d, j ) {
// select.append( '<option value="'+d+'">'+d+'</option>' )
// } );
// });
// }
initComplete: function () {
this.api().columns([1]).every( function () {
var column = this;
@@ -522,28 +490,12 @@
],
});
optionDAK = () =>{
$.ajax({
url: '{{ $baseUrl }}/item-search-sps?ta='+$("#srcTA").val()+'&jenis=dak',
dataType: 'json',
success: function (data) {
$('#txt_id_sps').empty();
$('#txt_id_sps').append($('<option>',{value:"",text:""}));
$.map(data, function (item) {
$('#txt_id_sps').append($('<option>', {
value: item.id,
text : item.name
}));
})
},
});
}
$('#txt_id_sps').on('change', function (e) {
dtTableSalur.draw();
//dtTableSalur.draw();
$(".dataTables_processing").show();
location.href = "?id_sps="+$(this).val();
})
optionDAK();
});
</script>
@endsection
resources/views/realisasi_belanja/create.blade.php
+25 -11
View File
@@ -6,6 +6,14 @@
@endphp
@extends('layouts.empty')
@section('styles')
<!-- DataTables -->
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-bs4/css/dataTables.bootstrap4.min.css">
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-responsive/css/responsive.bootstrap4.min.css">
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-buttons/css/buttons.bootstrap4.min.css">
<link rel="stylesheet" href="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-fixedcolumns/css/fixedColumns.bootstrap4.min.css">
@endsection
@section('content')
<div class="card">
@@ -24,24 +32,30 @@
<form id="frmRealBelanja" action="{{ url('/realisasi-belanja') }}" method="POST" autocomplete="off">
@csrf
@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>
<a class="modalButton btn btn-sm btn-warning" size="modal-xl" title="Ubah RSK" href="{{ URL::to("/realisasi-belanja/create-from-rsk") }}"><i class='fa fa-edit'></i> Ubah Rsk</a>
</form>
</div>
</div>
@endsection
@section('scripts2')
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables/jquery.dataTables.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-bs4/js/dataTables.bootstrap4.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-responsive/js/dataTables.responsive.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-responsive/js/responsive.bootstrap4.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-buttons/js/dataTables.buttons.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-buttons/js/buttons.bootstrap4.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/jszip/jszip.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/pdfmake/pdfmake.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/pdfmake/vfs_fonts.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-buttons/js/buttons.html5.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-buttons/js/buttons.print.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-buttons/js/buttons.colVis.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-fixedcolumns/js/dataTables.fixedColumns.min.js"></script>
<script src="{{ $baseUrl }}/AdminLTE-3.2.0/plugins/datatables-fixedcolumns/js/fixedColumns.bootstrap4.min.js"></script>
<script type="text/javascript">
$(document).ready(function(){
var srcDate1 = null, srcDate2 = null;
// let $newOptionJenisBelanja = $("<option selected='selected'></option>").val("{{ $VwDpaRsk->jenis_belanja }}").text("{{ $VwDpaRsk->jenis_belanja." | ".$VwDpaRsk->nama_jenis_belanja }}")
// $("select[name=jenis]").val("{{ $VwDpaRsk->jenis_belanja }}");
// $("select[name=jenis]").append($newOptionJenisBelanja).trigger('change');
// $("select[name=jenis]").attr("disabled", true);
// let $newOptionSubJenisBelanja = $("<option selected='selected'></option>").val("{{ $VwDpaRsk->sub_jenis_belanja }}").text("{{ $VwDpaRsk->sub_jenis_belanja." | ".$VwDpaRsk->nama_sub_jenis_belanja }}")
// $("select[name=sub_jenis]").val("{{ $VwDpaRsk->sub_jenis_belanja }}");
// $("select[name=sub_jenis]").append($newOptionSubJenisBelanja).trigger('change');
// $("select[name=sub_jenis]").attr("disabled", true);
let $newOptionProgram = $("<option selected='selected'></option>").val("{{ $VwDpaRsk->c_program }}").text("{{ $VwDpaRsk->c_program." | ".$VwDpaRsk->n_program }}")
$("select[name=prog]").val("{{ $VwDpaRsk->c_program }}");
@@ -83,8 +97,8 @@
denyButtonText: "Tidak",
icon: "warning",
}).then((result) => {
$("select[name=rsk]").attr("disabled", false);
if (result.isConfirmed) {
$("select[name=rsk]").attr("disabled", false);
e.currentTarget.submit();
}
})
resources/views/realisasi_belanja/form.blade.php
-1
View File
@@ -11,7 +11,6 @@
<label class="col-form-label label-align" for="jenis">Sub Jenis Dana</label>
<select id="sub_jenis_dana" name="sub_jenis_dana" class="form-control sub_jenis_dana" required></select>
</div>
<div class="form-group">
<label class="col-form-label label-align" for="txt_simtrad4_kotor">DBH / DAK</label>
<select id="id_sps" name="id_sps" style="width:100%" class="form-control sps_search" required></select>
resources/views/realisasi_belanja/index.blade.php
+17 -10
View File
@@ -18,7 +18,9 @@
<div class="card-header">
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2>
<div class="card-tools">
<a class="modalButton" size="modal-xl" title="Tambah Data Realisasi Belanja" href="{{ URL::to("/realisasi-belanja/create-from-rsk") }}"><i class="fa fa-plus"></i> Tambah Data</a>
@php if (Auth::user()->can("Input Realisasi DBH Realisasi Belanja")) { @endphp
<a class="modalButton btn btn-sm btn-success" size="modal-xl" title="Tambah Data Realisasi Belanja" href="{{ URL::to("/realisasi-belanja/create-from-rsk") }}">Tambah Data</a>
@php } @endphp
</div>
</div>
@stop
@@ -54,6 +56,12 @@
</select>
</div>
</div>
<div class="col-3">
<div class="form-group">
<label>DBH / DAK</label>
<select id="id_sps" name="id_sps" style="width:100%" class="form-control sps_search" required></select>
</div>
</div>
<?php if (getRole()!="skpd"){ ?>
<div class="col-3">
<div class="form-group">
@@ -122,7 +130,7 @@
});
subJenisDana($("#srcJenisDana").val());
$("#srcSubJenisDana").on("change",function(){
$("#srcSubJenisDana, #srcTA, #id_sps").on("change",function(){
dtTable.draw();
});
@@ -133,10 +141,6 @@
}
});
$("#srcTA").on("change",function(){
dtTable.draw();
});
$('#skpd').select2({
placeholder: 'Pilih SKPD',
allowClear: true,
@@ -211,7 +215,8 @@
//d.src = $("#src").val(),
d.jenis_dana = $("#srcJenisDana").val(),
d.sub_jenis_dana = $("#srcSubJenisDana").val(),
d.skpd = $("#skpd").val()
d.skpd = $("#skpd").val(),
d.id_sps = $("#id_sps").val()
}
},
"columnDefs": [
@@ -257,9 +262,11 @@
<form class="form-delete" action="{{ URL::to("/realisasi-belanja") }}/`+ aData["id"] +`" method="POST">
@csrf
@method('DELETE')
<a href="{{ URL::to("/realisasi-belanja") }}/` + aData["id"] +`/submit" class="btn btn-sm btn-info mr-2"><i class="fa fa-eye"></i></a>
<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>
<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>
@php } @endphp
</form>`);
return nRow;
resources/views/realisasi_belanja/submit.blade.php
+2 -1
View File
@@ -18,7 +18,8 @@
@section('content')
<div class="card">
<div class="card-header">
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> DETAIL {{ strtoupper($sitesubTitle) }}</h2>
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> DETAIL {{ strtoupper($sitesubTitle) }}
<?= !empty($BelanjaRealisasi->f_view_sbpk)?"<span class='text-success'><strong>[ Review SBPK ]</strong></span>":"" ?></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>