diff --git a/app/Http/Controllers/KuesionerController.php b/app/Http/Controllers/KuesionerController.php
index 9314291..8b372d6 100644
--- a/app/Http/Controllers/KuesionerController.php
+++ b/app/Http/Controllers/KuesionerController.php
@@ -51,15 +51,36 @@ class KuesionerController extends Controller
     public function grid(Request $request)
     {
         $_data = [];
+
         if(session('kabupaten_id') != ''){
             $kuesioner = Kuesioner::whereHas('sekolah',function($query){
                 $query->where('ms_kabupaten_id',session('kabupaten_id'));
-            })->where('tahun',date('Y'))->get();
+            });
         }else{
-            $kuesioner = Kuesioner::where('tahun',date('Y'))->get();
+            $kuesioner = Kuesioner::where('tahun',date('Y'));
         }
 
-        foreach ($kuesioner as $key => $row) {
+        
+        if(@request()->kabupaten != 0){
+            $kuesioner->whereHas('sekolah',function($query) use ($request){
+                $query->where('ms_kabupaten_id',decode_id($request->kabupaten));
+            });
+        }
+
+        if(@request()->kecamatan != 0){
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('ms_kecamatan_id',decode_id(request()->kecamatan));
+            });
+        }
+
+        if(@request()->tingkat){
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('ms_tingkat_sekolah_id',request()->tingkat);
+            });
+        }
+        
+
+        foreach ($kuesioner->get() as $key => $row) {
 
             $action = '';
 
diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php
index f5762d5..54a66dd 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAKController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Modules\Usulan;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use App\Models\Master\Provinsi;
+use App\Models\Master\Kabupaten;
 use App\Models\Kuesioner;
 use App\Models\KuesionerLog;
 use App\Models\Master\Sekolah;
@@ -26,6 +27,7 @@ class CSAKController extends Controller
         $data['route'] = $this->route;
         $data['title'] = $this->title;
         $data['provinsi'] = Provinsi::where('kode_wilayah','010000')->get();
+        $data['kabupaten'] = Kabupaten::where('ms_provinsi_id','15')->get();
 
         return view($this->template.'.index',$data);
     }
@@ -83,12 +85,30 @@ class CSAKController extends Controller
         if(session('kabupaten_id') != ''){
             $kuesioner = Kuesioner::where('level',0)->whereHas('sekolah',function($query){
                 $query->where('ms_kabupaten_id',session('kabupaten_id'));
-            })->orderBy('created_at','DESC')->get();
+            })->orderBy('created_at','DESC');
         }else{
-            $kuesioner = Kuesioner::where('level',0)->orderBy('created_at','DESC')->get();
+            $kuesioner = Kuesioner::where('level',0)->orderBy('created_at','DESC');
         }
 
-        foreach ($kuesioner as $key => $row) {
+        if(@request()->kabupaten != 0){
+            $kuesioner->whereHas('sekolah',function($query) use ($request){
+                $query->where('ms_kabupaten_id',decode_id($request->kabupaten));
+            });
+        }
+
+        if(@request()->kecamatan != 0){
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('ms_kecamatan_id',decode_id(request()->kecamatan));
+            });
+        }
+
+        if(@request()->tingkat){
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('ms_tingkat_sekolah_id',request()->tingkat);
+            });
+        }
+
+        foreach ($kuesioner->get() as $key => $row) {
 
             $action = '';
             if((access('is_create', $this->route.'.*')) || (access('is_update', $this->route.'.*'))){
diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php
index 69e9013..3a95bd2 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAPController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php
@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\Request;
 use App\Models\Master\Provinsi;
+use App\Models\Master\Kabupaten;
 use App\Models\Kuesioner;
 use App\Models\KuesionerLog;
 use App\Models\Master\Sekolah;
@@ -29,6 +30,7 @@ class CSAPController extends Controller
         $data['route'] = $this->route;
         $data['title'] = $this->title;
         $data['provinsi'] = Provinsi::where('kode_wilayah','010000')->get();
+        $data['kabupaten'] = Kabupaten::where('ms_provinsi_id','15')->get();
 
         return view($this->template.'.index',$data);
     }
@@ -89,12 +91,30 @@ class CSAPController extends Controller
         if(session('kabupaten_id') != ''){
             $kuesioner = Kuesioner::where('level',1)->whereHas('sekolah',function($query){
                 $query->where('ms_kabupaten_id',session('kabupaten_id'));
-            })->orderBy('created_at','DESC')->get();
+            })->orderBy('created_at','DESC');
         }else{
-            $kuesioner = Kuesioner::where('level',1)->orderBy('created_at','DESC')->get();
+            $kuesioner = Kuesioner::where('level',1)->orderBy('created_at','DESC');
         }
 
-        foreach ($kuesioner as $key => $row) {
+        if(@request()->kabupaten != 0){
+            $kuesioner->whereHas('sekolah',function($query) use ($request){
+                $query->where('ms_kabupaten_id',decode_id($request->kabupaten));
+            });
+        }
+
+        if(@request()->kecamatan != 0){
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('ms_kecamatan_id',decode_id(request()->kecamatan));
+            });
+        }
+
+        if(@request()->tingkat){
+            $kuesioner->whereHas('sekolah',function($query){
+                $query->where('ms_tingkat_sekolah_id',request()->tingkat);
+            });
+        }
+
+        foreach ($kuesioner->get() as $key => $row) {
 
             $action = '';
 
diff --git a/app/Models/Kuesioner.php b/app/Models/Kuesioner.php
index f1573ab..d166e43 100644
--- a/app/Models/Kuesioner.php
+++ b/app/Models/Kuesioner.php
@@ -13,27 +13,9 @@ class Kuesioner extends Model
     protected $primaryKey = 'KuesionerId';
     protected $guarded = [];
 
-    // protected $fillable = [
-    //     'ms_sekolah_id',
-    //     'level',
-    //     'tim_adiwiyata',
-    //     'info_pblhs',
-    //     'media',
-    //     'materi',
-    //     'komitmen',
-    //     'kegiatan_lingkungan',
-    //     'pihak_kegiatan_lingkungan',
-    //     'tahun',
-    //     'tahun_penghargaan',
-    //     'link_sk_adiwiyata',
-    //     'tim_adiwiyata_nomor_sk',
-    //     'tim_adiwiyata_link',
-    //     'created_by',
-    // ];
-
     public function sekolah()
     {
-        return $this->belongsTo(\App\Models\Master\Sekolah::class,'ms_sekolah_id','MsSekolahId');
+        return $this->belongsTo(\App\Models\Master\Sekolah::class,'ms_sekolah_id');
     }
 
     public function profile()
diff --git a/app/Models/Master/Sekolah.php b/app/Models/Master/Sekolah.php
index e914dc1..090c163 100644
--- a/app/Models/Master/Sekolah.php
+++ b/app/Models/Master/Sekolah.php
@@ -11,18 +11,19 @@ class Sekolah extends Model
 
     protected $table = 'ms_sekolah';
     protected $primaryKey = 'MsSekolahId';
-    protected $fillable = [
-        'ms_provinsi_id',
-        'ms_kabupaten_id',
-        'ms_kecamatan_id',
-        'ms_tingkat_sekolah_id',
-        'status',
-        'nama_sekolah',
-        'npsn',
-        'alamat_sekolah',
-        'lat',
-        'long',
-    ];
+    protected $guarded = [];
+    // protected $fillable = [
+    //     'ms_provinsi_id',
+    //     'ms_kabupaten_id',
+    //     'ms_kecamatan_id',
+    //     'ms_tingkat_sekolah_id',
+    //     'status',
+    //     'nama_sekolah',
+    //     'npsn',
+    //     'alamat_sekolah',
+    //     'lat',
+    //     'long',
+    // ];
 
     public function profile()
     {
diff --git a/resources/views/modules/kuesioner/index.blade.php b/resources/views/modules/kuesioner/index.blade.php
index 8780dee..ecf3c9e 100644
--- a/resources/views/modules/kuesioner/index.blade.php
+++ b/resources/views/modules/kuesioner/index.blade.php
@@ -71,7 +71,7 @@
                             </div>
                             <div class="w-100">
                                 <div class="form-group">
-                                    <select name="status_sekolah" class="form-control select2">
+                                    <select name="progress" class="form-control select2">
                                         <option value="">-- PILIH PROGRESS --</option>
                                         <option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
                                         <option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
diff --git a/resources/views/modules/usulan/csak/index.blade.php b/resources/views/modules/usulan/csak/index.blade.php
index dc48e0d..386fa73 100644
--- a/resources/views/modules/usulan/csak/index.blade.php
+++ b/resources/views/modules/usulan/csak/index.blade.php
@@ -17,26 +17,19 @@
                 <div class="row" id="pencarian">
                     
                     <div class="col-md-12 mb-2">
-                        <div class="row">
+                        <div class="d-flex flex-column flex-lg-row gap-2">
                             @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas'))
-                                <div class="col-md-3">
+                                <div class="w-100">
                                     <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>
+                                        <select name="kabupaten" class="form-control select2" id="kabupaten">
+                                            <option value="0">- PILIH WILAYAH -</option>
+                                            @foreach ($kabupaten as $datakabupaten)
+                                                <option value="{{ encode_id($datakabupaten->MsKabupatenId) }}">{{$datakabupaten->name}}</option>
                                             @endforeach
                                         </select>
                                     </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>
-                                </div>
-                                <div class="col-md-3">
+                                <div class="w-100">
                                     <div class="form-group">
                                         <select name="kecamatan" class="form-control select2" id="kecamatan" required>
                                             <option value="0">- PILIH KECAMATAN -</option>
@@ -45,7 +38,7 @@
                                 </div>
                             @else 
                                 @if(@$kecamatan)
-                                    <div class="col-md-3">
+                                    <div class="w-100">
                                         <div class="form-group">
                                             <select name="kecamatan" class="form-control select2" id="kecamatan" required>
                                                 <option value="0">- PILIH KECAMATAN -</option>
@@ -57,11 +50,8 @@
                                     </div> 
                                 @endif
                             @endif
-                        </div>
-                    </div>
-                    <div class="col-md-12 mb-2">
-                        <div class="row">
-                            <div class="col-md-3">
+
+                            <div class="w-100">
                                 <div class="form-group">
                                     <select name="tingkat" class="form-control select2">
                                         <option value="">-- PILIH TINGKAT --</option>
@@ -79,22 +69,34 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-md-3">
+                            <div class="w-100">
                                 <div class="form-group">
-                                    <select name="status_sekolah" class="form-control select2">
-                                        <option value="">-- PILIH STATUS --</option>
-                                        <option value="Negeri">Negeri</option>
-                                        <option value="Swasta">Swasta</option>
+                                    <select name="progress" class="form-control select2">
+                                        <option value="">-- PILIH PROGRESS --</option>
+                                        <option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
+                                        <option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
+                                        <option value="dikembalikan">Perbaikan Kuesioner Leveling</option>
+                                        <option value="sekolah_mengisi_form_pemenuhan_kriteria">Sekolah Mengisi Form Pemenuhan Kriteria</option>
+                                        <option value="penilaian_oleh_tim_penilai_kota">Penilaian Tim Penilai Kota</option>
+                                        <option value="dikembalikan_penilaian_kota">Dikembalikan Penilai Kota</option>
+                                        <option value="selesai_penilaian_kota">Selesai Penilai Kota</option>
+                                        <option value="selesai_penilaian_provinsi">Selesai Penilai Provinsi</option>
+                                        <option value="selesai_penilaian_tahap_akhir">Selesai Penilai Tahap Akhir</option>
+                                        <option value="terbit_sk">Terbit SK</option>
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-md-3">
+
+                            <div class="w-100">
                                 <div class="form-group">
                                     <button id="ok" class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
+
+
                         </div>
                     </div>
+
                 </div>
             </div>
         </div>
diff --git a/resources/views/modules/usulan/csap/index.blade.php b/resources/views/modules/usulan/csap/index.blade.php
index 8d17b97..4d718be 100644
--- a/resources/views/modules/usulan/csap/index.blade.php
+++ b/resources/views/modules/usulan/csap/index.blade.php
@@ -17,26 +17,19 @@
                 <div class="row" id="pencarian">
                     
                     <div class="col-md-12 mb-2">
-                        <div class="row">
+                        <div class="d-flex flex-column flex-lg-row gap-2">
                             @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas'))
-                                <div class="col-md-3">
+                                <div class="w-100">
                                     <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>
+                                        <select name="kabupaten" class="form-control select2" id="kabupaten">
+                                            <option value="0">- PILIH WILAYAH -</option>
+                                            @foreach ($kabupaten as $datakabupaten)
+                                                <option value="{{ encode_id($datakabupaten->MsKabupatenId) }}">{{$datakabupaten->name}}</option>
                                             @endforeach
                                         </select>
                                     </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>
-                                </div>
-                                <div class="col-md-3">
+                                <div class="w-100">
                                     <div class="form-group">
                                         <select name="kecamatan" class="form-control select2" id="kecamatan" required>
                                             <option value="0">- PILIH KECAMATAN -</option>
@@ -45,7 +38,7 @@
                                 </div>
                             @else 
                                 @if(@$kecamatan)
-                                    <div class="col-md-3">
+                                    <div class="w-100">
                                         <div class="form-group">
                                             <select name="kecamatan" class="form-control select2" id="kecamatan" required>
                                                 <option value="0">- PILIH KECAMATAN -</option>
@@ -57,11 +50,8 @@
                                     </div> 
                                 @endif
                             @endif
-                        </div>
-                    </div>
-                    <div class="col-md-12 mb-2">
-                        <div class="row">
-                            <div class="col-md-3">
+
+                            <div class="w-100">
                                 <div class="form-group">
                                     <select name="tingkat" class="form-control select2">
                                         <option value="">-- PILIH TINGKAT --</option>
@@ -79,22 +69,34 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-md-3">
+                            <div class="w-100">
                                 <div class="form-group">
-                                    <select name="status_sekolah" class="form-control select2">
-                                        <option value="">-- PILIH STATUS --</option>
-                                        <option value="Negeri">Negeri</option>
-                                        <option value="Swasta">Swasta</option>
+                                    <select name="progress" class="form-control select2">
+                                        <option value="">-- PILIH PROGRESS --</option>
+                                        <option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
+                                        <option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
+                                        <option value="dikembalikan">Perbaikan Kuesioner Leveling</option>
+                                        <option value="sekolah_mengisi_form_pemenuhan_kriteria">Sekolah Mengisi Form Pemenuhan Kriteria</option>
+                                        <option value="penilaian_oleh_tim_penilai_kota">Penilaian Tim Penilai Kota</option>
+                                        <option value="dikembalikan_penilaian_kota">Dikembalikan Penilai Kota</option>
+                                        <option value="selesai_penilaian_kota">Selesai Penilai Kota</option>
+                                        <option value="selesai_penilaian_provinsi">Selesai Penilai Provinsi</option>
+                                        <option value="selesai_penilaian_tahap_akhir">Selesai Penilai Tahap Akhir</option>
+                                        <option value="terbit_sk">Terbit SK</option>
                                     </select>
                                 </div>
                             </div>
-                            <div class="col-md-3">
+
+                            <div class="w-100">
                                 <div class="form-group">
                                     <button id="ok" class="btn btn-success btn-block"><i class="fal fa-search"></i>&nbsp;Cari Data</button>
                                 </div>
                             </div>
+
+
                         </div>
                     </div>
+
                 </div>
             </div>
         </div>