From d499a13118cd54857ec7f7ed0b476883e115452d Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Wed, 18 Feb 2026 12:51:34 +0700 Subject: [PATCH] update --- app/Http/Controllers/HomeController.php | 47 +++++++++++---- resources/views/auth/login.blade.php | 4 +- resources/views/layouts/appNew.blade.php | 10 +--- resources/views/layouts/master.blade.php | 8 +-- .../modules/dashboard/dashboard.blade.php | 58 ++++++++++++------- routes/modules/modules.php | 1 + 6 files changed, 83 insertions(+), 45 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index a4f288b..c218cbf 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Models\Dataset; +use App\Models\DatasetTambahan; use App\Models\Master\Topik; use App\Models\Master\Instansi; use App\Models\Master\Template; @@ -30,21 +31,17 @@ class HomeController extends Controller public function dashboard() { $data['title'] = 'Dashboard'; + $data['route'] = $this->route; if((session('group_id') == 1) || (session('group_alias') == 'admin')){ - $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->limit(10)->get(); + $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->count(); + $data['datasetTambahan'] = DatasetTambahan::orderBy('DatasetId','DESC')->count(); }else{ - $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->limit(10)->get(); + $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->count(); + $data['datasetTambahan'] = DatasetTambahan::whereIn('instansi_id',[auth()->user()->ms_instansi_id])->count(); + } - // $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->limit(10)->get(); - $data['group'] = Group::where('MsGroupId','!=',1)->where('alias','!=','admin')->get(); - if((session('group_id') == 1) || (session('group_alias') == 'admin')){ - $data['resource'] = TabelData::with(['dataset'])->get(); - }else{ - $data['resource'] = TabelData::with(['dataset'])->whereHas('dataset',function($query){ - $query->where('instansi_id',auth()->user()->ms_instansi_id); - })->where('show_dashboard',1)->get(); - } - $data['classDataset'] = Dataset::class; + $data['instansi'] = Instansi::count(); + $data['tabelData'] = tabelData::count(); return view($this->template.'.dashboard',$data); } @@ -59,6 +56,32 @@ class HomeController extends Controller return view($this->template.'.dataset',$data); } + public function gridTabel(Request $request) + { + if((session('group_id') == 1) || (session('group_alias') == 'admin')){ + $data = Instansi::limit(10)->get(); + }else{ + $data = Instansi::where('MsInstansiId',auth()->user()->ms_instansi_id)->get(); + } + // $data = User::with(['group'])->orderBy('id','DESC')->get(); + $_data = []; + + foreach ($data as $key => $row) { + + + $_data[] = [ + 'no' => $key+1, + 'name' => @$row->name, + 'dataset' => '-', + ]; + + } + + // return response()->json($_data); // Return the data as a JSON response + return response()->json($_data); + + } + public function grid(Request $request) { if((session('group_id') == 1) || (session('group_alias') == 'admin')){ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 6d53896..d01abb6 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -39,11 +39,11 @@
- +

SLHD

-

Dinas Lingkungan Hidup Provinsi DKI Jakarta

+

Status Lingkungan Hidup Provinsi DKI Jakarta

diff --git a/resources/views/layouts/appNew.blade.php b/resources/views/layouts/appNew.blade.php index b6bb5b5..413e9f8 100644 --- a/resources/views/layouts/appNew.blade.php +++ b/resources/views/layouts/appNew.blade.php @@ -41,12 +41,10 @@