From 06f0dcc46c87c7eb2e3f3fba4e14de5d418a9d84 Mon Sep 17 00:00:00 2001
From: Ilham Wara Nugroho <ilhamwara@gmail.com>
Date: Thu, 15 Jan 2026 15:22:10 +0700
Subject: [PATCH] update

---
 .../Modules/Usulan/AdministrasiController.php          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php
index 8f8dfed..a7d4d0b 100644
--- a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php
+++ b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php
@@ -34,11 +34,11 @@ class AdministrasiController extends Controller
             $kuesioner = Kuesioner::where('tahun',date('Y'))->where('ms_sekolah_id',session('sekolah_id'))->orderBy('created_at','DESC');
         }else{
             if(session('kabupaten_id') != ''){
-                $kuesioner = Kuesioner::where('tahun',date('Y'))->whereHas('sekolah',function($query){
+                $kuesioner = Kuesioner::whereHas('sekolah',function($query){
                     $query->where('ms_kabupaten_id',session('kabupaten_id'));
                 })->orderBy('created_at','DESC');
             }else{
-                $kuesioner = Kuesioner::where('tahun',date('Y'))->orderBy('created_at','DESC');
+                $kuesioner = Kuesioner::orderBy('created_at','DESC');
             }
         }
 
@@ -56,7 +56,9 @@ class AdministrasiController extends Controller
             $kuesioner->where('level',(request()->level-1));
         }
         if(@request()->tahun){
-            $kuesioner->where('tahun',request()->tahun);
+            $tahun = request()->tahun;
+        }else{
+            $tahun = date('Y');
         }
         if(@request()->provinsi != 0){
             $kuesioner->whereHas('sekolah',function($query){
@@ -73,6 +75,8 @@ class AdministrasiController extends Controller
                 $query->where('kecamatan',request()->kecamatan);
             });
         }
+
+        $kuesioner->where('tahun',$tahun);
         
         foreach ($kuesioner->get() as $key => $row) {