ilham
/
sekolah_adiwiyata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

main
Ilham Wara Nugroho 2026-01-15 15:22:10 +07:00
parent 8c0e3d129e
commit 06f0dcc46c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Modules/Usulan/AdministrasiController.php
View File

@ -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'); $kuesioner = Kuesioner::where('tahun',date('Y'))->where('ms_sekolah_id',session('sekolah_id'))->orderBy('created_at','DESC');
}else{ }else{
if(session('kabupaten_id') != ''){ 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')); $query->where('ms_kabupaten_id',session('kabupaten_id'));
})->orderBy('created_at','DESC'); })->orderBy('created_at','DESC');
}else{ }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)); $kuesioner->where('level',(request()->level-1));
} }
if(@request()->tahun){ if(@request()->tahun){
$kuesioner->where('tahun',request()->tahun); $tahun = request()->tahun;
}else{
$tahun = date('Y');
} }
if(@request()->provinsi != 0){ if(@request()->provinsi != 0){
$kuesioner->whereHas('sekolah',function($query){ $kuesioner->whereHas('sekolah',function($query){
@ -73,6 +75,8 @@ class AdministrasiController extends Controller
$query->where('kecamatan',request()->kecamatan); $query->where('kecamatan',request()->kecamatan);
}); });
} }
$kuesioner->where('tahun',$tahun);
foreach ($kuesioner->get() as $key => $row) { foreach ($kuesioner->get() as $key => $row) {