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

Update

Browse Source
This commit is contained in:
Izuddin
2022-08-30 10:31:28 +07:00
parent 34f95b22ef
commit 5c0adb9c17
6 changed files with 253 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/MstJenisBelanjaController.php
+12 -16
View File
@@ -75,36 +75,32 @@ class MstJenisBelanjaController extends Controller
return view('admin.mst_jenis_belanja.show',compact('MstJenisBelanja','SubJenisBelanja'));
}
public function edit(User $user)
public function edit(MstJenisBelanja $MstJenisBelanja)
{
$this->setSubtitle("Ubah Data");
return view('admin.mst_jenis_belanja.edit',compact('user'));
return view('admin.mst_jenis_belanja.edit',compact('MstJenisBelanja'));
}
public function update(Request $request, User $user)
public function update(Request $request, MstJenisBelanja $MstJenisBelanja)
{
$request->validate([
'name' => 'required',
'opt_role' => 'required'
]);
$requestAll = $request->all();
$requestAll["role_name"] = $requestAll["opt_role"];
$user->update($requestAll);
$req = $request->all();
$data["name"] = $req["name"];
$data["description"] = $req["description"];
$MstJenisBelanja->update($req);
$user->roles()->detach();
// $user->removeRole($requestAll["opt_role"]);
$user->assignRole($requestAll["opt_role"]);
return redirect()->route('users.index')
return redirect()->route('MstJenisBelanja.index')
->with('success','Data Jenis Belanja berhasil diubah!');
}
public function destroy(User $user)
public function destroy(MstJenisBelanja $MstJenisBelanja)
{
$user->delete();
return redirect()->route('users.index')
MstSubJenisBelanja::where("id_jenis_belanja",$MstJenisBelanja->id)->delete();
$MstJenisBelanja->delete();
return redirect()->route('MstJenisBelanja.index')
->with('success','Data Jenis Belanja berhasil dihapus!');
}
app/Http/Controllers/RealisasiBelanjaController.php
+15 -15
View File
@@ -71,25 +71,25 @@ class RealisasiBelanjaController extends Controller
}
$vwAKB = VwAkbSpdRealRsk::where("I_IDRSK",$BelanjaRealisasi->kode_rsk)->firstorNew();
$BelanjaRealisasiKontrak = BelanjaRealisasiKontrak::where("belanja_realisasi_id",$id)->get();
// $vwSPD = DB::select(DB::raw(
// "SELECT x.I_SPDNO_DOK, x.D_SPDNO, sum(z.V_SPP) AS JML
// FROM NEWSIPKD.TMSPD x
// LEFT JOIN NEWSIPKD.TMSPPRINCIBLJ y ON x.I_ID = y.I_IDSPD
// LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK z ON y.I_IDSPP = z.I_IDSPP
// WHERE z.I_IDRSK=".$BelanjaRealisasi->kode_rsk."GROUP BY x.I_SPDNO_DOK, x.D_SPDNO ORDER BY x.D_SPDNO "
// ));
$vwSPD = DB::select(DB::raw(
"SELECT x.I_SPDNO_DOK, x.D_SPDNO, sum(z.V_SPP) AS JML
FROM NEWSIPKD.TMSPD x
LEFT JOIN NEWSIPKD.TMSPPRINCIBLJ y ON x.I_ID = y.I_IDSPD
LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK z ON y.I_IDSPP = z.I_IDSPP
WHERE z.I_IDRSK=".$BelanjaRealisasi->kode_rsk."GROUP BY x.I_SPDNO_DOK, x.D_SPDNO ORDER BY x.D_SPDNO "
));
// $vwSP2D = DB::select(DB::raw('SELECT x.I_ID as IDSP2D, x.I_SP2DNO_DOK,
// TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH, sum(y.V_SPP) as V_SPP
// FROM NEWSIPKD.TMSP2D x
// LEFT JOIN NEWSIPKD.V_SPPBLJRSK y
// ON x.I_ID = y.I_IDSP2D
// 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 ' )
// );
$vwSP2D = DB::select(DB::raw('SELECT x.I_ID as IDSP2D, x.I_SP2DNO_DOK,
TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH, sum(y.V_SPP) as V_SPP
FROM NEWSIPKD.TMSP2D x
LEFT JOIN NEWSIPKD.V_SPPBLJRSK y
ON x.I_ID = y.I_IDSP2D
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","unitSatuan","jmlRealisasi"));
return view('realisasi_belanja.submit', compact("BelanjaRealisasi","BelanjaRealisasiDetail","BelanjaRealisasiKontrak","vwAKB","vwSPD","vwSP2D","unitSatuan","jmlRealisasi"));
}
public function datatable(Request $request)