diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 7274237..88001db 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\Master\AccessMenu; +use App\Models\Master\Menu; class HomeController extends Controller { @@ -26,18 +27,20 @@ class HomeController extends Controller { $data['title'] = 'Dashboard'; if(session('group_id') == 1){ - $data['dashboard'] = AccessMenu::with(['parentMenu'])->whereHas('parentMenu',function($query){ + $access = AccessMenu::with(['parentMenu'])->whereHas('parentMenu',function($query){ $query->where('parent_id','!=','0'); - })->where('module','like','%dashboard%')->get(); + })->where('module','like','%dashboard%')->pluck('ms_menu_id')->toArray(); }elseif((session('group_alias') == 'inventory') || (session('group_alias') == 'adaptasi') || (session('group_alias') == 'mitigasi')){ - $data['dashboard'] = AccessMenu::with(['parentMenu'])->whereHas('parentMenu',function($query){ + $access = AccessMenu::with(['parentMenu'])->whereHas('parentMenu',function($query){ $query->where('parent_id','!=','0'); - })->where('ms_group_id',session('group_id'))->where('module','like','%dashboard%')->get(); + })->where('ms_group_id',session('group_id'))->where('module','like','%dashboard%')->pluck('ms_menu_id')->toArray(); }else{ - $data['dashboard'] = AccessMenu::with(['parentMenu'])->whereHas('parentMenu',function($query){ + $access = AccessMenu::with(['parentMenu'])->whereHas('parentMenu',function($query){ $query->where('parent_id','!=','0'); - })->where('module','like','%dashboard%')->groupBy(['ms_group_id'])->get(); + })->where('module','like','%dashboard%')->pluck('ms_menu_id')->toArray(); } + + $data['dashboard'] = Menu::whereIn('MsMenuId',array_unique($access))->get(); return view('home',$data); } diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 63ec68b..8e688be 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -24,23 +24,23 @@ parentMenu->title == 'Adaptasi'){ + if($datas->title == 'Adaptasi'){ $image = 'assets/images/small/img-9.jpg'; $text = 'This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.'; - }elseif($datas->parentMenu->title == 'Mitigasi'){ + }elseif($datas->title == 'Mitigasi'){ $image = 'assets/images/small/img-8.jpg'; $text = 'This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.'; - }elseif($datas->parentMenu->title == 'Inventory'){ + }elseif($datas->title == 'Inventory'){ $image = 'assets/images/small/img-6.jpg'; $text = 'Dashboard Inventory adalah tampilan ringkas dan interaktif yang menampilkan status inventaris (stok, lokasi, kondisi, alokasi anggaran) secara real-time..'; } ?>