diff --git a/app/Http/Controllers/PerhitunganController.php b/app/Http/Controllers/PerhitunganController.php index 57a24f2..1a4d47e 100644 --- a/app/Http/Controllers/PerhitunganController.php +++ b/app/Http/Controllers/PerhitunganController.php @@ -149,8 +149,8 @@ public function nilaiUtility(Request $request) } else { // Perhitungan nilai utility $utility = 1*(($bobot - $minBobot) / $denominator); - // $nilaiUtility[$extracurricularId][$criteriaId] = $utility; - $nilaiUtility[$extracurricularId][$criteriaId] = number_format($utility, 2, '.', ''); + $nilaiUtility[$extracurricularId][$criteriaId] = $utility; + // $nilaiUtility[$extracurricularId][$criteriaId] = number_format($utility, 2, '.', ''); } } } @@ -181,7 +181,8 @@ public function nilaiAkhir(Request $request) if ($criteria) { // Lakukan perhitungan nilai akhir $bobotKriteria = $criteria->bobot; - $nilaiAkhir[$extracurricularId][$criteriaId] = number_format($utility * $bobotKriteria, 2, '.', ''); + $nilaiAkhir[$extracurricularId][$criteriaId] = $utility * $bobotKriteria; + // $nilaiAkhir[$extracurricularId][$criteriaId] = number_format($utility * $bobotKriteria, 2, '.', ''); } else { // Handle jika kriteria tidak ditemukan $nilaiAkhir[$extracurricularId][$criteriaId] = '0'; @@ -189,7 +190,8 @@ public function nilaiAkhir(Request $request) } $totalNilai = array_sum($nilaiAkhir[$extracurricularId]); $totalNilai = min($totalNilai, 100); - $totalNilaiAkhir[$extracurricularId] = number_format($totalNilai, 2, '.', ''); + $totalNilaiAkhir[$extracurricularId]= $totalNilai; + // $totalNilaiAkhir[$extracurricularId] = number_format($totalNilai, 2, '.', ''); } // Membuat koleksi dari nilai akhir yang bersifat multidimenasi menjadi satu dimensi @@ -225,7 +227,8 @@ public function perangkingan(Request $request) if ($criteria) { // Lakukan perhitungan nilai akhir $bobotKriteria = $criteria->bobot; - $nilaiAkhir[$extracurricularId][$criteriaId] = number_format($utility * $bobotKriteria, 2, '.', ''); + // $nilaiAkhir[$extracurricularId][$criteriaId] = number_format($utility * $bobotKriteria, 2, '.', ''); + $nilaiAkhir[$extracurricularId][$criteriaId] =$utility * $bobotKriteria; // Tambahkan nilai akhir ke total nilai untuk ekstrakurikuler saat ini $totalNilai += $utility * $bobotKriteria; @@ -236,7 +239,8 @@ public function perangkingan(Request $request) } // Simpan total nilai akhir untuk setiap ekstrakurikuler - $totalNilaiAkhir[$extracurricularId] = number_format($totalNilai, 2, '.', ''); + // $totalNilaiAkhir[$extracurricularId] = number_format($totalNilai, 2, '.', ''); + $totalNilaiAkhir[$extracurricularId]= $totalNilai; // Hitung persentase total nilai akhir $totalPersen = ($totalNilai ) * 100; diff --git a/public/DataUser/data-user-template.xlsx b/public/DataUser/data-user-template.xlsx index ede9022..757c7a8 100644 Binary files a/public/DataUser/data-user-template.xlsx and b/public/DataUser/data-user-template.xlsx differ