From 5efc9977c3abce2fdc1930f5a3019d10ff051e07 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sun, 27 Oct 2024 08:35:46 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Helpers/Helper.php | 111 +++++++++++------------ app/Models/DaftarHonorMitra.php | 4 +- app/Models/DaftarHonorPegawai.php | 2 +- app/Nova/Actions/ExportTemplateBos.php | 3 +- app/Nova/DaftarHonorMitra.php | 3 - app/Nova/DaftarHonorPegawai.php | 17 ++-- app/Nova/HonorKegiatan.php | 5 +- app/Nova/Lenses/RekapHonorMitra.php | 1 - app/Nova/Metrics/HelperHonorKegiatan.php | 1 + app/Nova/Metrics/JumlahMitra.php | 11 +-- app/Nova/Metrics/KesesuaianSbml.php | 1 - app/Nova/User.php | 2 +- 12 files changed, 75 insertions(+), 86 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index c9f93829..3346692e 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -810,67 +810,66 @@ public static function makeStMitraAndPegawai($honor_kegiatan_id, $tanggal) ->toArray(); } - public static function makeCollectionForExportOnSheet($honor_kegiatan_id, $tanggal, $sheet_no = 1, $awal ='', $akhir = '') + public static function makeCollectionForExportOnSheet($honor_kegiatan_id, $tanggal, $sheet_no = 1, $awal = '', $akhir = '') { // TODO: ada OB selain bulanan harus diisi bulan awal dan akhir if ($sheet_no === 1) { return self::makeBaseListMitraAndPegawai($honor_kegiatan_id, $tanggal) - ->reject(function ($item) { - return $item['netto'] == 0; - }) - ->flatten() - ->transform(function ($item, $index) use ($awal, $akhir){ - $item['NIP Lama'] = $item['nip_lama']; - $item['TanggalAwal'] = ''; - $item['TanggalAkhir'] = ''; - $item['BulanMulai'] = $awal; - $item['BulanSelesai'] = $akhir; - $item['Volume'] = $item['volume']; - $item['HargaSatuan'] = $item['harga_satuan']; - $item['PersentasePajak'] = $item['persen_pajak']; - $item['Pajak'] = ''; - unset($item['nip_lama']); - unset($item['volume']); - unset($item['harga_satuan']); - unset($item['persen_pajak']); - unset($item['bruto']); - unset($item['nama']); - unset($item['nip']); - unset($item['jabatan']); - unset($item['rekening']); - unset($item['golongan']); - unset($item['bruto']); - unset($item['pajak']); - unset($item['netto']); - - return $item; - }); + ->reject(function ($item) { + return $item['netto'] == 0; + }) + ->flatten() + ->transform(function ($item, $index) use ($awal, $akhir) { + $item['NIP Lama'] = $item['nip_lama']; + $item['TanggalAwal'] = ''; + $item['TanggalAkhir'] = ''; + $item['BulanMulai'] = $awal; + $item['BulanSelesai'] = $akhir; + $item['Volume'] = $item['volume']; + $item['HargaSatuan'] = $item['harga_satuan']; + $item['PersentasePajak'] = $item['persen_pajak']; + $item['Pajak'] = ''; + unset($item['nip_lama']); + unset($item['volume']); + unset($item['harga_satuan']); + unset($item['persen_pajak']); + unset($item['bruto']); + unset($item['nama']); + unset($item['nip']); + unset($item['jabatan']); + unset($item['rekening']); + unset($item['golongan']); + unset($item['bruto']); + unset($item['pajak']); + unset($item['netto']); + + return $item; + }); + } else { + return self::makeBaseListMitra($honor_kegiatan_id) + ->reject(function ($item) { + return $item['netto'] == 0; + }) + ->flatten() + ->transform(function ($item, $index) { + $item['nip'] = $item['nip_lama']; + $item['nama'] = $item['nama']; + unset($item['nip_lama']); + unset($item['volume']); + unset($item['harga_satuan']); + unset($item['persen_pajak']); + unset($item['bruto']); + unset($item['jabatan']); + unset($item['rekening']); + unset($item['golongan']); + unset($item['bruto']); + unset($item['pajak']); + unset($item['netto']); + + return $item; + }); } -else { - return self::makeBaseListMitra($honor_kegiatan_id) - ->reject(function ($item) { - return $item['netto'] == 0; - }) - ->flatten() - ->transform(function ($item, $index) { - $item['nip'] = $item['nip_lama']; - $item['nama'] = $item['nama']; - unset($item['nip_lama']); - unset($item['volume']); - unset($item['harga_satuan']); - unset($item['persen_pajak']); - unset($item['bruto']); - unset($item['jabatan']); - unset($item['rekening']); - unset($item['golongan']); - unset($item['bruto']); - unset($item['pajak']); - unset($item['netto']); - - return $item; - }); -} -} + } /** * Make Surat Keterangan (SK) for both Mitra and Pegawai. diff --git a/app/Models/DaftarHonorMitra.php b/app/Models/DaftarHonorMitra.php index 719f49dd..da575d12 100644 --- a/app/Models/DaftarHonorMitra.php +++ b/app/Models/DaftarHonorMitra.php @@ -23,8 +23,8 @@ protected static function booted(): void HonorKegiatan::find($honor->honor_kegiatan_id)->update(['status' => 'dibuat']); } if ($honor->volume_realisasi != $honor->volume_target) { - $honor->status_realisasi = $honor->volume_realisasi < $honor->volume_target - ? 'Selesai Tidak Sesuai Target' + $honor->status_realisasi = $honor->volume_realisasi < $honor->volume_target + ? 'Selesai Tidak Sesuai Target' : 'Selesai Melebihi Target'; } else { $honor->status_realisasi = 'Selesai Sesuai Target'; diff --git a/app/Models/DaftarHonorPegawai.php b/app/Models/DaftarHonorPegawai.php index 499911ee..ec0669fa 100644 --- a/app/Models/DaftarHonorPegawai.php +++ b/app/Models/DaftarHonorPegawai.php @@ -15,7 +15,7 @@ protected static function booted(): void if ($honor->isDirty()) { HonorKegiatan::find($honor->honor_kegiatan_id)->update(['status' => 'dibuat']); } - if (!$honor->volume) { + if (! $honor->volume) { $honor->harga_satuan = null; $honor->persen_pajak = null; } diff --git a/app/Nova/Actions/ExportTemplateBos.php b/app/Nova/Actions/ExportTemplateBos.php index b6127a45..0e575d48 100644 --- a/app/Nova/Actions/ExportTemplateBos.php +++ b/app/Nova/Actions/ExportTemplateBos.php @@ -37,7 +37,7 @@ public function handle(ActionFields $fields, Collection $models) $sheetCollection = Helper::makeCollectionForExportOnSheet($model->id, $model->tangal_spj, 1); if (in_array($satuan, ['OB', 'BULAN', '0B'])) { $sheetCollection = Helper::makeCollectionForExportOnSheet($model->id, $model->tangal_spj, 1, $fields->awal, $fields->akhir); - } + } $filename = $fields->filename.'.xlsx'; $sheets = new SheetCollection([ 'Template' => $sheetCollection, @@ -57,7 +57,6 @@ public function handle(ActionFields $fields, Collection $models) */ public function fields(NovaRequest $request) { - return [ Select::make('Bulan Awal', 'awal') ->options(Helper::$bulan) diff --git a/app/Nova/DaftarHonorMitra.php b/app/Nova/DaftarHonorMitra.php index d2e69805..655e0f43 100644 --- a/app/Nova/DaftarHonorMitra.php +++ b/app/Nova/DaftarHonorMitra.php @@ -4,9 +4,7 @@ use App\Helpers\Helper; use App\Helpers\Policy; -use App\Models\HonorKegiatan; use App\Nova\Actions\EditRekening; -use App\Nova\Actions\EditTarget; use App\Nova\Actions\ImportDaftarHonorMitra; use App\Nova\Lenses\RekapHonorMitra; use Laravel\Nova\Fields\Currency; @@ -183,5 +181,4 @@ public static function redirectAfterUpdate(NovaRequest $request, $resource) { return '/resources/honor-kegiatans/'.$request->viaResourceId.'#Daftar%20Honor=daftar-honor-mitra'; } - } diff --git a/app/Nova/DaftarHonorPegawai.php b/app/Nova/DaftarHonorPegawai.php index 2f717b7c..5c50ceb1 100644 --- a/app/Nova/DaftarHonorPegawai.php +++ b/app/Nova/DaftarHonorPegawai.php @@ -16,7 +16,6 @@ class DaftarHonorPegawai extends Resource { - public static $displayInNavigation = false; /** @@ -45,6 +44,7 @@ class DaftarHonorPegawai extends Resource public function fields(NovaRequest $request) { $user = Helper::getPegawaiByUserId($this->user_id); + return [ Select::make('Nama Pegawai', 'user_id') ->rules('required') @@ -59,18 +59,17 @@ public function fields(NovaRequest $request) ->exceptOnForms(), Number::make('Jumlah', 'volume') ->step(0.01) - ->rules('nullable','bail','gt:0') + ->rules('nullable', 'bail', 'gt:0') ->help('Kosongkan jika pegawai tidak diberi honor'), Currency::make('Harga Satuan', 'harga_satuan') ->currency('IDR') ->locale('id') ->hide() - ->dependsOn(['volume'], function (Number $field, NovaRequest $request, FormData $formData) { - if ($formData->volume <> null) { + ->dependsOn(['volume'], function (Number $field, NovaRequest $request, FormData $formData) { + if ($formData->volume != null) { $field->show(); - $field->rules('required','gt:0'); + $field->rules('required', 'gt:0'); } - }) ->step(1), Currency::make('Bruto', fn () => $this->volume * $this->harga_satuan) @@ -80,14 +79,12 @@ public function fields(NovaRequest $request) Number::make('Persentase Pajak (%)', 'persen_pajak') ->hide() ->step(0.01) - ->dependsOn(['volume','user_id'], function (Number $field, NovaRequest $request, FormData $formData) { - if ($formData->volume <> null) { + ->dependsOn(['volume', 'user_id'], function (Number $field, NovaRequest $request, FormData $formData) { + if ($formData->volume != null) { $field->show(); $field->rules('required'); $field->setvalue(Helper::$pajakgolongan[Helper::getPropertyFromCollection(Helper::getDataPegawaiByUserId($formData->user_id, Helper::getPropertyFromCollection(HonorKegiatan::where('id', $request->viaResourceId)->first(), 'tanggal_spj')), 'golongan') ?? 'I/a']); - } - })->onlyOnForms(), Currency::make('Pajak', fn () => round($this->volume * $this->harga_satuan * $this->persen_pajak / 100, 0, PHP_ROUND_HALF_UP)) ->currency('IDR') diff --git a/app/Nova/HonorKegiatan.php b/app/Nova/HonorKegiatan.php index 5f24f479..19866208 100644 --- a/app/Nova/HonorKegiatan.php +++ b/app/Nova/HonorKegiatan.php @@ -11,7 +11,6 @@ use App\Nova\Actions\Download; use App\Nova\Actions\ExportTemplateBos; use App\Nova\Metrics\HelperHonorKegiatan; -use DigitalCreative\NovaWelcomeCard\WelcomeCard; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Carbon; use Laravel\Nova\Fields\BelongsTo; @@ -317,8 +316,8 @@ public function fields(NovaRequest $request) public function cards(NovaRequest $request) { return [ - HelperHonorKegiatan::make() - ->width('full'), + HelperHonorKegiatan::make() + ->width('full'), ]; } diff --git a/app/Nova/Lenses/RekapHonorMitra.php b/app/Nova/Lenses/RekapHonorMitra.php index 80d686e3..3922571c 100644 --- a/app/Nova/Lenses/RekapHonorMitra.php +++ b/app/Nova/Lenses/RekapHonorMitra.php @@ -52,7 +52,6 @@ public static function query(LensRequest $request, $query) ->orderBy('jenis_kontrak_id', 'asc') ->orderBy('bulan', 'desc') ->orderBy('nilai_kontrak', 'desc')); - } /** diff --git a/app/Nova/Metrics/HelperHonorKegiatan.php b/app/Nova/Metrics/HelperHonorKegiatan.php index 61892a05..0b048b4b 100644 --- a/app/Nova/Metrics/HelperHonorKegiatan.php +++ b/app/Nova/Metrics/HelperHonorKegiatan.php @@ -12,6 +12,7 @@ public function name() { return 'Tata Cara Penggunaan Import dan Upload Menggunakan FIle BOS'; } + /** * Calculate the value of the metric. * diff --git a/app/Nova/Metrics/JumlahMitra.php b/app/Nova/Metrics/JumlahMitra.php index c35251cd..dee63a61 100644 --- a/app/Nova/Metrics/JumlahMitra.php +++ b/app/Nova/Metrics/JumlahMitra.php @@ -33,15 +33,15 @@ public function calculate(NovaRequest $request) $query = DB::table('daftar_honor_mitras') ->select(DB::raw('bulan, COUNT(DISTINCT mitra_id) as mitra_count')) ->join( - 'honor_kegiatans', - 'honor_kegiatans.id', - '=', - 'daftar_honor_mitras.honor_kegiatan_id' + 'honor_kegiatans', + 'honor_kegiatans.id', + '=', + 'daftar_honor_mitras.honor_kegiatan_id' ) ->where('jenis_honor', 'Kontrak Mitra Bulanan') ->where('tahun', session('year')) ->when(! empty($filtered_jenis), function ($query) use ($filtered_jenis) { - return $query->where('jenis_kontrak_id', $filtered_jenis); + return $query->where('jenis_kontrak_id', $filtered_jenis); }) ->groupBy('bulan') ->get(); @@ -57,7 +57,6 @@ public function calculate(NovaRequest $request) ->suffix('Mitra') ->withoutSuffixInflection(); } - } /** diff --git a/app/Nova/Metrics/KesesuaianSbml.php b/app/Nova/Metrics/KesesuaianSbml.php index f218af3f..736928a9 100644 --- a/app/Nova/Metrics/KesesuaianSbml.php +++ b/app/Nova/Metrics/KesesuaianSbml.php @@ -77,7 +77,6 @@ public function calculate(NovaRequest $request) } return ['Tidak Ada Data' => 0]; - }); return $this diff --git a/app/Nova/User.php b/app/Nova/User.php index 9bfae982..d8357e4f 100644 --- a/app/Nova/User.php +++ b/app/Nova/User.php @@ -57,7 +57,7 @@ public function fields(NovaRequest $request) return [ Avatar::make('Avatar')->disableDownload()->disk('avatars')->prunable(), Panel::make('Akun', [ - Text::make('Username','email') + Text::make('Username', 'email') ->sortable() ->rules('required', 'regex:/^[0-9A-Za-z.\-_]+$/u', 'max:254') ->creationRules('unique:users,email')