From 2fe1f86fb476a23915485e11e83a09d907e1a9d5 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Wed, 23 Oct 2024 11:45:01 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Helpers/Helper.php | 9 ++++----- app/Nova/BastMitra.php | 1 + app/Nova/IzinKeluar.php | 2 -- app/Nova/KerangkaAcuan.php | 2 +- app/Nova/Metrics/JumlahKegiatan.php | 14 +++++++------- app/Nova/Metrics/JumlahMitra.php | 4 ++-- app/Nova/Metrics/JumlahMitraPerJenisKontrak.php | 4 ++-- app/Policies/NaskahMasukPolicy.php | 4 ++-- 8 files changed, 19 insertions(+), 21 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 2ab6121a..2522729b 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -367,10 +367,9 @@ public static function createDateFromString($tanggal) /** * Mem-parsing filter dari URL yang diberikan. * - * @param string $url URL yang akan di-parsing. - * @param string $filterUri URI filter yang akan dicari dalam query URL. - * @param string $filterKey Kunci filter yang akan diambil nilainya. - * + * @param string $url URL yang akan di-parsing. + * @param string $filterUri URI filter yang akan dicari dalam query URL. + * @param string $filterKey Kunci filter yang akan diambil nilainya. * @return string Nilai filter yang ditemukan berdasarkan kunci filter yang diberikan. */ public static function parseFilterFromUrl($url, $filterUri, $filterKey, $defaultValue = null) @@ -393,7 +392,7 @@ public static function parseFilterFromUrl($url, $filterUri, $filterKey, $default ) ); - $filterValue= $filters[$filterKey]; + $filterValue = $filters[$filterKey]; } return $filterValue; diff --git a/app/Nova/BastMitra.php b/app/Nova/BastMitra.php index 672e967c..ee03fae9 100644 --- a/app/Nova/BastMitra.php +++ b/app/Nova/BastMitra.php @@ -35,6 +35,7 @@ public static function label() public static function indexQuery(NovaRequest $request, $query) { $kontrakMitraIds = KontrakMitra::where('tahun', session('year'))->get()->pluck('id'); + return $query->whereIn('kontrak_mitra_id', $kontrakMitraIds); } diff --git a/app/Nova/IzinKeluar.php b/app/Nova/IzinKeluar.php index 00098153..41679a3c 100644 --- a/app/Nova/IzinKeluar.php +++ b/app/Nova/IzinKeluar.php @@ -3,7 +3,6 @@ namespace App\Nova; use App\Helpers\Helper; -use App\Helpers\Policy; use App\Models\User; use Carbon\Carbon; use Ctessier\NovaAdvancedImageField\AdvancedImage; @@ -27,7 +26,6 @@ public static function label() { return 'Izin Keluar'; } - /** * The model the resource corresponds to. diff --git a/app/Nova/KerangkaAcuan.php b/app/Nova/KerangkaAcuan.php index 624a208b..4ea16b64 100644 --- a/app/Nova/KerangkaAcuan.php +++ b/app/Nova/KerangkaAcuan.php @@ -37,7 +37,7 @@ public static function indexQuery(NovaRequest $request, $query) { $query->whereYear('tanggal', session('year')); if (Policy::make()->allowedFor('koordinator,anggota')->get()) { - return $query->where('unit_kerja_id',Helper::getDataPegawaiByUserId($request->user()->id, now())->unit_kerja_id ); + return $query->where('unit_kerja_id', Helper::getDataPegawaiByUserId($request->user()->id, now())->unit_kerja_id); } return $query; diff --git a/app/Nova/Metrics/JumlahKegiatan.php b/app/Nova/Metrics/JumlahKegiatan.php index e053d703..94aba832 100644 --- a/app/Nova/Metrics/JumlahKegiatan.php +++ b/app/Nova/Metrics/JumlahKegiatan.php @@ -26,17 +26,17 @@ public function name() */ public function calculate(NovaRequest $request) { - $filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\BulanKontrak', date('m')); - $filtered_jenis= Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\JenisKontrak'); + $filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'daftar-honor-mitras_filter', 'App\Nova\Filters\BulanKontrak', date('m')); + $filtered_jenis = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'daftar-honor-mitras_filter', 'App\Nova\Filters\JenisKontrak'); $bulan_ini = DB::table('daftar_honor_mitras') ->select('honor_kegiatans.id') ->join('honor_kegiatans', 'honor_kegiatans.id', '=', 'daftar_honor_mitras.honor_kegiatan_id') ->where('jenis_honor', 'Kontrak Mitra Bulanan') ->where('tahun', session('year')) - ->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) { + ->when(! empty($filtered_bulan), function ($query) use ($filtered_bulan) { return $query->where('bulan', $filtered_bulan); }) - ->when(!empty($filtered_jenis), function ($query) use ($filtered_jenis) { + ->when(! empty($filtered_jenis), function ($query) use ($filtered_jenis) { return $query->where('jenis_kontrak_id', $filtered_jenis); }) ->distinct('honor_kegiatans.id') @@ -46,10 +46,10 @@ public function calculate(NovaRequest $request) ->join('honor_kegiatans', 'honor_kegiatans.id', '=', 'daftar_honor_mitras.honor_kegiatan_id') ->where('jenis_honor', 'Kontrak Mitra Bulanan') ->where('tahun', session('year')) - ->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) { - return $query->where('bulan', $filtered_bulan-1); + ->when(! empty($filtered_bulan), function ($query) use ($filtered_bulan) { + return $query->where('bulan', $filtered_bulan - 1); }) - ->when(!empty($filtered_jenis), function ($query) use ($filtered_jenis) { + ->when(! empty($filtered_jenis), function ($query) use ($filtered_jenis) { return $query->where('jenis_kontrak_id', $filtered_jenis); }) ->distinct('honor_kegiatans.id') diff --git a/app/Nova/Metrics/JumlahMitra.php b/app/Nova/Metrics/JumlahMitra.php index 998b8fd7..aaf28c64 100644 --- a/app/Nova/Metrics/JumlahMitra.php +++ b/app/Nova/Metrics/JumlahMitra.php @@ -27,7 +27,7 @@ public function name() */ public function calculate(NovaRequest $request) { - $filtered_jenis= Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\JenisKontrak'); + $filtered_jenis = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'daftar-honor-mitras_filter', 'App\Nova\Filters\JenisKontrak'); $arr = []; foreach (Helper::$bulan as $key => $value) { $arr[$value] = DB::table('daftar_honor_mitras') @@ -41,7 +41,7 @@ public function calculate(NovaRequest $request) ->where('jenis_honor', 'Kontrak Mitra Bulanan') ->where('tahun', session('year')) ->where('bulan', $key) - ->when(!empty($filtered_jenis), function ($query) use ($filtered_jenis) { + ->when(! empty($filtered_jenis), function ($query) use ($filtered_jenis) { return $query->where('jenis_kontrak_id', $filtered_jenis); }) ->distinct('mitra_id') diff --git a/app/Nova/Metrics/JumlahMitraPerJenisKontrak.php b/app/Nova/Metrics/JumlahMitraPerJenisKontrak.php index 1ee6800c..c3c16037 100644 --- a/app/Nova/Metrics/JumlahMitraPerJenisKontrak.php +++ b/app/Nova/Metrics/JumlahMitraPerJenisKontrak.php @@ -26,7 +26,7 @@ public function name() */ public function calculate(NovaRequest $request) { - $filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'),'daftar-honor-mitras_filter', 'App\Nova\Filters\BulanKontrak', date('m')); + $filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'daftar-honor-mitras_filter', 'App\Nova\Filters\BulanKontrak', date('m')); $arr = DB::table('daftar_honor_mitras') ->selectRaw('jenis, count(distinct(mitra_id)) as jumlah_mitra') ->join( @@ -44,7 +44,7 @@ public function calculate(NovaRequest $request) ->join('mitras', 'mitras.id', '=', 'daftar_honor_mitras.mitra_id') ->where('jenis_honor', 'Kontrak Mitra Bulanan') ->where('tahun', session('year')) - ->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) { + ->when(! empty($filtered_bulan), function ($query) use ($filtered_bulan) { return $query->where('bulan', $filtered_bulan); }) ->groupBy('jenis_kontrak_id') diff --git a/app/Policies/NaskahMasukPolicy.php b/app/Policies/NaskahMasukPolicy.php index 4c5a0a6f..69606af4 100644 --- a/app/Policies/NaskahMasukPolicy.php +++ b/app/Policies/NaskahMasukPolicy.php @@ -46,7 +46,7 @@ public function create(): bool public function update(User $user, NaskahMasuk $naskahMasuk): bool { return Policy::make() - ->allowedFor('anggota,koordinator,kepala,arsiparis') + ->allowedFor('anggota,koordinator,kepala,arsiparis') ->withYear(Helper::getYearFromDate($naskahMasuk->tanggal)) ->get(); } @@ -57,7 +57,7 @@ public function update(User $user, NaskahMasuk $naskahMasuk): bool public function delete(User $user, NaskahMasuk $naskahMasuk): bool { return Policy::make() - ->allowedFor('anggota,koordinator,kepala,arsiparis') + ->allowedFor('anggota,koordinator,kepala,arsiparis') ->withYear(Helper::getYearFromDate($naskahMasuk->tanggal)) ->get(); }