From 85dc0829165b11d2203f4df3aa3696775502413d Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Wed, 4 Mar 2026 09:33:02 +0700 Subject: [PATCH] update --- .../Opendata/DatasetController.php | 8 ++++-- .../modules/opendata/dataset/index.blade.php | 25 ++++++++++++++----- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php index 7e974d9..e1f9640 100644 --- a/app/Http/Controllers/Opendata/DatasetController.php +++ b/app/Http/Controllers/Opendata/DatasetController.php @@ -93,10 +93,14 @@ class DatasetController extends Controller public function grid(Request $request) { if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){ - $data = Dataset::with(['tabelData'])->orderBy('DatasetId','DESC')->get(); + $data = Dataset::with(['tabelData']); }else{ - $data = Dataset::with(['tabelData'])->orderBy('DatasetId','DESC')->whereIn('instansi_id',[session('instansi_id')])->get(); + $data = Dataset::with(['tabelData'])->whereIn('instansi_id',[session('instansi_id')]); } + if(@$request->tahun){ + $data->where('tahun',$request->tahun); + } + $data->orderBy('DatasetId','DESC')->get(); // $data = User::with(['group'])->orderBy('id','DESC')->get(); $_data = []; diff --git a/resources/views/modules/opendata/dataset/index.blade.php b/resources/views/modules/opendata/dataset/index.blade.php index a6f4248..c50fb67 100644 --- a/resources/views/modules/opendata/dataset/index.blade.php +++ b/resources/views/modules/opendata/dataset/index.blade.php @@ -10,17 +10,18 @@

{{$title}}

{{--

Pengelolaan data masuk dari berbagai stasiun pemantauan.

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