From f5af8aba64551f46e4be99652d4691ae6d22c38d Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Thu, 16 Jul 2026 11:00:09 +0700 Subject: [PATCH] update --- app/Helpers/custom.php | 4 ++-- app/Http/Controllers/Modules/Usulan/CSAPController.php | 4 ++-- app/Http/Controllers/Modules/Usulan/KriteriaController.php | 4 ++-- database/seeders/DatabaseSeeder.php | 4 ++++ resources/views/modules/kuesioner/index.blade.php | 2 +- resources/views/modules/profile/admin.blade.php | 2 +- resources/views/modules/usulan/csak/index.blade.php | 2 +- resources/views/modules/usulan/csap/form.blade.php | 4 ++-- resources/views/modules/usulan/csap/index.blade.php | 2 +- resources/views/pdf/dokumen.blade.php | 2 +- 10 files changed, 17 insertions(+), 13 deletions(-) diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php index 942c5f2..1596df2 100644 --- a/app/Helpers/custom.php +++ b/app/Helpers/custom.php @@ -1451,7 +1451,7 @@ if (!function_exists('formKriteria')) { $status = 0; }elseif(session('group_alias') == 'penilai_kota'){ $status = 1; - }elseif(session('group_alias') == 'penilai_provinsi'){ + }elseif((session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag')){ $status = 2; }else{ if(@$type == 'kota'){ @@ -1587,7 +1587,7 @@ if (!function_exists('formKriteria')) { $lainnya = Penilaian::where('key','lainnya')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',1)->first(); $lainnyaOld = Penilaian::where('key','lainnya')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',0)->first(); - }elseif(session('group_alias') == 'penilai_provinsi'){ + }elseif((session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag')){ $lainnya = Penilaian::where('key','lainnya')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',2)->first(); $lainnyaOld = Penilaian::where('key','lainnya')->where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',1)->first(); diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php index a0a79ce..2c3eed2 100644 --- a/app/Http/Controllers/Modules/Usulan/CSAPController.php +++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php @@ -46,7 +46,7 @@ class CSAPController extends Controller $data['page'] = FormKriteria::select('page_number')->where('tahun',tahunKuesioner($keyId))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); if(session('group_alias') == 'penilai_kota'){ $data['penilaian'] = Penilaian::where('ms_sekolah_id',$data['kuesioner']->ms_sekolah_id)->where('tahun',$data['kuesioner']->tahun)->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); - }elseif(session('group_alias') == 'penilai_provinsi'){ + }elseif((session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag')){ $data['penilaian'] = Penilaian::where('ms_sekolah_id',$data['kuesioner']->ms_sekolah_id)->where('tahun',$data['kuesioner']->tahun)->where('status',2)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); } @@ -312,7 +312,7 @@ class CSAPController extends Controller $log->save(); - }elseif(session('group_alias') == 'penilai_provinsi'){ + }elseif((session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag')){ $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first(); $kuesioner->catatan_usulan = $request['catatan_validasi']; $kuesioner->status = 10; diff --git a/app/Http/Controllers/Modules/Usulan/KriteriaController.php b/app/Http/Controllers/Modules/Usulan/KriteriaController.php index 8d0a69b..e92a63e 100644 --- a/app/Http/Controllers/Modules/Usulan/KriteriaController.php +++ b/app/Http/Controllers/Modules/Usulan/KriteriaController.php @@ -200,7 +200,7 @@ class KriteriaController extends Controller $status = 1; $penilaian = Penilaian::where('ms_sekolah_id',$idSekolah)->where('tahun',date('Y'))->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); $reload = (count(@$penilaian) == count(@$page) ? true : false); - }elseif(session('group_alias') == 'penilai_provinsi'){ + }elseif((session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag')){ $status = 2; $penilaian = Penilaian::where('ms_sekolah_id',$idSekolah)->where('tahun',date('Y'))->where('status',2)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); $reload = (count(@$penilaian) == count(@$page) ? true : false); @@ -538,7 +538,7 @@ class KriteriaController extends Controller $status = 0; }elseif(session('group_alias') == 'penilai_kota'){ $status = 1; - }elseif(session('group_alias') == 'penilai_provinsi'){ + }elseif((session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag')){ $status = 2; } diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 2548cec..dd743c2 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -48,6 +48,10 @@ class DatabaseSeeder extends Seeder ['name' => 'Dinas','alias' => 'dinas'], ['name' => 'Penilai Kota','alias' => 'penilai_kota'], ['name' => 'Penilai Provinsi','alias' => 'penilai_provinsi'], + ['name' => 'Dinas Pendidikan','alias' => 'dinas_pendidikan'], + ['name' => 'Kemenag','alias' => 'kemenag'], + ['name' => 'Penilai Disdik','alias' => 'penilai_disdik'], + ['name' => 'Penilai Kemenag','alias' => 'penilai_kemenag'], ]; foreach($group as $valGroup){ diff --git a/resources/views/modules/kuesioner/index.blade.php b/resources/views/modules/kuesioner/index.blade.php index db4bbd0..29cfb99 100644 --- a/resources/views/modules/kuesioner/index.blade.php +++ b/resources/views/modules/kuesioner/index.blade.php @@ -20,7 +20,7 @@
- @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas') || (session('group_alias') == 'penilai_provinsi') ) + @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas') || (session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || || (session('group_alias') == 'penilai_kemenag'))
diff --git a/resources/views/modules/usulan/csak/index.blade.php b/resources/views/modules/usulan/csak/index.blade.php index 6d00e32..1063e57 100644 --- a/resources/views/modules/usulan/csak/index.blade.php +++ b/resources/views/modules/usulan/csak/index.blade.php @@ -20,7 +20,7 @@
- @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas') || (session('group_alias') == 'penilai_provinsi') ) + @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas') || (session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag'))
diff --git a/resources/views/modules/usulan/csap/index.blade.php b/resources/views/modules/usulan/csap/index.blade.php index f81e61e..820d44f 100644 --- a/resources/views/modules/usulan/csap/index.blade.php +++ b/resources/views/modules/usulan/csap/index.blade.php @@ -20,7 +20,7 @@
- @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas') || (session('group_alias') == 'penilai_provinsi') ) + @if((session('group_alias') == 'administrator') || (session('group_alias') == 'dinas') || (session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag') )