diff --git a/app/Helpers/Cetak.php b/app/Helpers/Cetak.php index 994aa51ffa929c5a26a56959ed53271096327970..b719e402f9e279181db518ce03af03b62f5fc15e 100644 --- a/app/Helpers/Cetak.php +++ b/app/Helpers/Cetak.php @@ -434,7 +434,7 @@ public static function kertas_kerja_reward($id) 'tanggal' => Helper::terbilangTanggal($data->tanggal_penetapan), 'kepala' => Helper::getPropertyFromCollection($kepala, 'name'), 'nipkepala' => Helper::getPropertyFromCollection($kepala, 'nip'), - 'daftar_penilaian' => DaftarPenilaianReward::where('reward_pegawai_id', $id)->where('user_id','!=', $data->kepala_user_id)->get(), + 'daftar_penilaian' => DaftarPenilaianReward::where('reward_pegawai_id', $id)->where('user_id', '!=', $data->kepala_user_id)->get(), ]; } diff --git a/app/Helpers/Policy.php b/app/Helpers/Policy.php index 6630d2c7b1fe4c56662f2bf45ba3cb666a7eaada..70c220b67d4d17c2d25ea8640b7461e45a72d8db 100644 --- a/app/Helpers/Policy.php +++ b/app/Helpers/Policy.php @@ -18,7 +18,7 @@ public static function make() private static function hasAccess($roles): bool { - return !empty(array_intersect($roles, session('role'))); + return ! empty(array_intersect($roles, session('role'))); } public function get(): bool @@ -35,7 +35,7 @@ public function allowedFor(string $roles = 'all'): self public function notAllowedFor(string $roles = 'all'): self { - $this->allowed = $roles !== 'all' && self::hasAccess(array_diff(array_keys(Helper::$role),explode(',', $roles)), session('role')); + $this->allowed = $roles !== 'all' && self::hasAccess(array_diff(array_keys(Helper::$role), explode(',', $roles)), session('role')); return $this; } diff --git a/app/Models/AnggaranKerangkaAcuan.php b/app/Models/AnggaranKerangkaAcuan.php index a492548d625305575c17d06cffca6325ceb3df60..ce75360c167f2f221bb4db41843043967c18541a 100644 --- a/app/Models/AnggaranKerangkaAcuan.php +++ b/app/Models/AnggaranKerangkaAcuan.php @@ -68,7 +68,7 @@ protected static function booted(): void if ($pemeliharaan = Pemeliharaan::where('anggaran_kerangka_acuan_id', $anggaranKak->id)->first()) { $pemeliharaan->rincian = $kak->rincian; $pemeliharaan->save(); - } else { + } else { $pemeliharaan = new Pemeliharaan; $pemeliharaan->kerangka_acuan_id = $kak->id; $pemeliharaan->tanggal_kak = $kak->tanggal; diff --git a/app/Models/DaftarPenilaianReward.php b/app/Models/DaftarPenilaianReward.php index 793b3d0ef3b9b795798a1bab66d15512b6f03fcc..875696fd3b4c59284e521a735fbd72c75994e536 100644 --- a/app/Models/DaftarPenilaianReward.php +++ b/app/Models/DaftarPenilaianReward.php @@ -11,22 +11,22 @@ class DaftarPenilaianReward extends Model 'reward_pegawai_id', 'user_id', ]; - - public function user() : BelongsTo + + public function user(): BelongsTo { return $this->belongsTo(User::class); } - public function rewardPegawai() : BelongsTo + public function rewardPegawai(): BelongsTo { return $this->belongsTo(RewardPegawai::class); } protected static function booted(): void - { + { static::saving(function (DaftarPenilaianReward $penilaian) { $nilai_kinerja = 0.6 * $penilaian->nilai_skp; - $nilai_disiplin = 0.2 * (100 - (100*$penilaian->tk + 50*($penilaian->tl4 + $penilaian->psw4) + 30*($penilaian->tl3 + $penilaian->psw3) + 20*($penilaian->tl2 + $penilaian->psw2) + 10*($penilaian->tl1 + $penilaian->psw1))); + $nilai_disiplin = 0.2 * (100 - (100 * $penilaian->tk + 50 * ($penilaian->tl4 + $penilaian->psw4) + 30 * ($penilaian->tl3 + $penilaian->psw3) + 20 * ($penilaian->tl2 + $penilaian->psw2) + 10 * ($penilaian->tl1 + $penilaian->psw1))); $nilai_disiplin_abs = $nilai_disiplin > 0 ? $nilai_disiplin : 0; $nilai_beban = 0.2 * 4 * $penilaian->jumlah_butir; $nilai_beban_abs = $nilai_beban <= 100 ? $nilai_beban : 100; @@ -34,7 +34,6 @@ protected static function booted(): void $penilaian->nilai_disiplin = $nilai_disiplin_abs; $penilaian->nilai_beban = $nilai_beban_abs; $penilaian->nilai_total = $nilai_kinerja + $nilai_disiplin_abs + $nilai_beban_abs; - - }); + }); } } diff --git a/app/Models/DaftarSp2d.php b/app/Models/DaftarSp2d.php index 6072199997309b2d7cdb2689cf9e0b0a3fd54e57..682fe49070d034e30977a4f869d2cfe41574a086 100644 --- a/app/Models/DaftarSp2d.php +++ b/app/Models/DaftarSp2d.php @@ -12,7 +12,7 @@ class DaftarSp2d extends Model ]; protected $fillable = ['dipa_id', 'nomor_sp2d']; - public function kerangkaAcuan():HasMany + public function kerangkaAcuan(): HasMany { return $this->hasMany(KerangkaAcuan::class); } diff --git a/app/Models/KerangkaAcuan.php b/app/Models/KerangkaAcuan.php index d96cd30b227bdca339c85a480ed82800827f2f41..60b6a815668569698e87ae0dc61c02d58a78482d 100644 --- a/app/Models/KerangkaAcuan.php +++ b/app/Models/KerangkaAcuan.php @@ -34,7 +34,6 @@ public function daftarSp2d(): BelongsTo return $this->belongsTo(DaftarSp2d::class); } - public function arsipDokumen(): HasMany { return $this->hasMany(ArsipDokumen::class); diff --git a/app/Models/PerjalananDinas.php b/app/Models/PerjalananDinas.php index 54aff9cd2d5c643e46d15fd7bceec077e439cabf..32ea3fbcc9d4cce3a774513171269ccd9f747b55 100644 --- a/app/Models/PerjalananDinas.php +++ b/app/Models/PerjalananDinas.php @@ -45,7 +45,7 @@ public function daftarPesertaPerjalanan(): HasMany protected static function booted(): void { - static::updating(function (PerjalananDinas $perjalanan) { + static::updating(function (PerjalananDinas $perjalanan) { if ($perjalanan->st_naskah_keluar_id === null) { $default_naskah = NaskahDefault::cache()->get('all') ->where('jenis', 'st') diff --git a/app/Models/RewardPegawai.php b/app/Models/RewardPegawai.php index b8c895ed0760b44651811c713e89e5d7bd059246..dd073e7d85bb9bbe2293cf9489b330bc7aee70f3 100644 --- a/app/Models/RewardPegawai.php +++ b/app/Models/RewardPegawai.php @@ -38,8 +38,8 @@ protected static function booted(): void { static::creating(function (RewardPegawai $reward) { $reward->status = 'dibuat'; - }); - + }); + static::deleting(function (RewardPegawai $reward) { $reward->daftarPenilaianReward->each->delete(); NaskahKeluar::destroy([$reward->sk_naskah_keluar_id, $reward->sertifikat_naskah_keluar_id]); @@ -47,7 +47,7 @@ protected static function booted(): void static::saving(function (RewardPegawai $reward) { $reward->tahun = session('year'); if ($reward->status === 'ditetapkan') { - if ($reward->sk_naskah_keluar_id === null) { + if ($reward->sk_naskah_keluar_id === null) { $default_naskah = NaskahDefault::cache()->get('all') ->where('jenis', 'sk_reward') ->first(); @@ -57,7 +57,7 @@ protected static function booted(): void $naskahkeluar->kode_arsip_id = Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')[0]; $naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id'); $naskahkeluar->tujuan = 'Employee of the month'; - $naskahkeluar->perihal = 'SK Employee of The Month Bulan ' . Helper::$bulan[$reward->bulan]; + $naskahkeluar->perihal = 'SK Employee of The Month Bulan '.Helper::$bulan[$reward->bulan]; $naskahkeluar->generate = 'A'; $naskahkeluar->save(); $reward->sk_naskah_keluar_id = $naskahkeluar->id; @@ -68,7 +68,7 @@ protected static function booted(): void $naskahkeluar->save(); } } - if ($reward->sertifikat_naskah_keluar_id === null) { + if ($reward->sertifikat_naskah_keluar_id === null) { $default_naskah = NaskahDefault::cache()->get('all') ->where('jenis', 'sertifikat_reward') ->first(); @@ -78,7 +78,7 @@ protected static function booted(): void $naskahkeluar->kode_arsip_id = Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')[0]; $naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id'); $naskahkeluar->tujuan = 'Employee of the month'; - $naskahkeluar->perihal = 'Sertifikat Employee of The Month Bulan ' . Helper::$bulan[$reward->bulan]; + $naskahkeluar->perihal = 'Sertifikat Employee of The Month Bulan '.Helper::$bulan[$reward->bulan]; $naskahkeluar->generate = 'A'; $naskahkeluar->save(); $reward->sertifikat_naskah_keluar_id = $naskahkeluar->id; @@ -90,9 +90,6 @@ protected static function booted(): void } } } - - }); } - } diff --git a/app/Nova/Actions/Download.php b/app/Nova/Actions/Download.php index 7d27f357e8c079e0a1b5b205515194479e2b554e..a6bac1f2d5c03668c7fce9a37d3c92105c8201e7 100644 --- a/app/Nova/Actions/Download.php +++ b/app/Nova/Actions/Download.php @@ -76,14 +76,14 @@ public function handle(ActionFields $fields, Collection $models) */ public function fields(NovaRequest $request) { - $fields = [ - Text::make('Nama File', 'filename') - ->rules('required', 'alpha_dash:ascii') - ->help('tanpa extensi file') - ->default(fn () => uniqid()), - Select::make('Template') - ->rules('required') - ->options(Helper::setOptionTemplate($this->jenis)), + $fields = [ + Text::make('Nama File', 'filename') + ->rules('required', 'alpha_dash:ascii') + ->help('tanpa extensi file') + ->default(fn () => uniqid()), + Select::make('Template') + ->rules('required') + ->options(Helper::setOptionTemplate($this->jenis)), ]; if ($this->withTanggal) { @@ -102,6 +102,5 @@ public function fields(NovaRequest $request) } return $fields; - } } diff --git a/app/Nova/Actions/ImportRekapPresensi.php b/app/Nova/Actions/ImportRekapPresensi.php index ea4e88f85bb2d54ff769b10c6cf7ca95949362b0..2ddb32c54007b5256ab39b0f4ac5f00cf264a330 100644 --- a/app/Nova/Actions/ImportRekapPresensi.php +++ b/app/Nova/Actions/ImportRekapPresensi.php @@ -4,11 +4,9 @@ use App\Helpers\Helper; use App\Models\DaftarPenilaianReward; -use App\Models\Mitra; use App\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Carbon; use Illuminate\Support\Collection; use Laravel\Nova\Actions\Action; use Laravel\Nova\Fields\ActionFields; @@ -34,25 +32,24 @@ public function handle(ActionFields $fields, Collection $models) $model = $models->first(); DaftarPenilaianReward::where('reward_pegawai_id', $model->id)->update(['updated_at' => null]); (new FastExcel)->startRow(5)->import($fields->file, function ($row) use ($model) { - $daftar = DaftarPenilaianReward::firstOrNew( - [ - 'user_id' => Helper::getPropertyFromCollection(User::cache()->get('all')->where('nip_lama', $row['NIP'])->first(), 'id'), - 'reward_pegawai_id' => $model->id, - ] - ); - $daftar->tk = $row['TK']; - $daftar->tl1 = $row['TL1']; - $daftar->tl2 = $row['TL2']; - $daftar->tl3 = $row['TL3']; - $daftar->tl4 = $row['TL4']; - $daftar->psw1 = $row['PSW1']; - $daftar->psw2 = $row['PSW2']; - $daftar->psw3 = $row['PSW3']; - $daftar->psw4 = $row['PSW4']; - $daftar->updated_at = now(); - - $daftar->save(); + $daftar = DaftarPenilaianReward::firstOrNew( + [ + 'user_id' => Helper::getPropertyFromCollection(User::cache()->get('all')->where('nip_lama', $row['NIP'])->first(), 'id'), + 'reward_pegawai_id' => $model->id, + ] + ); + $daftar->tk = $row['TK']; + $daftar->tl1 = $row['TL1']; + $daftar->tl2 = $row['TL2']; + $daftar->tl3 = $row['TL3']; + $daftar->tl4 = $row['TL4']; + $daftar->psw1 = $row['PSW1']; + $daftar->psw2 = $row['PSW2']; + $daftar->psw3 = $row['PSW3']; + $daftar->psw4 = $row['PSW4']; + $daftar->updated_at = now(); + $daftar->save(); }); $ids = DaftarPenilaianReward::where('updated_at', null)->get()->pluck('id'); DaftarPenilaianReward::destroy($ids); diff --git a/app/Nova/Actions/SetStatus.php b/app/Nova/Actions/SetStatus.php index eb6f3d44815dcb54c85444147b47b82d5e21116f..a70c98b466418150e1b1880573e9422aa223948a 100644 --- a/app/Nova/Actions/SetStatus.php +++ b/app/Nova/Actions/SetStatus.php @@ -65,21 +65,18 @@ public function setStatus($status, $statusField = 'status') public function handle(ActionFields $fields, Collection $models) { $model = $models->first(); - + if ($this->withTanggal) { $model->{$this->column} = $fields->tanggal; $model->kepala_user_id = $fields->kepala; - } if ($this->withUser) { $model->{$this->userColumn} = $fields->user; - } if ($this->withUser || $this->withTanggal) { $model->save(); } $model->update([$this->statusField => $this->status]); - } /** @@ -92,20 +89,20 @@ public function fields(NovaRequest $request) $fields = []; if ($this->withUser) { $fields[] = Select::make('Employee of the Month', 'user') - ->options(Helper::setOptionsPemenang($this->parent_id)) - ->searchable() - ->rules('required'); + ->options(Helper::setOptionsPemenang($this->parent_id)) + ->searchable() + ->rules('required'); } if ($this->withTanggal) { $fields[] = Date::make('Tanggal') - ->default(now()) - ->rules('required', 'before_or_equal:today'); + ->default(now()) + ->rules('required', 'before_or_equal:today'); $fields[] = Select::make('Kepala') - ->searchable() - ->rules('required') - ->dependsOn(['tanggal'], function (Select $field, NovaRequest $request, FormData $form) { - $field->options(Helper::setOptionPengelola('kepala', $form->tanggal)); - }); + ->searchable() + ->rules('required') + ->dependsOn(['tanggal'], function (Select $field, NovaRequest $request, FormData $form) { + $field->options(Helper::setOptionPengelola('kepala', $form->tanggal)); + }); } return $fields; diff --git a/app/Nova/BarangPersediaan.php b/app/Nova/BarangPersediaan.php index a0227513d86b735de2a507f119f7715682e45719..7becde5a864919289e08861720c89b75db8a07e5 100644 --- a/app/Nova/BarangPersediaan.php +++ b/app/Nova/BarangPersediaan.php @@ -14,7 +14,6 @@ use App\Nova\PersediaanMasuk as NovaPersediaanMasuk; use Laravel\Nova\Fields\BelongsTo; use Laravel\Nova\Fields\Currency; -use Laravel\Nova\Fields\Field; use Laravel\Nova\Fields\FormData; use Laravel\Nova\Fields\Number; use Laravel\Nova\Fields\Select; diff --git a/app/Nova/DaftarPenilaianReward.php b/app/Nova/DaftarPenilaianReward.php index 6da162daa2eae52e0950bf8ddfd8ccbc70bdeb62..e216852f5030dbcd45edc291fb2296318605e618 100644 --- a/app/Nova/DaftarPenilaianReward.php +++ b/app/Nova/DaftarPenilaianReward.php @@ -82,7 +82,7 @@ public function fields(NovaRequest $request) ->exceptOnForms(), Number::make('Total Nilai', 'nilai_total') ->exceptOnForms(), - + ]; } diff --git a/app/Nova/DaftarSp2d.php b/app/Nova/DaftarSp2d.php index 7fde32df35c072b0fa575e0d8e8a0e38f31bdd27..7b58e663d5c0fb06542e6589d3e40e3d9272f48d 100644 --- a/app/Nova/DaftarSp2d.php +++ b/app/Nova/DaftarSp2d.php @@ -77,18 +77,18 @@ public function fields(NovaRequest $request) ->sortable() ->readonly(), Panel::make('Arsip', [ - File::make('Arsip', 'arsip_spm') - ->disk('arsip') - ->rules('mimes:pdf') - ->acceptedTypes('.pdf') - ->creationRules('required') - ->prunable(), - File::make('Arsip SP2D', 'arsip_sp2d') - ->disk('arsip') - ->rules('mimes:pdf') - ->acceptedTypes('.pdf') - ->creationRules('required') - ->prunable(), + File::make('Arsip', 'arsip_spm') + ->disk('arsip') + ->rules('mimes:pdf') + ->acceptedTypes('.pdf') + ->creationRules('required') + ->prunable(), + File::make('Arsip SP2D', 'arsip_sp2d') + ->disk('arsip') + ->rules('mimes:pdf') + ->acceptedTypes('.pdf') + ->creationRules('required') + ->prunable(), ]), HasMany::make('Kerangka Acuan Kerja', 'kerangkaAcuan', 'App\Nova\KerangkaAcuan'), ]; diff --git a/app/Nova/KerangkaAcuan.php b/app/Nova/KerangkaAcuan.php index eb8f9f8420bbf265c86cf6bfa8183943a0a9dcd2..9966f593e0f11ebfe2c7e488e4f44ce6f6d2b5f1 100644 --- a/app/Nova/KerangkaAcuan.php +++ b/app/Nova/KerangkaAcuan.php @@ -192,7 +192,6 @@ public function actions(NovaRequest $request) ->exceptOnIndex(); } - return $actions; } diff --git a/app/Nova/MasterBarangPemeliharaan.php b/app/Nova/MasterBarangPemeliharaan.php index a1c545eea8006d65ce9f29eff8bd021f57b7176b..94775a460371fdaf7c38480577f15a216c89ed94 100644 --- a/app/Nova/MasterBarangPemeliharaan.php +++ b/app/Nova/MasterBarangPemeliharaan.php @@ -3,7 +3,6 @@ namespace App\Nova; use App\Helpers\Policy; -use App\Nova\Actions\Download; use App\Nova\Actions\ImportMasterBarangPemeliharaan; use App\Nova\Lenses\PemeliharaanBarang; use Laravel\Nova\Fields\BelongsTo; @@ -154,6 +153,7 @@ public function actions(NovaRequest $request) ->standalone() ->onlyOnIndex(); } + return $actions; } } diff --git a/app/Policies/DaftarPenilaianRewardPolicy.php b/app/Policies/DaftarPenilaianRewardPolicy.php index 6cdac4db65af196f41a4d7cf739776fa93389d14..74a6d47e99c8bcafb434007084f936c9b69849df 100644 --- a/app/Policies/DaftarPenilaianRewardPolicy.php +++ b/app/Policies/DaftarPenilaianRewardPolicy.php @@ -33,8 +33,8 @@ public function viewAny(): bool public function view(): bool { return Policy::make() - ->allowedFor('all') - ->get(); + ->allowedFor('all') + ->get(); } /** @@ -51,6 +51,7 @@ public function create(): bool public function update(User $user, DaftarPenilaianReward $daftar): bool { $status = RewardPegawai::find($daftar->reward_pegawai_id)->status; + return Policy::make() ->allowedFor('kasubbag') ->andNotEqual($status, 'ditetapkan') diff --git a/app/Policies/KerangkaAcuanPolicy.php b/app/Policies/KerangkaAcuanPolicy.php index 6e2a883658ca806effe037d276eae610345a4993..076c4f23189e34d865366d53fec70c2524349b9f 100644 --- a/app/Policies/KerangkaAcuanPolicy.php +++ b/app/Policies/KerangkaAcuanPolicy.php @@ -51,8 +51,8 @@ public function create(User $user): bool } return Policy::make() - ->allowedFor('koordinator,anggota') - ->get(); + ->allowedFor('koordinator,anggota') + ->get(); }); } diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php index 4dec87c76383f89802188eedac3b262a30cbaa97..d650595cce7a6b9e324a47c63d4f27b49ebe2b74 100644 --- a/app/Policies/UserPolicy.php +++ b/app/Policies/UserPolicy.php @@ -4,7 +4,6 @@ use App\Helpers\Policy; use App\Models\User; -use Illuminate\Support\Facades\Auth; class UserPolicy { diff --git a/app/Providers/NovaServiceProvider.php b/app/Providers/NovaServiceProvider.php index 45fd7eada073b5eebdfb47ce5b7d04e3355e1051..97bacea228c9a8ca2752bccfe5efd92ec02ddaf2 100644 --- a/app/Providers/NovaServiceProvider.php +++ b/app/Providers/NovaServiceProvider.php @@ -3,8 +3,8 @@ namespace App\Providers; use App\Helpers\Policy; -use App\Nova\DaftarSp2d; use App\Nova\BastMitra; +use App\Nova\DaftarSp2d; use App\Nova\Dashboards\Main; use App\Nova\Dipa; use App\Nova\HargaSatuan;