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/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