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

Maintenance DBH dan DAK

Browse Source
This commit is contained in:
Pusdatin BPKD Jkt
2022-08-01 11:32:08 +07:00
parent 346de23d03
commit 842152b856
27 changed files with 268 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/PermissionsController.php
+1 -1
View File
@@ -14,7 +14,7 @@ class PermissionsController extends Controller
public function index()
{
$data = Permission::latest()->paginate(10);
$data = Permission::latest()->orderby("name")->paginate(10);
return view('admin.mst_permission.index',compact('data'))
->with('i', (request()->input('page', 1) - 1) * 10);
app/Http/Controllers/JadwalSalurdanaController.php
+5 -5
View File
@@ -42,7 +42,7 @@ class JadwalSalurdanaController extends Controller
(
SELECT * FROM (
SELECT ID_SPS,extract(month from RKUD_TGL) AS BULAN,RKUD_JUMLAH
FROM SAMASA.DBH_PENDAPATAN_REALISASI
FROM SAMASA.PENDAPATAN_REALISASI
WHERE TAHUN=\''.$ta.'\'
)
PIVOT
@@ -70,11 +70,11 @@ class JadwalSalurdanaController extends Controller
]);
}
public function index_cht_dak(Request $request,$typeJadwal)
public function index_cht_dak(Request $request,$typeDana)
{
$judul = strtoupper($typeJadwal);
$judul = strtoupper($typeDana);
$this->setTitle("Jadwal Salur Dana $judul");
return view("jadwal_salurdana.index_".$typeJadwal);
return view("jadwal_salurdana.index_".$typeDana);
}
public function datatable_cht_dak(Request $request)
@@ -88,7 +88,7 @@ class JadwalSalurdanaController extends Controller
$dataFilter=0;
$sqlstr = 'SELECT x.kode_rsk, x.nama_rsk, x.jumlah_anggaran, y.*
FROM
SAMASA.DBH_BELANJA_REALISASI x
SAMASA.BELANJA_REALISASI x
LEFT JOIN
(
SELECT * FROM (
app/Http/Controllers/NotifikasiController.php
+4 -4
View File
@@ -27,11 +27,11 @@ class NotifikasiController extends Controller
{
}
public function edit(DbhBelanjaRealisasi $realisasi_belanja)
public function edit(BelanjaRealisasi $realisasi_belanja)
{
}
public function update(Request $request, DbhBelanjaRealisasi $realisasi_belanja)
public function update(Request $request, BelanjaRealisasi $realisasi_belanja)
{
}
@@ -57,7 +57,7 @@ class NotifikasiController extends Controller
]);
}
public function destroy(DbhBelanjaRealisasi $realisasi_belanja)
public function destroy(BelanjaRealisasi $realisasi_belanja)
{
// try{
// DB::beginTransaction();
@@ -74,7 +74,7 @@ class NotifikasiController extends Controller
// }
}
public function show(DbhBelanjaRealisasi $realisasi_belanja)
public function show(BelanjaRealisasi $realisasi_belanja)
{
// if (!Auth::user()->can("Lihat SKPP")){
// abort(403, 'Youre not allowed to visit this page!');
app/Http/Controllers/RealisasiBelanjaController.php
+50 -97
View File
@@ -7,8 +7,8 @@ use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
use Maatwebsite\Excel\Facades\Excel;
use App\Models\DbhBelanjaRealisasi;
use App\Models\DbhBelanjaRealisasiDetail;
use App\Models\BelanjaRealisasi;
use App\Models\BelanjaRealisasiDetail;
use App\Models\TempRealisasiBelanja;
use App\Models\VwAkbSpdRealRsk;
use App\Models\UnitSatuan;
@@ -18,7 +18,7 @@ use App\Imports\RealisasiBelanjaImport;
class RealisasiBelanjaController extends Controller
{
public function __construct(){
$this->siteTitle = "DBH Realisasi Belanja";
$this->siteTitle = "Realisasi Belanja";
parent::__construct();
}
@@ -35,20 +35,22 @@ class RealisasiBelanjaController extends Controller
{
}
public function edit(DbhBelanjaRealisasi $realisasi_belanja)
public function edit(BelanjaRealisasi $realisasi_belanja)
{
}
public function update(Request $request, DbhBelanjaRealisasi $realisasi_belanja)
public function update(Request $request, BelanjaRealisasi $realisasi_belanja)
{
}
public function submit(Request $request, $id)
{
$this->setSubtitle("Detail");
$DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew();
// var_dump($DbhBelanjaRealisasi->kode_rsk,$DbhBelanjaRealisasi->kode_sub_kegiatan); exit;
$vwAKB = VwAkbSpdRealRsk::where("I_IDRSK",$DbhBelanjaRealisasi->kode_rsk)->firstorNew();
$BelanjaRealisasi = BelanjaRealisasi::where("id", $id)->firstOrNew();
// var_dump($BelanjaRealisasi->kode_rsk,$BelanjaRealisasi->kode_sub_kegiatan); exit;
$this->setTitle("Realisasi Belanja ".$BelanjaRealisasi->jenis_dana." ".$BelanjaRealisasi->sub_jenis_dana);
$this->setSubtitle("Detail Data");
$vwAKB = VwAkbSpdRealRsk::where("I_IDRSK",$BelanjaRealisasi->kode_rsk)->firstorNew();
$vwSPD = DB::select(DB::raw(
'SELECT x.I_SPDNO_DOK,x.D_SPDNO,sum(y.V_SPD) AS JML
FROM NEWSIPKD.TMSPD x
@@ -58,25 +60,22 @@ class RealisasiBelanjaController extends Controller
ON y.I_IDSUBGIAT = z.I_ID
LEFT JOIN NEWSIPKD.TROPD a
ON x.I_IDOPD = a.I_ID
WHERE z.C_SUBGIAT = \''.$DbhBelanjaRealisasi->kode_sub_kegiatan.'\'
AND a.C_OPD = \''.$DbhBelanjaRealisasi->kode_skpd.'\'
AND x.C_ANGG_TAHUN = \''.$DbhBelanjaRealisasi->tahun_anggaran.'\'
WHERE z.C_SUBGIAT = \''.$BelanjaRealisasi->kode_sub_kegiatan.'\'
AND a.C_OPD = \''.$BelanjaRealisasi->kode_skpd.'\'
AND x.C_ANGG_TAHUN = \''.$BelanjaRealisasi->tahun_anggaran.'\'
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_IDOPD,x.I_SP2DNO_DOK,
TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP
FROM NEWSIPKD.TMSP2D x
LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y
ON x.I_IDSPP = y.I_IDSPP
WHERE y.I_IDRSK='.$DbhBelanjaRealisasi->kode_rsk.' ORDER BY x.D_SP2D_SAH ' )
WHERE y.I_IDRSK='.$BelanjaRealisasi->kode_rsk.' ORDER BY x.D_SP2D_SAH ' )
);
// foreach($vwSP2D as $key=>$sp2d){
// var_dump($sp2d->i_sp2dno_dok);
// }
// exit;
return view('realisasi_belanja.submit', compact("DbhBelanjaRealisasi","vwAKB","vwSPD","vwSP2D"));
return view('realisasi_belanja.submit', compact("BelanjaRealisasi","vwAKB","vwSPD","vwSP2D"));
}
public function datatable(Request $request)
@@ -87,7 +86,7 @@ class RealisasiBelanjaController extends Controller
$src = isset($post["search"])?$post["search"]["value"]:"";
$dataFilter=0;
$data = DB::select(DB::raw('SELECT x.*,y.JML_REALISASI_SP2D FROM DBH_BELANJA_REALISASI x
$data = DB::select(DB::raw('SELECT x.*,y.JML_REALISASI_SP2D FROM BELANJA_REALISASI x
LEFT JOIN (
SELECT I_IDRSK,SUM(y.V_SPP) AS JML_REALISASI_SP2D
FROM NEWSIPKD.TMSP2D x
@@ -108,7 +107,7 @@ class RealisasiBelanjaController extends Controller
}
$dataFilter = count($data);
$dataTotal = DbhBelanjaRealisasi::count();
$dataTotal = BelanjaRealisasi::count();
return response()->json([
"recordsTotal" => $dataTotal,
@@ -117,24 +116,24 @@ class RealisasiBelanjaController extends Controller
]);
}
public function destroy(DbhBelanjaRealisasi $realisasi_belanja)
public function destroy(BelanjaRealisasi $realisasi_belanja)
{
try{
DB::beginTransaction();
$realisasi_belanja->delete();
DB::commit();
return redirect('dbh/realisasi-pendapatan')
return redirect('/realisasi-pendapatan')
->with('success','Data Realisasi Pendapatan berhasil dihapus!');
}catch(Throwable $e){
DB::rollBack();
return redirect('dbh/realisasi-pendapatan')
return redirect('/realisasi-pendapatan')
->with('error','Data Realisasi Pendapatan gagal dihapus.');
}
}
public function show(DbhBelanjaRealisasi $realisasi_belanja)
public function show(BelanjaRealisasi $realisasi_belanja)
{
// if (!Auth::user()->can("Lihat SKPP")){
// abort(403, 'Youre not allowed to visit this page!');
@@ -143,10 +142,11 @@ class RealisasiBelanjaController extends Controller
return view('realisasi_belanja.show',compact("realisasi_belanja"));
}
public function upload(Request $request)
public function upload(Request $request, $typeDana)
{
$method = $request->method();
$this->setSubtitle("Upload Data Rencana Belanja");
$this->setTitle("Upload Rencana Belanja ".strtoupper($typeDana));
$this->setSubtitle("Upload File");
if ($request->isMethod('post')) {
$req = $request->all();
try{
@@ -155,6 +155,7 @@ class RealisasiBelanjaController extends Controller
]);
$file = $request->file('file');
$subJenisDana = $request->optJenisDana;
// echo 'File Name: '.$file->getClientOriginalName();
// echo 'File Extension: '.$file->getClientOriginalExtension();
// echo 'File Real Path: '.$file->getRealPath();
@@ -164,18 +165,18 @@ class RealisasiBelanjaController extends Controller
$file->move($tujuan_upload,$file->getClientOriginalName());
// var_dump($file->getRealPath()); exit;
DB::beginTransaction();
TempRealisasiBelanja::truncate();
Excel::import(new RealisasiBelanjaImport, $tujuan_upload."/".$file->getClientOriginalName());
TempRealisasiBelanja::where("userid",Auth::user()->id)->truncate();
Excel::import(new RealisasiBelanjaImport(strtoupper($typeDana),$subJenisDana), $tujuan_upload."/".$file->getClientOriginalName());
DB::commit();
return redirect('dbh/upload-realisasi-belanja')->with('success','Data Rencana belanja berhasil diupload, Silahkan validasi data!');
return redirect('/upload-realisasi-belanja/'.$typeDana)->with('success','Data Rencana belanja berhasil diupload, Silahkan validasi data!');
}catch(\Exception $e){
throw new \Exception($e->getMessage());
DB::rollBack();
return redirect('dbh/upload-realisasi-belanja')->with('error',$e->getMessage());
return redirect('/upload-realisasi-belanja/'.$typeDana)->with('error',$e->getMessage());
}
}
$this->siteTitle = "Rencana Belanja";
return view('realisasi_belanja.upload');
return view('realisasi_belanja.upload',compact("typeDana"));
}
public function uploadDatatable(Request $request)
@@ -208,20 +209,20 @@ class RealisasiBelanjaController extends Controller
]);
}
public function uploadValidate(Request $request)
public function uploadValidate(Request $request, $typeDana)
{
try{
DB::beginTransaction();
$datas = TempRealisasiBelanja::orderBy("id","ASC")->get();
for($i=0;$i<$datas->count();$i++){
$cekData = DbhBelanjaRealisasi::where([
$cekData = BelanjaRealisasi::where([
"kode_rsk"=>$datas[$i]["kode_rsk"],
// "kode_rekening"=>$datas[$i]["kode_rekening"]
])->firstOrNew();
if (!$cekData==null){
$cekData->delete();
// DbhBelanjaRealisasi::where(["kode_rsk"=>$datas[$i]["kode_rsk"],"kode_rekening"=>$datas[$i]["kode_rekening"]])->delete();
// BelanjaRealisasi::where(["kode_rsk"=>$datas[$i]["kode_rsk"],"kode_rekening"=>$datas[$i]["kode_rekening"]])->delete();
}
$input = [
"tahun_anggaran"=>$datas[$i]["tahun_anggaran"],
@@ -237,77 +238,29 @@ class RealisasiBelanjaController extends Controller
"nama_sub_kegiatan"=>$datas[$i]["nama_sub_kegiatan"],
"kode_rsk"=>$datas[$i]["kode_rsk"],
"nama_rsk"=>$datas[$i]["nama_rsk"],
// "kode_rekening"=>$datas[$i]["kode_rekening"],
// "nama_rekening"=>$datas[$i]["nama_rekening"],
"jumlah_anggaran"=>$datas[$i]["jumlah_anggaran"],
"volume_satuan"=>$datas[$i]["volume_satuan"],
"unit_satuan"=>$datas[$i]["unit_satuan"]
"unit_satuan"=>$datas[$i]["unit_satuan"],
"jenis_dana"=>$datas[$i]["jenis_dana"],
"sub_jenis_dana"=>$datas[$i]["sub_jenis_dana"],
"created_by"=>$datas[$i]["userid"]
];
DbhBelanjaRealisasi::create($input);
BelanjaRealisasi::create($input);
}
TempRealisasiBelanja::truncate();
DB::commit();
return redirect('/dbh/upload-realisasi-belanja')->with('success','Data Realisasi belanja berhasil diupload.');
return redirect('/upload-realisasi-belanja/'.$typeDana)->with('success','Data Realisasi belanja berhasil diupload.');
}catch(\Exception $e){
throw new \Exception($e->getMessage());
DB::rollBack();
return redirect('/dbh/upload-realisasi-belanja')->with('error',$e->getMessage());
return redirect('/upload-realisasi-belanja/'.$typeDana)->with('error',$e->getMessage());
}
return view('realisasi_belanja.upload');
}
// public function inputRealisasi(Request $request, $id)
// {
// $DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew();
// $req = $request->all();
// $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"/dbh/realisasi-belanja";
// if ($request->isMethod('post')) {
// try{
// DB::beginTransaction();
// $DbhBelanjaRealisasiDetail = DbhBelanjaRealisasiDetail::where(["dbh_belanja_realisasi_id"=>$id,"no_sp2d"=>$req["no_sp2d"]]);
// $data["dbh_belanja_realisasi_id"] = $id;
// $data["volume_satuan_realisasi"] = $req["vol_realisasi"];
// $data["unit_satuan_realisasi"] = $req["unit_realisasi"];
// $data["jumlah_realisasi"] = replaceMoney($req["jml_realisasi"]);
// $data["no_sp2d"] = $req["no_sp2d"];
// $data["created_by"] = Auth::user()->id;
// // var_dump($DbhBelanjaRealisasiDetail->count()); exit;
// if ($DbhBelanjaRealisasiDetail->count()==0){
// DbhBelanjaRealisasiDetail::create($data);
// }else{
// $DbhBelanjaRealisasiDetail->firstorNew()->update($data);
// }
// DB::commit();
// return redirect($redirect)->with('success','Data Realisasi berhasil di input!');
// }catch(\Exception $e){
// throw new \Exception($e->getMessage());
// DB::rollBack();
// return redirect($redirect)->with('error',$e->getMessage());
// }
// }
// $DbhBelanjaRealisasiDetail = DB::select(
// DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP,
// a.no_sp2d,a.jumlah_realisasi,a.VOLUME_SATUAN_REALISASI,a.UNIT_SATUAN_REALISASI,a.ID
// FROM NEWSIPKD.TMSP2D x
// LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y
// ON x.I_IDSPP = y.I_IDSPP
// LEFT JOIN SAMASA.DBH_BELANJA_REALISASI_DETAIL a
// ON x.I_SP2DNO_DOK = a.NO_SP2D
// WHERE x.I_ID='.$request->id_sp2d.' ORDER BY x.D_SP2D_SAH ' )
// );
// $DbhBelanjaRealisasiDetail = $DbhBelanjaRealisasiDetail == null ? null : $DbhBelanjaRealisasiDetail[0];
// $unitSatuan = UnitSatuan::orderBy("id")->get();
// return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "DbhBelanjaRealisasiDetail", "unitSatuan","redirect"));
// }
public function inputRealisasi(Request $request, $id)
{
$DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew();
$BelanjaRealisasi = BelanjaRealisasi::where("id", $id)->firstOrNew();
$req = $request->all();
$redirect = isset($req["redirect_link"])?$req["redirect_link"]:"realisasi-belanja";
if ($request->isMethod('post')) {
@@ -316,7 +269,7 @@ class RealisasiBelanjaController extends Controller
$data["volume_satuan_realisasi"] = $req["vol_realisasi"];
$data["unit_satuan_realisasi"] = $req["unit_realisasi"];
$data["realisasi_by"] = Auth::user()->id;
$DbhBelanjaRealisasi->update($data);
$BelanjaRealisasi->update($data);
DB::commit();
return redirect($redirect)->with('success','Data Realisasi berhasil di input!');
@@ -328,7 +281,7 @@ class RealisasiBelanjaController extends Controller
}
$unitSatuan = UnitSatuan::orderBy("id")->get();
return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "unitSatuan","redirect"));
return view('realisasi_belanja.form_input_realisasi',compact("BelanjaRealisasi", "unitSatuan","redirect"));
}
public function datatableInputRealisasi(Request $request)
@@ -339,7 +292,7 @@ class RealisasiBelanjaController extends Controller
$src = isset($post["search"])?$post["search"]["value"]:"";
$dataFilter=0;
//$data = DbhBelanjaRealisasiDetail::where(["DBH_BELANJA_REALISASI_ID"=>$request->id])->orderBy("id","ASC");
//$data = BelanjaRealisasiDetail::where(["DBH_BELANJA_REALISASI_ID"=>$request->id])->orderBy("id","ASC");
$data = DB::select(
DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP,
a.no_sp2d,a.jumlah_realisasi,a.VOLUME_SATUAN_REALISASI,a.UNIT_SATUAN_REALISASI,a.ID
@@ -362,17 +315,17 @@ class RealisasiBelanjaController extends Controller
public function deleteDetail($id)
{
$data = DbhBelanjaRealisasiDetail::where('id', $id)->firstorNew();
$data = BelanjaRealisasiDetail::where('id', $id)->firstorNew();
try{
DB::beginTransaction();
$data->delete();
DB::commit();
return redirect('/dbh/realisasi-belanja/'.$data->dbh_belanja_realisasi_id."/submit")->with('success','Data detail Realisasi belanja berhasil dihapus!');
return redirect('/realisasi-belanja/'.$data->dbh_belanja_realisasi_id."/submit")->with('success','Data detail Realisasi belanja berhasil dihapus!');
}catch(Throwable $e){
DB::rollBack();
return redirect('/dbh/realisasi-belanja/'.$data->dbh_belanja_realisasi_id."/submit")->with('error','Data detail Realisasi belanja gagal dihapus.');
return redirect('/realisasi-belanja/'.$data->dbh_belanja_realisasi_id."/submit")->with('error','Data detail Realisasi belanja gagal dihapus.');
}
}
}
app/Http/Controllers/RealisasiPendapatanController.php
+20 -20
View File
@@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth;
use Maatwebsite\Excel\Facades\Excel;
use App\Models\DbhPendapatanRealisasi;
use App\Models\PendapatanRealisasi;
use App\Models\Sps_pendapatan;
use App\Models\User;
@@ -60,32 +60,32 @@ class RealisasiPendapatanController extends Controller
$data = $this->dataPendapatan($req);
$data["created_by"] = Auth::user()->id;
$DbhPendapatanRealisasi = DbhPendapatanRealisasi::create($data);
$PendapatanRealisasi = PendapatanRealisasi::create($data);
// SEND NOTIF
$userBendahara = User::where("role_name","bendahara")->get()->toArray();
$userBendahara = array_column($userBendahara,"id");
$url = "/dbh/realisasi-pendapatan/".$DbhPendapatanRealisasi->id;
$url = "/realisasi-pendapatan/".$PendapatanRealisasi->id;
$message = "Realisasi Pendapatan telah dibuat oleh Bidang Anggaran dengan No. SP2D BUN ".$req["txt_simtrad4_sp2d_bun"];
$this->sendNotif("anggaran", "bendahara", $userBendahara, $message, $url, "Realisasi Pendapatan", $DbhPendapatanRealisasi->id);
$this->sendNotif("anggaran", "bendahara", $userBendahara, $message, $url, "Realisasi Pendapatan", $PendapatanRealisasi->id);
DB::commit();
return redirect('/dbh/realisasi-pendapatan')
return redirect('/realisasi-pendapatan')
->with('success','Realisasi Pendapatan berhasil dibuat.');
}catch(\Exception $e){
DB::rollBack();
return redirect('/dbh/realisasi-pendapatan')
return redirect('/realisasi-pendapatan')
->with('error',$e->getMessage());
}
}
public function edit(DbhPendapatanRealisasi $realisasi_pendapatan)
public function edit(PendapatanRealisasi $realisasi_pendapatan)
{
$this->setSubtitle("Ubah Data");
return view('realisasi_pendapatan.edit',compact('realisasi_pendapatan'));
}
public function update(Request $request, DbhPendapatanRealisasi $realisasi_pendapatan)
public function update(Request $request, PendapatanRealisasi $realisasi_pendapatan)
{
try{
@@ -98,12 +98,12 @@ class RealisasiPendapatanController extends Controller
DB::commit();
return redirect('/dbh/realisasi-pendapatan')
return redirect('/realisasi-pendapatan')
->with('success','Realisasi Pendapatan berhasil diubah.');
}catch(Throwable $e){
DB::rollBack();
return redirect('/dbh/realisasi-pendapatan')
return redirect('/realisasi-pendapatan')
->with('error','Realisasi Pendapatan gagal diubah!');
}
}
@@ -126,12 +126,12 @@ class RealisasiPendapatanController extends Controller
$ta = $post["ta"];
$dataFilter=0;
$data = DbhPendapatanRealisasi::orderBy("created_at","ASC");
$data = PendapatanRealisasi::orderBy("created_at","ASC");
if (!empty($src)){
$data->whereRaw("(LOWER(simtrad4_uraian) LIKE '%".strtolower($src)."%')");
}
$dataFilter = $data->count();
$dataTotal = DbhPendapatanRealisasi::count();
$dataTotal = PendapatanRealisasi::count();
return response()->json([
"recordsTotal" => $dataTotal,
@@ -140,24 +140,24 @@ class RealisasiPendapatanController extends Controller
]);
}
public function destroy(DbhPendapatanRealisasi $realisasi_pendapatan)
public function destroy(PendapatanRealisasi $realisasi_pendapatan)
{
try{
DB::beginTransaction();
$realisasi_pendapatan->delete();
DB::commit();
return redirect('/dbh/realisasi-pendapatan.index')
return redirect('/realisasi-pendapatan.index')
->with('success','Data Realisasi Pendapatan berhasil dihapus!');
}catch(Throwable $e){
DB::rollBack();
return redirect('/dbh/realisasi-pendapatan.index')
return redirect('/realisasi-pendapatan.index')
->with('error','Data Realisasi Pendapatan gagal dihapus.');
}
}
public function show(DbhPendapatanRealisasi $realisasi_pendapatan)
public function show(PendapatanRealisasi $realisasi_pendapatan)
{
// if (!Auth::user()->can("Lihat SKPP")){
// abort(403, 'Youre not allowed to visit this page!');
@@ -182,10 +182,10 @@ class RealisasiPendapatanController extends Controller
$date = date("Ymd");
DB::beginTransaction();
$data = DbhPendapatanRealisasi::firstOrNew(array('id' => $realisasiId));
$data = PendapatanRealisasi::firstOrNew(array('id' => $realisasiId));
if ($data["simtrad4_bersih"]<>replaceMoney($req["rkud_jumlah"])){
return redirect(url("/dbh/realisasi-pendapatan/".$realisasiId))->with('error', "Jumlah STS harus sama dengan Rencana !");
return redirect(url("/realisasi-pendapatan/".$realisasiId))->with('error', "Jumlah STS harus sama dengan Rencana !");
}
$data["rkud_tgl"] = $req["rkud_tgl"];
$data["rkud_no_sts"] = $req["rkud_no_sts"];
@@ -196,11 +196,11 @@ class RealisasiPendapatanController extends Controller
DB::commit();
return redirect('/dbh/realisasi-pendapatan')->with('success','STS berhasil diinput.');
return redirect('/realisasi-pendapatan')->with('success','STS berhasil diinput.');
}catch(\Exception $e){
DB::rollBack();
return redirect(url("/dbh/realisasi-pendapatan/".$realisasiId))->with('error',$e->getMessage());
return redirect(url("/realisasi-pendapatan/".$realisasiId))->with('error',$e->getMessage());
}
}
app/Imports/RealisasiBelanjaImport.php
+12 -3
View File
@@ -4,10 +4,18 @@ use App\Models\TempRealisasiBelanja;
use Maatwebsite\Excel\Concerns\ToModel;
use Maatwebsite\Excel\Concerns\Importable;
use Maatwebsite\Excel\Concerns\WithStartRow;
use Illuminate\Support\Facades\Auth;
class RealisasiBelanjaImport implements ToModel, WithStartRow
{
use Importable;
protected $jenisDana;
protected $subjenisDana;
public function __construct($jenisDana, $subjenisDana){
$this->jenisDana = $jenisDana;
$this->subjenisDana = $subjenisDana;
}
public function startRow(): int
{
@@ -30,11 +38,12 @@ class RealisasiBelanjaImport implements ToModel, WithStartRow
"nama_sub_kegiatan"=>$row[10],
"kode_rsk"=>$row[11],
"nama_rsk"=>$row[12],
// "kode_rekening"=>$row[13],
// "nama_rekening"=>$row[14],
"jumlah_anggaran"=>$row[13],
"volume_satuan"=>$row[14],
"unit_satuan"=>$row[15]
"unit_satuan"=>$row[15],
"jenis_dana"=>$this->jenisDana,
"sub_jenis_dana"=>$this->subjenisDana,
"userid"=>Auth::user()->id
]);
}
}
app/Models/DbhBelanjaRealisasi.php → app/Models/BelanjaRealisasi.php
+6 -3
View File
@@ -6,12 +6,12 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Yajra\Oci8\Eloquent\OracleEloquent as Eloquent;
class DbhBelanjaRealisasi extends Eloquent
class BelanjaRealisasi extends Eloquent
{
use HasFactory;
use Uuids;
protected $connection = 'Samasa';
protected $table = 'SAMASA.dbh_belanja_realisasi';
protected $table = 'SAMASA.belanja_realisasi';
protected $fillable = [
"tahun_anggaran",
"jenis_belanja",
@@ -35,6 +35,9 @@ class DbhBelanjaRealisasi extends Eloquent
"volume_satuan_realisasi",
"unit_satuan_realisasi",
"no_sp2d",
"realisasi_by"
"realisasi_by",
"created_by",
"jenis_dana",
"sub_jenis_dana"
];
}
app/Models/DbhBelanjaRealisasiDetail.php → app/Models/BelanjaRealisasiDetail.php
+2 -2
View File
@@ -6,11 +6,11 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Yajra\Oci8\Eloquent\OracleEloquent as Eloquent;
class DbhBelanjaRealisasiDetail extends Eloquent
class BelanjaRealisasiDetail extends Eloquent
{
use HasFactory;
protected $connection = 'Samasa';
protected $table = 'SAMASA.dbh_belanja_realisasi_detail';
protected $table = 'SAMASA.belanja_realisasi_detail';
protected $fillable = [
"dbh_belanja_realisasi_id",
"jumlah_realisasi",
app/Models/DbhPendapatanRealisasi.php → app/Models/PendapatanRealisasi.php
+2 -2
View File
@@ -6,12 +6,12 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Yajra\Oci8\Eloquent\OracleEloquent as Eloquent;
class DbhPendapatanRealisasi extends Eloquent
class PendapatanRealisasi extends Eloquent
{
use HasFactory;
use Uuids;
protected $connection = 'Samasa';
protected $table = 'SAMASA.dbh_pendapatan_realisasi';
protected $table = 'SAMASA.pendapatan_realisasi';
protected $fillable = [
'tahun','simtrad4_uraian','simtrad4_kotor','simtrad4_potongan','simtrad4_bersih','simtrad4_tgl_sp2d_bun','simtrad4_sp2d_bun',
'rkud_tgl','rkud_no_sts','rkud_kode_akun','rkud_nama_akun','rkud_jumlah','id_sps','kode_rekening_sps','nama_rekening_sps'
app/Models/TempRealisasiBelanja.php
+4 -1
View File
@@ -29,6 +29,9 @@ class TempRealisasiBelanja extends Eloquent
"nama_rekening",
"jumlah_anggaran",
"volume_satuan",
"unit_satuan"
"unit_satuan",
"jenis_dana",
"sub_jenis_dana",
"userid"
];
}