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-29 16:57:34 +07:00
parent 019f6be7f6
commit ffc4b94fdc
5 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/NotifikasiController.php
+6 -1
View File
@@ -86,7 +86,12 @@ class NotifikasiController extends Controller
public function getNotif(Request $request)
{
$notif = Notifikasi::where(["userid"=>Auth::user()->id,"is_read"=>0])->get();
$notif = Notifikasi::where(["userid"=>Auth::user()->id,"is_read"=>0]);
$notif = [
"jml"=>$notif->count(),
"data"=>$notif->orderBy("created_at","desc")->skip(0)->take(5)->get()
];
return response()->json($notif);
}
}
app/Http/Controllers/RealisasiBelanjaController.php
+15 -4
View File
@@ -295,7 +295,8 @@ class RealisasiBelanjaController extends Controller
$idSPS = isset($post["id_sps"])?$post["id_sps"]:"";
$fReview = isset($post["f_review"])?$post["f_review"]:"";
$sqlStr = "SELECT x.* FROM BELANJA_REALISASI x LEFT JOIN NEWSIPKD.TROPD z ON x.KODE_SKPD = z.C_OPD
$sqlStr = "SELECT x.* FROM BELANJA_REALISASI x
LEFT JOIN NEWSIPKD.TROPD z ON x.KODE_SKPD = z.C_OPD
WHERE x.tahun_anggaran='$ta'";
if (getRole()=="skpd"){
@@ -333,13 +334,19 @@ class RealisasiBelanjaController extends Controller
$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
$data = DB::select(DB::raw("SELECT a.*,b.jml,NVL(c.jml_spd,0) AS jml_spd FROM (".$sqlStr.$filter.") a
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
) b ON a.kode_rsk = b.I_IDRSK
) b
ON a.kode_rsk = b.I_IDRSK
LEFT JOIN (
SELECT id_rsk,count(id_rsk) as jml_spd FROM SAMASA.belanja_realisasi_spd
GROUP BY id_rsk
) c
ON a.kode_rsk = c.id_rsk
ORDER BY a.KODE_SKPD, a.KODE_RSK OFFSET ".$offset." ROWS FETCH NEXT ".$limit." ROWS ONLY"));
return response()->json([
@@ -575,7 +582,11 @@ class RealisasiBelanjaController extends Controller
}
}
return view('realisasi_belanja.form_input_spd',compact("SPDs","id","redirect"));
$selected = BelanjaRealisasiSPD::where("id_rsk",$id)->get();
//$selected = (array) $selected;
$selected = json_decode(json_encode($selected), true);
return view('realisasi_belanja.form_input_spd',compact("SPDs","id","redirect","selected"));
}
public function inputRealisasi(Request $request, $id)