diff --git a/app/Http/Controllers/Opendata/DatasetTambahanController.php b/app/Http/Controllers/Opendata/DatasetTambahanController.php index a5372c2..f337a29 100644 --- a/app/Http/Controllers/Opendata/DatasetTambahanController.php +++ b/app/Http/Controllers/Opendata/DatasetTambahanController.php @@ -59,15 +59,21 @@ class DatasetTambahanController extends Controller public function grid(Request $request) { if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ - $data = DatasetTambahan::with(['tabelData'])->orderBy('DatasetTambahanId','DESC')->get(); + $data = DatasetTambahan::with(['tabelData']); }else{ - $data = DatasetTambahan::with(['tabelData'])->orderBy('DatasetTambahanId','DESC')->whereIn('instansi_id',[session('instansi_id')])->get(); + $data = DatasetTambahan::with(['tabelData'])->whereIn('instansi_id',[session('instansi_id')]); } + if(@$request->tahun){ + $data->where('tahun',$request->tahun); + }else{ + $data->where('tahun',date('Y')); + } + $data->orderBy('DatasetTambahanId','DESC'); // $data = User::with(['group'])->orderBy('id','DESC')->get(); $_data = []; - foreach ($data as $key => $row) { + foreach ($data->get() as $key => $row) { $action = ''; diff --git a/resources/views/modules/opendata/dataset-tambahan/index.blade.php b/resources/views/modules/opendata/dataset-tambahan/index.blade.php index c22f68e..266b8f1 100644 --- a/resources/views/modules/opendata/dataset-tambahan/index.blade.php +++ b/resources/views/modules/opendata/dataset-tambahan/index.blade.php @@ -10,7 +10,12 @@

{{$title}}

{{--

Pengelolaan data masuk dari berbagai stasiun pemantauan.

--}} -
+
+ @if(access('is_create', $route.'.*','module',false) || access('is_update', $route.'.*','module',false)) Tambah Data @@ -34,6 +39,7 @@ data-sort-order="desc" data-page-size="10" data-id-field="id" + data-query-params="queryParams" id="grid-data"> @@ -57,6 +63,17 @@ @endsection @section('js')