From 0f6c67db7551cbae0f05667bf20d7be634581dd2 Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Wed, 4 Feb 2026 15:33:15 +0700 Subject: [PATCH] update --- .../Modules/Usulan/CSAPController.php | 1 + .../Modules/Usulan/KriteriaController.php | 12 +++++++----- .../views/modules/usulan/csak/form.blade.php | 12 +++++------- .../views/modules/usulan/csap/form.blade.php | 17 +++++++++++++++-- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php index ca4ed95..ba2986f 100644 --- a/app/Http/Controllers/Modules/Usulan/CSAPController.php +++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php @@ -38,6 +38,7 @@ class CSAPController extends Controller $data['route'] = $this->route; $data['title'] = $this->title; $data['page'] = FormKriteria::select('page_number')->where('tahun',tahunKuesioner($keyId))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); + $data['penilaian'] = Penilaian::where('ms_sekolah_id',$data['kuesioner']->ms_sekolah_id)->where('tahun',$data['kuesioner']->tahun)->where('status',2)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); $jumlah = json_decode($data['sekolah']->profile->data_jumlah); $data['jumlah_peserta_didik'] = @$jumlah->jumlah_peserta_didik; diff --git a/app/Http/Controllers/Modules/Usulan/KriteriaController.php b/app/Http/Controllers/Modules/Usulan/KriteriaController.php index 2f0af3c..02bc6e0 100644 --- a/app/Http/Controllers/Modules/Usulan/KriteriaController.php +++ b/app/Http/Controllers/Modules/Usulan/KriteriaController.php @@ -105,6 +105,7 @@ class KriteriaController extends Controller $_value = []; $kuesioner = decode_id($data['secure_id']); + $page = FormKriteria::where('tahun',tahunKuesioner($kuesioner))->select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); foreach ($data as $key => $value) { if (strpos($key, 'input_') === 0) { @@ -176,10 +177,15 @@ class KriteriaController extends Controller if(session('group_alias') == 'sekolah'){ $status = 0; + $reload = false; }elseif(session('group_alias') == 'penilai_kota'){ $status = 1; + $penilaian = Penilaian::where('ms_sekolah_id',$idSekolah)->where('tahun',date('Y'))->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); + $reload = (count(@$penilaian) == count(@$page) ? true : false); }elseif(session('group_alias') == 'penilai_provinsi'){ $status = 2; + $penilaian = Penilaian::where('ms_sekolah_id',$idSekolah)->where('tahun',date('Y'))->where('status',2)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); + $reload = (count(@$penilaian) == count(@$page) ? true : false); } if(@$request['sekolah']){ @@ -335,10 +341,6 @@ class KriteriaController extends Controller // dd($value); } - - - - $nilai_kota = Penilaian::where('ms_sekolah_id',$idSekolah) ->where('page_number',decode_id($data['key'])) ->where('skor','!=',0) @@ -375,7 +377,7 @@ class KriteriaController extends Controller } } - return response()->json(['total_sekolah' => getNilaiAll('sekolah',$sekolah->MsSekolahId,$kuesioner),'total_kota' => getNilaiAll('kota',$sekolah->MsSekolahId,$kuesioner),'total_provinsi' => getNilaiAll('provinsi',$sekolah->MsSekolahId,$kuesioner),'status' => true,'data' => $_value,'message' => 'Berhasil Update Data','page' => $data['key'],'page_number' => decode_id($data['key']),'nilai_kota' => @$nilai_kota ? @$nilai_kota->skor : 0, + return response()->json(['reload' => $reload,'total_sekolah' => getNilaiAll('sekolah',$sekolah->MsSekolahId,$kuesioner),'total_kota' => getNilaiAll('kota',$sekolah->MsSekolahId,$kuesioner),'total_provinsi' => getNilaiAll('provinsi',$sekolah->MsSekolahId,$kuesioner),'status' => true,'data' => $_value,'message' => 'Berhasil Update Data','page' => $data['key'],'page_number' => decode_id($data['key']),'nilai_kota' => @$nilai_kota ? @$nilai_kota->skor : 0, 'nilai_prov' => @$nilai_prov ? @$nilai_prov->skor : 0]); diff --git a/resources/views/modules/usulan/csak/form.blade.php b/resources/views/modules/usulan/csak/form.blade.php index 84423d5..6bb00b0 100644 --- a/resources/views/modules/usulan/csak/form.blade.php +++ b/resources/views/modules/usulan/csak/form.blade.php @@ -331,13 +331,11 @@ - @if(count(@$penilaian) == count(@$page)) - @if(session('group_id') == 6) - @if(@$kuesioner->status < 4) -
- -
- @endif + @if(session('group_id') == 6) + @if(@$kuesioner->status < 4) +
+ +
@endif @endif diff --git a/resources/views/modules/usulan/csap/form.blade.php b/resources/views/modules/usulan/csap/form.blade.php index 6fa6ef0..0fc7732 100644 --- a/resources/views/modules/usulan/csap/form.blade.php +++ b/resources/views/modules/usulan/csap/form.blade.php @@ -306,6 +306,19 @@ +
+
+
Pemenuhan Kriteria
+
+ {{count(@$penilaian)}} / {{count(@$page)}}   + @if(count(@$penilaian) == count(@$page)) + Sudah Lengkap + @else + Belum Lengkap + @endif +
+
+
@@ -335,13 +348,13 @@ @if(session('group_id') == 6) @if(@$kuesioner->status <= 3)
- +
@endif @elseif(session('group_id') == 7) @if(@$kuesioner->status <= 4)
- +
@endif @endif