diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 53e3534..d0fc4a4 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -35,8 +35,19 @@ class HomeController extends Controller return view('home'); } + public function session() + { + $key = request('key'); + $val = request('val'); + session([$key => $val]); + return response()->json([ + 'status' => 'success' + ]); + } + public function dashboard() { + // dd(date('Y')); $data['title'] = 'Dashboard'; $data['group'] = session('group_alias'); if(session('group_alias') == 'sekolah'){ @@ -144,6 +155,7 @@ class HomeController extends Controller 'npsn' => @$row->sekolah->npsn, 'kab' => @$row->sekolah->kabupaten->name, 'kecamatan' => @$row->sekolah->kecamatan->name, + 'tahun' => @$row->tahun, 'usulan_sebelumnya' => @$usulanAwal, 'pengajuan_usulan' => @$jenis_usulan, ]; diff --git a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php index 00985d6..1fba6ba 100644 --- a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php +++ b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php @@ -30,14 +30,14 @@ class AdministrasiController extends Controller public function grid(Request $request) { if(session('group_alias') == 'sekolah'){ - $kuesioner = Kuesioner::where('ms_sekolah_id',session('sekolah_id'))->where('tahun',date('Y'))->orderBy('created_at','DESC')->get(); + $kuesioner = Kuesioner::where('ms_sekolah_id',session('sekolah_id'))->orderBy('created_at','DESC')->get(); }else{ if(session('kabupaten_id') != ''){ $kuesioner = Kuesioner::whereHas('sekolah',function($query){ $query->where('ms_kabupaten_id',session('kabupaten_id')); - })->where('tahun',date('Y'))->orderBy('created_at','DESC')->get(); + })->orderBy('created_at','DESC')->get(); }else{ - $kuesioner = Kuesioner::where('tahun',date('Y'))->orderBy('created_at','DESC')->get(); + $kuesioner = Kuesioner::orderBy('created_at','DESC')->get(); } } diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php index da0fed1..29ada90 100644 --- a/app/Http/Controllers/Modules/Usulan/CSAKController.php +++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php @@ -82,9 +82,9 @@ class CSAKController extends Controller if(session('kabupaten_id') != ''){ $kuesioner = Kuesioner::where('level',0)->whereHas('sekolah',function($query){ $query->where('ms_kabupaten_id',session('kabupaten_id')); - })->where('tahun',date('Y'))->orderBy('created_at','DESC')->get(); + })->orderBy('created_at','DESC')->get(); }else{ - $kuesioner = Kuesioner::where('level',0)->where('tahun',date('Y'))->orderBy('created_at','DESC')->get(); + $kuesioner = Kuesioner::where('level',0)->orderBy('created_at','DESC')->get(); } foreach ($kuesioner as $key => $row) { @@ -134,6 +134,7 @@ class CSAKController extends Controller 'no' => $key+1, 'id' => encode_id($row->id), 'npsn' => $row->sekolah->npsn, + 'tahun' => @$row->tahun, 'nama' => $sekolah, 'status_level' => 'Level '.levelAdiwiyata($row->npsn).'', 'wilayah' => $row->sekolah->kabupaten->name, diff --git a/app/Http/Controllers/Modules/Usulan/CSAPController.php b/app/Http/Controllers/Modules/Usulan/CSAPController.php index 5b11bc5..24c7533 100644 --- a/app/Http/Controllers/Modules/Usulan/CSAPController.php +++ b/app/Http/Controllers/Modules/Usulan/CSAPController.php @@ -81,9 +81,9 @@ class CSAPController extends Controller if(session('kabupaten_id') != ''){ $kuesioner = Kuesioner::where('level',1)->whereHas('sekolah',function($query){ $query->where('ms_kabupaten_id',session('kabupaten_id')); - })->where('tahun',date('Y'))->orderBy('created_at','DESC')->get(); + })->orderBy('created_at','DESC')->get(); }else{ - $kuesioner = Kuesioner::where('level',1)->where('tahun',date('Y'))->orderBy('created_at','DESC')->get(); + $kuesioner = Kuesioner::where('level',1)->orderBy('created_at','DESC')->get(); } foreach ($kuesioner as $key => $row) { @@ -138,6 +138,7 @@ class CSAPController extends Controller 'no' => $key+1, 'id' => encode_id($row->id), 'npsn' => $row->sekolah->npsn, + 'tahun' => @$row->tahun, 'nama' => $sekolah, 'wilayah' => $row->sekolah->kabupaten->name, 'kecamatan' => $row->sekolah->kecamatan->name, diff --git a/app/Http/Controllers/Modules/Usulan/SKController.php b/app/Http/Controllers/Modules/Usulan/SKController.php index 1b12e6e..c580e4a 100644 --- a/app/Http/Controllers/Modules/Usulan/SKController.php +++ b/app/Http/Controllers/Modules/Usulan/SKController.php @@ -37,7 +37,7 @@ class SKController extends Controller public function grid(Request $request) { - $usulan = SK::where('tahun',date('Y'))->get(); + $usulan = SK::all(); $_data = []; foreach ($usulan as $key => $row) { diff --git a/resources/views/include/header.blade.php b/resources/views/include/header.blade.php index 623b214..af11938 100644 --- a/resources/views/include/header.blade.php +++ b/resources/views/include/header.blade.php @@ -3,7 +3,6 @@ - +
+
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index bb93faf..16a5634 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -84,6 +84,24 @@ }); }); + $('#changeYear').on('change',function(){ + var key = 'currYear'; + var val = $(this).val(); + $.ajax({ + url: "{{route('modules.dashboard.session')}}", // replace with your URL endpoint + method: 'POST', + data: { + _token:'{{csrf_token()}}', + key: key, + val: val + }, + success: function(response) { + window.location.reload() + }, + }); + + }); + @if (Session::get('message_type')=='invalid') toastr.error("{{ Session::get('message') }}", 'Error!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'}); @endif diff --git a/resources/views/modules/dashboard/admin.blade.php b/resources/views/modules/dashboard/admin.blade.php index 99cacf7..b14f901 100644 --- a/resources/views/modules/dashboard/admin.blade.php +++ b/resources/views/modules/dashboard/admin.blade.php @@ -158,7 +158,7 @@
-
Usulan Adiwiyata Tahun {{date('Y')}}
+
Usulan Adiwiyata
Nama Sekolah + diff --git a/resources/views/modules/usulan/csak/index.blade.php b/resources/views/modules/usulan/csak/index.blade.php index a4edc89..341fa7e 100644 --- a/resources/views/modules/usulan/csak/index.blade.php +++ b/resources/views/modules/usulan/csak/index.blade.php @@ -131,6 +131,7 @@ + diff --git a/resources/views/modules/usulan/csam/index.blade.php b/resources/views/modules/usulan/csam/index.blade.php index c9432a4..1e5a6ac 100644 --- a/resources/views/modules/usulan/csam/index.blade.php +++ b/resources/views/modules/usulan/csam/index.blade.php @@ -131,6 +131,7 @@ + diff --git a/resources/views/modules/usulan/csan/index.blade.php b/resources/views/modules/usulan/csan/index.blade.php index c9432a4..1e5a6ac 100644 --- a/resources/views/modules/usulan/csan/index.blade.php +++ b/resources/views/modules/usulan/csan/index.blade.php @@ -131,6 +131,7 @@ + diff --git a/resources/views/modules/usulan/csap/index.blade.php b/resources/views/modules/usulan/csap/index.blade.php index a4edc89..341fa7e 100644 --- a/resources/views/modules/usulan/csap/index.blade.php +++ b/resources/views/modules/usulan/csap/index.blade.php @@ -131,6 +131,7 @@ + diff --git a/routes/modules/modules.php b/routes/modules/modules.php index ab68a2a..ae66785 100644 --- a/routes/modules/modules.php +++ b/routes/modules/modules.php @@ -27,6 +27,7 @@ use App\Http\Controllers\Modules\Konten\GaleriController; use App\Http\Controllers\Modules\Konten\KegiatanController; Route::get('dashboard',[HomeController::class,'dashboard'])->name('dashboard'); +Route::post('session', [HomeController::class, 'session'])->name('dashboard.session'); Route::get('dashboard/gridUsulan',[HomeController::class,'gridUsulan'])->name('gridUsulan'); Route::get('profile',[ProfileController::class,'profile'])->name('profile'); Route::post('profile-store',[ProfileController::class,'profileStore'])->name('profileStore');
Kab/Kota KecamatanTahun Usulan Sebelumnya Pengajuan Usulan
# NoTahun NPSN Nama Sekolah Wilayah
# NoTahun NPSN Nama Sekolah Wilayah
# NoTahun NPSN Nama Sekolah Wilayah
# NoTahun NPSN Nama Sekolah Wilayah