Bugs Fix
This commit is contained in:
Pusdatin BPKD Jkt
@@ -147,6 +147,8 @@ class ItemSearchController extends Controller
|
||||
$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' OR SUBSTR(KODE_REKENING,1,12)='4.2.01.01.04') ");
|
||||
}else{
|
||||
$sps->whereRaw(" (SUBSTR(KODE_REKENING,1,3)='4.2') ");
|
||||
}
|
||||
|
||||
$sps->orderby("KODE_REKENING");
|
||||
|
||||
@@ -95,9 +95,9 @@ class RealisasiBelanjaController extends Controller
|
||||
WHERE y.I_IDRSK='.$BelanjaRealisasi->kode_rsk.' GROUP BY x.I_ID, x.I_SP2DNO_DOK,x.D_SP2D_SAH ORDER BY x.D_SP2D_SAH ' )
|
||||
);
|
||||
$unitSatuan = UnitSatuan::orderBy("id")->get();
|
||||
$jmlRealisasi = DB::select(DB::raw("SELECT sum(REALISASI) as jml FROM NEWSIPKD.VW_BKU_REALISASI_RSK WHERE IDRSK = ".$BelanjaRealisasi->kode_rsk));
|
||||
$jmlRealisasi = $jmlRealisasi[0]->jml;
|
||||
return view('realisasi_belanja.submit', compact("BelanjaRealisasi","BelanjaRealisasiDetail","BelanjaRealisasiKontrak","vwAKB","vwSPD","vwSP2D","unitSatuan","jmlRealisasi"));
|
||||
$jmlRealisasi1 = $this->getRealisasi($BelanjaRealisasi->kode_rsk, 1);
|
||||
$jmlRealisasi2 = $this->getRealisasi($BelanjaRealisasi->kode_rsk, 2);
|
||||
return view('realisasi_belanja.submit', compact("BelanjaRealisasi","BelanjaRealisasiDetail","BelanjaRealisasiKontrak","vwAKB","vwSPD","vwSP2D","unitSatuan","jmlRealisasi1","jmlRealisasi2"));
|
||||
}
|
||||
|
||||
public function datatable(Request $request)
|
||||
@@ -112,8 +112,14 @@ class RealisasiBelanjaController extends Controller
|
||||
$skpd = isset($post["skpd"])?$post["skpd"]:"";
|
||||
$subkeg = isset($post["subkeg"])?$post["subkeg"]:"";
|
||||
|
||||
$sqlStr = "SELECT x.*
|
||||
$sqlStr = "SELECT x.*,x1.jml
|
||||
FROM BELANJA_REALISASI x
|
||||
LEFT JOIN (
|
||||
SELECT I_IDRSK,SUM(V_SPP) as jml
|
||||
FROM NEWSIPKD.V_SPPBLJRSK
|
||||
WHERE D_SP2D_SAH IS NOT NULL AND C_ANGG_TAHUN = $ta
|
||||
GROUP BY I_IDRSK
|
||||
) x1 ON x.kode_rsk = x1.I_IDRSK
|
||||
LEFT JOIN NEWSIPKD.TROPD z ON x.KODE_SKPD = z.C_OPD
|
||||
WHERE x.tahun_anggaran='$ta'";
|
||||
|
||||
@@ -312,6 +318,23 @@ class RealisasiBelanjaController extends Controller
|
||||
return view('realisasi_belanja.upload');
|
||||
}
|
||||
|
||||
public function getRealisasi($kdRsk,$sms=1)
|
||||
{
|
||||
$semester = "";
|
||||
if($sms==1)
|
||||
{
|
||||
$semester = "SEMESTER 1";
|
||||
$filter = " AND D_POSTING BETWEEN '".getTA()."0101' AND '".getTA()."0630' ";
|
||||
}else{
|
||||
$semester = "SEMESTER 2";
|
||||
$filter = " AND D_POSTING BETWEEN '".getTA()."0101' AND '".getTA()."1231' ";
|
||||
}
|
||||
$jmlRealisasi = DB::select(DB::raw("SELECT sum(REALISASI) as jml FROM NEWSIPKD.VW_BKU_REALISASI_RSK
|
||||
WHERE IDRSK = ".$kdRsk.$filter));
|
||||
|
||||
return $jmlRealisasi[0]->jml;
|
||||
}
|
||||
|
||||
public function inputRealisasi(Request $request, $id)
|
||||
{
|
||||
$req = $request->all();
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<h1>S I D A T A</h1>
|
||||
<h2 style="letter-spacing:3px;">Sistem Informasi Dana Transfer</h2>
|
||||
<img src="{{ URL::to('/sidata.png') }}" style="width:300px; height:270px; opacity:.1; margin:20px 0;">
|
||||
<h5 style="letter-spacing:3px;" class="text-muted mb-4">Tahun Anggaran {{ !empty(Session::get('Tahun_Anggaran'))?Session::get('Tahun_Anggaran'):date("Y") }}<br>Badan Pengelola Keuangan Daerah<br>Provinsi DKI Jakarta</h5>
|
||||
<h5 style="letter-spacing:3px;" class="text-muted mb-4">Tahun Anggaran {{ !empty(Session::get('Tahun_Anggaran'))?Session::get('Tahun_Anggaran'):date("Y") }}<br>Badan Pengelolaan Keuangan Daerah<br>Provinsi DKI Jakarta</h5>
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
@@ -43,17 +43,26 @@
|
||||
<script type="text/javascript">
|
||||
$("#frmInputRealisasi").on("submit",function(e){
|
||||
e.preventDefault();
|
||||
Swal.fire({
|
||||
title: 'Data akan disimpan?',
|
||||
showDenyButton: true,
|
||||
showCancelButton: false,
|
||||
confirmButtonText: 'Ya',
|
||||
denyButtonText: "Tidak",
|
||||
icon: "warning",
|
||||
}).then((result) => {
|
||||
if (result.isConfirmed) {
|
||||
return e.currentTarget.submit();
|
||||
}
|
||||
});
|
||||
if ($("#jml_realisasi").val()>0)
|
||||
{
|
||||
Swal.fire({
|
||||
title: 'Data akan disimpan?',
|
||||
showDenyButton: true,
|
||||
showCancelButton: false,
|
||||
confirmButtonText: 'Ya',
|
||||
denyButtonText: "Tidak",
|
||||
icon: "warning",
|
||||
}).then((result) => {
|
||||
if (result.isConfirmed) {
|
||||
return e.currentTarget.submit();
|
||||
}
|
||||
});
|
||||
}else{
|
||||
Swal.fire(
|
||||
'Warning',
|
||||
'Belumm ada Realisasi!',
|
||||
'error'
|
||||
)
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@@ -264,7 +264,7 @@
|
||||
$("td:eq(4)", nRow).html("<div style='width:200px;'>"+aData["kode_rsk"]+" | "+aData["nama_rsk"]+"</div>");
|
||||
$("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["jumlah_realisasi"]));
|
||||
$("td:eq(8)", nRow).html(separateNumberIndo(aData["jml"]));
|
||||
$("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-info mr-2"><i class="fa fa-eye"></i></a>'+btnInput);
|
||||
|
||||
|
||||
@@ -250,7 +250,7 @@
|
||||
<div class="col-12">
|
||||
<div class="form-group">
|
||||
<label class="col-form-label label-align" for="sk">Jumlah Realisasi</label>
|
||||
<input type="text" class="form-control" name="jml_realisasi" disabled value="{{ isset($BelanjaRealisasiDetail[0])?separateNumberIndo($BelanjaRealisasiDetail[0]->jumlah_realisasi):"" }}">
|
||||
<input type="text" class="form-control" name="jml_realisasi" disabled value="{{ isset($BelanjaRealisasiDetail[0])?separateNumberIndo($BelanjaRealisasiDetail[0]->jumlah_realisasi):separateNumberIndo($jmlRealisasi1) }}">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-form-label label-align" for="sk">Volume Realisasi</label>
|
||||
@@ -269,7 +269,7 @@
|
||||
<div class="col-12">
|
||||
<div class="form-group">
|
||||
<label class="col-form-label label-align" for="sk">Jumlah Realisasi</label>
|
||||
<input type="text" class="form-control" name="jml_realisasi2" disabled value="{{ separateNumberIndo($jmlRealisasi) }}">
|
||||
<input type="text" class="form-control" name="jml_realisasi2" disabled value="{{ separateNumberIndo($jmlRealisasi2) }}">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-form-label label-align" for="sk">Volume Realisasi</label>
|
||||
|
||||
Reference in New Issue
Block a user