From 7bde848428f5c5dab7c48e1ea83873af2fdbc313 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sun, 22 Sep 2024 13:44:38 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Helpers/Cetak.php | 13 ++++++----- app/Helpers/Helper.php | 16 +++++++------ app/Imports/DaftarHonorMitraImport.php | 5 ++-- app/Imports/MataAnggaransImport.php | 2 +- app/Models/HonorKegiatan.php | 11 ++++----- app/Models/KerangkaAcuan.php | 2 +- app/Models/NaskahKeluar.php | 2 +- app/Nova/Actions/ImportDaftarHonorMitra.php | 5 ++-- app/Nova/HonorKegiatan.php | 23 ++++++++----------- app/Nova/SpesifikasiKerangkaAcuan.php | 1 - app/Nova/User.php | 2 +- .../2024_08_03_090339_update_users_table.php | 1 - 12 files changed, 39 insertions(+), 44 deletions(-) diff --git a/app/Helpers/Cetak.php b/app/Helpers/Cetak.php index 15f842e7..aa0f1995 100644 --- a/app/Helpers/Cetak.php +++ b/app/Helpers/Cetak.php @@ -70,12 +70,12 @@ public static function getTemplate(string $jenis, $id, $template_id) foreach ($detailAnggarans as $detailAnggaran) { if (Str::of($data[$detailAnggaran])->contains('edit manual karena belum ada di POK')) { $detail = new TextRun(); - $detail ->addText(Str::of($data[$detailAnggaran])->before('edit manual karena belum ada di POK')); - $detail->addText('edit manual karena belum ada di POK', array('color' => 'red')); + $detail->addText(Str::of($data[$detailAnggaran])->before('edit manual karena belum ada di POK')); + $detail->addText('edit manual karena belum ada di POK', ['color' => 'red']); $templateProcessor->setComplexValue($detailAnggaran, $detail); unset($data[$detailAnggaran]); } - } + } unset($data['daftar_honor_mitra']); HonorKegiatan::where('id', $id)->update(['status' => 'selesai']); @@ -158,12 +158,13 @@ public static function kak($id) public static function spj($id) { $data = HonorKegiatan::find($id); - $kamus = KamusAnggaran::cache()->get('all')->where('id',$data->kamus_anggaran_id)->first(); + $kamus = KamusAnggaran::cache()->get('all')->where('id', $data->kamus_anggaran_id)->first(); + return [ 'nama' => $data->judul_spj, 'tanggal_spj' => Helper::terbilangTanggal($data->tanggal_spj), - 'detail' => $kamus == null ?'edit manual karena belum ada di POK':$kamus->detail, - 'bulan' => $data->bulan == '13'? Helper::terbilangTanggal($data->awal).' - '.Helper::terbilangTanggal($data->akhir) :Helper::terbilangBulan($data->bulan), + 'detail' => $kamus == null ? 'edit manual karena belum ada di POK' : $kamus->detail, + 'bulan' => $data->bulan == '13' ? Helper::terbilangTanggal($data->awal).' - '.Helper::terbilangTanggal($data->akhir) : Helper::terbilangBulan($data->bulan), 'mak' => $data->mak, 'kegiatan' => Helper::getDetailAnggaran($data->mak, 'kegiatan'), 'kro' => Helper::getDetailAnggaran($data->mak, 'kro'), diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index f18bff39..846932ee 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -574,10 +574,9 @@ public static function isAkunHonor(string $mak): bool return in_array(substr($mak, -6), self::$akun_honor); } - public static function isAkunHonorChanged($mak_old, $mak_new) { - return (self::isAkunHonor($mak_old) && !self::isAkunHonor($mak_new)) ||(self::isAkunHonor($mak_old) && self::isAkunHonor($mak_new) && $mak_old != $mak_new) ; + return (self::isAkunHonor($mak_old) && ! self::isAkunHonor($mak_new)) || (self::isAkunHonor($mak_old) && self::isAkunHonor($mak_new) && $mak_old != $mak_new); } // /** @@ -710,7 +709,7 @@ public static function getDetailAnggaran($mak, $level = 'akun', bool $kode_prefi $kamus = KamusAnggaran::cache()->get('all')->filter(function ($item, $key) use ($mak, $length, $level) { return Str::of($item->mak)->startsWith(Str::substr($mak, 0, $length[$level])) && Str::of($item->mak)->length == $length[$level]; })->first(); - $detail = $kamus == null ? 'edit manual karena belum ada di POK': $kamus->detail; + $detail = $kamus == null ? 'edit manual karena belum ada di POK' : $kamus->detail; return $kode_prefix ? $kode[$level].$detail : $detail; } @@ -791,7 +790,7 @@ public static function formatSpj($spesifikasi) if (isset($item['harga_satuan'])) { $item['harga_satuan'] = self::formatUang($item['harga_satuan']); } - if (!isset($item['golongan'])) { + if (! isset($item['golongan'])) { $item['golongan'] = '-'; } if (isset($item['bruto'])) { @@ -844,7 +843,7 @@ public static function getTemplatePathById($id) */ public static function getDipa($id) { - return Dipa::cache()->get('all')->where('id', $id)->first()?? ''; + return Dipa::cache()->get('all')->where('id', $id)->first() ?? ''; } /** @@ -856,13 +855,15 @@ public static function getDipa($id) public static function getLatestTataNaskahId($tanggal) { $tata_naskah = TataNaskah::cache()->get('all')->where('tanggal', '<=', $tanggal)->sortByDesc('tanggal')->first(); - return $tata_naskah == null ? '': $tata_naskah->id; + + return $tata_naskah == null ? '' : $tata_naskah->id; } public static function getLatestHargaSatuanId($tanggal) { $harga_satuan = HargaSatuan::cache()->get('all')->where('tanggal', '<=', $tanggal)->sortByDesc('tanggal')->first(); - return $harga_satuan == null ? null: $harga_satuan->id; + + return $harga_satuan == null ? null : $harga_satuan->id; } /** @@ -997,6 +998,7 @@ public static function setOptionDipa() { return self::setOptions(Dipa::cache()->get('all')->whereBetween('tahun', [session('year'), session('year') + 1]), 'id', 'tahun'); } + public static function setOptionKepkaMitra($tahun) { return self::setOptions(KepkaMitra::cache()->get('all')->where('tahun', $tahun), 'id', 'nomor'); diff --git a/app/Imports/DaftarHonorMitraImport.php b/app/Imports/DaftarHonorMitraImport.php index 6f2f0d77..574f2632 100644 --- a/app/Imports/DaftarHonorMitraImport.php +++ b/app/Imports/DaftarHonorMitraImport.php @@ -22,11 +22,10 @@ public function __construct($id, $bulan, $jenis, $kepka_mitra_id) { $this->id = $id; $this->jenis = $jenis; - $this->bulan = $bulan; - $this->kepka_mitra_id = $kepka_mitra_id; + $this->bulan = $bulan; + $this->kepka_mitra_id = $kepka_mitra_id; } - public function collection(Collection $rows) { foreach ($rows as $row) { diff --git a/app/Imports/MataAnggaransImport.php b/app/Imports/MataAnggaransImport.php index 40c32fab..2f662063 100644 --- a/app/Imports/MataAnggaransImport.php +++ b/app/Imports/MataAnggaransImport.php @@ -42,7 +42,7 @@ public function collection(Collection $rows) [ 'detail' => $row['Program/ Kegiatan/ KRO/ RO/ Komponen'], 'updated_at' => now(), - 'satuan' => $row['Volume'] !=''? explode(' ', $row['Volume'])[1]:'', + 'satuan' => $row['Volume'] != '' ? explode(' ', $row['Volume'])[1] : '', ] ); } diff --git a/app/Models/HonorKegiatan.php b/app/Models/HonorKegiatan.php index 39e8cd96..b18d1ddc 100644 --- a/app/Models/HonorKegiatan.php +++ b/app/Models/HonorKegiatan.php @@ -52,15 +52,15 @@ public function DaftarHonorMitra(): HasMany protected static function booted(): void { static::saving(function (HonorKegiatan $honor) { - if ($honor->isDirty()){ + if ($honor->isDirty()) { $honor->status = 'diubah'; - } - if (!$honor->generate_sk) { + } + if (! $honor->generate_sk) { $honor->tanggal_sk = null; NaskahKeluar::destroy($honor->sk_naskah_keluar_id); $honor->sk_naskah_keluar_id = null; } - if (!$honor->generate_st) { + if (! $honor->generate_st) { $honor->tanggal_st = null; $honor->uraian_tugas = null; $honor->kode_arsip_id = null; @@ -84,7 +84,7 @@ protected static function booted(): void ->get('all') ->where('kode', 'VS.220') ->where('tata_naskah_id', Helper::getLatestTataNaskahId($honor->tanggal_sk)) - ->first(); + ->first(); $naskahkeluar = new NaskahKeluar; $naskahkeluar->tanggal = $honor->tanggal_sk; $naskahkeluar->jenis_naskah_id = $jenis_naskah->id; @@ -142,7 +142,6 @@ protected static function booted(): void NaskahKeluar::destroy([$honor->sk_naskah_keluar_id, $honor->st_naskah_keluar_id]); $DaftarHonorMitraIds = DaftarHonorMitra::where('honor_kegiatan_id', $honor->id)->pluck('id'); DaftarHonorMitra::destroy($DaftarHonorMitraIds); - }); static::creating(function (HonorKegiatan $honor) { $honor->status = 'dibuat'; diff --git a/app/Models/KerangkaAcuan.php b/app/Models/KerangkaAcuan.php index 02fddcbe..74b92bce 100644 --- a/app/Models/KerangkaAcuan.php +++ b/app/Models/KerangkaAcuan.php @@ -81,7 +81,7 @@ protected static function booted(): void $naskahkeluar->tanggal = $kak->tanggal; $naskahkeluar->perihal = 'Form Permintaan '.$kak->rincian; $naskahkeluar->save(); - if ($kak->isDirty('dipa_id')){ + if ($kak->isDirty('dipa_id')) { $anggaranKerangkaAcuanIds = AnggaranKerangkaAcuan::where('kerangka_acuan_id', $kak->id)->pluck('id'); AnggaranKerangkaAcuan::destroy($anggaranKerangkaAcuanIds); } diff --git a/app/Models/NaskahKeluar.php b/app/Models/NaskahKeluar.php index 514a7679..50833ddf 100644 --- a/app/Models/NaskahKeluar.php +++ b/app/Models/NaskahKeluar.php @@ -23,7 +23,7 @@ protected static function booted(): void { static::saving(function (NaskahKeluar $naskah) { if ($naskah->isDirty(['kode_naskah_id', 'tanggal'])) { - $unit_kerja_id = Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal) == null? null : Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal)->unit_kerja_id; + $unit_kerja_id = Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal) == null ? null : Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal)->unit_kerja_id; $nomor = Helper::nomor($naskah->tanggal, $naskah->jenis_naskah_id, $unit_kerja_id, $naskah->kode_arsip_id, $naskah->derajat); $naskah->nomor = $nomor['nomor']; $naskah->no_urut = $nomor['no_urut']; diff --git a/app/Nova/Actions/ImportDaftarHonorMitra.php b/app/Nova/Actions/ImportDaftarHonorMitra.php index 2ffec39c..764fbf12 100644 --- a/app/Nova/Actions/ImportDaftarHonorMitra.php +++ b/app/Nova/Actions/ImportDaftarHonorMitra.php @@ -5,7 +5,6 @@ use App\Helpers\Helper; use App\Imports\DaftarHonorMitraImport; use App\Models\DaftarHonorMitra; -use App\Models\KepkaMitra; use Illuminate\Bus\Queueable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Collection; @@ -28,7 +27,6 @@ public function __construct($tahun) $this->tahun = $tahun; } - /** * Perform the action on the given models. * @@ -44,6 +42,7 @@ public function handle(ActionFields $fields, Collection $models) Excel::import(new DaftarHonorMitraImport($model->id, $model->bulan, $model->jenis, $fields->kepka_mitra_id), $fields->file); $model->status = 'import'; $model->save(); + return Action::message('File BOS sukses diimport!'); } @@ -59,7 +58,7 @@ public function fields(NovaRequest $request) ->rules('required', 'mimes:xlsx')->acceptedTypes('.xlsx'), Select::make('Kepka Mitra', 'kepka_mitra_id') ->rules('required') - ->options(Helper::setOptionKepkaMitra($this->tahun)) + ->options(Helper::setOptionKepkaMitra($this->tahun)), ]; } } diff --git a/app/Nova/HonorKegiatan.php b/app/Nova/HonorKegiatan.php index 1c5c04ce..4bf0da42 100644 --- a/app/Nova/HonorKegiatan.php +++ b/app/Nova/HonorKegiatan.php @@ -7,7 +7,6 @@ use App\Models\JenisKontrak; use App\Models\KamusAnggaran; use App\Models\KodeArsip; -use App\Models\User; use App\Nova\Actions\Download; use App\Nova\Actions\ImportDaftarHonorMitra; use Illuminate\Database\Eloquent\Model; @@ -25,7 +24,6 @@ use Laravel\Nova\Http\Requests\ActionRequest; use Laravel\Nova\Http\Requests\NovaRequest; use Laravel\Nova\Panel; -use Outl1ne\NovaSimpleRepeatable\SimpleRepeatable; class HonorKegiatan extends Resource { @@ -137,8 +135,9 @@ public function fields(NovaRequest $request) ->hideFromIndex() ->help('Contoh Satuan Pembayaran: Dokumen, Ruta, BS') ->dependsOn('kamus_anggaran_id', function (Text $field, NovaRequest $request, FormData $formData) { - if (KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first()) - $field->setValue(KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first()->satuan); + if (KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first()) { + $field->setValue(KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first()->satuan); + } }), Text::make('Tim Kerja', 'unit_kerja_id') ->onlyOnIndex() @@ -167,7 +166,7 @@ public function fields(NovaRequest $request) Boolean::make('Buat Surat Tugas', 'generate_st') ->hideFromIndex(), Date::make('Tanggal Surat Tugas', 'tanggal_st') - ->hide() + ->hide() ->dependsOn('generate_st', function (Date $field, NovaRequest $request, FormData $formData) { if ($formData->generate_st) { $field->show() @@ -185,26 +184,26 @@ public function fields(NovaRequest $request) ->dependsOn('generate_st', function (Text $field, NovaRequest $request, FormData $formData) { if ($formData->generate_st) { $field->show() - ->rules('required'); + ->rules('required'); } }) ->hideFromIndex(), Select::make('Klasifikasi Arsip', 'kode_arsip_id') ->searchable() ->hide() - ->hideFromIndex() + ->hideFromIndex() ->displayUsing(fn ($kode) => $kode ? KodeArsip::cache()->get('all')->where('id', $kode)->first()->kode : null) - ->dependsOn(['generate_st' , 'tanggal_st'], function (Select $field, NovaRequest $request, FormData $formData) { + ->dependsOn(['generate_st', 'tanggal_st'], function (Select $field, NovaRequest $request, FormData $formData) { if ($formData->generate_st) { $field->rules('required') - ->show() - ->options(Helper::setOptionsKodeArsip($formData->tanggal_st)); + ->show() + ->options(Helper::setOptionsKodeArsip($formData->tanggal_st)); } }), ]), Status::make('Status', 'status') - ->loadingWhen(['dibuat','import','diubah']) + ->loadingWhen(['dibuat', 'import', 'diubah']) ->failedWhen(['gagal'])->onlyOnIndex(), Panel::make('Penanda Tangan', [ @@ -313,6 +312,4 @@ public function actions(NovaRequest $request) return $actions; } - - } diff --git a/app/Nova/SpesifikasiKerangkaAcuan.php b/app/Nova/SpesifikasiKerangkaAcuan.php index 24098e09..1232f143 100644 --- a/app/Nova/SpesifikasiKerangkaAcuan.php +++ b/app/Nova/SpesifikasiKerangkaAcuan.php @@ -4,7 +4,6 @@ use App\Nova\Actions\AddHasManyModel; use Laravel\Nova\Fields\Currency; -use Laravel\Nova\Fields\FormData; use Laravel\Nova\Fields\Hidden; use Laravel\Nova\Fields\Number; use Laravel\Nova\Fields\Text; diff --git a/app/Nova/User.php b/app/Nova/User.php index 40ec90ee..3acd0bc7 100644 --- a/app/Nova/User.php +++ b/app/Nova/User.php @@ -71,7 +71,7 @@ public function fields(NovaRequest $request) ->placeholder('NIP Baru') ->creationRules('unique:users,nip') ->updateRules('unique:users,nip,{{resourceId}}') - ->rules('required','size:18'), + ->rules('required', 'size:18'), ]), Tabs::make('Detail', [ HasMany::make('Data Pegawai'), diff --git a/database/migrations/2024_08_03_090339_update_users_table.php b/database/migrations/2024_08_03_090339_update_users_table.php index e0df85c6..4816705b 100644 --- a/database/migrations/2024_08_03_090339_update_users_table.php +++ b/database/migrations/2024_08_03_090339_update_users_table.php @@ -21,7 +21,6 @@ public function up() $table->after('nip', function (Blueprint $table) { $table->string('rekening', 40)->nullable(); }); - }); }