diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php
index 8c35bd5..fbe992d 100644
--- a/app/Helpers/custom.php
+++ b/app/Helpers/custom.php
@@ -7,6 +7,7 @@ use App\Models\KuesionerLog;
 use App\Models\Master\FormKriteria;
 use App\Models\Penilaian;
 use App\Models\PenilaianFile;
+use App\Models\ProfileSekolah;
 use App\Models\User;
 use App\Models\Master\Sekolah;
 use App\Models\SK;
@@ -141,7 +142,121 @@ if (!function_exists('getNilaiAll')) {
      *
      * @return string
      */
-    function getNilaiAll($type,$sekolah_id)
+    function getNilaiAll($type,$sekolah_id,$kuesionerId = null)
+    {
+        $tahun = tahunKuesioner($kuesionerId);
+        $kuesioner = Kuesioner::find($kuesionerId);
+        // $countSoal = FormKriteria::select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->count();
+        if($type == 'sekolah'){
+            // III  = ((SUM(D246:D252)/11)*20)
+            // II   = ((SUM(D35:D243)/89)*60)
+            // I    = ((SUM(D9:D30)/19)*20)
+
+            $kriteria1 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','I. Kebijakan')->pluck('page_number')->toArray();
+            $nilai1  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria1)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',0) //inputan sekolah
+            ->sum('skor');
+
+            $kriteria2 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','II. Proses Pembelajaran')->pluck('page_number')->toArray();
+            $nilai2  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria2)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',0) //inputan sekolah
+            ->sum('skor');
+
+            $kriteria3 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','III. Kegiatan Berbasis Partisipatif')->pluck('page_number')->toArray();
+            $nilai3  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria3)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',0) //inputan sekolah
+            ->sum('skor');
+
+            $kriteria4 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','IV. Prasarana dan Sarana')->pluck('page_number')->toArray();
+            $nilai4  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria4)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',0) //inputan sekolah
+            ->sum('skor');
+
+            // dd($kriteria4);
+
+            $nilai = (round(($nilai4/34)*30))+(($nilai3/45)*30)+(($nilai2/16)*30)+(($nilai1/9)*10);
+
+        }elseif($type == 'kota'){
+            $kriteria1 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','I. Kebijakan')->pluck('page_number')->toArray();
+            $nilai1  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria1)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',1) //inputan Kota
+            ->sum('skor');
+
+            $kriteria2 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','II. Proses Pembelajaran')->pluck('page_number')->toArray();
+            $nilai2  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria2)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',1) //inputan Kota
+            ->sum('skor');
+
+            $kriteria3 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','III. Kegiatan Berbasis Partisipatif')->pluck('page_number')->toArray();
+            $nilai3  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria3)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',1) //inputan Kota
+            ->sum('skor');
+
+            $kriteria4 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','IV. Prasarana dan Sarana')->pluck('page_number')->toArray();
+            $nilai4  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria4)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',1) //inputan kota
+            ->sum('skor');
+
+            $nilai = (round(($nilai4/34)*30))+(($nilai3/45)*30)+(($nilai2/16)*30)+(($nilai1/9)*10);
+        }elseif($type == 'provinsi'){
+            $kriteria1 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','I. Kebijakan')->pluck('page_number')->toArray();
+            $nilai1  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria1)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',2) //inputan provinsi
+            ->sum('skor');
+
+            $kriteria2 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','II. Proses Pembelajaran')->pluck('page_number')->toArray();
+            $nilai2  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria2)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',2) //inputan provinsi
+            ->sum('skor');
+
+            $kriteria3 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','III. Kegiatan Berbasis Partisipatif')->pluck('page_number')->toArray();
+            $nilai3  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria3)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',2) //inputan provinsi
+            ->sum('skor');
+
+            $kriteria4 = FormKriteria::select('page_number')->where('tahun',$tahun)->groupBy('page_number')->where('kategori','IV. Prasarana dan Sarana')->pluck('page_number')->toArray();
+            $nilai4  = Penilaian::where('ms_sekolah_id',$sekolah_id)->whereIn('page_number',$kriteria4)
+            ->where('skor','!=',0)
+            ->where('tahun',$kuesioner->tahun)
+            ->where('status',2) //inputan provinsi
+            ->sum('skor');
+
+            $nilai = (round(($nilai4/34)*30))+(($nilai3/45)*30)+(($nilai2/16)*30)+(($nilai1/9)*10);
+        }
+
+        return @$nilai ? round(@$nilai) : 0;
+    }
+}
+
+if (!function_exists('getNilaiAll2025')) {
+    /**
+     * @param $val
+     *
+     * @return string
+     */
+    function getNilaiAll2025($type,$sekolah_id)
     {
         // $countSoal = FormKriteria::select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->count();
         if($type == 'sekolah'){
@@ -352,6 +467,48 @@ if (!function_exists('user')) {
     }
 }
 
+if (!function_exists('checkCatatan')) {
+    /**
+     * @param $val
+     *
+     * @return string
+     */
+    function checkCatatan($page_number,$sekolah_id = null,$type = null,$kuesionerId = null)
+    {
+        if(@$sekolah_id){
+            $idSekolah = @$sekolah_id;
+        }else{
+            $idSekolah = session('sekolah_id');
+        }
+
+        if(@$type == 'kota'){
+            $penilaian = Penilaian::whereHas('page',function($query) use ($kuesionerId){
+                $query->where('tahun',tahunKuesioner($kuesionerId));
+            })->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',1)->first();
+        }elseif(@$type == 'provinsi'){
+            $penilaian = Penilaian::whereHas('page',function($query) use ($kuesionerId){
+                $query->where('tahun',tahunKuesioner($kuesionerId));
+            })->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',2)->first();
+        }else{
+            $penilaian = Penilaian::whereHas('page',function($query) use ($kuesionerId){
+                $query->where('tahun',tahunKuesioner($kuesionerId));
+            })->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',0)->first();
+        }
+
+        if($penilaian == true){
+            $catatan = Penilaian::where('key','catatan')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first();
+            $valueCatatan = json_decode(@$catatan->value);
+            if($valueCatatan != null){
+                return '<i class="fal fa-info-circle"></i> ';
+            }
+        }else{
+            return '';
+        }
+
+        // return @$penilaian ? true : false;
+    }
+}
+
 if (!function_exists('checkPenilaian')) {
     /**
      * @param $val
@@ -380,18 +537,15 @@ if (!function_exists('checkPenilaian')) {
             })->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',0)->first();
         }
 
-        // if(session('group_alias') == 'sekolah'){
-            
-        // }elseif(session('group_alias') == 'penilai_kota'){
-            
-        // }elseif(session('group_alias') == 'penilai_provinsi'){
-            
-        // }else{
-        //     $penilaian = Penilaian::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first();
-        // }
+        if($penilaian == true){
+            // $catatan = Penilaian::where('key','catatan')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first();
+            // $valueCatatan = json_decode(@$catatan->value);
+            return 'bg-success-light text-success border-success rounded';
+        }else{
+            return 'border-secondary rounded';
+        }
 
-        // $penilaian = Penilaian::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first();   
-        return @$penilaian ? true : false;
+        // return @$penilaian ? true : false;
     }
 }
 if (!function_exists('hitungSkor')) {
@@ -1476,7 +1630,7 @@ if (!function_exists('formKriteria')) {
                                                     <div class="input-group-prepend ">
                                                         <a target="_blank" class="input-group-text border-none bg-primary text-white" href="'.asset(@$checkFile->value).'"><i class="fal fa-download"></i></a>
                                                     </div>
-                                                    <input type="file" accept=".pdf,.png,.jpeg,.jpg" name="input_upload_files" data-replace-index="0" class="removeFormKriteria form-control">
+                                                    <input type="file" accept=".pdf,.png,.jpeg,.jpg" name="input_upload_files[]" data-replace-index="0" class="removeFormKriteria form-control">
                                                 </div>
                                                 <span class="text-primary"><i>Ukuran Maksimal File : 10MB, Ekstension File : .pdf,.png,.jpeg,.jpg</i></span>
                                             </div>';
@@ -1485,7 +1639,7 @@ if (!function_exists('formKriteria')) {
                                                 <label class="fw-500">Upload Dokumen '.@$data->judul.'</label>
                                                 <input type="hidden" name="input_upload_files_label[]" value="'.@$data->key.'">
                                                 <div class="input-group border-none">
-                                                    <input type="file" accept=".pdf,.png,.jpeg,.jpg" name="input_upload_files" data-replace-index="0" class="removeFormKriteria form-control is-required">
+                                                    <input type="file" accept=".pdf,.png,.jpeg,.jpg" name="input_upload_files[]" data-replace-index="0" class="removeFormKriteria form-control is-required">
                                                 </div>
                                                 <span class="text-primary"><i>Ukuran Maksimal File : 10MB, Ekstension File : .pdf,.png,.jpeg,.jpg</i></span>
                                             </div>';
@@ -1551,12 +1705,50 @@ if (!function_exists('formKriteria')) {
             $html .= '<div class="card mb-2 removeFormKriteria">';
                 $html .= '<div class="card-body">';
                     $html .= '<h6><b>Bukti File</b></h6>';
+                    $html .= '<hr>';
                     $html .= '<div class="form-group">';
-                        $html .= '<div id="dynamic-file-container" style="margin-top: 20px;">
-                                    <ul id="file-list">';
-                                       
-                            $html .=    '</ul>
-                                    </div>';
+                    if(($kriteriaFirst->type == 'textarea') || ($kriteriaFirst->type == 'number')){
+                        foreach($kriteria as $keyKriteria => $data){
+                                $checkFile = PenilaianFile::where('page_number',$page_number)
+                                        ->where('ms_sekolah_id',$idSekolah)
+                                        ->where('tahun',$kuesioner->tahun)
+                                        ->where('key',$data->key)
+                                        ->first();
+                                $extension = explode('.',@$checkFile->value);
+
+                                if(@$checkFile){
+                                    $html .= '<div class="mb-3 file-item d-flex justify-content-between align-items-center">
+                                                    <label class="fw-500">Dokumen '.$data->judul.'</label>
+                                                    <a class="text-white btn btn-sm bg-primary clickModal" data-toggle="modal" data-title="'.$data->judul.'" data-target="#modal" data-type="'.$extension[1].'" data-url="'.asset($checkFile->value).'" href="#"><i class="fal fa-eye"></i>&nbsp; Preview</a>
+                                                </div>
+                                                <hr>';
+                                }
+                            }
+                    }else{
+                        foreach($kriteria as $keyKriteria => $data){
+                            $option = json_decode($data->option);
+                            foreach($option as $keyOption => $dataOption){
+                                if(($dataOption == 'Tidak Ada Prasarana dan Sarana Terkait Hemat dan Konservasi Energi') || ($dataOption == 'Tidak Ada Prasarana dan Sarana Terkait Hemat dan Konservasi Air') || ($dataOption == 'Tidak Ada Prasarana dan Sarana Pembelajaran Keanekaraganan Hayati') || ($dataOption == 'Tidak ada prasarana dan sarana pengelolaan sampah dan limbah padat') || ($dataOption == 'Tidak ada prasarana dan sarana sanitasi') || ($dataOption == 'Prasarana dan Sarana yang dimanfaatkan menjadi media pembelajaran tidak terkait 5 aspek lingkungan') || ($dataOption == 'Tidak Ada Kerjasama dengan pihak lain terkait lingkungan') || ($dataOption == 'Tidak Ada Kegiatan Diinisiasi Sekolah') || ($dataOption == 'Tidak Ada Kegiatan Pemberdayaan Kader') || ($dataOption == 'Tidak Ada Media Publikasi') || ($dataOption == 'Tidak Ada Kegiatan Kampanye/Publikasi') || ($dataOption == 'Tidak Ada Aspek Lingkungan') || ($dataOption == 'Tidak Ada Program Rutin') || ($dataOption == 'Tidak Ada Aspek Rutin Terkait Aspek Lingkungan') || ($dataOption == 'Tidak Ada Hasil Karya Siswa yang terkait Aspek Lingkungan') || ($dataOption == 'Jurnal Ekstrakurikuler Tidak Terkait Aspek Lingkungan') || ($dataOption == 'Jurnal Guru dan RPP Tidak Terkait Aspek Lingkungan') || ($dataOption == 'Bahan Informasi lingkungan di sekolah tidak terkait 5 aspek lingkungan') || ($dataOption == 'Visi, Misi dan Tujuan Sekolah Tidak Terkait Aspek Lingkungan') || ($dataOption == 'SK/Tatib Tidak Terkait Aspek Lingkungan')){
+                                }else{
+                                    $checkFile = PenilaianFile::where('page_number',$page_number)
+                                    ->where('ms_sekolah_id',$idSekolah)
+                                    ->where('tahun',$kuesioner->tahun)
+                                    ->where('key',preg_replace('/[^a-z0-9]+/', '_', strtolower($dataOption)))
+                                    ->first();
+
+                                    $extension = explode('.',@$checkFile->value);
+
+                                    if(@$checkFile){
+                                        $html .= '<div class="mb-3 file-item d-flex justify-content-between align-items-center">
+                                                    <label class="fw-500">Dokumen '.$dataOption.'</label>
+                                                    <a class="text-white btn btn-sm bg-primary clickModal" data-toggle="modal" data-title="'.$dataOption.'" data-target="#modal" data-type="'.$extension[1].'" data-url="'.asset($checkFile->value).'" href="#"><i class="fal fa-eye"></i>&nbsp; Preview</a>
+                                                </div>
+                                                <hr>';
+                                    }   
+                                }
+                            }
+                        }
+                    }
                     $html .= '</div>';
                 $html .= '</div>';
             $html .= '</div>';
diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php
index c280a35..7f702e4 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAKController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php
@@ -32,11 +32,11 @@ class CSAKController 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::where('tahun',tahunKuesioner($keyId))->select('page_number')->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;
@@ -58,7 +58,7 @@ class CSAKController 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',$keyId)->where('tahun',$data['kuesioner']->tahun)->first();
 
         return view($this->template.'.form',$data);
     }
@@ -93,7 +93,7 @@ class CSAKController extends Controller
             if((access('is_create', $this->route.'.*')) || (access('is_update', $this->route.'.*'))){
                 // if($row->status == 3){
                 if($row->tahun == date('Y')){
-                    $action .= '<a href="'.url('usulan/csak/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/csak/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>';
                 }
                 // }
             }
@@ -115,17 +115,17 @@ class CSAKController extends Controller
                 $penilaian .= '<div class="text-secondary bg-secondary px-1 py-1 rounded w-100">';
                     $penilaian .= '<div class="d-flex flex-column">';
                         $penilaian .= '<span class="text-center"> Sekolah </span>';
-                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('sekolah',$row->ms_sekolah_id).' </h5>';
+                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('sekolah',$row->ms_sekolah_id,$row->KuesionerId).' </h5>';
                     $penilaian .= '</div>';
                 $penilaian .= '</div>';
                 $penilaian .= '<div class="text-primary bg-primary-light px-1 py-1 rounded w-100">';
                     $penilaian .= '<div class="d-flex flex-column">';
                         $penilaian .= '<span class="text-center"> Kota</span>';
-                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('kota',$row->ms_sekolah_id).' </h5>';
+                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('kota',$row->ms_sekolah_id,$row->KuesionerId).' </h5>';
                     $penilaian .= '</div>';
                 $penilaian .= '</div>';
             $penilaian .= '</div>';
-            // $penilaian .= '<span style="width:100%;" class="text-left badge bg-success-light text-success"> Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'</span></br>';
+            // $penilaian .= '<span style="width:100%;" class="text-left badge bg-success-light text-success"> Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id,$row->KuesionerId).'</span></br>';
 
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
@@ -165,10 +165,13 @@ class CSAKController extends Controller
      */
     public function store(Request $request)
     {
+        // dd($request->all());
         $sekolahId = decode_id($request->sekolah);
+        $kuesionerId = decode_id($request->kuesioner);
+        $kuesioner = Kuesioner::find($kuesionerId);
 
-        $soal = Penilaian::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
-        $penilaian  = Penilaian::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
+        $soal = Penilaian::where('ms_sekolah_id',$sekolahId)->where('tahun',$kuesioner->tahun)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
+        $penilaian  = Penilaian::where('ms_sekolah_id',$sekolahId)->where('tahun',$kuesioner->tahun)->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
 
         if(count($soal) != count($penilaian)){
             return response()->json(['validasi' => false,'message' => 'Maaf Penilaian Belum Lengkap!']);
@@ -176,7 +179,6 @@ class CSAKController extends Controller
 
         if($request['validasi'] == 1){
 
-            $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
             $kuesioner->catatan_usulan  = $request['catatan_validasi'];
             $kuesioner->status          = 10; // selesai final, karena usulannya ke kota dari yang belum ada jadi langsung selesai tidak ada naik ke provinsi
             $kuesioner->save();
@@ -198,14 +200,14 @@ class CSAKController 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();
 
         }elseif($request['validasi'] == 2){
 
-            $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
+            // $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
             $kuesioner->catatan_usulan  = $request['catatan_validasi'];
             $kuesioner->status          = 5;
             $kuesioner->save();
diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php
index b79c7fb..da3060e 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAPController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php
@@ -114,19 +114,19 @@ class CSAPController extends Controller
                 $penilaian .= '<div class="text-secondary bg-secondary px-1 py-1 rounded w-100">';
                     $penilaian .= '<div class="d-flex flex-column">';
                         $penilaian .= '<span class="text-center"> Sekolah </span>';
-                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('sekolah',$row->ms_sekolah_id).' </h5>';
+                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('sekolah',$row->ms_sekolah_id,$row->KuesionerId).' </h5>';
                     $penilaian .= '</div>';
                 $penilaian .= '</div>';
                 $penilaian .= '<div class="text-primary bg-primary-light px-1 py-1 rounded w-100">';
                     $penilaian .= '<div class="d-flex flex-column">';
                         $penilaian .= '<span class="text-center"> Kota</span>';
-                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('kota',$row->ms_sekolah_id).' </h5>';
+                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('kota',$row->ms_sekolah_id,$row->KuesionerId).' </h5>';
                     $penilaian .= '</div>';
                 $penilaian .= '</div>';
                 $penilaian .= '<div class="text-success bg-success-light px-1 py-1 rounded w-100">';
                     $penilaian .= '<div class="d-flex flex-column">';
                         $penilaian .= '<span class="text-center"> Provinsi</span>';
-                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('provinsi',$row->ms_sekolah_id).'</h5>';
+                        $penilaian .= '<h5 class="text-center font-weight-bold ">'.getNilaiAll('provinsi',$row->ms_sekolah_id,$row->KuesionerId).'</h5>';
                     $penilaian .= '</div>';
                 $penilaian .= '</div>';
             $penilaian .= '</div>';
diff --git a/app/Http/Controllers/Modules/Usulan/KriteriaController.php b/app/Http/Controllers/Modules/Usulan/KriteriaController.php
index 0bb30e9..9385901 100644
--- a/app/Http/Controllers/Modules/Usulan/KriteriaController.php
+++ b/app/Http/Controllers/Modules/Usulan/KriteriaController.php
@@ -100,7 +100,7 @@ class KriteriaController extends Controller
     }
     public function store2026(Request $request)
     {
-        // dd($request);
+        // dd($request->all());
         $data = $request->all();
         $_value = [];
 
@@ -706,7 +706,7 @@ class KriteriaController extends Controller
             $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
             $log->npsn           = $kuesioner->npsn;
             $log->ms_group_id    = session('group_id');
-            $log->step           = 'kirim_kelengkapan_data';
+            $log->step           = 'penilaian_oleh_tim_penilai_kota';
             $log->status         = 3;
             $log->created_by     = auth()->user()->id;
             $log->save();
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index df1f715..4a73464 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -209,69 +209,83 @@ class ProfileController extends Controller
     public function grid(Request $request)
     {
         $_data = [];
+        
+
         $profile = Profile::groupBy('ms_sekolah_id')->pluck('ms_sekolah_id')->toArray();
         if(session('kabupaten_id') != ''){
-            $sekolah = Sekolah::whereIn('MsSekolahId',$profile)->where('ms_kabupaten_id',session('kabupaten_id'));
+            $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');
+
+            // $sekolah = Sekolah::whereIn('MsSekolahId',$profile)->where('ms_kabupaten_id',session('kabupaten_id'));
         }else{
-            $sekolah = Sekolah::whereIn('MsSekolahId',$profile);
+            $kuesioner  = Kuesioner::with('sekolah')->where('ms_sekolah_id',$profile)->orderBy('created_at','DESC');
+            // $sekolah = Sekolah::whereIn('MsSekolahId',$profile);
         }
 
         if(@request()->tingkat){
-            $sekolah->where('ms_tingkat_sekolah_id',request()->tingkat);
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('ms_tingkat_sekolah_id',request()->tingkat);
+            });
         }
         if(@request()->status_sekolah){
-            $sekolah->where('status',request()->status_sekolah);
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('status',request()->status_sekolah);
+            });
         }
         if(@request()->provinsi != 0){
-            $sekolah->where('ms_provinsi_id',decode_id(request()->provinsi));
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('ms_provinsi_id',decode_id(request()->provinsi));
+            });
         }
         if(@request()->kabupaten != 0){
-            $sekolah->where('ms_kabupaten_id',decode_id(request()->kabupaten));
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('ms_kabupaten_id',decode_id(request()->kabupaten));
+            });
         }
         if(@request()->kecamatan != 0){
-            $sekolah->where('ms_kecamatan_id',decode_id(request()->kecamatan));
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('ms_kecamatan_id',decode_id(request()->kecamatan));
+            });
         }
 
-        foreach ($sekolah->get() as $key => $row) {
+        foreach ($kuesioner->get() as $key => $row) {
 
             $action = '';
 
             if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){
-                $action .= '<a href="'.url('profile-sekolah/update/'.encode_id($row->MsSekolahId)).'" data-toggle="tooltip" title="Edit Data" class="btn btn-xs btn-block btn-primary"><i class="fal fa-pencil text-white"></i></a>';
+                $action .= '<a href="'.url('profile-sekolah/update/'.encode_id($row->sekolah->MsSekolahId)).'" data-toggle="tooltip" title="Edit Data" class="btn btn-xs btn-block btn-primary"><i class="fal fa-pencil text-white"></i></a>';
             }
 
-            $kuesioner  = Kuesioner::where('ms_sekolah_id',$row->MsSekolahId)->where('tahun',date('Y'))->orderBy('created_at','DESC')->first();
-            $log  = KuesionerLog::where('kuesioner_id',@$kuesioner->KuesionerId)->orderBy('created_at','DESC')->first();
+            $log  = KuesionerLog::where('kuesioner_id',@$row->KuesionerId)->orderBy('created_at','DESC')->first();
             if(@$log){
                 $progress = '<span class="badge bg-warning-light text-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
             }else{
-                $progress = StatusActivity($row->MsSekolahId);
+                $progress = StatusActivity($row->sekolah->MsSekolahId);
             }
 
-            if($kuesioner){
-                if(@$kuesioner->level == 0){
+                if(@$row->level == 0){
                     $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Belum Pernah';
-                }elseif(@$kuesioner->level == 1){
+                }elseif(@$row->level == 1){
                     $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Kab/Kota';
-                }elseif(@$kuesioner->level == 2){
+                }elseif(@$row->level == 2){
                     $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Provinsi';
-                }elseif(@$kuesioner->level == 3){
+                }elseif(@$row->level == 3){
                     $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Nasional';
-                }elseif(@$kuesioner->level == 4){
+                }elseif(@$row->level == 4){
                     $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Mandiri';
+                }else{
+                    $penghargaan = '-';
                 }
-            }else{
-                $penghargaan = '-';
-            }
 
-            if($kuesioner){
-                if((@$kuesioner->level+1) == 1){
+            if($row){
+                if((@$row->level+1) == 1){
                     $jenis_usulan = 'Adiwiyata Kab/Kota';
-                }elseif((@$kuesioner->level+1) == 2){
+                }elseif((@$row->level+1) == 2){
                     $jenis_usulan = 'Adiwiyata Provinsi';
-                }elseif((@$kuesioner->level+1) == 3){
+                }elseif((@$row->level+1) == 3){
                     $jenis_usulan = 'Adiwiyata Nasional';
-                }elseif((@$kuesioner->level+1) == 4){
+                }elseif((@$row->level+1) == 4){
                     $jenis_usulan = 'Adiwiyata Mandiri';
                 }
             }else{
@@ -280,17 +294,17 @@ class ProfileController extends Controller
             
 
             $penilaian = '';
-            $penilaian .= '<span style="width:100%;" class="text-left badge bg-secondary text-secondary"> Sekolah : '.getNilaiAll('sekolah',$row->MsSekolahId).'</span></br>';
-            if((@$kuesioner->level+1) == 1){
-                $penilaian .= '<span style="width:100%;" class="text-left badge bg-primary-light text-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
+            $penilaian .= '<span style="width:100%;" class="text-left badge bg-secondary text-secondary"> Sekolah : '.getNilaiAll('sekolah',$row->sekolah->MsSekolahId,$row->KuesionerId).'</span></br>';
+            if((@$row->level+1) == 1){
+                $penilaian .= '<span style="width:100%;" class="text-left badge bg-primary-light text-primary"> Kota : '.getNilaiAll('kota',$row->sekolah->MsSekolahId,$row->KuesionerId).'</span></br>';
             }
-            if((@$kuesioner->level+1) == 2){
-                $penilaian .= '<span style="width:100%;" class="text-left badge bg-primary-light text-primary"> Kota : '.getNilaiAll('kota',$row->MsSekolahId).'</span></br>';
-                $penilaian .= '<span style="width:100%;" class="text-left badge bg-success-light text-success"> Provinsi : '.getNilaiAll('provinsi',$row->MsSekolahId).'</span></br>';
+            if((@$row->level+1) == 2){
+                $penilaian .= '<span style="width:100%;" class="text-left badge bg-primary-light text-primary"> Kota : '.getNilaiAll('kota',$row->sekolah->MsSekolahId,$row->KuesionerId).'</span></br>';
+                $penilaian .= '<span style="width:100%;" class="text-left badge bg-success-light text-success"> Provinsi : '.getNilaiAll('provinsi',$row->sekolah->MsSekolahId,$row->KuesionerId).'</span></br>';
             }
 
             $sekolah = '';
-            $sekolah .= @$row->nama_sekolah.'<br>';
+            $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
             $sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
             $sekolah .= '<span class="badge bg-primary-light text-primary mt-1">'.@$row->profile->status_sekolah.'</span>&nbsp;';
             $sekolah .= '<span class="badge bg-info-light text-info">Level '.levelAdiwiyata($row->npsn).'</span>';
@@ -300,11 +314,11 @@ class ProfileController extends Controller
                 'no'                => $key+1,
                 'id'                => encode_id($row->id),
                 'npsn'              => $row->npsn,
-                'sekolah'              => $sekolah,
-                'nama'              => $row->nama_sekolah,
+                'sekolah'           => $sekolah,
+                'nama'              => $row->sekolah->nama_sekolah,
                 'status_level'      => '<span class="badge bg-success-light text-success">Level '.levelAdiwiyata($row->npsn).'</span>',
-                'kecamatan'         => $row->kecamatan->name,
-                'wilayah'           => $row->kabupaten->name,
+                'kecamatan'         => $row->sekolah->kecamatan->name,
+                'wilayah'           => $row->sekolah->kabupaten->name,
                 'tanggal_level'     => '-',
                 'penghargaan'       => $penghargaan,
                 'dok'               => '-',
diff --git a/resources/views/modules/dashboard/sekolah.blade.php b/resources/views/modules/dashboard/sekolah.blade.php
index 0285efd..ffabfda 100644
--- a/resources/views/modules/dashboard/sekolah.blade.php
+++ b/resources/views/modules/dashboard/sekolah.blade.php
@@ -13,13 +13,32 @@
         ?>
 
 @if(@$dok->status == 1)
-    <div class="card mb-2 bg-success-light text-success">
-        <div class="card-body">
-            <h4 class="fw-500"><i class="fal fa-info-circle"></i>&nbsp;Verifikasi Kuesioner Leveling</h4>
-            <p>Kuesioner Anda telah di-approve dan dinyatakan valid. Silakan melanjutkan ke tahapan berikutnya.</p>
-            <a href="{{ url('usulan/adiwiyata/kriteria') }}" class="btn btn-info">Pemenuhan Kriteria &nbsp; <i class="fal fa-arrow-right"></i></a>
+
+    @if($kuesioner->status == 3)
+        <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;Pemenuhan Kriteria</h4>
+                <p class="mb-0">Pemenuhan Kriteria Sedang Dilakukan Verifikasi Oleh Pihak Penilai.</p>
+            </div>
         </div>
-    </div>
+    @elseif($kuesioner->status == 5)
+        <div class="card mb-2 bg-warning text-white">
+            <div class="card-body">
+                <h4 class="fw-500"><i class="fal fa-info-circle"></i>&nbsp;Pemenuhan Kriteria</h4>
+                <p>Pemenuhan Kriteria Anda Dikembalikan Oleh Penilai Kota, Silahkan Lakukan Perbaikan Kembali.</p>
+                <a href="{{ url('usulan/adiwiyata/kriteria') }}" class="btn btn-danger">Pemenuhan Kriteria &nbsp; <i class="fal fa-arrow-right"></i></a>
+            </div>
+        </div>
+    @else
+        <div class="card mb-2 bg-success-light text-success">
+            <div class="card-body">
+                <h4 class="fw-500"><i class="fal fa-info-circle"></i>&nbsp;Verifikasi Kuesioner Leveling</h4>
+                <p>Kuesioner Anda telah di-approve dan dinyatakan valid. Silakan melanjutkan ke tahapan berikutnya.</p>
+                <a href="{{ url('usulan/adiwiyata/kriteria') }}" class="btn btn-info">Pemenuhan Kriteria &nbsp; <i class="fal fa-arrow-right"></i></a>
+            </div>
+        </div>
+    @endif
+    
 @endif
 <div class="row mb-2">
     <div class="col-md-6 mb-2">
diff --git a/resources/views/modules/kuesioner/form.blade.php b/resources/views/modules/kuesioner/form.blade.php
index 92cd744..e3884c1 100644
--- a/resources/views/modules/kuesioner/form.blade.php
+++ b/resources/views/modules/kuesioner/form.blade.php
@@ -69,25 +69,34 @@
             </div>
         @elseif (session('group_alias') == 'sekolah')
             @if(@$dok->status == 1)
-                <div class="card mb-2 bg-success-light text-success">
-                    <div class="card-body">
-                        <h4 class="fw-500"><i class="fal fa-info-circle"></i>&nbsp;Verifikasi Kuesioner Leveling</h4>
-                        <p>Kuesioner Anda telah di-approve dan dinyatakan valid. Silakan melanjutkan ke tahapan berikutnya.</p>
-                        <a href="{{ url('usulan/adiwiyata/kriteria') }}" class="btn btn-info">Pemenuhan Kriteria &nbsp; <i class="fal fa-arrow-right"></i></a>
+                @if($kuesioner->status >= 3)
+                    <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;Pemenuhan Kriteria</h4>
+                            <p class="mb-0">Pemenuhan Kriteria Sedang Dilakukan Verifikasi Oleh Pihak Penilai.</p>
+                        </div>
                     </div>
-                </div>
+                @else
+                    <div class="card mb-2 bg-success-light text-success">
+                        <div class="card-body">
+                            <h4 class="fw-500"><i class="fal fa-info-circle"></i>&nbsp;Verifikasi Kuesioner Leveling</h4>
+                            <p>Kuesioner Anda telah di-approve dan dinyatakan valid. Silakan melanjutkan ke tahapan berikutnya.</p>
+                            <a href="{{ url('usulan/adiwiyata/kriteria') }}" class="btn btn-info">Pemenuhan Kriteria &nbsp; <i class="fal fa-arrow-right"></i></a>
+                        </div>
+                    </div>
+                @endif
             @elseif(@$dok->status == 2)
-            <?php
-                if(($kuesioner->level+1) == 1){
-                    $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Kab/Kota';
-                }elseif(($kuesioner->level+1) == 2){
-                    $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Provinsi';
-                }elseif(($kuesioner->level+1) == 3){
-                    $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Nasional';
-                }elseif(($kuesioner->level+1) == 4){
-                    $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Mandiri';
-                }
-            ?>
+                <?php
+                    if(($kuesioner->level+1) == 1){
+                        $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Kab/Kota';
+                    }elseif(($kuesioner->level+1) == 2){
+                        $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Provinsi';
+                    }elseif(($kuesioner->level+1) == 3){
+                        $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Nasional';
+                    }elseif(($kuesioner->level+1) == 4){
+                        $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Mandiri';
+                    }
+                ?>
                 <div class="card mb-2 bg-danger-light text-white">
                     <div class="card-body">
                         <h4 class="fw-500"><i class="fal fa-info-circle"></i>&nbsp;Verifikasi Kuesioner Leveling</h4>
@@ -99,7 +108,7 @@
                 <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>Kuesioner anda sedang dilakukan verifikasi oleh sudin/dinas terkait. Mohon Menunggu...</p>
+                        <p class="mb-0">Kuesioner anda sedang dilakukan verifikasi oleh sudin/dinas terkait. Mohon Menunggu...</p>
                     </div>
                 </div>
             @endif
diff --git a/resources/views/modules/master/form-kriteria/form.blade.php b/resources/views/modules/master/form-kriteria/form.blade.php
index 691ed6d..ea67e09 100644
--- a/resources/views/modules/master/form-kriteria/form.blade.php
+++ b/resources/views/modules/master/form-kriteria/form.blade.php
@@ -32,10 +32,10 @@
                             <div class="col-12 pr-1">
                                 <select name="kategori" class="form-control form-control-sm @error('kategori') is-invalid @enderror" required>
                                     <option value="">-- Pilih Kategori --</option>
-                                    <option {{@$item->kategori == 'I' ? 'selected' : ''}} value="I">I</option>
-                                    <option {{@$item->kategori == 'II' ? 'selected' : ''}} value="II">II</option>
-                                    <option {{@$item->kategori == 'III' ? 'selected' : ''}} value="III">III</option>
-                                    <option {{@$item->kategori == 'IV' ? 'selected' : ''}} value="IV">IV</option>
+                                    <option {{@$item->kategori == 'I. Kebijakan' ? 'selected' : ''}} value="I. Kebijakan">I. Kebijakan</option>
+                                    <option {{@$item->kategori == 'II. Proses Pembelajaran' ? 'selected' : ''}} value="II. Proses Pembelajaran">II. Proses Pembelajaran</option>
+                                    <option {{@$item->kategori == 'III. Kegiatan Berbasis Partisipatif' ? 'selected' : ''}} value="III. Kegiatan Berbasis Partisipatif">III. Kegiatan Berbasis Partisipatif</option>
+                                    <option {{@$item->kategori == 'IV. Prasarana dan Sarana' ? 'selected' : ''}} value="IV. Prasarana dan Sarana">IV. Prasarana dan Sarana</option>
                                     <option {{@$item->kategori == 'I.Perencanaan Gerakan PBLHS' ? 'selected' : ''}} value="I.Perencanaan Gerakan PBLHS">I.Perencanaan Gerakan PBLHS</option>
                                     <option {{@$item->kategori == 'II.Pelaksanaan Gerakan PBLHS' ? 'selected' : ''}} value="II.Pelaksanaan Gerakan PBLHS">II.Pelaksanaan Gerakan PBLHS</option>
                                     <option {{@$item->kategori == 'III.Pemantauan dan Evaluasi Gerakan PBLHS' ? 'selected' : ''}} value="III.Pemantauan dan Evaluasi Gerakan PBLHS">III.Pemantauan dan Evaluasi Gerakan PBLHS</option>
diff --git a/resources/views/modules/profile/admin.blade.php b/resources/views/modules/profile/admin.blade.php
index 7c1e8fe..36422f6 100644
--- a/resources/views/modules/profile/admin.blade.php
+++ b/resources/views/modules/profile/admin.blade.php
@@ -19,41 +19,43 @@
                     <div class="col-md-12 mb-2">
                         <div class="row">
                             @if(session('group_alias') == 'administrator')
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="provinsi" class="form-control select2" id="provinsi">
-                                        <option value="0">- PILIH PROVINSI -</option>
-                                        @foreach($provinsi as $datProv)
-                                        <option value="{{encode_id($datProv->MsProvinsiId)}}">{{$datProv->name}}</option>
-                                        @endforeach
-                                    </select>
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="provinsi" class="form-control select2" id="provinsi">
+                                            <option value="0">- PILIH PROVINSI -</option>
+                                            @foreach($provinsi as $datProv)
+                                            <option value="{{encode_id($datProv->MsProvinsiId)}}">{{$datProv->name}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="kabupaten" class="form-control select2" id="kabupaten">
-                                        <option value="0">- PILIH KABUPATEN/KOTA -</option>
-                                    </select>
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="kabupaten" class="form-control select2" id="kabupaten">
+                                            <option value="0">- PILIH KABUPATEN/KOTA -</option>
+                                        </select>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="kecamatan" class="form-control select2" id="kecamatan" required>
-                                        <option value="0">- PILIH KECAMATAN -</option>
-                                    </select>
+                                <div class="col-md-3">
+                                    <div class="form-group">
+                                        <select name="kecamatan" class="form-control select2" id="kecamatan" required>
+                                            <option value="0">- PILIH KECAMATAN -</option>
+                                        </select>
+                                    </div>
                                 </div>
-                            </div>
                             @else 
-                            <div class="col-md-3">
-                                <div class="form-group">
-                                    <select name="kecamatan" class="form-control select2" id="kecamatan" required>
-                                        <option value="0">- PILIH KECAMATAN -</option>
-                                        @foreach($kecamatan as $dataKec)
-                                        <option value="{{encode_id($dataKec->MsKecamatanId)}}">{{$dataKec->name}}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                            </div> 
+                                @if(@$kecamatan)
+                                    <div class="col-md-3">
+                                        <div class="form-group">
+                                            <select name="kecamatan" class="form-control select2" id="kecamatan" required>
+                                                <option value="0">- PILIH KECAMATAN -</option>
+                                                @foreach($kecamatan as $dataKec)
+                                                <option value="{{encode_id($dataKec->MsKecamatanId)}}">{{$dataKec->name}}</option>
+                                                @endforeach
+                                            </select>
+                                        </div>
+                                    </div> 
+                                @endif
                             @endif
                         </div>
                     </div>
diff --git a/resources/views/modules/usulan/csak/form.blade.php b/resources/views/modules/usulan/csak/form.blade.php
index fe90840..344a33f 100644
--- a/resources/views/modules/usulan/csak/form.blade.php
+++ b/resources/views/modules/usulan/csak/form.blade.php
@@ -208,17 +208,17 @@
                                                         <a href="#" class="btn btn-outline-primary mr-2 ">
                                                             Sekolah
                                                             <br>
-                                                            <h4 class="nilai_sekolah">{{getNilai('sekolah',1,$sekolah->MsSekolahId)}}</h4>
+                                                            <h4 class="nilai_sekolah">{{getNilai('sekolah',1,$sekolah->MsSekolahId,$kuesioner->KuesionerId)}}</h4>
                                                         </a>
                                                         <a href="#" class="btn btn-outline-warning mr-2 ">
                                                             Kab/Kota
                                                             <br>
-                                                            <h4 class="nilai_kota">{{getNilai('kota',1,$sekolah->MsSekolahId)}}</h4>
+                                                            <h4 class="nilai_kota">{{getNilai('kota',1,$sekolah->MsSekolahId,$kuesioner->KuesionerId)}}</h4>
                                                         </a>
                                                     </div>
                                                     <div class="pageNumber row gap-1 justify-content-center">
                                                         @foreach($page as $hal)
-                                                        <div class="col-3 text-center page {{ (checkPenilaian($hal,$sekolah->MsSekolahId,'kota') == 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) == true ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
                                                                 <span>{{$hal}}</span>
                                                         </div>
                                                         @endforeach
@@ -240,7 +240,7 @@
                                                                 <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
                                                             </div>
                                                             <div class="changeForm">
-                                                                {!! formKriteria(1,$sekolah->MsSekolahId,'kota') !!}
+                                                                {!! formKriteria(1,$sekolah->MsSekolahId,'kota',tahunKuesioner($kuesioner->KuesionerId)) !!}
                                                             </div>
                                                         </div>
                                                         @if(session('group_id') == 6)
@@ -279,7 +279,7 @@
                                                         <label class="fw-500">Validasi</label>
                                                         <select class="form-control select2" id="validasi" name="validasi">
                                                             <option value="">- Pilih Validasi -</option>
-                                                            <option {{@$kuesioner->status == '4' ? 'selected' : ''}} value="1">Selesai</option>
+                                                            <option {{@$kuesioner->status == '4' || @$kuesioner->status == '10' ? 'selected' : ''}} value="1">Selesai</option>
                                                             <option {{@$kuesioner->status == '5' ? 'selected' : ''}} value="2">Dikembalikan</option>
                                                         </select>
                                                     </div>
@@ -310,9 +310,54 @@
         </form>
     </div>
 </div>
+
+<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5><b class="titleModal"></b></h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true"><i class="fal fa-times"></i></span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="bodyModal text-center"></div>
+            </div>
+        </div>
+    </div>
+</div>
 @endsection
 @section('page-js')
 <script type="text/javascript">
+    $(document).on('change', '.uncheckall', function () {
+        if ($(this).is(':checked')) {
+            $('.checklistInput').not(this).prop('checked', false);
+        }
+    });
+
+    $(document).on('change', '.checklistInput:not(.uncheckall)', function () {
+        if ($(this).is(':checked')) {
+            $('.uncheckall').prop('checked', false);
+        }
+    });
+
+    $('.clickModal').on('click',function(){
+        $('.remove').remove();
+        const fileType = $(this).data('type');
+        const title = $(this).data('title');
+        const url = $(this).data('url');
+
+        $('.titleModal').html(title);
+        
+        if (fileType === 'pdf') {
+            var body = `<iframe class="remove" src="${url}" width="100%" height=500"></iframe>`;
+        } else {
+            var body = `<img class="remove" src="${url}" width="70%" style="max-width:100%; max-height:50%;">`;
+        }
+
+        $('.bodyModal').append(body);
+
+    });
     @if(@$kuesioner->status < 4)
     $(document).ready(function() {
       // $('input[type="checkbox"], input[type="radio"], input[type="text"], textarea').attr('disabled', true);
@@ -336,6 +381,7 @@
                 _token:'{{csrf_token()}}',
                 page: number,
                 type:'kota',
+                kuesionerId: '{{ $kuesioner->KuesionerId }}' ,
                 sekolah: "{{encode_id(@$sekolah->MsSekolahId)}}"
             }, // Kirim number sebagai parameter
             dataType: 'json', // Format respons JSON
@@ -344,7 +390,7 @@
                 $('.removeFormKriteria').remove();
             },
             success: function (response) {
-                console.log('Response:', response);
+                // console.log('Response:', response);
                 $('.changeForm').append(response.data);
                 $('.changeTitle').html(response.title);
                 $('.nilai_sekolah').html(response.nilai_sekolah);
@@ -354,6 +400,24 @@
                 $('.numberInput').on('input', function() {
                     this.value = this.value.replace(/[^0-9]/g, ''); // Hanya angka 0-9
                 });
+
+                $('.clickModal').on('click',function(){
+                    $('.remove').remove();
+                    const fileType = $(this).data('type');
+                    const title = $(this).data('title');
+                    const url = $(this).data('url');
+
+                    $('.titleModal').html(title);
+                    
+                    if (fileType === 'pdf') {
+                        var body = `<iframe class="remove" src="${url}" width="100%" height=500"></iframe>`;
+                    } else {
+                        var body = `<img class="remove" src="${url}" width="70%" style="max-width:100%; max-height:50%;">`;
+                    }
+
+                    $('.bodyModal').append(body);
+
+                });
             },
             error: function (xhr, status, error) {
                 console.error('AJAX Error:', status, error);
@@ -392,7 +456,8 @@
                 _token:'{{csrf_token()}}',
                 validasi: validasi,
                 catatan_validasi: catatan_validasi,
-                sekolah: "{{encode_id(@$sekolah->MsSekolahId)}}"
+                sekolah: "{{encode_id(@$sekolah->MsSekolahId)}}",
+                kuesioner: "{{encode_id(@$kuesioner->KuesionerId)}}"
             }, // Kirim number sebagai parameter
             dataType: 'json', // Format respons JSON
             beforeSend: function () {
@@ -474,7 +539,124 @@
 
 
     });
-    $('#btnSave').on('click',function(e){
+    $('#btnSave').on('click', function (e) {
+        e.preventDefault();
+
+        let isValid = true;
+        let isMultiple = true;
+
+        // =========================
+        // VALIDASI FIELD REQUIRED
+        // =========================
+        $('.is-required').each(function () {
+            let type = $(this).attr('type');
+            let name = $(this).attr('name');
+            let value = $(this).val()?.trim();
+
+            if (type === 'radio') {
+                if ($(`input[name="${name}"]:checked`).length === 0) {
+                    isValid = false;
+                    $(`input[name="${name}"]`).addClass("is-invalid");
+                } else {
+                    $(`input[name="${name}"]`).removeClass("is-invalid");
+                }
+
+            } else if (type === 'checkbox') {
+                let checkedCount = $(`input[name="${name}"]:checked`).length;
+
+                if (checkedCount === 0) {
+                    isValid = false;
+                    $(`input[name="${name}"]`).addClass("is-invalid");
+                } else if (checkedCount === 1) {
+                    isMultiple = false;
+                    $(`input[name="${name}"]`).addClass("is-invalid");
+                } else {
+                    $(`input[name="${name}"]`).removeClass("is-invalid");
+                }
+
+            } else if (type === 'file') {
+                if (this.files.length === 0) {
+                    isValid = false;
+                    $(this).addClass("is-invalid");
+                } else {
+                    $(this).removeClass("is-invalid");
+                }
+
+            } else {
+                if (!value) {
+                    isValid = false;
+                    $(this).addClass("is-invalid");
+                } else {
+                    $(this).removeClass("is-invalid");
+                }
+            }
+        });
+
+        if (!isValid) {
+            toastr.error(
+                "Harap isi semua field yang wajib diisi",
+                "Error!",
+                { positionClass: 'toast-bottom-right' }
+            );
+            return;
+        }
+
+        // =========================
+        // FORM DATA (AUTO FILE + INPUT)
+        // =========================
+        let formElement = document.getElementById('form');
+        let number = $('.page').data('number');
+        let formData = new FormData(formElement);
+
+        let replaceIndex = $('input[type="file"][data-replace-index]').data('replace-index');
+
+        if (replaceIndex !== undefined) {
+            formData.append('replace_index', replaceIndex);
+            
+        }
+
+        formData.append('sekolah', "{{encode_id(@$sekolah->MsSekolahId)}}");
+
+        // OPTIONAL: debug isi FormData
+        /*
+        for (let pair of formData.entries()) {
+            console.log(pair[0]+ ':', pair[1]);
+        }
+        */
+
+        // =========================
+        // AJAX SUBMIT
+        // =========================
+        $.ajax({
+            url: "{{route('modules.usulan_adiwiyata.kriteria.store')}}", // Ganti dengan URL API-mu
+            type: "POST",
+            data: formData,
+            processData: false, // WAJIB
+            contentType: false, // WAJIB
+            beforeSend: function () {
+                $('#loading-spinner').show();
+            },
+            success: function (response) {
+                toastr.success("Berhasil menyimpan data", 'Success!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
+                $('.nilai_kota').html(response.nilai_kota);
+                $('.nilai_provinsi').html(response.nilai_prov);
+                $('.page').closest('.bg-primary-light').addClass('bg-success-light border-success text-success');
+                $('.page').closest('.bg-primary-light').removeClass('bg-primary-light border-primary border-secondary text-primary');
+            },
+            error: function (xhr) {
+                toastr.error(
+                    "Maaf terjadi kesalahan saat menyimpan data",
+                    "Error!",
+                    { positionClass: 'toast-bottom-right' }
+                );
+            },
+            complete: function () {
+                $('#loading-spinner').hide();
+            }
+        });
+    });
+
+    $('#btnSave1').on('click',function(e){
         e.preventDefault();
         let currentForm = $("#form").serializeArray();
         console.log(currentForm);
@@ -557,18 +739,10 @@
                 toastr.success("Berhasil menyimpan data", 'Success!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
                 $('.nilai_kota').html(response.nilai_kota);
                 $('.nilai_provinsi').html(response.nilai_prov);
-                
-                // $('.page').closest('.activePage').addClass('bg-success');
-                // $('.page').closest('.activePage').addClass('text-white');
-                // $('.page').removeClass('activePage');
-                // (checkPenilaian($hal) == true ? 'bg-success text-white' : '' )
-
                 $('.page').closest('.bg-primary-light').addClass('bg-success-light border-success text-success');
                 $('.page').closest('.bg-primary-light').removeClass('bg-primary-light border-primary border-secondary text-primary');
             },
             error: function (xhr, status, error) {
-                // console.error('AJAX Error:', status, error);
-                // alert('Failed to fetch data!');
                 toastr.error("Maaf Terjadi Kesalahan Menyimpan Data", 'Error!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
             },
             complete: function () {
diff --git a/resources/views/modules/usulan/csap/form.blade.php b/resources/views/modules/usulan/csap/form.blade.php
index d0d5220..5eea77c 100644
--- a/resources/views/modules/usulan/csap/form.blade.php
+++ b/resources/views/modules/usulan/csap/form.blade.php
@@ -207,27 +207,27 @@
                                                         <a href="#" class="btn btn-outline-primary mr-2 ">
                                                             Sekolah
                                                             <br>
-                                                            <h4 class="nilai_sekolah">{{getNilai('sekolah',1,$sekolah->MsSekolahId)}}</h4>
+                                                            <h4 class="nilai_sekolah">{{getNilai('sekolah',1,$sekolah->MsSekolahId,$kuesioner->KuesionerId)}}</h4>
                                                         </a>
                                                         <a href="#" class="btn btn-outline-warning mr-2 ">
                                                             Kab/Kota
                                                             <br>
-                                                            <h4 class="nilai_kota">{{getNilai('kota',1,$sekolah->MsSekolahId)}}</h4>
+                                                            <h4 class="nilai_kota">{{getNilai('kota',1,$sekolah->MsSekolahId,$kuesioner->KuesionerId)}}</h4>
                                                         </a>
                                                         <a href="#" class="btn btn-outline-danger mr-2 ">
                                                             Provinsi
                                                             <br>
-                                                            <h4 class="nilai_provinsi">{{getNilai('provinsi',1,$sekolah->MsSekolahId)}}</h4>
+                                                            <h4 class="nilai_provinsi">{{getNilai('provinsi',1,$sekolah->MsSekolahId,$kuesioner->KuesionerId)}}</h4>
                                                         </a>
                                                     </div>
                                                     <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') == 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) == true) ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
                                                                     <span>{{$hal}}</span>
                                                             </div>
                                                         @else
-                                                            <div class="col-3 text-center page {{ ((checkPenilaian($hal,$sekolah->MsSekolahId,'provinsi') == 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) == true) ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
                                                                     <span>{{$hal}}</span>
                                                             </div>
                                                         @endif
@@ -250,7 +250,7 @@
                                                                 <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
                                                             </div>
                                                             <div class="changeForm">
-                                                                {!! formKriteria(1,$sekolah->MsSekolahId,'provinsi') !!}
+                                                                {!! formKriteria(1,$sekolah->MsSekolahId,'provinsi',tahunKuesioner($kuesioner->KuesionerId)) !!}
                                                             </div>
                                                         </div>
                                                         @if(session('group_id') == 6)
@@ -337,9 +337,42 @@
         </form>
     </div>
 </div>
+
+<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5><b class="titleModal"></b></h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true"><i class="fal fa-times"></i></span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="bodyModal text-center"></div>
+            </div>
+        </div>
+    </div>
+</div>
 @endsection
 @section('page-js')
 <script type="text/javascript">
+    $('.clickModal').on('click',function(){
+        $('.remove').remove();
+        const fileType = $(this).data('type');
+        const title = $(this).data('title');
+        const url = $(this).data('url');
+
+        $('.titleModal').html(title);
+        
+        if (fileType === 'pdf') {
+            var body = `<iframe class="remove" src="${url}" width="100%" height=500"></iframe>`;
+        } else {
+            var body = `<img class="remove" src="${url}" width="70%" style="max-width:100%; max-height:50%;">`;
+        }
+
+        $('.bodyModal').append(body);
+
+    });
     @if(@$kuesioner->status < 4)
     $(document).ready(function() {
       // $('input[type="checkbox"], input[type="radio"], input[type="text"], textarea').attr('disabled', true);
@@ -363,6 +396,7 @@
                 _token:'{{csrf_token()}}',
                 page: number,
                 type:'provinsi',
+                kuesionerId: '{{ $kuesioner->KuesionerId }}' ,
                 sekolah: "{{encode_id(@$sekolah->MsSekolahId)}}"
             }, // Kirim number sebagai parameter
             dataType: 'json', // Format respons JSON
@@ -381,6 +415,24 @@
                 $('.numberInput').on('input', function() {
                     this.value = this.value.replace(/[^0-9]/g, ''); // Hanya angka 0-9
                 });
+
+                $('.clickModal').on('click',function(){
+                    $('.remove').remove();
+                    const fileType = $(this).data('type');
+                    const title = $(this).data('title');
+                    const url = $(this).data('url');
+
+                    $('.titleModal').html(title);
+                    
+                    if (fileType === 'pdf') {
+                        var body = `<iframe class="remove" src="${url}" width="100%" height=500"></iframe>`;
+                    } else {
+                        var body = `<img class="remove" src="${url}" width="70%" style="max-width:100%; max-height:50%;">`;
+                    }
+
+                    $('.bodyModal').append(body);
+
+                });
             },
             error: function (xhr, status, error) {
                 console.error('AJAX Error:', status, error);
@@ -501,7 +553,115 @@
 
 
     });
-    $('#btnSave').on('click',function(e){
+    $('#btnSave').on('click', function (e) {
+        e.preventDefault();
+
+        let isValid = true;
+        let isMultiple = true;
+
+        // =========================
+        // VALIDASI FIELD REQUIRED
+        // =========================
+        $('.is-required').each(function () {
+            let type = $(this).attr('type');
+            let name = $(this).attr('name');
+            let value = $(this).val()?.trim();
+
+            if (type === 'radio') {
+                if ($(`input[name="${name}"]:checked`).length === 0) {
+                    isValid = false;
+                    $(`input[name="${name}"]`).addClass("is-invalid");
+                } else {
+                    $(`input[name="${name}"]`).removeClass("is-invalid");
+                }
+
+            } else if (type === 'checkbox') {
+                let checkedCount = $(`input[name="${name}"]:checked`).length;
+
+                if (checkedCount === 0) {
+                    isValid = false;
+                    $(`input[name="${name}"]`).addClass("is-invalid");
+                } else if (checkedCount === 1) {
+                    isMultiple = false;
+                    $(`input[name="${name}"]`).addClass("is-invalid");
+                } else {
+                    $(`input[name="${name}"]`).removeClass("is-invalid");
+                }
+
+            } else if (type === 'file') {
+                if (this.files.length === 0) {
+                    isValid = false;
+                    $(this).addClass("is-invalid");
+                } else {
+                    $(this).removeClass("is-invalid");
+                }
+
+            } else {
+                if (!value) {
+                    isValid = false;
+                    $(this).addClass("is-invalid");
+                } else {
+                    $(this).removeClass("is-invalid");
+                }
+            }
+        });
+
+        if (!isValid) {
+            toastr.error(
+                "Harap isi semua field yang wajib diisi",
+                "Error!",
+                { positionClass: 'toast-bottom-right' }
+            );
+            return;
+        }
+
+        // =========================
+        // FORM DATA (AUTO FILE + INPUT)
+        // =========================
+        let formElement = document.getElementById('form');
+        let number = $('.page').data('number');
+        let formData = new FormData(formElement);
+
+        let replaceIndex = $('input[type="file"][data-replace-index]').data('replace-index');
+
+        if (replaceIndex !== undefined) {
+            formData.append('replace_index', replaceIndex);   
+        }
+        formData.append('sekolah', "{{encode_id(@$sekolah->MsSekolahId)}}");
+
+        // =========================
+        // AJAX SUBMIT
+        // =========================
+        $.ajax({
+            url: "{{route('modules.usulan_adiwiyata.kriteria.store')}}", // Ganti dengan URL API-mu
+            type: "POST",
+            data: formData,
+            processData: false, // WAJIB
+            contentType: false, // WAJIB
+            beforeSend: function () {
+                $('#loading-spinner').show();
+            },
+            success: function (response) {
+                toastr.success("Berhasil menyimpan data", 'Success!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
+                $('.nilai_kota').html(response.nilai_kota);
+                $('.nilai_provinsi').html(response.nilai_prov);
+                $('.page').closest('.bg-primary-light').addClass('bg-success-light border-success text-success');
+                $('.page').closest('.bg-primary-light').removeClass('bg-primary-light border-primary border-secondary text-primary');
+            },
+            error: function (xhr) {
+                toastr.error(
+                    "Maaf terjadi kesalahan saat menyimpan data",
+                    "Error!",
+                    { positionClass: 'toast-bottom-right' }
+                );
+            },
+            complete: function () {
+                $('#loading-spinner').hide();
+            }
+        });
+    });
+
+    $('#btnSave1').on('click',function(e){
         e.preventDefault();
         let currentForm = $("#form").serializeArray();
         console.log(currentForm);
@@ -591,7 +751,7 @@
                 // $('.page').closest('.activePage').addClass('bg-success');
                 // $('.page').closest('.activePage').addClass('text-white');
                 // $('.page').removeClass('activePage');
-                // (checkPenilaian($hal) == true ? 'bg-success text-white' : '' )
+                // (checkPenilaian($hal) == true ? 'bg-success ,$kuesioner->KuesionerIdtext-white' : '' )
 
                 $('.page').closest('.bg-primary-light').addClass('bg-success-light border-success text-success');
                 $('.page').closest('.bg-primary-light').removeClass('bg-primary-light border-primary border-secondary text-primary');
diff --git a/resources/views/modules/usulan/kriteria/form.blade.php b/resources/views/modules/usulan/kriteria/form.blade.php
index e60b98a..634d41e 100644
--- a/resources/views/modules/usulan/kriteria/form.blade.php
+++ b/resources/views/modules/usulan/kriteria/form.blade.php
@@ -65,9 +65,12 @@
                 <div class="card-body">
                     <div class="pageNumber row gap-1 justify-content-center">
                         @foreach($page as $hal)
-                        <div class="col-3 text-center page {{ (checkPenilaian($hal,null,null,$kuesioner->KuesionerId) == true ? 'bg-success-light text-success border-success rounded' : 'border-secondary rounded' )}}" data-number={{$hal}}>
-                            <span>{{$hal}}</span>
-                        </div>
+                            <div class="col-3 text-center page {{ checkPenilaian($hal,null,null,$kuesioner->KuesionerId)}}" data-number={{$hal}}>
+                                <span>
+                                    {!! checkCatatan($hal,null,null,$kuesioner->KuesionerId) !!}
+                                    {{$hal}}
+                                </span>
+                            </div>
                         @endforeach
                     </div>
                     <div class="row mt-2 gap-1 justify-content-center">
@@ -78,14 +81,18 @@
                             <span>Progress Usulan</span>
                         </div>
                     </div>
+                    <hr>
+                    <div class="row mt-2 gap-1 justify-content-center align-items-center">
+                        <i class="fal fa-info-circle"></i> : Terdapat Catatan Dari Penilai
+                    </div>
                 </div>
             </div>
         </div>
         <div class="col-md-8">
             <div class="row">
-                <div class="col-md-12 d-none">
+                <div class="col-md-12">
                     <div class="alert alert-primary mb-2 p-2">
-                        <h6 class="mb-0"><b class="changeTitle">I. Perencanaan Gerakan PBLHS</b></h6>
+                        <h6 class="mb-0"><b class="changeTitle">I. Kebijakan</b></h6>
                     </div>
                 </div>
                 <div class="col-md-12 bodyInput">
diff --git a/resources/views/modules/usulan/kriteria/progress.blade.php b/resources/views/modules/usulan/kriteria/progress.blade.php
index 826226d..d09212d 100644
--- a/resources/views/modules/usulan/kriteria/progress.blade.php
+++ b/resources/views/modules/usulan/kriteria/progress.blade.php
@@ -147,8 +147,8 @@
                             <i class="fal fa-pencil"></i>&nbsp;Nilai Pemenuhan Kriteria
                         </div>
                         <div>
-                            {{ getNilaiAll('sekolah',$kuesioner->ms_sekolah_id) }}
-                            @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id) > 70)
+                            {{ getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) }}
+                            @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) > 70)
+                    @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) > 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) > 70)
+                                @if(getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) > 80)
                                     <button class="btn btn-success btnSend">Kirim Data</button>
                                 @endif
                             @endif