diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php index 0517da5..1abd4af 100644 --- a/app/Helpers/custom.php +++ b/app/Helpers/custom.php @@ -288,7 +288,7 @@ if (!function_exists('checkPenilaian')) { * * @return string */ - function checkPenilaian($page_number,$sekolah_id = null) + function checkPenilaian($page_number,$sekolah_id = null,$type = null) { if(@$sekolah_id){ $idSekolah = @$sekolah_id; @@ -296,16 +296,24 @@ if (!function_exists('checkPenilaian')) { $idSekolah = session('sekolah_id'); } - if(session('group_alias') == 'sekolah'){ - $penilaian = Penilaian::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',0)->first(); - }elseif(session('group_alias') == 'penilai_kota'){ + if(@$type == 'kota'){ $penilaian = Penilaian::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',1)->first(); - }elseif(session('group_alias') == 'penilai_provinsi'){ + }elseif(@$type == 'provinsi'){ $penilaian = Penilaian::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',2)->first(); }else{ - $penilaian = Penilaian::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first(); + $penilaian = Penilaian::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->where('status',0)->first(); } + // if(session('group_alias') == 'sekolah'){ + + // }elseif(session('group_alias') == 'penilai_kota'){ + + // }elseif(session('group_alias') == 'penilai_provinsi'){ + + // }else{ + // $penilaian = Penilaian::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first(); + // } + // $penilaian = Penilaian::where('page_number',$page_number)->where('ms_sekolah_id',$idSekolah)->first(); return @$penilaian ? true : false; } diff --git a/resources/views/modules/usulan/csak/form.blade.php b/resources/views/modules/usulan/csak/form.blade.php index ae5bdba..720dd6e 100644 --- a/resources/views/modules/usulan/csak/form.blade.php +++ b/resources/views/modules/usulan/csak/form.blade.php @@ -218,7 +218,7 @@