update
parent
8c0e3d129e
commit
06f0dcc46c
|
|
@ -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');
|
||||
}else{
|
||||
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'));
|
||||
})->orderBy('created_at','DESC');
|
||||
}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));
|
||||
}
|
||||
if(@request()->tahun){
|
||||
$kuesioner->where('tahun',request()->tahun);
|
||||
$tahun = request()->tahun;
|
||||
}else{
|
||||
$tahun = date('Y');
|
||||
}
|
||||
if(@request()->provinsi != 0){
|
||||
$kuesioner->whereHas('sekolah',function($query){
|
||||
|
|
@ -73,6 +75,8 @@ class AdministrasiController extends Controller
|
|||
$query->where('kecamatan',request()->kecamatan);
|
||||
});
|
||||
}
|
||||
|
||||
$kuesioner->where('tahun',$tahun);
|
||||
|
||||
foreach ($kuesioner->get() as $key => $row) {
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue