From 016aa8d874b1dd8bd3b478e536c60f5055a06ce9 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Wed, 4 Sep 2024 08:14:07 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Helpers/Cetak.php | 3 ++- app/Helpers/Helper.php | 19 +++++++------------ app/Models/KerangkaAcuan.php | 8 +++----- app/Nova/Actions/Download.php | 6 +++--- app/Nova/KerangkaAcuan.php | 2 -- 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/app/Helpers/Cetak.php b/app/Helpers/Cetak.php index 7e73786c..3a477809 100644 --- a/app/Helpers/Cetak.php +++ b/app/Helpers/Cetak.php @@ -29,6 +29,7 @@ public static function cetak($jenis, $id) $templateProcessor->setValues($data); $filename = $jenis.'_'.session('year').'_'.explode('/', $data['nomor'])[0].'.docx'; $templateProcessor->saveAs(Storage::path('public/'.$jenis.'/'.$filename)); + return $filename; } @@ -62,7 +63,7 @@ public static function kak($id) 'tanggal_dipa' => Helper::terbilangTanggal(Helper::getDipa($data->tahun)->tanggal), 'tahun' => $data->tahun, 'jabatan' => $data->jabatan, - 'waktu' => Helper::jangkaWaktuHariKalender($data->awal,$data->akhir), + 'waktu' => Helper::jangkaWaktuHariKalender($data->awal, $data->akhir), 'awal' => Helper::terbilangTanggal($data->awal), 'akhir' => Helper::terbilangTanggal($data->akhir), 'ppk' => $data->ppk, diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 80d6e566..33cec7f9 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -748,19 +748,20 @@ public static function formatAnggaran($anggaran) } /** - * Mengambil Path Template + * Mengambil Path Template. * * @param string $jenis * @return string */ public static function getTemplatePath($jenis) { - $file = Template::cache()->get('all')->where('slug','template_'.$jenis)->first()->file; + $file = Template::cache()->get('all')->where('slug', 'template_'.$jenis)->first()->file; + return Storage::disk('templates')->path($file); } /** - * Mengambil Keterangan DIPA + * Mengambil Keterangan DIPA. * * @param string $tahun * @return collection @@ -771,7 +772,7 @@ public static function getDipa($tahun) } /** - * Menghapus titik di akhir kalimat + * Menghapus titik di akhir kalimat. * * @param string $kalimat * @return string @@ -782,7 +783,7 @@ public static function hapusTitikAkhirKalimat($kalimat) } /** - * Menghapus File dokumen + * Menghapus File dokumen. * * @param string $id * @return void @@ -792,14 +793,8 @@ public static function hapusFile($jenis, $id) if ($jenis == 'kak') { $naskah_id = KerangkaAcuan::find($id)->naskah_keluar_id; $nomor = NaskahKeluar::find($naskah_id)->nomor; - } + } $filename = $jenis.'_'.session('year').'_'.explode('/', $nomor)[0].'.docx'; File::delete(Storage::path('public/'.$jenis.'/'.$filename)); - } - - - - - } diff --git a/app/Models/KerangkaAcuan.php b/app/Models/KerangkaAcuan.php index 2e3ecead..f3f60bfc 100644 --- a/app/Models/KerangkaAcuan.php +++ b/app/Models/KerangkaAcuan.php @@ -3,7 +3,6 @@ namespace App\Models; use App\Helpers\Helper; -use App\Models\User; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -48,10 +47,10 @@ protected static function booted(): void $naskahkeluar->save(); $kak->naskah_keluar_id = $naskahkeluar->id; - $user = User::cache()->get('all')->where('role', 'koordinator')->where('unit_kerja_id' , Auth::user()->unit_kerja_id)->first(); + $user = User::cache()->get('all')->where('role', 'koordinator')->where('unit_kerja_id', Auth::user()->unit_kerja_id)->first(); $kak->nama = $user->nama; $kak->nip = $user->nip; - $kak->jabatan = $user->jabatan == 'Kepala Subbagian Umum' ? 'Kepala Subbagian Umum': 'Penanggung Jawab Kegiatan'; + $kak->jabatan = $user->jabatan == 'Kepala Subbagian Umum' ? 'Kepala Subbagian Umum' : 'Penanggung Jawab Kegiatan'; $kak->unit_kerja_id = Auth::user()->unit_kerja_id; $kak->ppk = Helper::getPengelola('ppk')->nama; $kak->nipppk = Helper::getPengelola('ppk')->nip; @@ -64,10 +63,9 @@ protected static function booted(): void $naskahkeluar->save(); }); static::deleting(function (KerangkaAcuan $kak) { - Helper::hapusFile('kak',$kak->id); + Helper::hapusFile('kak', $kak->id); NaskahKeluar::where('id', $kak->naskah_keluar_id)->delete(); HonorSurvei::where('kerangka_acuan_id', $kak->id)->delete(); - }); static::saving(function (KerangkaAcuan $kak) { if ($kak->jenis !== 'Penyedia') { diff --git a/app/Nova/Actions/Download.php b/app/Nova/Actions/Download.php index 725f5ceb..bb0ce677 100644 --- a/app/Nova/Actions/Download.php +++ b/app/Nova/Actions/Download.php @@ -4,7 +4,6 @@ use App\Helpers\Cetak; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Storage; @@ -20,13 +19,13 @@ class Download extends Action protected $jenis; protected $title; - public function __construct($jenis , $title = 'Unduh') + public function __construct($jenis, $title = 'Unduh') { $this->jenis = $jenis; $this->title = $title; } - public function name () + public function name() { return $this->title; } @@ -42,6 +41,7 @@ public function handle(ActionFields $fields, Collection $models) { $model = $models->first(); $filename = Cetak::cetak($this->jenis, $model->id); + return ActionResponse::download($filename, Storage::disk($this->jenis)->url($filename)); } diff --git a/app/Nova/KerangkaAcuan.php b/app/Nova/KerangkaAcuan.php index f3512540..0892c051 100644 --- a/app/Nova/KerangkaAcuan.php +++ b/app/Nova/KerangkaAcuan.php @@ -9,7 +9,6 @@ use App\Nova\Repeater\Anggaran; use Carbon\Carbon; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Storage; use Laravel\Nova\Fields\BelongsTo; use Laravel\Nova\Fields\Boolean; use Laravel\Nova\Fields\Currency; @@ -20,7 +19,6 @@ use Laravel\Nova\Fields\Stack; use Laravel\Nova\Fields\Text; use Laravel\Nova\Fields\Textarea; -use Laravel\Nova\Fields\URL; use Laravel\Nova\Http\Requests\NovaRequest; use Laravel\Nova\Panel; use Outl1ne\NovaSimpleRepeatable\SimpleRepeatable;