diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php index 7f702e4..f5762d5 100644 --- a/app/Http/Controllers/Modules/Usulan/CSAKController.php +++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php @@ -34,9 +34,10 @@ class CSAKController extends Controller $keyId = decode_id($id); $data['kuesioner'] = Kuesioner::find($keyId); $data['sekolah'] = Sekolah::find($data['kuesioner']->ms_sekolah_id); - $data['route'] = $this->route; - $data['title'] = $this->title; - $data['page'] = FormKriteria::where('tahun',tahunKuesioner($keyId))->select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); + $data['route'] = $this->route; + $data['title'] = $this->title; + $data['page'] = FormKriteria::where('tahun',tahunKuesioner($keyId))->select('page_number')->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',1)->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 d8a6b23..2f0af3c 100644 --- a/app/Http/Controllers/Modules/Usulan/KriteriaController.php +++ b/app/Http/Controllers/Modules/Usulan/KriteriaController.php @@ -94,7 +94,7 @@ class KriteriaController extends Controller $data['log'] = KuesionerLog::where('ms_sekolah_id',$keyId)->orderBy('created_at','ASC')->get(); $data['dok'] = DokumenAdministrasi::where('ms_sekolah_id',$keyId)->where('tahun',$data['kuesioner']->tahun)->first(); - $data['penilaian'] = Penilaian::where('ms_sekolah_id',$keyId)->where('tahun',$data['kuesioner']->tahun)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); + $data['penilaian'] = Penilaian::where('ms_sekolah_id',$keyId)->where('tahun',$data['kuesioner']->tahun)->where('status',0)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); return view($this->template.'.progress',$data); } diff --git a/resources/views/modules/usulan/csak/form.blade.php b/resources/views/modules/usulan/csak/form.blade.php index bc45e96..16b9fd0 100644 --- a/resources/views/modules/usulan/csak/form.blade.php +++ b/resources/views/modules/usulan/csak/form.blade.php @@ -273,13 +273,13 @@