diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 4a0f6eb..10b7981 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -31,7 +31,12 @@ class HomeController extends Controller public function dashboard() { $data['title'] = 'Dashboard'; - $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->limit(10)->get(); + if(session('group_id') == 1){ + $data['dataset'] = Dataset::orderBy('DatasetId','DESC')->limit(10)->get(); + }else{ + $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['classDataset'] = Dataset::class; diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php index c6363f8..7fc7ec7 100644 --- a/app/Http/Controllers/Opendata/DatasetController.php +++ b/app/Http/Controllers/Opendata/DatasetController.php @@ -59,7 +59,7 @@ class DatasetController extends Controller if(session('group_id') == 1){ $data = Dataset::orderBy('DatasetId','DESC')->get(); }else{ - $data = Dataset::orderBy('DatasetId','DESC')->whereIn('created_by',[auth()->user()->id,1])->get(); + $data = Dataset::orderBy('DatasetId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->get(); } // $data = User::with(['group'])->orderBy('id','DESC')->get(); $_data = []; diff --git a/app/Http/Controllers/Opendata/DatasetTambahanController.php b/app/Http/Controllers/Opendata/DatasetTambahanController.php index a5d40b0..3064c38 100644 --- a/app/Http/Controllers/Opendata/DatasetTambahanController.php +++ b/app/Http/Controllers/Opendata/DatasetTambahanController.php @@ -59,7 +59,7 @@ class DatasetTambahanController extends Controller if(session('group_id') == 1){ $data = DatasetTambahan::orderBy('DatasetId','DESC')->get(); }else{ - $data = DatasetTambahan::orderBy('DatasetId','DESC')->whereIn('created_by',[auth()->user()->id,1])->get(); + $data = DatasetTambahan::orderBy('DatasetId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->get(); } // $data = User::with(['group'])->orderBy('id','DESC')->get(); $_data = []; diff --git a/resources/views/modules/dashboard/dashboard.blade.php b/resources/views/modules/dashboard/dashboard.blade.php index dfad266..72e4901 100644 --- a/resources/views/modules/dashboard/dashboard.blade.php +++ b/resources/views/modules/dashboard/dashboard.blade.php @@ -12,13 +12,13 @@ alias == 'dinas'){ + if(@$dataGroup->alias == 'dinas'){ $bg = 'success'; - }elseif($dataGroup->alias == 'biro'){ + }elseif(@$dataGroup->alias == 'biro'){ $bg = 'warning'; - }elseif($dataGroup->alias == 'badan'){ + }elseif(@$dataGroup->alias == 'badan'){ $bg = 'danger'; - }elseif($dataGroup->alias == 'deputi'){ + }elseif(@$dataGroup->alias == 'deputi'){ $bg = 'info'; } @@ -47,8 +47,8 @@