main
Ilham Wara Nugroho 2026-07-16 11:00:09 +07:00
parent aeb01614eb
commit f5af8aba64
10 changed files with 17 additions and 13 deletions

View File

@ -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();

View File

@ -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;

View File

@ -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;
}

View File

@ -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){

View File

@ -20,7 +20,7 @@
<div class="col-md-12 mb-2">
<div class="d-flex flex-column flex-lg-row gap-2">
@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'))
<div class="w-100">
<div class="form-group">
<select name="kabupaten" class="form-control select2" id="kabupaten">

View File

@ -18,7 +18,7 @@
<div class="col-md-12 mb-2">
<div class="row">
@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'))
<div class="col-md-3">
<div class="form-group">
<select name="provinsi" class="form-control select2" id="provinsi">

View File

@ -20,7 +20,7 @@
<div class="col-md-12 mb-2">
<div class="d-flex flex-column flex-lg-row gap-2">
@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'))
<div class="w-100">
<div class="form-group">
<select name="kabupaten" class="form-control select2" id="kabupaten">

View File

@ -296,7 +296,7 @@
</div>
</div>
@endif
@elseif(session('group_alias') == 'penilai_provinsi')
@elseif((session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag'))
@if(getNilaiAll('provinsi',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId) < 75)
<div class="col-12">
<div class="alert bg-danger text-white mb-3">
@ -354,7 +354,7 @@
@if(session('group_alias') == 'penilai_kota')
<option {{@$kuesioner->status == '4' ? 'selected' : ''}} value="1">Diteruskan</option>
<option {{@$kuesioner->status == '5' ? 'selected' : ''}} value="2">Dikembalikan</option>
@elseif(session('group_alias') == 'penilai_provinsi')
@elseif((session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag'))
<option selected value="1">Selesai</option>
@endif
</select>

View File

@ -20,7 +20,7 @@
<div class="col-md-12 mb-2">
<div class="d-flex flex-column flex-lg-row gap-2">
@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') )
<div class="w-100">
<div class="form-group">
<select name="kabupaten" class="form-control select2" id="kabupaten">

View File

@ -34,7 +34,7 @@
$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'){