From 0ce6ee87ec1a4ae2b88f1915e2ad242dd6bb2bb7 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sat, 12 Oct 2024 10:00:34 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Helpers/Cetak.php | 3 +-- app/Helpers/Helper.php | 9 ++++----- app/Http/Controllers/RoleController.php | 19 +++++++++---------- app/Models/AnggaranKerangkaAcuan.php | 2 +- app/Models/DaftarKontrakMitra.php | 2 -- app/Models/HonorKegiatan.php | 11 +++++------ app/Models/KerangkaAcuan.php | 1 - app/Nova/Actions/GenerateKontrakMitra.php | 1 + app/Nova/Actions/ImportDaftarHonorMitra.php | 1 - app/Nova/Actions/ImportKodeArsip.php | 3 +-- app/Nova/Actions/ImportMataAnggaran.php | 1 - app/Nova/Actions/ImportMitra.php | 1 - app/Nova/DaftarKontrakMitra.php | 3 ++- app/Nova/HonorKegiatan.php | 10 ++++------ app/Nova/NaskahKeluar.php | 2 +- 15 files changed, 29 insertions(+), 40 deletions(-) diff --git a/app/Helpers/Cetak.php b/app/Helpers/Cetak.php index 99e9630d..031c44c0 100644 --- a/app/Helpers/Cetak.php +++ b/app/Helpers/Cetak.php @@ -232,7 +232,6 @@ public static function sk($id) $data = HonorKegiatan::find($id); $kpa = Helper::getPegawaiByUserId($data->kpa_user_id); - return [ 'nomor' => NaskahKeluar::find($data->sk_naskah_keluar_id)->nomor, 'kegiatan' => $data->kegiatan, @@ -259,7 +258,7 @@ public static function validate($jenis, $model_id) ); } if ($jenis === 'spj') { - $honor =HonorKegiatan::where('id', $model_id)->first(); + $honor = HonorKegiatan::where('id', $model_id)->first(); throw_if( $honor->status == 'dibuat', 'Mohon lengkapi terlebih dulu isian honor kegiatan yang akan dicetak melalui menu Ubah' diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 4746b897..9beb29c2 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -501,7 +501,7 @@ public static function getMitraById($id) * Metode ini mengambil semua catatan dari cache Mitra dan memfilter * untuk menemukan catatan pertama yang cocok dengan ID yang diberikan. * - * @param int $id ID jenis kontrak yang akan diambil. + * @param int $id ID jenis kontrak yang akan diambil. * @return mixed Catatan pertama yang cocok dengan ID yang diberikan, atau null jika tidak ada yang cocok. */ public static function getJenisKontrakById($id) @@ -701,7 +701,6 @@ public static function makeBaseListMitraAndPegawai($honor_kegiatan_id, $tanggal) $formattedMitra->push(...$formattedPegawai); return $formattedMitra; - } /** @@ -875,11 +874,11 @@ public static function setOptionsJenisNaskah($tanggal) public static function setOptionsKodeArsip($tanggal, array $filterId = []) { $kodeArsip = KodeArsip::cache()->get('all')->where('tata_naskah_id', self::getLatestTataNaskahId($tanggal)); - - if (!empty($filterId)) { + + if (! empty($filterId)) { $kodeArsip = $kodeArsip->whereIn('id', $filterId); } - + return self::setOptions($kodeArsip, 'id', 'detail', 'group', '', 'kode'); } diff --git a/app/Http/Controllers/RoleController.php b/app/Http/Controllers/RoleController.php index 4c15ab5a..8da43204 100644 --- a/app/Http/Controllers/RoleController.php +++ b/app/Http/Controllers/RoleController.php @@ -12,16 +12,15 @@ class RoleController extends Controller /** * Handle the incoming request. */ -public function changeRole($role, Request $request) -{ - $userId = Auth::user()->id; + public function changeRole($role, Request $request) + { + $userId = Auth::user()->id; - if (Pengelola::cache()->get('all')->where('user_id', $userId) - ->whereNull('inactive')->contains('role', $role)) { - session(['role' => $role]); - } - - return redirect(Nova::path()); -} + if (Pengelola::cache()->get('all')->where('user_id', $userId) + ->whereNull('inactive')->contains('role', $role)) { + session(['role' => $role]); + } + return redirect(Nova::path()); + } } diff --git a/app/Models/AnggaranKerangkaAcuan.php b/app/Models/AnggaranKerangkaAcuan.php index a1ec637b..da44afa4 100644 --- a/app/Models/AnggaranKerangkaAcuan.php +++ b/app/Models/AnggaranKerangkaAcuan.php @@ -18,7 +18,7 @@ protected static function booted(): void $honor->mak = $anggaranKak->mak; $honor->perkiraan_anggaran = $anggaranKak->perkiraan; $honor->save(); - } else { + } else { $kak = KerangkaAcuan::find($anggaranKak->kerangka_acuan_id); $dipa = Dipa::cache()->get('all')->where('id', $kak->dipa_id)->first(); $honor = new HonorKegiatan; diff --git a/app/Models/DaftarKontrakMitra.php b/app/Models/DaftarKontrakMitra.php index bd86e6d5..82eb2d1f 100644 --- a/app/Models/DaftarKontrakMitra.php +++ b/app/Models/DaftarKontrakMitra.php @@ -3,7 +3,6 @@ namespace App\Models; use App\Helpers\Helper; -use App\Models\KontrakMitra; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; @@ -55,5 +54,4 @@ protected static function booted(): void } }); } - } diff --git a/app/Models/HonorKegiatan.php b/app/Models/HonorKegiatan.php index 0c67bd20..1884db35 100644 --- a/app/Models/HonorKegiatan.php +++ b/app/Models/HonorKegiatan.php @@ -3,7 +3,6 @@ namespace App\Models; use App\Helpers\Helper; -use App\Models\KontrakMitra; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -88,7 +87,7 @@ protected static function booted(): void $honor->st_naskah_keluar_id = null; } if ($honor->jenis_honor !== null) { - if ($honor->jenis_honor === 'Kontrak Mitra Bulanan'){ + if ($honor->jenis_honor === 'Kontrak Mitra Bulanan') { $kontrak = KontrakMitra::firstOrNew( [ 'jenis_kontrak' => $honor->jenis_kontrak, @@ -96,14 +95,14 @@ protected static function booted(): void 'tahun' => $honor->tahun, ] ); - $kontrak->nama_kontrak = 'Kontrak '.Helper::getPropertyFromCollection(Helper::getJenisKontrakById($honor->jenis_kontrak),'jenis').' Bulan '.Helper::$bulan[$honor->bulan]; + $kontrak->nama_kontrak = 'Kontrak '.Helper::getPropertyFromCollection(Helper::getJenisKontrakById($honor->jenis_kontrak), 'jenis').' Bulan '.Helper::$bulan[$honor->bulan]; $kontrak->status = 'dibuat'; $kontrak->jenis_honor = $honor->jenis_honor; $kontrak->awal_kontrak = Carbon::createFromDate(session('year'), $honor->bulan)->startOfMonth(); - $kontrak->akhir_kontrak = Carbon::createFromDate(session('year'), $honor->bulan)->endOfMonth(); + $kontrak->akhir_kontrak = Carbon::createFromDate(session('year'), $honor->bulan)->endOfMonth(); $kontrak->save(); } - if ($honor->jenis_honor === 'Kontrak Mitra AdHoc'){ + if ($honor->jenis_honor === 'Kontrak Mitra AdHoc') { $kontrak = KontrakMitra::firstOrNew( [ 'honor_kegiatan_id' => $honor->id, @@ -114,7 +113,7 @@ protected static function booted(): void $kontrak->status = 'dibuat'; $kontrak->jenis_honor = $honor->jenis_honor; $kontrak->awal_kontrak = $honor->awal; - $kontrak->akhir_kontrak = $honor->akhir; + $kontrak->akhir_kontrak = $honor->akhir; $kontrak->save(); } if ($honor->generate_sk) { diff --git a/app/Models/KerangkaAcuan.php b/app/Models/KerangkaAcuan.php index 6fd97cd4..94eeb7ea 100644 --- a/app/Models/KerangkaAcuan.php +++ b/app/Models/KerangkaAcuan.php @@ -150,7 +150,6 @@ private function createInitialArsipDokumen(): void $arsipDokumen->slug = $slug; $arsipDokumen->kerangka_acuan_id = $this->id; $arsipDokumen->save(); - } } diff --git a/app/Nova/Actions/GenerateKontrakMitra.php b/app/Nova/Actions/GenerateKontrakMitra.php index bb2570a1..82439aef 100644 --- a/app/Nova/Actions/GenerateKontrakMitra.php +++ b/app/Nova/Actions/GenerateKontrakMitra.php @@ -60,6 +60,7 @@ public function handle(ActionFields $fields, Collection $models) $model->status = 'selesai'; $model->save(); DaftarKontrakMitra::where('updated_at', null)->delete(); + return Action::message('Kontrak Sukses Digenerate'); } diff --git a/app/Nova/Actions/ImportDaftarHonorMitra.php b/app/Nova/Actions/ImportDaftarHonorMitra.php index 415a2af8..a33509ef 100644 --- a/app/Nova/Actions/ImportDaftarHonorMitra.php +++ b/app/Nova/Actions/ImportDaftarHonorMitra.php @@ -54,7 +54,6 @@ public function handle(ActionFields $fields, Collection $models) $daftarHonorMitra->updated_at = now(); $daftarHonorMitra->save(); - } }); DaftarHonorMitra::where('updated_at', null)->delete(); diff --git a/app/Nova/Actions/ImportKodeArsip.php b/app/Nova/Actions/ImportKodeArsip.php index ef9e1498..1405f1fc 100644 --- a/app/Nova/Actions/ImportKodeArsip.php +++ b/app/Nova/Actions/ImportKodeArsip.php @@ -38,12 +38,11 @@ public function handle(ActionFields $fields, Collection $models) 'tata_naskah_id' => $model->id, 'kode' => $row['kode'], ] - ); + ); $kodeArsip->group = $row['group']; $kodeArsip->updated_at = now(); $kodeArsip->save(); - }); KodeArsip::where('updated_at', null)->delete(); KodeArsip::cache()->enable(); diff --git a/app/Nova/Actions/ImportMataAnggaran.php b/app/Nova/Actions/ImportMataAnggaran.php index 82d8c8aa..1c93f773 100644 --- a/app/Nova/Actions/ImportMataAnggaran.php +++ b/app/Nova/Actions/ImportMataAnggaran.php @@ -61,7 +61,6 @@ public function handle(ActionFields $fields, Collection $models) $mataAnggaran->updated_at = now(); $mataAnggaran->save(); } - }); MataAnggaran::where('updated_at', null)->delete(); KamusAnggaran::where('updated_at', null)->delete(); diff --git a/app/Nova/Actions/ImportMitra.php b/app/Nova/Actions/ImportMitra.php index bb32749c..66dbf9ed 100644 --- a/app/Nova/Actions/ImportMitra.php +++ b/app/Nova/Actions/ImportMitra.php @@ -47,7 +47,6 @@ public function handle(ActionFields $fields, Collection $models) $mitra->npwp = $row['NPWP']; $mitra->save(); - } }); Mitra::where('updated_at', null)->delete(); diff --git a/app/Nova/DaftarKontrakMitra.php b/app/Nova/DaftarKontrakMitra.php index 491a17e9..bb63763c 100644 --- a/app/Nova/DaftarKontrakMitra.php +++ b/app/Nova/DaftarKontrakMitra.php @@ -48,6 +48,7 @@ public static function label() public function fields(NovaRequest $request) { $mitra = Helper::getMitraById($this->mitra_id); + return [ Text::make('NIK', fn () => Helper::getPropertyFromCollection($mitra, 'nik')) ->readOnly(), @@ -57,7 +58,7 @@ public function fields(NovaRequest $request) ->readOnly(), Text::make('Nomor BAST', 'nomor_bast') ->readOnly(), - Number::make('Jumlah Kegiatan','jumlah_kegiatan') + Number::make('Jumlah Kegiatan', 'jumlah_kegiatan') ->readOnly(), Currency::make('Honor', 'honor') ->currency('IDR') diff --git a/app/Nova/HonorKegiatan.php b/app/Nova/HonorKegiatan.php index 8286ccc2..2b5b6bc0 100644 --- a/app/Nova/HonorKegiatan.php +++ b/app/Nova/HonorKegiatan.php @@ -116,7 +116,6 @@ public function fields(NovaRequest $request) return $fail('Bulan Kontrak harus berisi tanggal setelah atau sama dengan awal bulan tanggal KAK.'); } }); - } }) ->options(Helper::$bulan) @@ -129,7 +128,6 @@ public function fields(NovaRequest $request) ->show() ->options(Helper::setOptionJenisKontrak($form->tanggal_kak)) ->rules('required'); - } }) ->displayUsing(fn ($kode) => Helper::getPropertyFromCollection(JenisKontrak::cache()->get('all')->where('id', $kode)->first(), 'jenis')), @@ -187,8 +185,8 @@ public function fields(NovaRequest $request) $field->show() ->rules('required') ->options(Helper::setOptionPengelola('kpa', Helper::createDateFromString($formData->tanggal_sk))); - } - }), + } + }), ]), Panel::make('Keterangan Surat Tugas', [ @@ -239,8 +237,8 @@ public function fields(NovaRequest $request) $field->show() ->rules('required') ->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal_st))); - } - }), + } + }), ]), Status::make('Status', 'status') ->loadingWhen(['dibuat', 'import', 'diubah']) diff --git a/app/Nova/NaskahKeluar.php b/app/Nova/NaskahKeluar.php index 99251ea0..e5ce830f 100644 --- a/app/Nova/NaskahKeluar.php +++ b/app/Nova/NaskahKeluar.php @@ -65,7 +65,7 @@ public function fields(NovaRequest $request) ->sortable() ->rules('required', 'before_or_equal:today') ->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal)) - ->rules('required', 'before_or_equal:today', function ($attribute, $value, $fail) { + ->rules('required', 'before_or_equal:today', function ($attribute, $value, $fail) { if (Helper::getYearFromDateString($value) != session('year')) { return $fail('Tanggal harus di tahun yang telah dipilih'); }