fix: update scoring logic and add new fields for attendance and behavior in DaftarPenilaianReward model

Author: laravelwebdev

app/Models/DaftarPenilaianReward.php

@@ -25,15 +25,14 @@ public function rewardPegawai(): BelongsTo
     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_abs = $nilai_disiplin > 0 ? $nilai_disiplin : 0;
-            $nilai_beban = 0.2 * 4 * $penilaian->jumlah_butir;
-            $nilai_beban_abs = $nilai_beban <= 20 ? $nilai_beban : 20;
+            $nilai_kinerja = 0.5 * $penilaian->nilai_skp;
+            $nilai_kehadiran = (100 / $penilaian->hk) * ($penilaian->hd + 0.5 * $penilaian->cst + 0.5 * $penilaian->tb);
+            $nilai_disiplin = 0.1 * ($nilai_kehadiran - (100 * $penilaian->tk + 10 * ($penilaian->tl4 + $penilaian->psw4) + 7.5 * ($penilaian->tl3 + $penilaian->psw3) + 5 * ($penilaian->tl2 + $penilaian->psw2) + 2.5 * ($penilaian->tl1 + $penilaian->psw1)));
+            $nilai_perilaku = 0.4 * $penilaian->nilai_perilaku;
             $penilaian->nilai_kinerja = $nilai_kinerja;
-            $penilaian->nilai_disiplin = $nilai_disiplin_abs;
-            $penilaian->nilai_beban = $nilai_beban_abs;
-            $penilaian->nilai_total = $nilai_kinerja + $nilai_disiplin_abs + $nilai_beban_abs;
+            $penilaian->nilai_disiplin = $nilai_disiplin;
+            $penilaian->nilai_perilaku = $nilai_perilaku;
+            $penilaian->nilai_total = $nilai_kinerja + $nilai_disiplin + $nilai_perilaku;
         });
     }
 }

app/Nova/Actions/ImportRekapPresensi.php

@@ -38,6 +38,10 @@ public function handle(ActionFields $fields, Collection $models)
                     'reward_pegawai_id' => $model->id,
                 ]
             );
+            $daftar->hk = $row['HK'];
+            $daftar->hd = $row['HD'];
+            $daftar->cst = (int) $row['CST1'] + (int) $row['CST2'];
+            $daftar->tb = $row['TB'];
             $daftar->tk = $row['TK'];
             $daftar->tl1 = $row['TL1'];
             $daftar->tl2 = $row['TL2'];
@@ -59,8 +63,8 @@ public function handle(ActionFields $fields, Collection $models)
                         'reward_pegawai_id' => $model->id,
                     ]
                 );
-                $daftar->nilai_skp = $row['Nilai rata-rata'] ?? 0;
-                $daftar->jumlah_butir = $row['Butir'] ?? 0;
+                $daftar->nilai_skp = $row['Rata-rata hasil kerja'] ?? 0;
+                $daftar->nilai_perilaku = $row['Rata-rata perilaku'] ?? 0;
                 $daftar->updated_at = now();
 
                 $daftar->save();

database/migrations/2025_07_08_202740_update_daftar_penilaian_rewards_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('daftar_penilaian_rewards', function (Blueprint $table) {
+            $table->after('nilai_skp', function (Blueprint $table) {
+                $table->decimal('nilai_perilaku')->nullable()->unsigned();
+                $table->tinyInteger('hk')->nullable()->unsigned();
+                $table->tinyInteger('hd')->nullable()->unsigned();
+                $table->tinyInteger('cst')->nullable()->unsigned();
+                $table->tinyInteger('tb')->nullable()->unsigned();
+            });
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('daftar_penilaian_rewards', function (Blueprint $table) {
+            $table->dropColumn('nilai_perilaku');
+            $table->dropColumn('hk');
+            $table->dropColumn('hd');
+            $table->dropColumn('cst');
+            $table->dropColumn('tb');
+        });
+    }
+};