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)
resources/views/admin/mst_jenis_belanja/create.blade.php
+1 -1
View File
@@ -36,7 +36,7 @@
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-12">
<button type="submit" class="btn btn-success"><i class="fa fa-paper-plane"></i> Submit</button>
<button type="submit" class="btn btn-success"><i class="fa fa-paper-plane"></i> Simpan</button>
</div>
</div>
</form>
resources/views/admin/mst_jenis_belanja/edit.blade.php
+49
View File
@@ -0,0 +1,49 @@
@php
$siteBreadcumb = [
["url"=>"/admin/mst-hak","label"=>$siteTitle],
["url"=>"/admin/mst-hak","label"=>$sitesubTitle]
];
@endphp
@extends('layouts.app')
@section('content')
<div class="row">
<div class="col-lg-12 margin-tb">
<div class="pull-left">
<h5><i class="fa fa-edit"></i> @php echo $sitesubTitle; @endphp</h5>
</div>
<div class="pull-right">
<a class="btn btn-secondary btn-sm" href="{{ route('MstJenisBelanja.index') }}"><i class="fa fa-arrow-left"></i> Back</a>
</div>
</div>
</div>
<form id="frmJenisBelanja" action="{{ URL::to('/admin/MstJenisBelanja/'.$MstJenisBelanja->id) }}" method="POST">
@csrf
@method('PUT')
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12">
<div class="form-group">
<strong>Nama</strong>
<input type="text" class="form-control" name="name" required placeholder="Input Nama" value="{{ $MstJenisBelanja->name }}">
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-12">
<div class="form-group">
<strong>Deskripsi</strong>
<textarea class="form-control" name="description" required placeholder="Input Keterangan">{{ $MstJenisBelanja->description }}</textarea>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-12">
<button type="submit" class="btn btn-success"><i class="fa fa-paper-plane"></i> Simpan</button>
</div>
</div>
</form>
@endsection
@section('scripts')
<script type="text/javascript">
$(document).ready(function(){
});
</script>
@endsection
resources/views/admin/mst_jenis_belanja/index.blade.php
+8 -1
View File
@@ -89,7 +89,14 @@
let checked = aData["is_lock_upload"] == 1 ? "checked":"";
$("td:eq(0)", nRow).html(index);
$("td:eq(3)", nRow).html(`<a class="btn btn-default btn-sm" href="{{ URL::to("/admin/MstJenisBelanja") }}/`+ aData["id"] +`" title="Lihat"><i class="fa fa-eye"></i></a>`);
$("td:eq(3)", nRow).html(`
<form class="form-delete" action="{{ URL::to("/admin/MstJenisBelanja") }}/`+ aData["id"] +`" method="POST">
@csrf
@method('DELETE')
<a class="btn btn-default btn-sm" href="{{ URL::to("/admin/MstJenisBelanja") }}/`+ aData["id"] +`" title="Lihat"><i class="fa fa-eye"></i></a>
<a class="btn btn-default btn-sm" href="{{ URL::to("/admin/MstJenisBelanja") }}/`+ aData["id"] +`/edit" title="Ubah"><i class="fa fa-edit"></i></a>
<button type="submit" class="btn btn-default btn-sm"title="Hapus"><i class="fa fa-trash"></i></button>
</form>`);
return nRow;
},
resources/views/realisasi_belanja/submit.blade.php
+131 -12
View File
@@ -40,6 +40,8 @@
</form>
</div>
</div>
<div class="row">
<div class="col-6">
<div class="card">
<div class="card-header">
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> AKB vs REALISASI</h2>
@@ -52,7 +54,7 @@
</div>
</div>
<div class="card-body">
<table class="table table-striped">
<table id="tableAKBReal" class="table table-striped">
<thead>
<th>Bulan</th>
<th class="text-right">AKB</th>
@@ -78,8 +80,22 @@
</tr>
</tbody>
</table>
{{-- <div class="col-6">
<strong><i class="fa fa-th-list mr-2"></i> SPD</strong><hr style="margin-bottom: 0 !important;">
</div>
</div>
</div>
<div class="col-6">
<div class="card">
<div class="card-header">
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> SPD</h2>
<div class="card-tools">
{{-- @if(auth()->user()->can('Tambah SKPP')) --}}
<button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
<i class="fas fa-minus"></i>
</button>
{{-- @endif --}}
</div>
</div>
<div class="card-body">
<table class="table table-sm table-striped">
<thead>
<th>No</th>
@@ -89,22 +105,35 @@
</thead>
<tbody>
<?php
//$totalSPD = 0;
//foreach($vwSPD as $key=>$spd){ ?>
$totalSPD = 0;
foreach($vwSPD as $key=>$spd){ ?>
<tr>
<td>{{ $key+1 }}</td>
<td>{{ $spd->i_spdno_dok }}</td>
<td class="text-center">{{ date("d-m-Y",strtotime($spd->d_spdno)) }}</td>
<td class="text-right">{{ separateNumberIndo($spd->jml) }}</td>
</tr>
<?php //$totalSPD+=floatVal($spd->jml); } ?>
<tr >
<?php $totalSPD+=floatVal($spd->jml); } ?>
<tr>
<td colspan="3"><strong>TOTAL SPD</strong></td>
<td class="text-right"><strong>{{ separateNumberIndo($totalSPD) }}</strong></td>
</tr>
</tbody>
</table>
<strong><i class="fa fa-th-list mr-2 mt-3"></i> SP2D</strong><hr style="margin-bottom: 0 !important;">
</div>
</div>
<div class="card">
<div class="card-header">
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> SP2D</h2>
<div class="card-tools">
{{-- @if(auth()->user()->can('Tambah SKPP')) --}}
<button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
<i class="fas fa-minus"></i>
</button>
{{-- @endif --}}
</div>
</div>
<div class="card-body">
<table class="table table-sm table-striped">
<thead>
<th>No</th>
@@ -114,15 +143,15 @@
</thead>
<tbody>
<?php
//$totalSP2D = 0;
//foreach($vwSP2D as $key=>$sp2d){ ?>
$totalSP2D = 0;
foreach($vwSP2D as $key=>$sp2d){ ?>
<tr>
<td>{{ $key+1 }}</td>
<td>{{ $sp2d->i_sp2dno_dok }}</td>
<td class="text-center">{{ date("d-m-Y",strtotime($sp2d->d_sp2d_sah)) }}</td>
<td class="text-right">{{ separateNumberIndo($sp2d->v_spp) }}</td>
</tr>
<?php //$totalSP2D+=floatVal($sp2d->v_spp); } ?>
<?php $totalSP2D+=floatVal($sp2d->v_spp); } ?>
<tr >
<td colspan="3"><strong>TOTAL SP2D</strong></td>
<td class="text-right"><strong>{{ separateNumberIndo($totalSP2D) }}</strong></td>
@@ -130,7 +159,7 @@
</tbody>
</table>
</div>
</div>--}}
</div>
</div>
</div>
<?php if (strtoupper($BelanjaRealisasi->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") }}?'<a class="btn btn-sm btn-success modalButton" title="Input Realisasi" href="/dbh/realisasi-belanja/'+aData["id"]+'/inputRealisasi"><i class="fa fa-paper-plane"></i> Input Realisasi</a>':'';
// 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('<a href="{{ $baseUrl }}/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+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": "<i class='fas fa-angle-double-left'></i>",
// "next": "<i class='fas fa-angle-double-right'></i>",
// },
// "processing": "<div class='loading'></div>",
// },
// scrollX:true,
// scrollY: "350px",
// buttons: [
// {
// extend: "collection",
// text: "Export",
// buttons: [
// {
// text: "<i class=\'fas fa-file-excel\'></i> Excel",
// className: "export-data link-excel",
// attr: {
// formid: "frmRealisasi",
// extype: "excel"
// }
// },
// ],
// }
// ],
// });
});
</script>
@endsection