From 04df17d7672d463b08c2bdf38e4cefd88aeb94ab Mon Sep 17 00:00:00 2001 From: ilhamwara Date: Mon, 7 Jul 2025 10:36:36 +0700 Subject: [PATCH] update --- app/Helpers/custom.php | 24 ------------- .../Modules/Usulan/KriteriaController.php | 35 ++++++++++++++++++- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php index f44d5f0..9f8bfa5 100644 --- a/app/Helpers/custom.php +++ b/app/Helpers/custom.php @@ -576,18 +576,6 @@ if (!function_exists('hitungSkor')) { }elseif(($val >= 1) || ($val <= 2)){ $skor = 1; } - }elseif($key == 'jumlah_kader'){ - if($val > 20){ - $skor = 5; - }elseif(($val > 15) || ($val <= 20)){ - $skor = 4; - }elseif(($val > 10) || ($val <= 15)){ - $skor = 3; - }elseif(($val > 5) || ($val <= 10)){ - $skor = 2; - }else{ - $skor = 1; - } }elseif($key == 'kegiatan_kader_adiwiyata'){ if(count($val) >= 5){ $skor = 5; @@ -608,18 +596,6 @@ if (!function_exists('hitungSkor')) { }else{ $skor = 1; } - }elseif($key == 'rencana_kegiatan_pblhs'){ - if($val > 80){ - $skor = 5; - }elseif(($val > 60) || ($val <= 80)){ - $skor = 4; - }elseif(($val > 40) || ($val <= 60)){ - $skor = 3; - }elseif(($val > 20) || ($val <= 40)){ - $skor = 2; - }else{ - $skor = 1; - } }elseif($key == 'unsur_pemantauan_evaluasi'){ $array3 = ["Kepala sekolah", "Dewan Pendidik", "Komite sekolah","Peserta Didik","Masyarakat"]; $array2 = ["Kepala sekolah", "Dewan Pendidik", "Komite sekolah","Peserta Didik"]; diff --git a/app/Http/Controllers/Modules/Usulan/KriteriaController.php b/app/Http/Controllers/Modules/Usulan/KriteriaController.php index e41cbb1..db6cf44 100644 --- a/app/Http/Controllers/Modules/Usulan/KriteriaController.php +++ b/app/Http/Controllers/Modules/Usulan/KriteriaController.php @@ -167,7 +167,7 @@ class KriteriaController extends Controller }elseif($key == 'input_jumlah_pohon'){ $pohon = $data['input_jumlah_pohon']; $warga = $data['input_jumlah_warga_sekolah']; - $persentase = $warga > 0 ? ($pohon / $warga) * 100 : 0; + $persentase = ($pohon / $warga) * 100; if($persentase > 80){ $skor = 5; @@ -181,6 +181,39 @@ class KriteriaController extends Controller $skor = 1; } + }elseif($key == 'input_jumlah_kader'){ + $kader = $data['input_jumlah_kader']; + $pesertadidik = $data['input_jumlah_peserta_didik']; + $persentase = ($kader / $pesertadidik) * 100; + + if($persentase > 20){ + $skor = 5; + }elseif(($persentase > 15) || ($persentase <= 20)){ + $skor = 4; + }elseif(($persentase > 10) || ($persentase <= 15)){ + $skor = 3; + }elseif(($persentase > 5) || ($persentase <= 10)){ + $skor = 2; + }else{ + $skor = 1; + } + }elseif($key == 'input_rencana_kegiatan_pblhs'){ + + $rencana = $data['input_rencana_kegiatan_pblhs']; + $jumlahKegiatan = $data['input_jumlah_rencana_kegiatan_pblhs']; + $persentase = ($rencana / $jumlahKegiatan) * 100; + + if($persentase > 80){ + $skor = 5; + }elseif(($persentase > 60) || ($persentase <= 80)){ + $skor = 4; + }elseif(($persentase > 40) || ($persentase <= 60)){ + $skor = 3; + }elseif(($persentase > 20) || ($persentase <= 40)){ + $skor = 2; + }else{ + $skor = 1; + } }elseif($key == 'input_kondisi_kebersihan'){ $kebersihan = $data['input_kondisi_kebersihan']; $drainase = $data['input_kondisi_drainase'];