diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index f69a00d..8a938be 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -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.'); + } } } diff --git a/public/css/app.css b/public/css/app.css index d5e9fd2..a451feb 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -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{ diff --git a/public/js/app.js b/public/js/app.js index a281296..cc61548 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -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(){ - $($.fn.dataTable.tables(true)).DataTable().columns.adjust(); + 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(); -}); \ No newline at end of file diff --git a/resources/views/realisasi_belanja/form_kontrak.blade.php b/resources/views/realisasi_belanja/form_kontrak.blade.php index b8d2614..4eb3430 100644 --- a/resources/views/realisasi_belanja/form_kontrak.blade.php +++ b/resources/views/realisasi_belanja/form_kontrak.blade.php @@ -1,22 +1,25 @@ -
+ @csrf + + @method('PUT') +
- +
- + tgl_kontrak)):"" }}" placeholder="Tanggal Kontrak">
- +
diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php index e1061bd..8065015 100644 --- a/resources/views/realisasi_belanja/index.blade.php +++ b/resources/views/realisasi_belanja/index.blade.php @@ -49,17 +49,6 @@ No Data Kontrak [ Tambah Kontrak ]
- + + + $kontrak){ ?> + + nominal_kontrak); } ?> - - + +
NomorNoNomor Kontrak Tanggal Jumlah
{{ $key+1 }} {{ $kontrak->nomor_kontrak }} {{ date("d-m-Y",strtotime($kontrak->tgl_kontrak)) }} {{ separateNumberIndo($kontrak->nominal_kontrak) }} + + + + + + +
TOTAL Kontrak{{ separateNumberIndo($totalKontrak) }}TOTAL KONTRAK{{ separateNumberIndo($totalKontrak) }}
SPD
- + + @@ -104,13 +116,14 @@ $totalSPD = 0; foreach($vwSPD as $key=>$spd){ ?> + jml); } ?> - + @@ -118,7 +131,8 @@ SP2D
NomorNoNomor SPD Tanggal Jumlah
{{ $key+1 }} {{ $spd->i_spdno_dok }} {{ date("d-m-Y",strtotime($spd->d_spdno)) }} {{ separateNumberIndo($spd->jml) }}
TOTAL SPDTOTAL SPD {{ separateNumberIndo($totalSPD) }}
- + + @@ -127,13 +141,14 @@ $totalSP2D = 0; foreach($vwSP2D as $key=>$sp2d){ ?> + v_spp); } ?> - + diff --git a/resources/views/realisasi_belanja/upload.blade.php b/resources/views/realisasi_belanja/upload.blade.php index 568e13a..e32c4fa 100644 --- a/resources/views/realisasi_belanja/upload.blade.php +++ b/resources/views/realisasi_belanja/upload.blade.php @@ -42,7 +42,7 @@
- +
diff --git a/resources/views/realisasi_pendapatan/form.blade.php b/resources/views/realisasi_pendapatan/form.blade.php index 9faa760..80fc1a4 100644 --- a/resources/views/realisasi_pendapatan/form.blade.php +++ b/resources/views/realisasi_pendapatan/form.blade.php @@ -12,7 +12,7 @@
- +
diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php index 9f15d2c..1e11730 100644 --- a/resources/views/realisasi_pendapatan/index.blade.php +++ b/resources/views/realisasi_pendapatan/index.blade.php @@ -147,7 +147,7 @@ $("td:eq(9)", nRow).html( ""+ ""+ - ""+ + ""+ btnEdit + btnDelete + ""); return nRow; diff --git a/routes/web.php b/routes/web.php index a4892aa..837da08 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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);
NomorNoNomor SP2D Tanggal Jumlah
{{ $key+1 }} {{ $sp2d->i_sp2dno_dok }} {{ date("d-m-Y",strtotime($sp2d->d_sp2d_sah)) }} {{ separateNumberIndo($sp2d->v_spp) }}
TOTAL SP2DTOTAL SP2D {{ separateNumberIndo($totalSP2D) }}