diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php
index fbe992d..fe32f9d 100644
--- a/app/Helpers/custom.php
+++ b/app/Helpers/custom.php
@@ -72,7 +72,7 @@ if (!function_exists('listSekolah')) {
             $res = [];
             $d = '';
             foreach (json_decode($sekolah) as $key => $value) {
-                $d .= '<span class="badge bg-success-light text-success">'.sekolah($value)->nama_sekolah.'</span><br>';
+                $d .= '<span class="badge bg-success-light text-success">'.@sekolah($value)->nama_sekolah.'</span><br>';
                 
             }
             array_push($res, $d);
diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php
index da3060e..ca4ed95 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAPController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php
@@ -33,11 +33,11 @@ class CSAPController extends Controller
     public function update($id)
     {
         $keyId = decode_id($id);
-        $data['kuesioner']  = Kuesioner::where('ms_sekolah_id',$keyId)->where('tahun',date('Y'))->first();
-        $data['sekolah']    = Sekolah::find($keyId);
+        $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::select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); 
+        $data['page']  = FormKriteria::select('page_number')->where('tahun',tahunKuesioner($keyId))->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;
@@ -59,7 +59,7 @@ class CSAPController extends Controller
         $data['luas_ruangan_non_ac']   = @$listrik->luas_ruangan_non_ac;
         $data['jumlah_kader']          = @$listrik->jumlah_kader;
 
-        $data['dokumen'] = DokumenAdministrasi::where('ms_sekolah_id',$keyId)->where('tahun',date('Y'))->first();
+        $data['dokumen'] = DokumenAdministrasi::where('ms_sekolah_id',$data['kuesioner']->ms_sekolah_id)->where('tahun',$data['kuesioner']->tahun)->first();
 
         return view($this->template.'.form',$data);
     }
@@ -92,7 +92,7 @@ class CSAPController extends Controller
 
             if((access('is_create', $this->route.'.*')) || (access('is_update', $this->route.'.*'))){
                 if($row->tahun == date('Y')){
-                    $action .= '<a href="'.url('usulan/csap/update/'.encode_id($row->ms_sekolah_id)).'" data-toggle="tooltip" title="View Data" class="btn btn-xs btn-block btn-primary"><i class="fal fa-edit text-white"></i></a>';
+                    $action .= '<a href="'.url('usulan/csap/update/'.encode_id($row->KuesionerId)).'" data-toggle="tooltip" title="View Data" class="btn btn-xs btn-block btn-primary"><i class="fal fa-edit text-white"></i></a>';
                 }
             }
 
@@ -222,7 +222,7 @@ class CSAPController extends Controller
                 $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
                 $log->npsn           = $kuesioner->npsn;
                 $log->ms_group_id    = session('group_id');
-                $log->step           = 'selesai_final';
+                $log->step           = 'selesai_penilaian_tahap_akhir';
                 $log->status         = 10;
                 $log->created_by     = auth()->user()->id;
                 $log->save();
diff --git a/app/Http/Controllers/Modules/Usulan/SKController.php b/app/Http/Controllers/Modules/Usulan/SKController.php
index c580e4a..380b0aa 100644
--- a/app/Http/Controllers/Modules/Usulan/SKController.php
+++ b/app/Http/Controllers/Modules/Usulan/SKController.php
@@ -38,6 +38,7 @@ class SKController extends Controller
     public function grid(Request $request)
     {
         $usulan = SK::all();
+        // dd($usulan);
         $_data = [];
         foreach ($usulan as $key => $row) {
 
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 4a73464..31d011b 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -212,14 +212,15 @@ class ProfileController extends Controller
         
 
         $profile = Profile::groupBy('ms_sekolah_id')->pluck('ms_sekolah_id')->toArray();
-        if(session('kabupaten_id') != ''){
+        
+        if((session('kabupaten_id') != '') || (session('kabupaten_id') != null)){
             $kuesioner  = Kuesioner::with('sekolah')->whereHas('sekolah',function($query){
                 $query->where('ms_kabupaten_id',session('kabupaten_id'));
-            })->where('ms_sekolah_id',$profile)->orderBy('created_at','DESC');
+            })->whereIn('ms_sekolah_id',$profile)->orderBy('created_at','DESC');
 
             // $sekolah = Sekolah::whereIn('MsSekolahId',$profile)->where('ms_kabupaten_id',session('kabupaten_id'));
         }else{
-            $kuesioner  = Kuesioner::with('sekolah')->where('ms_sekolah_id',$profile)->orderBy('created_at','DESC');
+            $kuesioner  = Kuesioner::with('sekolah')->whereIn('ms_sekolah_id',$profile)->orderBy('created_at','DESC');
             // $sekolah = Sekolah::whereIn('MsSekolahId',$profile);
         }
 
diff --git a/resources/views/modules/kuesioner/form.blade.php b/resources/views/modules/kuesioner/form.blade.php
index e3884c1..9dffd38 100644
--- a/resources/views/modules/kuesioner/form.blade.php
+++ b/resources/views/modules/kuesioner/form.blade.php
@@ -68,7 +68,14 @@
                 </div>
             </div>
         @elseif (session('group_alias') == 'sekolah')
-            @if(@$dok->status == 1)
+            @if(@$dok->status == 0)
+                <div class="card mb-2 bg-primary-light text-primary">
+                    <div class="card-body">
+                        <h4 class="fw-500"><i class="fal fa-info-circle"></i>&nbsp;Verifikasi Kuesioner Leveling</h4>
+                        <p class="mb-0">Kuesioner anda sedang dilakukan verifikasi oleh sudin/dinas terkait. Mohon Menunggu...</p>
+                    </div>
+                </div>
+            @elseif(@$dok->status == 1)
                 @if($kuesioner->status >= 3)
                     <div class="card mb-2 bg-primary-light text-primary">
                         <div class="card-body">
@@ -105,12 +112,6 @@
                     </div>
                 </div>
             @else
-                <div class="card mb-2 bg-primary-light text-primary">
-                    <div class="card-body">
-                        <h4 class="fw-500"><i class="fal fa-info-circle"></i>&nbsp;Verifikasi Kuesioner Leveling</h4>
-                        <p class="mb-0">Kuesioner anda sedang dilakukan verifikasi oleh sudin/dinas terkait. Mohon Menunggu...</p>
-                    </div>
-                </div>
             @endif
         @endif
         <form method="POST" action="{{route($route.'.store')}}" id="form" enctype="multipart/form-data">
diff --git a/resources/views/modules/usulan/csap/form.blade.php b/resources/views/modules/usulan/csap/form.blade.php
index 5eea77c..66b8d17 100644
--- a/resources/views/modules/usulan/csap/form.blade.php
+++ b/resources/views/modules/usulan/csap/form.blade.php
@@ -223,11 +223,11 @@
                                                     <div class="pageNumber row gap-1 justify-content-center">
                                                         @foreach($page as $hal)
                                                         @if(session('group_id') == 6)
-                                                            <div class="col-3 text-center page {{ ((checkPenilaian($hal,$sekolah->MsSekolahId,'kota',$kuesioner->KuesionerId) == true) ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
+                                                            <div class="col-3 text-center page {{checkPenilaian($hal,$sekolah->MsSekolahId,'kota',$kuesioner->KuesionerId)}}" data-number={{$hal}}>
                                                                     <span>{{$hal}}</span>
                                                             </div>
                                                         @else
-                                                            <div class="col-3 text-center page {{ ((checkPenilaian($hal,$sekolah->MsSekolahId,'provinsi',$kuesioner->KuesionerId) == true) ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
+                                                            <div class="col-3 text-center page {{ checkPenilaian($hal,$sekolah->MsSekolahId,'provinsi',$kuesioner->KuesionerId) }}" data-number={{$hal}}>
                                                                     <span>{{$hal}}</span>
                                                             </div>
                                                         @endif
@@ -254,13 +254,13 @@
                                                             </div>
                                                         </div>
                                                         @if(session('group_id') == 6)
-                                                            @if(@$kuesioner->status <= 3)
+                                                            @if(@$kuesioner->status == 3)
                                                                 <div class="col-md-12 mt-3">
                                                                     <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
                                                                 </div>
                                                             @endif
                                                         @elseif(session('group_id') == 7)
-                                                            @if(@$kuesioner->status <= 4)
+                                                            @if(@$kuesioner->status == 4)
                                                                 <div class="col-md-12 mt-3">
                                                                     <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
                                                                 </div>
@@ -296,10 +296,10 @@
                                                         <select class="form-control select2" id="validasi" name="validasi">
                                                             <option value="">- Pilih Validasi -</option>
                                                             @if(session('group_alias') == 'penilai_kota')
-                                                            <option value="1">Diteruskan</option>
-                                                            <option value="2">Dikembalikan</option>
+                                                                <option {{@$kuesioner->status == '4' ? 'selected' : ''}} value="1">Diteruskan</option>
+                                                                <option {{@$kuesioner->status == '5' ? 'selected' : ''}} value="2">Dikembalikan</option>
                                                             @elseif(session('group_alias') == 'penilai_provinsi')
-                                                            <option value="1">Selesai</option>
+                                                                <option selected value="1">Selesai</option>
                                                             @endif
                                                         </select>
                                                     </div>
diff --git a/resources/views/modules/usulan/kriteria/progress.blade.php b/resources/views/modules/usulan/kriteria/progress.blade.php
index d09212d..7319436 100644
--- a/resources/views/modules/usulan/kriteria/progress.blade.php
+++ b/resources/views/modules/usulan/kriteria/progress.blade.php
@@ -148,7 +148,7 @@
                         </div>
                         <div>
                             {{ getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) }}
-                            @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) > 80)
+                            @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) >= 80)
                                 <span class="badge bg-success text-white">Nilai Lolos Verifikasi</span>
                             @else
                                 <span class="badge bg-danger text-white">Nilai Belum Cukup</span>
@@ -160,7 +160,7 @@
                 </div>
                 @if(session('group_alias') == 'sekolah')
 
-                    @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) > 80)
+                    @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) >= 80)
                     @else
                         <div class="alert alert-danger mt-5 pb-0">
                             <p>Nilai Pemenuhan Kriteria dinyatakan belum memenuhi ketentuan verifikasi dan perlu dilakukan perbaikan.</p>
@@ -170,7 +170,7 @@
                         @if(session('group_alias') == 'sekolah')
                             @if(count(@$penilaian) == count(@$page))
                                 @if(($kuesioner->status == 1) || ($kuesioner->status == 5))
-                                    @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) > 80)
+                                    @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) >= 80)
                                         <div class="custom-control custom-checkbox">
                                             <input type="checkbox" class="custom-control-input is-required check" id="true" value="1" name="check">
                                             <label class="custom-control-label" for="true">Dengan ini menyatakan bahwa kelengkapan data sudah benar.</label>
@@ -189,7 +189,7 @@
                         @endif
                         @if(count(@$penilaian) == count(@$page))
                             @if(($kuesioner->status == 1) || ($kuesioner->status == 5))
-                                @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) > 80)
+                                @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) >= 80)
                                     <button class="btn btn-success btnSend">Kirim Data</button>
                                 @endif
                             @endif