diff --git a/app/Models/Kuesioner.php b/app/Models/Kuesioner.php
index 5be35d0..2ff075a 100644
--- a/app/Models/Kuesioner.php
+++ b/app/Models/Kuesioner.php
@@ -20,13 +20,13 @@ class Kuesioner extends Model
 
             $role = session('group_alias'); // misal: dinas_pendidikan atau kemenag
 
-            if ($role == 'dinas_pendidikan') {
+            if (($role == 'dinas_pendidikan') || ($role == 'penilai_disdik')) {
 
                 $builder->whereHas('sekolah', function ($q) {
                     $q->where('is_kemenag', false);
                 });
 
-            } elseif ($role == 'kemenag') {
+            } elseif (($role == 'kemenag') || ($role == 'penilai_kemenag')) {
 
                 $builder->whereHas('sekolah', function ($q) {
                     $q->where('is_kemenag', true);
diff --git a/app/Models/Penilaian.php b/app/Models/Penilaian.php
index 2c9f369..695bbe4 100644
--- a/app/Models/Penilaian.php
+++ b/app/Models/Penilaian.php
@@ -28,8 +28,34 @@ class Penilaian extends Model
     //     'level_adiwiyata',
     // ];
 
+    protected static function booted()
+    {
+        static::addGlobalScope('filterSekolah', function (Builder $builder) {
+
+            $role = session('group_alias'); // misal: dinas_pendidikan atau kemenag
+
+            if (($role == 'dinas_pendidikan') || ($role == 'penilai_disdik')) {
+
+                $builder->whereHas('sekolah', function ($q) {
+                    $q->where('is_kemenag', false);
+                });
+
+            } elseif (($role == 'kemenag') || ($role == 'penilai_kemenag')) {
+
+                $builder->whereHas('sekolah', function ($q) {
+                    $q->where('is_kemenag', true);
+                });
+            }
+        });
+    }
+
     public function page()
     {
         return $this->belongsTo(\App\Models\Master\FormKriteria::class,'page_number','page_number');
     }
+
+    public function sekolah()
+    {
+        return $this->belongsTo(\App\Models\Master\Sekolah::class,'ms_sekolah_id','MsSekolahId');
+    }
 }
diff --git a/app/Models/ProfileSekolah.php b/app/Models/ProfileSekolah.php
index 998f4d9..3ccf663 100644
--- a/app/Models/ProfileSekolah.php
+++ b/app/Models/ProfileSekolah.php
@@ -13,6 +13,27 @@ class ProfileSekolah extends Model
     
     protected $guarded = [];
 
+    protected static function booted()
+    {
+        static::addGlobalScope('filterSekolah', function (Builder $builder) {
+
+            $role = session('group_alias'); // misal: dinas_pendidikan atau kemenag
+
+            if (($role == 'dinas_pendidikan') || ($role == 'penilai_disdik')) {
+
+                $builder->whereHas('sekolah', function ($q) {
+                    $q->where('is_kemenag', false);
+                });
+
+            } elseif (($role == 'kemenag') || ($role == 'penilai_kemenag')) {
+
+                $builder->whereHas('sekolah', function ($q) {
+                    $q->where('is_kemenag', true);
+                });
+            }
+        });
+    }
+
     public function tingkat()
     {
         return $this->belongsTo(\App\Models\Master\MasterTingkatSekolah::class,'ms_tingkat_sekolah_id','MsTingkatSekolahId');
diff --git a/app/Models/SampahBelumTerkelola.php b/app/Models/SampahBelumTerkelola.php
index a88f88e..526d8de 100644
--- a/app/Models/SampahBelumTerkelola.php
+++ b/app/Models/SampahBelumTerkelola.php
@@ -20,13 +20,13 @@ class SampahBelumTerkelola extends Model
 
             $role = session('group_alias'); // misal: dinas_pendidikan atau kemenag
 
-            if ($role == 'dinas_pendidikan') {
+            if (($role == 'dinas_pendidikan') || ($role == 'penilai_disdik')) {
 
                 $builder->whereHas('sekolah', function ($q) {
                     $q->where('is_kemenag', false);
                 });
 
-            } elseif ($role == 'kemenag') {
+            } elseif (($role == 'kemenag') || ($role == 'penilai_kemenag')) {
 
                 $builder->whereHas('sekolah', function ($q) {
                     $q->where('is_kemenag', true);
diff --git a/app/Models/SampahTerkelola.php b/app/Models/SampahTerkelola.php
index b9d5ce7..4178819 100644
--- a/app/Models/SampahTerkelola.php
+++ b/app/Models/SampahTerkelola.php
@@ -20,13 +20,13 @@ class SampahTerkelola extends Model
 
             $role = session('group_alias'); // misal: dinas_pendidikan atau kemenag
 
-            if ($role == 'dinas_pendidikan') {
+            if (($role == 'dinas_pendidikan') || ($role == 'penilai_disdik')) {
 
                 $builder->whereHas('sekolah', function ($q) {
                     $q->where('is_kemenag', false);
                 });
 
-            } elseif ($role == 'kemenag') {
+            } elseif (($role == 'kemenag') || ($role == 'penilai_kemenag')) {
 
                 $builder->whereHas('sekolah', function ($q) {
                     $q->where('is_kemenag', true);