diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php
index 38d098f..3aa6130 100644
--- a/app/Helpers/custom.php
+++ b/app/Helpers/custom.php
@@ -226,7 +226,11 @@ if (!function_exists('kuesionerLogStatus')) {
         if($plain == 'plain'){
             $progress = str_replace('_',' ',\Str::title($log->step));
         }else{
-            $progress = '<span class="badge bg-warning-light text-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
+            if($log->status == 11){
+                $progress = '<span class="badge bg-success-light text-success">Terbit SK</span>';
+            }else{
+                $progress = '<span class="badge bg-warning-light text-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
+            }
         }
         return $progress;
     }
@@ -716,6 +720,12 @@ if (!function_exists('formKriteria')) {
             $status = 1;
         }elseif(session('group_alias') == 'penilai_provinsi'){
             $status = 2;
+        }else{
+            if(@$type == 'kota'){
+                $status = 1;
+            }elseif(@$type == 'provinsi'){
+                $status = 2;
+            }
         }
 
         foreach($kriteria as $keyKriteria => $data){
diff --git a/app/Http/Controllers/Auth/CustomLoginController.php b/app/Http/Controllers/Auth/CustomLoginController.php
index a141ae7..854bafc 100644
--- a/app/Http/Controllers/Auth/CustomLoginController.php
+++ b/app/Http/Controllers/Auth/CustomLoginController.php
@@ -50,6 +50,7 @@ class CustomLoginController extends Controller
                         'telp'                      => @$user->profile->telp,
                         'currYear'                  => date('Y'),
                         'group_id'                  => @$user->ms_group_id,
+                        'kabupaten_id'              => @$user->ms_kabupaten_id,
                         'group_alias'               => @$user->group->alias,
                         'group_name'                => @$user->group->name,
                     ];
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index c59dd27..bebc4ed 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -66,7 +66,13 @@ class HomeController extends Controller
 
     public function gridUsulan(Request $request)
     {
-        $usulan = Kuesioner::where('tahun',date('Y'))->get();
+        if(session('kabupaten_id') != ''){
+            $usulan = Kuesioner::whereHas('sekolah',function($query){
+                $query->where('ms_kabupaten_id',session('kabupaten_id'));
+            })->where('tahun',date('Y'))->get();
+        }else{
+            $usulan = Kuesioner::where('tahun',date('Y'))->get();
+        }
         $_data = [];
         foreach ($usulan as $key => $row) {
             $action = '';
@@ -104,6 +110,7 @@ class HomeController extends Controller
                 'nama_sekolah'       => @$sekolah,
                 'npsn'               => @$row->sekolah->npsn,
                 'kab'                => @$row->sekolah->kabupaten->name,
+                'kecamatan'          => @$row->sekolah->kecamatan->name,
                 'usulan_sebelumnya'  => @$usulanAwal,
                 'pengajuan_usulan'   => @$jenis_usulan,
             ];
diff --git a/app/Http/Controllers/KuesionerController.php b/app/Http/Controllers/KuesionerController.php
index 8b4d78d..6fd937a 100644
--- a/app/Http/Controllers/KuesionerController.php
+++ b/app/Http/Controllers/KuesionerController.php
@@ -47,7 +47,14 @@ class KuesionerController extends Controller
 
     public function grid(Request $request)
     {
-        $kuesioner = Kuesioner::orderBy('created_at','DESC')->get();
+        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();
+        }
+
         foreach ($kuesioner as $key => $row) {
 
             $action = '';
@@ -81,6 +88,8 @@ class KuesionerController extends Controller
                 $status = '<span class="badge bg-success-light text-success">Sudah Diverifikasi</span>';
             }elseif($row->status == 2){
                 $status = '<span class="badge bg-danger-light text-danger">Ditolak</span>';
+            }elseif($row->status == 11){
+                $status = '<span class="badge bg-primary-light text-primary">Terbit SK</span>';
             }else{
                 $log  = KuesionerLog::where('kuesioner_id',$row->KuesionerId)->orderBy('created_at','DESC')->first();
                 $status = '<span class="badge bg-warning-light text-warning">'.str_replace('_',' ',\Str::title($log->step)).'</span>';
@@ -99,6 +108,7 @@ class KuesionerController extends Controller
                 'nama'              => $sekolah,
                 'status_level'      => '<span style="width:100%" class="badge bg-success-light text-success">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->sekolah->kabupaten->name,
+                'kecamatan'         => $row->sekolah->kecamatan->name,
                 'alamat_sekolah'    => $row->sekolah->alamat_sekolah,
                 'tingkat_sekolah'   => $row->sekolah->tingkat->name,
                 'status_sekolah'    => $row->sekolah->status,
diff --git a/app/Http/Controllers/Management/UserController.php b/app/Http/Controllers/Management/UserController.php
index 10229cb..ee84e10 100644
--- a/app/Http/Controllers/Management/UserController.php
+++ b/app/Http/Controllers/Management/UserController.php
@@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use App\Models\User;
 use App\Models\Master\MasterGroup;
+use App\Models\Master\Kabupaten;
 use App\Models\ProfileSekolah as Profile;
 
 class UserController extends Controller
@@ -62,6 +63,7 @@ class UserController extends Controller
             'role'              => @$row->group->name,
             'username'          => @$row->username,
             'email'             => @$row->email,
+            'wilayah'           => @$row->kabupaten->name,
             'created_at'        => dateTime(@$row->created_at),
             'action'            => @$action,
         ];
@@ -95,6 +97,7 @@ class UserController extends Controller
                     'email'           => 'required|unique:users,email,'.$keyId.'|email',
                     'name'            => 'required|max:50',
                     'group'           => 'required',
+                    'ms_kabupaten_id' => 'required',
                     'username'        => 'required|unique:users,username,'.$keyId,
                     'password'        => 'nullable|min:8|regex:/[a-z]/|regex:/[A-Z]/|regex:/[0-9]/|regex:/[@$!%*#?&]/', //min 8 char, maks 15 char, min 1 symbol, min 1 uppercase, min 1 lowercase, 1 number
                 ],[
@@ -104,9 +107,10 @@ class UserController extends Controller
                 ])->validate();
 
                 $user = User::find($keyId);
-                $user->email = $request->email;
-                $user->username = $request->username;
-                $user->ms_group_id = decode_id($request->group);
+                $user->email            = $request->email;
+                $user->username         = $request->username;
+                $user->ms_group_id      = decode_id($request->group);
+                $user->ms_kabupaten_id  = decode_id($request->ms_kabupaten_id);
                 if(@$request->password){
                     $user->password = Hash::make($request->password);
                 }
@@ -117,6 +121,7 @@ class UserController extends Controller
                     'email'           => 'required|unique:users,email|email',
                     'name'            => 'required|max:50',
                     'group'           => 'required',
+                    'ms_kabupaten_id' => 'required',
                     'username'        => 'required|unique:users,username',
                     'password'        => 'required|min:8|regex:/[a-z]/|regex:/[A-Z]/|regex:/[0-9]/|regex:/[@$!%*#?&]/', //min 8 char, maks 15 char, min 1 symbol, min 1 uppercase, min 1 lowercase, 1 number
                 ],[
@@ -126,9 +131,10 @@ class UserController extends Controller
                 ])->validate();
 
                 $user = new User;
-                $user->email = $request->email;
-                $user->username = $request->username;
-                $user->ms_group_id = decode_id($request->group);
+                $user->email            = $request->email;
+                $user->username         = $request->username;
+                $user->ms_group_id      = decode_id($request->group);
+                $user->ms_kabupaten_id  = decode_id($request->ms_kabupaten_id);
                 if(@$request->password){
                     $user->password = Hash::make($request->password);
                 }
@@ -181,6 +187,7 @@ class UserController extends Controller
         $data['keyId'] = $id;
         $data['item'] = User::with('profile')->where('id',$keyId)->first();
         $data['group'] = MasterGroup::where('MsGroupId','!=',1)->get();
+        $data['kabupaten'] = Kabupaten::all();
         return view($this->template.'.form',$data);
     }
 
@@ -231,6 +238,7 @@ class UserController extends Controller
                         'telp'                      => @$user->profile->telp,
                         'currYear'                  => date('Y'),
                         'group_id'                  => @$user->ms_group_id,
+                        'kabupaten_id'              => @$user->ms_kabupaten_id,
                         'group_alias'               => @$user->group->alias,
                         'group_name'                => @$user->group->name,
                     ];
diff --git a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php
index 3e0507a..00985d6 100644
--- a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php
+++ b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php
@@ -32,7 +32,13 @@ class AdministrasiController extends Controller
         if(session('group_alias') == 'sekolah'){
             $kuesioner = Kuesioner::where('ms_sekolah_id',session('sekolah_id'))->where('tahun',date('Y'))->orderBy('created_at','DESC')->get();
         }else{
-            $kuesioner = Kuesioner::where('tahun',date('Y'))->orderBy('created_at','DESC')->get();    
+            if(session('kabupaten_id') != ''){
+                $kuesioner = Kuesioner::whereHas('sekolah',function($query){
+                    $query->where('ms_kabupaten_id',session('kabupaten_id'));
+                })->where('tahun',date('Y'))->orderBy('created_at','DESC')->get();
+            }else{
+                $kuesioner = Kuesioner::where('tahun',date('Y'))->orderBy('created_at','DESC')->get();
+            }
         }
         
         foreach ($kuesioner as $key => $row) {
@@ -144,6 +150,7 @@ class AdministrasiController extends Controller
                 'labelDok'          => $labelDok,
                 'status_level'      => '<span style="width:100%" class="badge bg-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->sekolah->kabupaten->name,
+                'kecamatan'         => $row->sekolah->kecamatan->name,
                 'penghargaan'       => $penghargaan,
                 'jenis_usulan'      => '<span class="badge bg-success-light">'.$jenis_usulan.'</span>',
                 'usulan'            => $fileUsulan,
diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php
index 3717e24..da0fed1 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAKController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php
@@ -77,14 +77,23 @@ class CSAKController extends Controller
 
     public function grid(Request $request)
     {
-        $kuesioner = Kuesioner::where('level',0)->orderBy('created_at','DESC')->get();
+        // $kuesioner = Kuesioner::where('level',0)->orderBy('created_at','DESC')->get();
+
+        if(session('kabupaten_id') != ''){
+            $kuesioner = Kuesioner::where('level',0)->whereHas('sekolah',function($query){
+                $query->where('ms_kabupaten_id',session('kabupaten_id'));
+            })->where('tahun',date('Y'))->orderBy('created_at','DESC')->get();
+        }else{
+            $kuesioner = Kuesioner::where('level',0)->where('tahun',date('Y'))->orderBy('created_at','DESC')->get();
+        }
+
         foreach ($kuesioner as $key => $row) {
 
             $action = '';
             if((access('is_create', $this->route.'.*')) || (access('is_update', $this->route.'.*'))){
-                if($row->status == 3){
+                // if($row->status == 3){
                     $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>';
-                }
+                // }
             }
 
             if($row->level == 0){
@@ -128,6 +137,7 @@ class CSAKController extends Controller
                 'nama'              => $sekolah,
                 'status_level'      => '<span style="width:100%" class="badge bg-secondary text-secondary">Level '.levelAdiwiyata($row->npsn).'</span>',
                 'wilayah'           => $row->sekolah->kabupaten->name,
+                'kecamatan'         => $row->sekolah->kecamatan->name,
                 'penghargaan'       => $penghargaan,
                 'penilaian'         => $penilaian,
                 'progress'          => kuesionerLogStatus($row->KuesionerId),
diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php
index d3cecf0..5b11bc5 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAPController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php
@@ -78,7 +78,14 @@ class CSAPController extends Controller
 
     public function grid(Request $request)
     {
-        $kuesioner = Kuesioner::where('level',1)->orderBy('created_at','DESC')->get();
+        if(session('kabupaten_id') != ''){
+            $kuesioner = Kuesioner::where('level',1)->whereHas('sekolah',function($query){
+                $query->where('ms_kabupaten_id',session('kabupaten_id'));
+            })->where('tahun',date('Y'))->orderBy('created_at','DESC')->get();
+        }else{
+            $kuesioner = Kuesioner::where('level',1)->where('tahun',date('Y'))->orderBy('created_at','DESC')->get();
+        }
+
         foreach ($kuesioner as $key => $row) {
 
             $action = '';
@@ -133,6 +140,7 @@ class CSAPController extends Controller
                 'npsn'              => $row->sekolah->npsn,
                 'nama'              => $sekolah,
                 'wilayah'           => $row->sekolah->kabupaten->name,
+                'kecamatan'         => $row->sekolah->kecamatan->name,
                 'penilaian'         => $penilaian,
                 'progress'          => kuesionerLogStatus($row->KuesionerId),
                 'action'            => $action,
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 9a9422e..d44f9a8 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -59,7 +59,11 @@ class ProfileController extends Controller
     public function grid(Request $request)
     {
         $profile = Profile::groupBy('ms_sekolah_id')->pluck('ms_sekolah_id')->toArray();
-        $sekolah = Sekolah::whereIn('MsSekolahId',$profile)->get();
+        if(session('kabupaten_id') != ''){
+            $sekolah = Sekolah::whereIn('MsSekolahId',$profile)->where('ms_kabupaten_id',session('kabupaten_id'))->get();
+        }else{
+            $sekolah = Sekolah::whereIn('MsSekolahId',$profile)->get();
+        }
         foreach ($sekolah as $key => $row) {
 
             $action = '';
@@ -114,6 +118,7 @@ class ProfileController extends Controller
                 'npsn'              => $row->npsn,
                 'nama'              => $row->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,
                 'tanggal_level'     => '-',
                 'penghargaan'       => $penghargaan,
diff --git a/app/Models/User.php b/app/Models/User.php
index f5312d0..b9574d1 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -55,4 +55,9 @@ class User extends Authenticatable
     {
         return $this->belongsTo(\App\Models\Master\MasterGroup::class,'ms_group_id','MsGroupId');
     }
+
+    public function kabupaten()
+    {
+        return $this->belongsTo(\App\Models\Master\Kabupaten::class,'ms_kabupaten_id','MsKabupatenId');
+    }
 }
diff --git a/database/migrations/2025_08_07_090555_add_column_kabupaten_id.php b/database/migrations/2025_08_07_090555_add_column_kabupaten_id.php
new file mode 100644
index 0000000..fcacf03
--- /dev/null
+++ b/database/migrations/2025_08_07_090555_add_column_kabupaten_id.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->integer('ms_kabupaten_id')->nullable();
+            $table->foreign('ms_kabupaten_id')->references('MsKabupatenId')->on('ms_kabupaten')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            //
+        });
+    }
+};
diff --git a/resources/views/modules/dashboard/admin.blade.php b/resources/views/modules/dashboard/admin.blade.php
index 3b974e9..99cacf7 100644
--- a/resources/views/modules/dashboard/admin.blade.php
+++ b/resources/views/modules/dashboard/admin.blade.php
@@ -179,6 +179,7 @@
                                   <th data-field="npsn">NPSN</th>
                                   <th data-field="nama_sekolah">Nama Sekolah</th>
                                   <th data-field="kab">Kab/Kota</th>
+                                  <th data-field="kecamatan">Kecamatan</th>
                                   <th data-field="usulan_sebelumnya">Usulan Sebelumnya</th>
                                   <th data-field="pengajuan_usulan">Pengajuan Usulan</th>
                                 </tr>
diff --git a/resources/views/modules/kuesioner/index.blade.php b/resources/views/modules/kuesioner/index.blade.php
index 33a009a..f979b8d 100644
--- a/resources/views/modules/kuesioner/index.blade.php
+++ b/resources/views/modules/kuesioner/index.blade.php
@@ -135,6 +135,7 @@
                           <th data-field="npsn">NPSN</th>
                           <th data-field="nama">Nama Sekolah</th>
                           <th data-field="wilayah">Wilayah</th>
+                          <th data-field="kecamatan">Kecamatan</th>
                           <!-- <th data-field="penghargaan">Penghargaan Terakhir</th> -->
                           <th data-field="status">Status</th>
                         </tr>
diff --git a/resources/views/modules/management/user/form.blade.php b/resources/views/modules/management/user/form.blade.php
index decb884..61958f9 100644
--- a/resources/views/modules/management/user/form.blade.php
+++ b/resources/views/modules/management/user/form.blade.php
@@ -77,6 +77,22 @@
                             </div>
                         </div>
                     </div>
+                    <div class="col-12 mb-3">
+                        <div class="form-group">
+                            <label class="col-xl-12 form-label" for="fname">Wilayah</label>
+                            <div class="col-12 pr-1">
+                                <select name="ms_kabupaten_id" class="form-control @error('ms_kabupaten_id') is-invalid @enderror" required>
+                                    <option value="">-Pilih Wilayah-</option>
+                                    @foreach($kabupaten as $data_kabupaten)
+                                        <option {{@$item->ms_kabupaten_id == $data_kabupaten->MsKabupatenId ? 'selected' : ''}} value="{{encode_id($data_kabupaten->MsKabupatenId)}}">{{$data_kabupaten->name}}</option>
+                                    @endforeach
+                                </select>
+                                @error('ms_kabupaten_id')
+                                <span class="invalid-feedback" style="display: block!important;"><strong>{{$message}}</strong></span>
+                                @enderror
+                            </div>
+                        </div>
+                    </div>
                     <div class="col-12 mb-3">
                         <div class="form-group">
                             <label class="col-xl-12 form-label">Password Baru</label>
diff --git a/resources/views/modules/management/user/index.blade.php b/resources/views/modules/management/user/index.blade.php
index 5c103ab..518ba67 100644
--- a/resources/views/modules/management/user/index.blade.php
+++ b/resources/views/modules/management/user/index.blade.php
@@ -52,6 +52,7 @@
                           <th data-field="role">Role</th>
                           <th data-field="email">Email</th>
                           <th data-field="name">Name</th>
+                          <th data-field="wilayah">Wilayah</th>
                           <th data-field="created_at">Created At</th>
                         </tr>
                       </thead>
diff --git a/resources/views/modules/profile/admin.blade.php b/resources/views/modules/profile/admin.blade.php
index 52c1a8a..71d2687 100644
--- a/resources/views/modules/profile/admin.blade.php
+++ b/resources/views/modules/profile/admin.blade.php
@@ -134,6 +134,7 @@
                           <th data-field="npsn">NPSN</th>
                           <th data-field="nama">Nama Sekolah</th>
                           <th data-field="wilayah">Wilayah</th>
+                          <th data-field="kecamatan">Kecamatan</th>
                           <th data-field="status_level">Status Level</th>
                           <!-- <th data-field="tanggal_level">Tanggal Level</th> -->
                           <!-- <th data-field="penghargaan">Penghargaan Terakhir</th> -->
diff --git a/resources/views/modules/usulan/administrasi/index.blade.php b/resources/views/modules/usulan/administrasi/index.blade.php
index 2afd344..645439b 100644
--- a/resources/views/modules/usulan/administrasi/index.blade.php
+++ b/resources/views/modules/usulan/administrasi/index.blade.php
@@ -135,6 +135,7 @@
                           <th data-field="npsn">NPSN</th>
                           <th data-field="nama">Nama Sekolah</th>
                           <th data-field="wilayah">Wilayah</th>
+                          <th data-field="kecamatan">Kecamatan</th>
                           <th data-field="usulan" width="60%">File</th>
                           <th data-field="labelDok">Status</th>
                         </tr>
diff --git a/resources/views/modules/usulan/csak/form.blade.php b/resources/views/modules/usulan/csak/form.blade.php
index 1f8bbfc..fe90840 100644
--- a/resources/views/modules/usulan/csak/form.blade.php
+++ b/resources/views/modules/usulan/csak/form.blade.php
@@ -243,10 +243,12 @@
                                                                 {!! formKriteria(1,$sekolah->MsSekolahId,'kota') !!}
                                                             </div>
                                                         </div>
-                                                        @if(@$kuesioner->status < 4)
-                                                            <div class="col-md-12 mt-3">
-                                                                <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
-                                                            </div>
+                                                        @if(session('group_id') == 6)
+                                                            @if(@$kuesioner->status < 4)
+                                                                <div class="col-md-12 mt-3">
+                                                                    <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
+                                                                </div>
+                                                            @endif
                                                         @endif
                                                     </div>
                                                 </div>
@@ -288,10 +290,12 @@
                                                         <textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
                                                     </div>
                                                 </div>
-                                                @if(@$kuesioner->status < 4)
-                                                <div class="col-md-12 my-2">
-                                                    <button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
-                                                </div>
+                                                @if(session('group_id') == 6)
+                                                    @if(@$kuesioner->status < 4)
+                                                        <div class="col-md-12 my-2">
+                                                            <button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
+                                                        </div>
+                                                    @endif
                                                 @endif
                                             </div>
                                         </div>
diff --git a/resources/views/modules/usulan/csak/index.blade.php b/resources/views/modules/usulan/csak/index.blade.php
index 41369b4..a4edc89 100644
--- a/resources/views/modules/usulan/csak/index.blade.php
+++ b/resources/views/modules/usulan/csak/index.blade.php
@@ -134,6 +134,7 @@
                           <th data-field="npsn">NPSN</th>
                           <th data-field="nama">Nama Sekolah</th>
                           <th data-field="wilayah">Wilayah</th>
+                          <th data-field="kecamatan">Kecamatan</th>
                           <!-- <th data-field="tingkat_sekolah">Dokumen Administrasi</th> -->
                           <th data-field="penilaian">Pemenuhan Kriteria</th>
                           <th data-field="progress">Progress</th>
diff --git a/resources/views/modules/usulan/csap/form.blade.php b/resources/views/modules/usulan/csap/form.blade.php
index 4f7a863..2eaa7fc 100644
--- a/resources/views/modules/usulan/csap/form.blade.php
+++ b/resources/views/modules/usulan/csap/form.blade.php
@@ -247,10 +247,12 @@
                                                                 {!! formKriteria(1,$sekolah->MsSekolahId,'provinsi') !!}
                                                             </div>
                                                         </div>
-                                                        @if(@$kuesioner->status <= 4)
-                                                            <div class="col-md-12 mt-3">
-                                                                <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
-                                                            </div>
+                                                        @if(session('group_id') == 7)
+                                                            @if(@$kuesioner->status <= 4)
+                                                                <div class="col-md-12 mt-3">
+                                                                    <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
+                                                                </div>
+                                                            @endif
                                                         @endif
                                                     </div>
                                                 </div>
@@ -296,10 +298,12 @@
                                                         <textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
                                                     </div>
                                                 </div>
-                                                @if(@$kuesioner->status <= 4)
-                                                <div class="col-md-12 my-2">
-                                                    <button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
-                                                </div>
+                                                @if(session('group_id') == 7)
+                                                    @if(@$kuesioner->status <= 4)
+                                                        <div class="col-md-12 my-2">
+                                                            <button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
+                                                        </div>
+                                                    @endif
                                                 @endif
                                             </div>
                                         </div>
diff --git a/resources/views/modules/usulan/csap/index.blade.php b/resources/views/modules/usulan/csap/index.blade.php
index 41369b4..a4edc89 100644
--- a/resources/views/modules/usulan/csap/index.blade.php
+++ b/resources/views/modules/usulan/csap/index.blade.php
@@ -134,6 +134,7 @@
                           <th data-field="npsn">NPSN</th>
                           <th data-field="nama">Nama Sekolah</th>
                           <th data-field="wilayah">Wilayah</th>
+                          <th data-field="kecamatan">Kecamatan</th>
                           <!-- <th data-field="tingkat_sekolah">Dokumen Administrasi</th> -->
                           <th data-field="penilaian">Pemenuhan Kriteria</th>
                           <th data-field="progress">Progress</th>