diff --git a/app/Http/Controllers/KuesionerController.php b/app/Http/Controllers/KuesionerController.php
index f865e0b..df14cbc 100644
--- a/app/Http/Controllers/KuesionerController.php
+++ b/app/Http/Controllers/KuesionerController.php
@@ -51,9 +51,9 @@ class KuesionerController extends Controller
         if(session('kabupaten_id') != ''){
             $kuesioner = Kuesioner::whereHas('sekolah',function($query){
                 $query->where('ms_kabupaten_id',session('kabupaten_id'));
-            })->where('tahun',date('Y'))->get();
+            })->get();
         }else{
-            $kuesioner = Kuesioner::where('tahun',date('Y'))->get();
+            $kuesioner = Kuesioner::all();
         }
 
         foreach ($kuesioner as $key => $row) {
@@ -62,10 +62,12 @@ class KuesionerController extends Controller
 
             if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){
                 $action .= '<a href="'.url('kuesioner/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-eye text-white"></i></a>';
-                if(session('group_alias') == 'dinas'){
-                    if($row->status == 0){
-                        $action .= '<a href="#" data-href="'.url('kuesioner/verifikasi/'.encode_id($row->KuesionerId)).'" data-toggle="tooltip" title="Verifikasi Data" class="btn btn-xs btn-block btn-success verifikasi"><i class="fal fa-check text-white"></i></a>';
-                        $action .= '<a href="#" data-href="'.url('kuesioner/tolak/'.encode_id($row->KuesionerId)).'" data-toggle="tooltip" title="Verifikasi Data" class="btn btn-xs btn-block btn-danger tolak"><i class="fal fa-times text-white"></i></a>';
+                if($row->tahun == date('Y')){
+                    if(session('group_alias') == 'dinas'){
+                        if($row->status == 0){
+                            $action .= '<a href="#" data-href="'.url('kuesioner/verifikasi/'.encode_id($row->KuesionerId)).'" data-toggle="tooltip" title="Verifikasi Data" class="btn btn-xs btn-block btn-success verifikasi"><i class="fal fa-check text-white"></i></a>';
+                            $action .= '<a href="#" data-href="'.url('kuesioner/tolak/'.encode_id($row->KuesionerId)).'" data-toggle="tooltip" title="Verifikasi Data" class="btn btn-xs btn-block btn-danger tolak"><i class="fal fa-times text-white"></i></a>';
+                        }
                     }
                 }
             }
@@ -113,6 +115,7 @@ class KuesionerController extends Controller
                 'alamat_sekolah'    => $row->sekolah->alamat_sekolah,
                 'tingkat_sekolah'   => $row->sekolah->tingkat->name,
                 'status_sekolah'    => $row->sekolah->status,
+                'tahun'             => $row->tahun,
                 'alamat_sekolah'    => $row->profile->alamat_sekolah,
                 'penghargaan'       => $penghargaan,
                 'status'            => $status,
diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php
index 29ada90..c280a35 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAKController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php
@@ -92,7 +92,9 @@ class CSAKController extends Controller
             $action = '';
             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>';
+                }
                 // }
             }
 
diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php
index 24c7533..b79c7fb 100644
--- a/app/Http/Controllers/Modules/Usulan/CSAPController.php
+++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php
@@ -91,7 +91,9 @@ class CSAPController extends Controller
             $action = '';
 
             if((access('is_create', $this->route.'.*')) || (access('is_update', $this->route.'.*'))){
-                $action .= '<a href="'.url('usulan/csap/update/'.encode_id($row->ms_sekolah_id)).'" data-toggle="tooltip" title="View Data" class="btn btn-xs btn-block btn-primary"><i class="fal fa-edit text-white"></i></a>';
+                if($row->tahun == date('Y')){
+                    $action .= '<a href="'.url('usulan/csap/update/'.encode_id($row->ms_sekolah_id)).'" data-toggle="tooltip" title="View Data" class="btn btn-xs btn-block btn-primary"><i class="fal fa-edit text-white"></i></a>';
+                }
             }
 
             if($row->level == 0){