From 587bdaeb8104d0cc63792b2122f554e26aa40d7d Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Mon, 25 Aug 2025 13:53:17 +0700 Subject: [PATCH] update --- app/Http/Controllers/HomeController.php | 25 +++++- .../Opendata/DatasetController.php | 5 +- app/Models/Master/Template.php | 4 + .../modules/dashboard/dashboard.blade.php | 31 +++++++ .../modules/dashboard/resource.blade.php | 78 ++++++++++++++++ .../dashboard/resource_detail.blade.php | 89 +++++++++++++++++++ .../modules/opendata/dataset/index.blade.php | 1 + routes/modules/modules.php | 2 + 8 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 resources/views/modules/dashboard/resource.blade.php create mode 100644 resources/views/modules/dashboard/resource_detail.blade.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 10b7981..9ff3ebb 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Models\Dataset; use App\Models\Master\Topik; +use App\Models\Master\Instansi; use App\Models\Master\Template; use App\Models\Master\Group; @@ -37,7 +38,8 @@ class HomeController extends Controller $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->limit(10)->get(); } // $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->limit(10)->get(); - $data['group'] = Group::where('MsGroupId','!=',1)->get(); + $data['group'] = Group::where('MsGroupId','!=',1)->where('name','!=','Balai')->get(); + $data['resource'] = Template::with(['dataset'])->where('show_dashboard',1)->get(); $data['classDataset'] = Dataset::class; return view($this->template.'.dashboard',$data); @@ -142,4 +144,25 @@ class HomeController extends Controller return response()->json($_data); } + + function resource($id){ + $keyId = decode_id($id); + $data['id'] = $id; + + $data['title'] = 'Dashboard'; + $data['dataset'] = Dataset::where('template_id',$keyId)->pluck('instansi_id')->toArray(); + $data['instansi'] = Instansi::whereIn('MsInstansiId',$data['dataset'])->paginate(9); + + return view($this->template.'.resource',$data); + } + function resource_instansi($instansi_id,$id){ + + $data['id'] = decode_id($id); + $data['instansi_id'] = decode_id($instansi_id); + $data['dataset'] = Dataset::with(['template'])->where('instansi_id',decode_id($instansi_id))->where('template_id',decode_id($id))->first(); + $data['title'] = 'Dashboard '.@$data['dataset']->template->name; + + return view($this->template.'.resource_detail',$data); + + } } diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php index 7fc7ec7..ea7e14c 100644 --- a/app/Http/Controllers/Opendata/DatasetController.php +++ b/app/Http/Controllers/Opendata/DatasetController.php @@ -57,9 +57,9 @@ class DatasetController extends Controller public function grid(Request $request) { if(session('group_id') == 1){ - $data = Dataset::orderBy('DatasetId','DESC')->get(); + $data = Dataset::with(['template'])->orderBy('DatasetId','DESC')->get(); }else{ - $data = Dataset::orderBy('DatasetId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->get(); + $data = Dataset::with(['template'])->orderBy('DatasetId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->get(); } // $data = User::with(['group'])->orderBy('id','DESC')->get(); $_data = []; @@ -99,6 +99,7 @@ class DatasetController extends Controller 'name' => @$row->name, 'publik' => @$row->publik, 'tahun' => @$row->tahun, + 'template' => @$row->template->name, 'created_at' => date('d-m-Y H:i:s',strtotime(@$row->created_at)), 'instansi' => @$row->instansi->name, 'action' => @$action, diff --git a/app/Models/Master/Template.php b/app/Models/Master/Template.php index 51c3ee4..cb48d4d 100644 --- a/app/Models/Master/Template.php +++ b/app/Models/Master/Template.php @@ -12,4 +12,8 @@ class Template extends Model protected $table = 'ms_template'; protected $primaryKey = 'MsTemplateId'; protected $guarded = []; + + function dataset(){ + return $this->hasMany(\App\Models\Dataset::class, 'template_id'); + } } diff --git a/resources/views/modules/dashboard/dashboard.blade.php b/resources/views/modules/dashboard/dashboard.blade.php index 72e4901..664b699 100644 --- a/resources/views/modules/dashboard/dashboard.blade.php +++ b/resources/views/modules/dashboard/dashboard.blade.php @@ -59,6 +59,37 @@
+
+
+
+
+
10 Data Update Terakhir
+
+ + + + + + + + + + + @foreach ($resource as $k => $res) + + + + + + + @endforeach + +
#NoResource DataJumlah Upload Dataset
Lihat Data{{$k+1}}{{ $res->name }}{{ $res->dataset->count() }}
+
+
+
+
+