diff --git a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php index a7d4d0b..d843b5a 100644 --- a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php +++ b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php @@ -11,6 +11,7 @@ use App\Models\Master\Provinsi; use App\Models\Kuesioner; use App\Models\DokumenAdministrasi; use App\Models\Usulan; +use App\Models\Master\Kecamatan; class AdministrasiController extends Controller { @@ -23,6 +24,10 @@ class AdministrasiController extends Controller $data['route'] = $this->route; $data['title'] = $this->title; $data['provinsi'] = Provinsi::where('kode_wilayah','010000')->get(); + + if(session('kabupaten_id') != ''){ + $data['kecamatan'] = Kecamatan::where('ms_kabupaten_id',session('kabupaten_id'))->get(); + } return view($this->template.'.index',$data); } @@ -62,17 +67,17 @@ class AdministrasiController extends Controller } if(@request()->provinsi != 0){ $kuesioner->whereHas('sekolah',function($query){ - $query->where('provinsi',request()->provinsi); + $query->where('ms_provinsi_id',decode_id(request()->provinsi)); }); } if(@request()->kabupaten != 0){ $kuesioner->whereHas('sekolah',function($query){ - $query->where('kabupaten',request()->kabupaten); + $query->where('ms_kabupaten_id',decode_id(request()->kabupaten)); }); } if(@request()->kecamatan != 0){ $kuesioner->whereHas('sekolah',function($query){ - $query->where('kecamatan',request()->kecamatan); + $query->where('ms_kecamatan_id',decode_id(request()->kecamatan)); }); } diff --git a/resources/views/modules/usulan/administrasi/index.blade.php b/resources/views/modules/usulan/administrasi/index.blade.php index db83252..519e88a 100644 --- a/resources/views/modules/usulan/administrasi/index.blade.php +++ b/resources/views/modules/usulan/administrasi/index.blade.php @@ -70,6 +70,7 @@
+ @if(session('group_alias') == 'administrator')
-
+
+ @else +
+
+ +
+
+ @endif