diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php
index 1abd4af..1f2b270 100644
--- a/app/Helpers/custom.php
+++ b/app/Helpers/custom.php
@@ -664,7 +664,7 @@ if (!function_exists('formKriteria')) {
      *
      * @return string
      */
-    function formKriteria($page_number,$sekolah_id = null)
+    function formKriteria($page_number,$sekolah_id = null,$type = null)
     {
         $kriteria = FormKriteria::where('page_number',$page_number)->get();
 
@@ -679,24 +679,32 @@ if (!function_exists('formKriteria')) {
 
         foreach($kriteria as $keyKriteria => $data){
 
-            if(session('group_alias') == 'sekolah'){
-
-                $penilaian = Penilaian::where('key',$data->key)->where('ms_sekolah_id',$idSekolah)->where('status',0)->first();
-
-            }elseif(session('group_alias') == 'penilai_kota'){
-
+            if(@$type == 'kota'){
                 $penilaian = Penilaian::where('key',$data->key)->where('ms_sekolah_id',$idSekolah)->where('status',1)->first();
                 $penilaianOld = Penilaian::where('key',$data->key)->where('ms_sekolah_id',$idSekolah)->where('status',0)->first();
-
-            }elseif(session('group_alias') == 'penilai_provinsi'){
-
+            }elseif(@$type == 'provinsi'){
                 $penilaian = Penilaian::where('key',$data->key)->where('ms_sekolah_id',$idSekolah)->where('status',2)->first();
                 $penilaianOld = Penilaian::where('key',$data->key)->where('ms_sekolah_id',$idSekolah)->where('status',1)->first();
-
             }else{
-                $penilaian = Penilaian::where('key',$data->key)->where('ms_sekolah_id',$idSekolah)->first();
+                $penilaian = Penilaian::where('key',$data->key)->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('key',$data->key)->where('ms_sekolah_id',$idSekolah)->first();
+            // }
+
             
             // dd();
 
diff --git a/resources/views/modules/usulan/csak/form.blade.php b/resources/views/modules/usulan/csak/form.blade.php
index 720dd6e..33d1454 100644
--- a/resources/views/modules/usulan/csak/form.blade.php
+++ b/resources/views/modules/usulan/csak/form.blade.php
@@ -240,7 +240,7 @@
                                                                 <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
                                                             </div>
                                                             <div class="changeForm">
-                                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
+                                                                {!! formKriteria(1,$sekolah->MsSekolahId,'kota') !!}
                                                             </div>
                                                         </div>
                                                         @if(@$kuesioner->status < 4)
diff --git a/resources/views/modules/usulan/csan/form.blade.php b/resources/views/modules/usulan/csan/form.blade.php
index 59a66bb..9e024fb 100644
--- a/resources/views/modules/usulan/csan/form.blade.php
+++ b/resources/views/modules/usulan/csan/form.blade.php
@@ -298,7 +298,7 @@
                                                 <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
                                             </div>
                                             <div class="changeForm">
-                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
+                                                {!! formKriteria(1,$sekolah->MsSekolahId,'nasional') !!}
                                             </div>
                                         </div>
                                         <div class="col-md-4 mt-5 mx-auto">
diff --git a/resources/views/modules/usulan/csap/form.blade.php b/resources/views/modules/usulan/csap/form.blade.php
index 1646317..feca9b7 100644
--- a/resources/views/modules/usulan/csap/form.blade.php
+++ b/resources/views/modules/usulan/csap/form.blade.php
@@ -244,7 +244,7 @@
                                                                 <img src="{{ asset('assets/spinner.gif') }}" alt="Loading..." width="20">
                                                             </div>
                                                             <div class="changeForm">
-                                                                {!! formKriteria(1,$sekolah->MsSekolahId) !!}
+                                                                {!! formKriteria(1,$sekolah->MsSekolahId,'provinsi') !!}
                                                             </div>
                                                         </div>
                                                         @if(@$kuesioner->status <= 4)