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
diff --git a/storage/app/public/templates/6xGSAprFh0YgkReR9xCUt9xvKKyXMzv1bQ83IGNy.xlsx b/storage/app/public/templates/6xGSAprFh0YgkReR9xCUt9xvKKyXMzv1bQ83IGNy.xlsx
deleted file mode 100644
index d45cd644e47aeb9bd9e77c78637028ede45272a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 10848
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
From b63a8d43a2a17c50f6bb3ee76d4bcc89c2f9b8a9 Mon Sep 17 00:00:00 2001
From: Muhlis Abdi
Date: Tue, 8 Jul 2025 21:13:21 +0800
Subject: [PATCH 011/264] fix: update help text for SKP file upload field to
clarify file requirements
---
app/Nova/Actions/ImportRekapPresensi.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/Nova/Actions/ImportRekapPresensi.php b/app/Nova/Actions/ImportRekapPresensi.php
index 17030be3..a3c20732 100644
--- a/app/Nova/Actions/ImportRekapPresensi.php
+++ b/app/Nova/Actions/ImportRekapPresensi.php
@@ -93,7 +93,7 @@ public function fields(NovaRequest $request)
File::make('Penilaian SKP', 'skp')
->rules('required', 'mimes:xlsx')
->acceptedTypes('.xlsx')
- ->help('Unduh Template'),
+ ->help('Gunakan File Excel Export dari Aplikasi KipApp (Masuk dengan Akun Kepala, Menu Penilaian Kinerja - Rekap Prestasi Periodik - Download Excel'),
];
}
}
From 395cfe0ac65ae01dd35d8788fd4fb68744944e2b Mon Sep 17 00:00:00 2001
From: Muhlis Abdi
Date: Tue, 8 Jul 2025 21:24:50 +0800
Subject: [PATCH 012/264] fix: update fields in DaftarPenilaianReward resource
and remove unused RewardPegawai model reference in policy
---
app/Nova/DaftarPenilaianReward.php | 30 ++++++++++++++------
app/Policies/DaftarPenilaianRewardPolicy.php | 8 +-----
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/app/Nova/DaftarPenilaianReward.php b/app/Nova/DaftarPenilaianReward.php
index af2e2980..01b38b23 100644
--- a/app/Nova/DaftarPenilaianReward.php
+++ b/app/Nova/DaftarPenilaianReward.php
@@ -50,10 +50,22 @@ public function fields(NovaRequest $request)
return [
BelongsTo::make('Pegawai', 'user', User::class)
->readOnly(),
- Number::make('Nilai SKP')
- ->step(1)
- ->rules('required', 'integer', 'gte:0', 'lte:120')
- ->hideFromIndex(),
+ // Number::make('Nilai Hasil Kerja', 'nilai_skp')
+ // ->step(1)
+ // ->rules('required', 'integer', 'gte:0', 'lte:120')
+ // ->hideFromIndex(),
+ // Number::make('Nilai Hasil Kerja', 'nilai_skp')
+ // ->step(1)
+ // ->rules('required', 'integer', 'gte:0', 'lte:120')
+ // ->hideFromIndex(),
+ Number::make('Jumlah Hari Kerja', 'hk')
+ ->onlyOnDetail(),
+ Number::make('Jumlah Hari Kehadiran', 'hd')
+ ->onlyOnDetail(),
+ Number::make('Jumlah Cuti Setengah Hari', 'cst')
+ ->onlyOnDetail(),
+ Number::make('Jumlah Hari Tugas Belajar', 'tb')
+ ->onlyOnDetail(),
Number::make('Jumlah TK', 'tk')
->onlyOnDetail(),
Number::make('Jumlah TL1', 'tl1')
@@ -70,15 +82,15 @@ public function fields(NovaRequest $request)
->onlyOnDetail(),
Number::make('Jumlah PSW4', 'psw4')
->onlyOnDetail(),
- Number::make('Jumlah Butir Pekerjaan', 'jumlah_butir')
- ->step(1)
- ->rules('required', 'integer', 'gt:0')
- ->hideFromIndex(),
+ // Number::make('Jumlah Butir Pekerjaan', 'jumlah_butir')
+ // ->step(1)
+ // ->rules('required', 'integer', 'gt:0')
+ // ->hideFromIndex(),
Number::make('Kinerja', 'nilai_kinerja')
->exceptOnForms(),
Number::make('Disiplin', 'nilai_disiplin')
->exceptOnForms(),
- Number::make('Beban Kerja', 'nilai_beban')
+ Number::make('Perilaku', 'nilai_perilaku')
->exceptOnForms(),
Number::make('Total Nilai', 'nilai_total')
->exceptOnForms(),
diff --git a/app/Policies/DaftarPenilaianRewardPolicy.php b/app/Policies/DaftarPenilaianRewardPolicy.php
index 7ed28038..f8393252 100644
--- a/app/Policies/DaftarPenilaianRewardPolicy.php
+++ b/app/Policies/DaftarPenilaianRewardPolicy.php
@@ -4,7 +4,6 @@
use App\Helpers\Policy;
use App\Models\DaftarPenilaianReward;
-use App\Models\RewardPegawai;
use App\Models\User;
use Laravel\Nova\Http\Requests\NovaRequest;
use Laravel\Nova\Nova;
@@ -48,12 +47,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')
- ->get();
+ return false;
}
/**
From 9ccb1beaf469d69041f4dd3338ce8132c2b30668 Mon Sep 17 00:00:00 2001
From: Muhlis Abdi
Date: Tue, 8 Jul 2025 21:25:07 +0800
Subject: [PATCH 013/264] fix: remove unnecessary parameter from update method
in DaftarPenilaianRewardPolicy
---
app/Policies/DaftarPenilaianRewardPolicy.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/Policies/DaftarPenilaianRewardPolicy.php b/app/Policies/DaftarPenilaianRewardPolicy.php
index f8393252..38863a69 100644
--- a/app/Policies/DaftarPenilaianRewardPolicy.php
+++ b/app/Policies/DaftarPenilaianRewardPolicy.php
@@ -45,7 +45,7 @@ public function create(): bool
/**
* Determine whether the user can update the model.
*/
- public function update(User $user, DaftarPenilaianReward $daftar): bool
+ public function update(): bool
{
return false;
}
From 248d60c4c0673fcffa64bb213dd780d7b2f3c524 Mon Sep 17 00:00:00 2001
From: Muhlis Abdi
Date: Tue, 8 Jul 2025 21:38:50 +0800
Subject: [PATCH 014/264] fix: update HD calculation in ImportRekapPresensi
action and bump version to 2.11.5
---
app/Nova/Actions/ImportRekapPresensi.php | 4 +---
composer.json | 2 +-
...F4WgsSMoKmH8EKUkqBzVgkSvTrNwm9krFHRg9.docx | Bin 41138 -> 41174 bytes
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app/Nova/Actions/ImportRekapPresensi.php b/app/Nova/Actions/ImportRekapPresensi.php
index a3c20732..d9f9645d 100644
--- a/app/Nova/Actions/ImportRekapPresensi.php
+++ b/app/Nova/Actions/ImportRekapPresensi.php
@@ -2,13 +2,11 @@
namespace App\Nova\Actions;
-use App\Helpers\Helper;
use App\Models\DaftarPenilaianReward;
use App\Models\User;
use Illuminate\Bus\Queueable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Storage;
use Laravel\Nova\Actions\Action;
use Laravel\Nova\Fields\ActionFields;
use Laravel\Nova\Fields\File;
@@ -39,7 +37,7 @@ public function handle(ActionFields $fields, Collection $models)
]
);
$daftar->hk = $row['HK'];
- $daftar->hd = $row['HD'];
+ $daftar->hd = (int) $row['HD'] + (int) $row['TL'] + (int) $row['PD'] + (int) $row['DK'] + (int) $row['KN'];
$daftar->cst = (int) $row['CST1'] + (int) $row['CST2'];
$daftar->tb = $row['TB'];
$daftar->tk = $row['TK'];
diff --git a/composer.json b/composer.json
index 77f9421c..bb2ffe2d 100644
--- a/composer.json
+++ b/composer.json
@@ -102,5 +102,5 @@
},
"minimum-stability": "dev",
"prefer-stable": true,
- "version": "2.11.4"
+ "version": "2.11.5"
}
diff --git a/storage/app/public/templates/1KOF4WgsSMoKmH8EKUkqBzVgkSvTrNwm9krFHRg9.docx b/storage/app/public/templates/1KOF4WgsSMoKmH8EKUkqBzVgkSvTrNwm9krFHRg9.docx
index 8ed8ed436c909554106f8e77437cb8433fda0b13..ad671a9cd74dd5c9c2b375d6d373fd93d39aeb3c 100644
GIT binary patch
delta 11537
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