Update
This commit is contained in:
@@ -122,14 +122,14 @@ class RealisasiBelanjaController extends Controller
|
||||
DB::beginTransaction();
|
||||
$realisasi_belanja->delete();
|
||||
DB::commit();
|
||||
return redirect('/realisasi-pendapatan')
|
||||
->with('success','Data Realisasi Pendapatan berhasil dihapus!');
|
||||
return redirect('/realisasi-belanja')
|
||||
->with('success','Data Realisasi Belanja berhasil dihapus!');
|
||||
|
||||
}catch(Throwable $e){
|
||||
|
||||
DB::rollBack();
|
||||
return redirect('/realisasi-pendapatan')
|
||||
->with('error','Data Realisasi Pendapatan gagal dihapus.');
|
||||
return redirect('/realisasi-belanja')
|
||||
->with('error','Data Realisasi Belanja gagal dihapus.');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -334,10 +334,12 @@ class RealisasiBelanjaController extends Controller
|
||||
$BelanjaRealisasi = BelanjaRealisasi::where("id", $id)->firstOrNew();
|
||||
$req = $request->all();
|
||||
$redirect = "/realisasi-belanja/".$id."/submit";
|
||||
$action = "/realisasi-belanja/".$id."/kontrak";
|
||||
// var_dump("WOY"); exit;
|
||||
if ($request->isMethod('post')) {
|
||||
try{
|
||||
DB::beginTransaction();
|
||||
BelanjaRealisasiKontrak::where("belanja_realisasi_id",$id)->truncate();
|
||||
BelanjaRealisasiKontrak::where("belanja_realisasi_id",$id)->where("nomor_kontrak",$req["nomor_kontrak"])->firstOrNew()->truncate();
|
||||
$data["belanja_realisasi_id"] = $id;
|
||||
$data["nomor_kontrak"] = $req["nomor_kontrak"];
|
||||
$data["tgl_kontrak"] = ConvertIndoDate($req["tgl_kontrak"]);
|
||||
@@ -355,6 +357,50 @@ class RealisasiBelanjaController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('realisasi_belanja.form_kontrak',compact("BelanjaRealisasi"));
|
||||
return view('realisasi_belanja.form_kontrak',compact("BelanjaRealisasi","action"));
|
||||
}
|
||||
|
||||
public function kontrakUpdate(Request $request, $idKontrak)
|
||||
{
|
||||
$BelanjaRealisasiKontrak = BelanjaRealisasiKontrak::where("id",$idKontrak)->firstorNew();
|
||||
$BelanjaRealisasi = BelanjaRealisasi::where("id", $BelanjaRealisasiKontrak->belanja_realisasi_id)->firstOrNew();
|
||||
$req = $request->all();
|
||||
$redirect = "/realisasi-belanja/".$BelanjaRealisasiKontrak->belanja_realisasi_id."/submit";
|
||||
$action = "/realisasi-belanja/".$idKontrak."/kontrak";
|
||||
if ($request->isMethod('put')) {
|
||||
try{
|
||||
DB::beginTransaction();
|
||||
$data["nomor_kontrak"] = $req["nomor_kontrak"];
|
||||
$data["tgl_kontrak"] = ConvertIndoDate($req["tgl_kontrak"]);
|
||||
$data["nominal_kontrak"] = replaceMoney($req["nominal_kontrak"]);
|
||||
$BelanjaRealisasiKontrak->update($data);
|
||||
DB::commit();
|
||||
|
||||
return redirect($redirect)->with('success','Data Kontrak berhasil di input!');
|
||||
}catch(\Exception $e){
|
||||
throw new \Exception($e->getMessage());
|
||||
DB::rollBack();
|
||||
return redirect($redirect)->with('error',$e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
return view('realisasi_belanja.form_kontrak',compact("BelanjaRealisasi","BelanjaRealisasiKontrak","action"));
|
||||
}
|
||||
|
||||
public function destroyKontrak($id)
|
||||
{
|
||||
try{
|
||||
DB::beginTransaction();
|
||||
BelanjaRealisasiKontrak::where("id",$id)->delete();
|
||||
DB::commit();
|
||||
return redirect('/realisasi-belanja/'.$id.'/kontrak')
|
||||
->with('success','Data Kontrak Realisasi Belanja berhasil dihapus!');
|
||||
|
||||
}catch(Throwable $e){
|
||||
|
||||
DB::rollBack();
|
||||
return redirect('/realisasi-belanja/'.$id.'/kontrak')
|
||||
->with('error','Data Kontrak Realisasi Belanja gagal dihapus.');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Vendored
-2
@@ -5,9 +5,7 @@ body{
|
||||
background-size: cover;
|
||||
/* background: #d5dee7 !important; */
|
||||
color:#333;
|
||||
font-size: 12px;
|
||||
/* font-family: "Ubuntu", "Helvetica Neue", Roboto, Arial, "Droid Sans", sans-serif; */
|
||||
zoom: 85%;
|
||||
}
|
||||
|
||||
.navy-link, .breadcrumb-item a{
|
||||
|
||||
Vendored
+7
-11
@@ -387,18 +387,14 @@ refreshNotif = ()=>{
|
||||
}
|
||||
refreshNotif();
|
||||
|
||||
$.extend( $.fn.dataTable.ext.classes, {
|
||||
sProcessing: "dataTables_processing",
|
||||
});
|
||||
if($.fn.dataTable != undefined){
|
||||
$.extend( $.fn.dataTable.ext.classes, {
|
||||
sProcessing: "dataTables_processing",
|
||||
});
|
||||
}
|
||||
|
||||
$(window).resize(function(){
|
||||
if($.fn.dataTable != undefined){
|
||||
$($.fn.dataTable.tables(true)).DataTable().columns.adjust();
|
||||
});
|
||||
|
||||
$(window).on("#barButton", "click",()=>{
|
||||
$(window).resize();
|
||||
$($.fn.dataTable.tables(true)).DataTable().columns.adjust();
|
||||
$.fn.dataTable
|
||||
.tables( { visible: true, api: true } )
|
||||
.columns.adjust();
|
||||
}
|
||||
});
|
||||
@@ -1,22 +1,25 @@
|
||||
<form id="frmKontrak" action="{{ url('/realisasi-belanja/'.$BelanjaRealisasi->id.'/kontrak') }}" method="POST" autocomplete="off">
|
||||
<form id="frmKontrak" action="{{ url($action) }}" method="POST" autocomplete="off">
|
||||
@csrf
|
||||
<?php if (isset($BelanjaRealisasiKontrak)){ ?>
|
||||
@method('PUT')
|
||||
<?php } ?>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-12 col-md-12">
|
||||
<div class="form-group">
|
||||
<label>Nomor Kontrak</label>
|
||||
<input type="text" id="nomor_kontrak" required class="form-control" name="nomor_kontrak" placeholder="Nomor Kontrak">
|
||||
<input type="text" id="nomor_kontrak" required class="form-control" name="nomor_kontrak" value="{{ isset($BelanjaRealisasiKontrak)?$BelanjaRealisasiKontrak->nomor_kontrak:"" }}" placeholder="Nomor Kontrak">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6 col-sm-6 col-md-6">
|
||||
<div class="form-group">
|
||||
<label>Tgl Kontrak</label>
|
||||
<input type="text" id="tgl_kontrak" required class="form-control indo_date" name="tgl_kontrak" placeholder="Tanggal Kontrak">
|
||||
<input type="text" id="tgl_kontrak" required class="form-control indo_date" name="tgl_kontrak" value="{{ isset($BelanjaRealisasiKontrak)?date("d/m/Y",strtotime($BelanjaRealisasiKontrak->tgl_kontrak)):"" }}" placeholder="Tanggal Kontrak">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6 col-sm-6 col-md-6">
|
||||
<div class="form-group">
|
||||
<label>Nominal Kontrak</label>
|
||||
<input type="text" id="nominal_kontrak" required class="form-control number-separator-indo" name="nominal_kontrak" placeholder="Nominal Kontrak">
|
||||
<input type="text" id="nominal_kontrak" required class="form-control number-separator-indo" name="nominal_kontrak" value="{{ isset($BelanjaRealisasiKontrak)?separateNumberIndo($BelanjaRealisasiKontrak->nominal_kontrak):"" }}" placeholder="Nominal Kontrak">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-12 col-md-12">
|
||||
|
||||
@@ -49,17 +49,6 @@
|
||||
<th>No</th>
|
||||
<?php
|
||||
$arrCol = array(
|
||||
// "Tahun",
|
||||
// "Jenis",
|
||||
// "Sub Jenis",
|
||||
// "Kode Program",
|
||||
|
||||
// "Kode SKPD",
|
||||
// "Kode Kegiatan",
|
||||
// "Nama Kegiatan",
|
||||
// "Kode Sub Kegiatan",
|
||||
// "Kode RSK",
|
||||
// "Kode Rek", "Nama Rek",
|
||||
"Nama SKPD",
|
||||
"Nama Program",
|
||||
"Nama Sub Kegiatan",
|
||||
@@ -141,17 +130,6 @@
|
||||
"paging": true, // Table pagination
|
||||
"columns": [
|
||||
{ "data": null},
|
||||
// { "data": "tahun_anggaran", "width": "400px" },
|
||||
// { "data": "jenis_belanja", "className":"text-left","defaultContent":"-" },
|
||||
// { "data": "sub_jenis_belanja", "className":"text-left", "defaultContent":"-" },
|
||||
// { "data": "kode_program", "className":"text-center", "defaultContent":"-" },
|
||||
// { "data": "kode_skpd", "className":"text-center", "defaultContent":"-" },
|
||||
// { "data": "kode_kegiatan", "className":"text-center", "defaultContent":"-" },
|
||||
// { "data": "nama_kegiatan", "className":"text-left", "defaultContent":"-" },
|
||||
// { "data": "kode_sub_kegiatan", "className":"text-center", "defaultContent":"-" },
|
||||
// { "data": "kode_rsk", "className":"text-center", "defaultContent":"-" },
|
||||
// { "data": "kode_rekening", "className":"text-center", "defaultContent":"-" },
|
||||
// { "data": "nama_rekening", "className":"text-left", "defaultContent":"-" },
|
||||
{ "data": "nama_skpd", "className":"text-left", "defaultContent":"-" },
|
||||
{ "data": "nama_program", "className":"text-left", "defaultContent":"-" },
|
||||
{ "data": "nama_sub_kegiatan", "className":"text-left", "defaultContent":"20%" },
|
||||
|
||||
@@ -72,30 +72,42 @@
|
||||
<strong><i class="fa fa-th-list mr-2"></i> Data Kontrak</strong> [ <a class="modalButton" title="Input Kontrak" href="{{ url('/realisasi-belanja/'.$BelanjaRealisasi->id.'/kontrak') }}">Tambah Kontrak</a> ]<hr style="margin-bottom: 0 !important;">
|
||||
<table class="table table-sm table-striped">
|
||||
<thead>
|
||||
<th>Nomor</th>
|
||||
<th>No</th>
|
||||
<th>Nomor Kontrak</th>
|
||||
<th class="text-center">Tanggal</th>
|
||||
<th class="text-right">Jumlah</th>
|
||||
<th class="text-center"></th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php
|
||||
$totalKontrak = 0;
|
||||
foreach($BelanjaRealisasiKontrak as $key=>$kontrak){ ?>
|
||||
<tr>
|
||||
<td>{{ $key+1 }}</td>
|
||||
<td>{{ $kontrak->nomor_kontrak }}</td>
|
||||
<td class="text-center">{{ date("d-m-Y",strtotime($kontrak->tgl_kontrak)) }}</td>
|
||||
<td class="text-right">{{ separateNumberIndo($kontrak->nominal_kontrak) }}</td>
|
||||
<td class="text-center">
|
||||
<form class='form-delete' action='/realisasi-belanja/{{ $kontrak->id }}/kontrak' method='POST'>
|
||||
<input type='hidden' name='_token' id='csrf-token' value='{{ Session::token() }}' />
|
||||
<input type='hidden' name='_method' value='DELETE'>
|
||||
<a class='btn btn-default btn-sm modalButton' href='/realisasi-belanja/{{ $kontrak->id }}/kontrak/update' title='Ubah Kontrak'><i class='fa fa-edit'></i></a>
|
||||
<button type="submit" class="btn btn-default btn-sm" name="btnSubmit"><i class="fa fa-trash"></i></button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
<?php $totalKontrak+=floatVal($kontrak->nominal_kontrak); } ?>
|
||||
<tr >
|
||||
<td colspan="2"><strong>TOTAL Kontrak</strong></td>
|
||||
<td class="text-right"><strong>{{ separateNumberIndo($totalKontrak) }}</strong></td>
|
||||
<td colspan="3"><strong>TOTAL KONTRAK</strong></td>
|
||||
<td colspan="2" class="text-right"><strong>{{ separateNumberIndo($totalKontrak) }}</strong></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<strong><i class="fa fa-th-list mr-2"></i> SPD</strong><hr style="margin-bottom: 0 !important;">
|
||||
<table class="table table-sm table-striped">
|
||||
<thead>
|
||||
<th>Nomor</th>
|
||||
<th>No</th>
|
||||
<th>Nomor SPD</th>
|
||||
<th class="text-center">Tanggal</th>
|
||||
<th class="text-right">Jumlah</th>
|
||||
</thead>
|
||||
@@ -104,13 +116,14 @@
|
||||
$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 >
|
||||
<td colspan="2"><strong>TOTAL SPD</strong></td>
|
||||
<td colspan="3"><strong>TOTAL SPD</strong></td>
|
||||
<td class="text-right"><strong>{{ separateNumberIndo($totalSPD) }}</strong></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@@ -118,7 +131,8 @@
|
||||
<strong><i class="fa fa-th-list mr-2"></i> SP2D</strong><hr style="margin-bottom: 0 !important;">
|
||||
<table class="table table-sm table-striped">
|
||||
<thead>
|
||||
<th>Nomor</th>
|
||||
<th>No</th>
|
||||
<th>Nomor SP2D</th>
|
||||
<th class="text-center">Tanggal</th>
|
||||
<th class="text-right">Jumlah</th>
|
||||
</thead>
|
||||
@@ -127,13 +141,14 @@
|
||||
$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); } ?>
|
||||
<tr >
|
||||
<td colspan="2"><strong>TOTAL SP2D</strong></td>
|
||||
<td colspan="3"><strong>TOTAL SP2D</strong></td>
|
||||
<td class="text-right"><strong>{{ separateNumberIndo($totalSP2D) }}</strong></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>File Gambar</label>
|
||||
<label>File</label>
|
||||
<input class="form-control" type="file" name="file" required>
|
||||
</div>
|
||||
<div class="form-group"><button type="submit" class="btn btn-sm btn-success"><i class="fas fa-file-excel"></i> Upload File</button></div>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-form-label label-align" for="txt_simtrad4_kotor">DBH</label>
|
||||
<label class="col-form-label label-align" for="txt_simtrad4_kotor">DBH / DAK</label>
|
||||
<select id="txt_id_sps" name="txt_id_sps" style="width:100%" class="form-control sps_search" required></select>
|
||||
<input id="txt_rek_sps" name="txt_rek_sps" type="hidden">
|
||||
</div>
|
||||
|
||||
@@ -147,7 +147,7 @@
|
||||
$("td:eq(9)", nRow).html(
|
||||
"<form class='form-delete' action='/realisasi-pendapatan/"+aData['id']+"' method='POST'>"+
|
||||
"<input type='hidden' name='_token' id='csrf-token' value='{{ Session::token() }}' /><input type='hidden' name='_method' value='DELETE'>"+
|
||||
"<a class='btn btn-default btn-sm' href='/realisasi-pendapatan/"+aData['id']+"' title='Lihat'><i class='fa fa-bullseye'></i></a>"+
|
||||
"<a class='btn btn-default btn-sm' href='/realisasi-pendapatan/"+aData['id']+"' title='Lihat'><i class='fa fa-eye'></i></a>"+
|
||||
btnEdit + btnDelete + "</form>");
|
||||
|
||||
return nRow;
|
||||
|
||||
@@ -67,6 +67,9 @@ Route::group(['middleware' => 'auth'], function () {
|
||||
Route::delete('/delete-detail/{id}', [RealisasiBelanjaController::class,'deleteDetail']);
|
||||
Route::get('/{id}/kontrak', [RealisasiBelanjaController::class,'kontrak']);
|
||||
Route::post('/{id}/kontrak', [RealisasiBelanjaController::class,'kontrak']);
|
||||
Route::delete('/{id}/kontrak', [RealisasiBelanjaController::class,'destroyKontrak']);
|
||||
Route::get('/{idKontrak}/kontrak/update', [RealisasiBelanjaController::class,'kontrakUpdate']);
|
||||
Route::put('/{idKontrak}/kontrak', [RealisasiBelanjaController::class,'kontrakUpdate']);
|
||||
});
|
||||
Route::resource('realisasi-belanja', RealisasiBelanjaController::class);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user