diff --git a/app/Http/Controllers/Admin/MstJenisBelanjaController.php b/app/Http/Controllers/Admin/MstJenisBelanjaController.php index 1c2ec2f..e0417f8 100644 --- a/app/Http/Controllers/Admin/MstJenisBelanjaController.php +++ b/app/Http/Controllers/Admin/MstJenisBelanjaController.php @@ -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!'); } diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 5483156..b52c278 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -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) diff --git a/resources/views/admin/mst_jenis_belanja/create.blade.php b/resources/views/admin/mst_jenis_belanja/create.blade.php index ce88599..99ff372 100644 --- a/resources/views/admin/mst_jenis_belanja/create.blade.php +++ b/resources/views/admin/mst_jenis_belanja/create.blade.php @@ -36,7 +36,7 @@
- +
diff --git a/resources/views/admin/mst_jenis_belanja/edit.blade.php b/resources/views/admin/mst_jenis_belanja/edit.blade.php new file mode 100644 index 0000000..adff372 --- /dev/null +++ b/resources/views/admin/mst_jenis_belanja/edit.blade.php @@ -0,0 +1,49 @@ +@php + $siteBreadcumb = [ + ["url"=>"/admin/mst-hak","label"=>$siteTitle], + ["url"=>"/admin/mst-hak","label"=>$sitesubTitle] + ]; +@endphp + +@extends('layouts.app') + +@section('content') +
+
+
+
@php echo $sitesubTitle; @endphp
+
+
+ Back +
+
+
+ +
+ @csrf + @method('PUT') +
+
+
+ Nama + +
+
+
+
+ Deskripsi + +
+
+
+ +
+
+
+@endsection +@section('scripts') + +@endsection \ No newline at end of file diff --git a/resources/views/admin/mst_jenis_belanja/index.blade.php b/resources/views/admin/mst_jenis_belanja/index.blade.php index 67ce262..2ced170 100644 --- a/resources/views/admin/mst_jenis_belanja/index.blade.php +++ b/resources/views/admin/mst_jenis_belanja/index.blade.php @@ -89,7 +89,14 @@ let checked = aData["is_lock_upload"] == 1 ? "checked":""; $("td:eq(0)", nRow).html(index); - $("td:eq(3)", nRow).html(``); + $("td:eq(3)", nRow).html(` +
+ @csrf + @method('DELETE') + + + +
`); return nRow; }, diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php index c1f783f..2682f81 100644 --- a/resources/views/realisasi_belanja/submit.blade.php +++ b/resources/views/realisasi_belanja/submit.blade.php @@ -39,47 +39,63 @@ - -
-
-

AKB vs REALISASI

-
- {{-- @if(auth()->user()->can('Tambah SKPP')) --}} - - {{-- @endif --}} +
+
+
+
+
+

AKB vs REALISASI

+
+ {{-- @if(auth()->user()->can('Tambah SKPP')) --}} + + {{-- @endif --}} +
+
+
+ + + + + + + + $bulan){ ?> + + + + + + + + + + + + +
BulanAKBRealisasi
{{ $bulan }}{{ separateNumberIndo($vwAKB["v_akb_".substr("00".($key+1),-2)]) }} {{ separateNumberIndo($vwAKB["v_bku_".substr("00".($key+1),-2)]) }}
TOTAL{{ separateNumberIndo($totalAKB) }}{{ separateNumberIndo($totalBKU) }}
+
-
- - - - - - - - $bulan){ ?> - - - - - - - - - - - - -
BulanAKBRealisasi
{{ $bulan }}{{ separateNumberIndo($vwAKB["v_akb_".substr("00".($key+1),-2)]) }} {{ separateNumberIndo($vwAKB["v_bku_".substr("00".($key+1),-2)]) }}
TOTAL{{ separateNumberIndo($totalAKB) }}{{ separateNumberIndo($totalBKU) }}
- {{--
- SPD
+
+
+
+

SPD

+
+ {{-- @if(auth()->user()->can('Tambah SKPP')) --}} + + {{-- @endif --}} +
+
+
@@ -89,22 +105,35 @@ $spd){ ?> + $totalSPD = 0; + foreach($vwSPD as $key=>$spd){ ?> - jml); } ?> - + jml); } ?> +
No
{{ $key+1 }} {{ $spd->i_spdno_dok }} {{ date("d-m-Y",strtotime($spd->d_spdno)) }} {{ separateNumberIndo($spd->jml) }}
TOTAL SPD {{ separateNumberIndo($totalSPD) }}
- SP2D
+
+
+
+
+

SP2D

+
+ {{-- @if(auth()->user()->can('Tambah SKPP')) --}} + + {{-- @endif --}} +
+
+
@@ -114,23 +143,23 @@ $sp2d){ ?> + $totalSP2D = 0; + foreach($vwSP2D as $key=>$sp2d){ ?> - v_spp); } ?> + v_spp); } ?>
No
{{ $key+1 }} {{ $sp2d->i_sp2dno_dok }} {{ date("d-m-Y",strtotime($sp2d->d_sp2d_sah)) }} {{ separateNumberIndo($sp2d->v_spp) }}
TOTAL SP2D {{ separateNumberIndo($totalSP2D) }}
-
-
--}} +
+
jenis_dana) == "DAK" && strtoupper($BelanjaRealisasi->sub_jenis_dana) == "FISIK") { ?> @@ -348,6 +377,96 @@ } }) }); + + // var dtTableAKBReal = $('#tableAKBReal').DataTable({ + // "processing": true, + // "serverSide": true, + // "ordering": false, + // "autoWidth": false, + // "ajax": { + // url: "{{ $baseUrl }}/realisasi-belanja/datatable", + // type: "POST", + // headers: { + // 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') + // }, + // data: function (d) { + // d.id_rsk = {{ $BelanjaRealisasi->kode_rsk }}, + // } + // }, + // "columnDefs": [ + // //{ className: "td-nowrap", "targets": [ 1 ] } + // ], + // "dom": "<\"top\" <\"row\"<\"col-md-6\"><\"col-md-6 text-right\">>>rt<\"bottom\" <\"row\"<\"col-md-6\"><\"col-md-6\">> ><\"clear\">", + // "lengthMenu": [ + // [ 10, 25, 50 ], + // [ "10", "25", "50" ] + // ], + // "paging": true, // Table pagination + // "columns": [ + // { "data": null}, + // { "data": "nama_skpd", "className":"text-left", "defaultContent":"-" }, + // { "data": "nama_program", "className":"text-left", "defaultContent":"-" }, + // { "data": "nama_sub_kegiatan", "className":"text-left", "defaultContent":"20%" }, + // { "data": "nama_rsk", "className":"text-left", "defaultContent":"-", "width":"20%" }, + // { "data": "jumlah_anggaran", "className":"text-right", "defaultContent":"0" }, + // { "data": "volume_satuan", "className":"text-center", "defaultContent":"0", "width":50 }, + // { "data": "unit_satuan", "className":"text-center", "defaultContent":"-", "width":50 }, + // { "data": null, "className":"text-right"}, + // { "data": "volume_satuan_realisasi", "className":"text-center", "defaultContent":"0", "width":50 }, + // { "data": "unit_satuan_realisasi", "className":"text-center", "defaultContent":"-", "width":50 }, + // { "data": null} + // ], + // "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) { + // let info = dtTable.page.info(); + // let numStart = info.page; + // let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1; + // //let btnInput = {{ empty(Auth::user()->can("Input Realisasi DBH Realisasi Belanja"))?"false":Auth::user()->can("Input Realisasi DBH Realisasi Belanja") }}?' Input Realisasi':''; + // let btnInput = ""; + // $("td:eq(0)", nRow).html(index); + // $("td:eq(1)", nRow).html(aData["kode_skpd"]+" | "+aData["nama_skpd"]); + // $("td:eq(2)", nRow).html(aData["kode_program"]+" | "+aData["nama_program"]); + // $("td:eq(3)", nRow).html(aData["kode_sub_kegiatan"]+" | "+aData["nama_sub_kegiatan"]); + // $("td:eq(4)", nRow).html(aData["kode_rsk"]+" | "+aData["nama_rsk"]); + // $("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(9)", nRow).html(separateNumberIndo(aData["volume_satuan_realisasi"])); + // $("td:eq(11)", nRow).html(''+btnInput); + + // return nRow; + // }, + // "language": { + // "lengthMenu": "Tampil _MENU_ data per Halaman", + // "zeroRecords": "Data tidak ditemukan!", + // "info": "Halaman _PAGE_ dari _PAGES_ Halaman", + // "infoEmpty": "Data tidak tersedia", + // "infoFiltered": "(Disaring dari _MAX_ Data)", + // "paginate": { + // "previous": "", + // "next": "", + // }, + // "processing": "
", + // }, + // scrollX:true, + // scrollY: "350px", + // buttons: [ + // { + // extend: "collection", + // text: "Export", + // buttons: [ + // { + // text: " Excel", + // className: "export-data link-excel", + // attr: { + // formid: "frmRealisasi", + // extype: "excel" + // } + // }, + // ], + // } + // ], + // }); + }); @endsection \ No newline at end of file