diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 8a938be..aaf0a11 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -47,8 +47,8 @@ class RealisasiBelanjaController extends Controller { $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"); + $this->setTitle("Realisasi Belanja"); + $this->setSubtitle("Realisasi Belanja :: ".$BelanjaRealisasi->jenis_dana." ".$BelanjaRealisasi->sub_jenis_dana); $vwAKB = VwAkbSpdRealRsk::where("I_IDRSK",$BelanjaRealisasi->kode_rsk)->firstorNew(); $BelanjaRealisasiKontrak = BelanjaRealisasiKontrak::where("belanja_realisasi_id",$id)->get(); $vwSPD = DB::select(DB::raw( @@ -247,7 +247,7 @@ class RealisasiBelanjaController extends Controller ]; BelanjaRealisasi::create($input); } - TempRealisasiBelanja::truncate(); + TempRealisasiBelanja::where("userid",Auth::user()->id)->truncate(); DB::commit(); return redirect('/upload-realisasi-belanja/'.$typeDana)->with('success','Data Realisasi belanja berhasil diupload.'); }catch(\Exception $e){ @@ -329,6 +329,18 @@ class RealisasiBelanjaController extends Controller } } + protected function uploadFileKontrak($request) + { + $file = $request->file('file_kontrak'); + if ($file){ + $fileName = $file->getClientOriginalName(); + $tujuan_upload = 'uploadFiles/kontrak'; + $file->move($tujuan_upload, $fileName); + return $fileName; + } + return false; + } + public function kontrak(Request $request, $id) { $BelanjaRealisasi = BelanjaRealisasi::where("id", $id)->firstOrNew(); @@ -339,14 +351,20 @@ class RealisasiBelanjaController extends Controller if ($request->isMethod('post')) { try{ DB::beginTransaction(); - BelanjaRealisasiKontrak::where("belanja_realisasi_id",$id)->where("nomor_kontrak",$req["nomor_kontrak"])->firstOrNew()->truncate(); + $this->validate($request, [ + 'file_kontrak' => 'required|mimes:pdf', + ]); + $fileName = $this->uploadFileKontrak($request); + + BelanjaRealisasiKontrak::where("belanja_realisasi_id",$id)->where("nomor_kontrak",$req["nomor_kontrak"])->firstOrNew()->delete(); $data["belanja_realisasi_id"] = $id; $data["nomor_kontrak"] = $req["nomor_kontrak"]; $data["tgl_kontrak"] = ConvertIndoDate($req["tgl_kontrak"]); $data["nominal_kontrak"] = replaceMoney($req["nominal_kontrak"]); - $data["file_kontrak"] = isset($req["file_kontrak"])?$req["file_kontrak"]:""; + $data["file_kontrak"] = $fileName; $data["created_by"] = Auth::user()->id; BelanjaRealisasiKontrak::create($data); + DB::commit(); return redirect($redirect)->with('success','Data Kontrak berhasil di input!'); @@ -373,6 +391,10 @@ class RealisasiBelanjaController extends Controller $data["nomor_kontrak"] = $req["nomor_kontrak"]; $data["tgl_kontrak"] = ConvertIndoDate($req["tgl_kontrak"]); $data["nominal_kontrak"] = replaceMoney($req["nominal_kontrak"]); + $fileName = $this->uploadFileKontrak($request); + if ($fileName){ + $data["file_kontrak"] = $fileName; + } $BelanjaRealisasiKontrak->update($data); DB::commit(); @@ -391,16 +413,33 @@ class RealisasiBelanjaController extends Controller { try{ DB::beginTransaction(); + $BelanjaRealisasiKontrak = BelanjaRealisasiKontrak::where("id",$id)->firstorNew(); + unlink("uploadFiles/kontrak/".$BelanjaRealisasiKontrak->file_kontrak); BelanjaRealisasiKontrak::where("id",$id)->delete(); DB::commit(); - return redirect('/realisasi-belanja/'.$id.'/kontrak') + return redirect('/realisasi-belanja/'.$BelanjaRealisasiKontrak->belanja_realisasi_id.'/submit') ->with('success','Data Kontrak Realisasi Belanja berhasil dihapus!'); }catch(Throwable $e){ DB::rollBack(); - return redirect('/realisasi-belanja/'.$id.'/kontrak') + return redirect('/realisasi-belanja/'.$BelanjaRealisasiKontrak->belanja_realisasi_id.'/submit') ->with('error','Data Kontrak Realisasi Belanja gagal dihapus.'); } } + + public function downloadKontrak($kode) + { + $kode = explode("__",$kode); + $BelanjaRealisasiKontrak = BelanjaRealisasiKontrak::where(["belanja_realisasi_id"=>$kode[0], "id"=>$kode[1]])->firstorNew(); + $headers = [ + 'Content-Type' => 'application/pdf', + 'Content-Disposition' => 'attachment;filename='.$BelanjaRealisasiKontrak->file_kontrak + ]; + if ($BelanjaRealisasiKontrak){ + return response()->download("uploadFiles/kontrak/".$BelanjaRealisasiKontrak->file_kontrak, $BelanjaRealisasiKontrak->file_kontrak, $headers); + }else{ + echo "File tidak ditemukan!"; + } + } } diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 33d7929..759fcf5 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -36,7 +36,7 @@ - can("Read DBH Jadwal") || $role == "superadmin"){ ?> + can("Read DAK Jadwal") || $role == "superadmin"){ ?>
  • @@ -46,32 +46,30 @@
    • - can("Upload DBH Rencana Belanja") || $role == "superadmin"){ ?> -
  • - - -

    Upload Rencana Belanja

    -     - -
    • - +
  • + + +

    Upload Rencana Belanja

    +     + +
    • can("Read DBH Realisasi Pendapatan") || $role == "superadmin"){ ?>
  • diff --git a/resources/views/partials/top_menu.blade.php b/resources/views/partials/top_menu.blade.php index 4eab88a..e5790c0 100644 --- a/resources/views/partials/top_menu.blade.php +++ b/resources/views/partials/top_menu.blade.php @@ -23,7 +23,7 @@
  • - {{ Auth::user()->name." | ".$role }} + {{ Auth::user()->name." | Role : ".strtoupper($role) }}
    id) }}" > Ganti Kata Sandi diff --git a/resources/views/realisasi_belanja/form_input_realisasi.blade_SP2D.php b/resources/views/realisasi_belanja/form_input_realisasi.blade_SP2D.php deleted file mode 100644 index 5804d51..0000000 --- a/resources/views/realisasi_belanja/form_input_realisasi.blade_SP2D.php +++ /dev/null @@ -1,106 +0,0 @@ -
    - @csrf -
    -
    -
    - - - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - volume_satuan_realisasi) ? 0: $BelanjaRealisasiDetail->volume_satuan_realisasi; ?> - - -
    -
    -
    -
    - - -
    -
    -
    - -
    -
    -
    - \ 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 4eb3430..5b7350f 100644 --- a/resources/views/realisasi_belanja/form_kontrak.blade.php +++ b/resources/views/realisasi_belanja/form_kontrak.blade.php @@ -1,4 +1,4 @@ -
    + @csrf @method('PUT') @@ -22,6 +22,13 @@
    +
    +
    + + + +
    +
    diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php index 8065015..6112b42 100644 --- a/resources/views/realisasi_belanja/index.blade.php +++ b/resources/views/realisasi_belanja/index.blade.php @@ -36,7 +36,33 @@ -
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    @@ -89,10 +115,19 @@ $(document).ready(function(){ var srcDate1 = null, srcDate2 = null; - // $('#tblRealisasi tbody').on('click', 'tr', function () { - // var data = dtTable.row( this ).data(); - // location.href = "/realisasi-belanja/" + data["id"] +"/submit"; - // }); + $("#srcJenisDana").on("change",function(){ + $("#srcSubJenisDana").empty(); + // console.log($(this).val()); + if ($(this).val()=="DBH"){ + $.each(["All","CHT"],function(i,x){ + $('#srcSubJenisDana').append($('