From 69a921733172956eeab25c6f7a3d94efe8091fc9 Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Wed, 8 Apr 2026 15:17:10 +0700 Subject: [PATCH] update --- app/Http/Controllers/Auth/CustomLoginController.php | 2 ++ app/Http/Controllers/HomeController.php | 6 +----- app/Http/Controllers/Management/UserController.php | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Auth/CustomLoginController.php b/app/Http/Controllers/Auth/CustomLoginController.php index 979c9ed..bdf5478 100644 --- a/app/Http/Controllers/Auth/CustomLoginController.php +++ b/app/Http/Controllers/Auth/CustomLoginController.php @@ -44,6 +44,7 @@ class CustomLoginController extends Controller 'currYear' => date('Y'), 'group_id' => @$user->ms_group_id, 'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_id'), + 'resource_data' => @UserInstansi::where('user_id',$user->id)->value('resource_data'), 'group_alias' => @$user->group->alias, 'group_name' => @$user->group->name, ]; @@ -73,6 +74,7 @@ class CustomLoginController extends Controller 'currYear' => date('Y'), 'group_id' => @$user->ms_group_id, 'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_id'), + 'resource_data' => @UserInstansi::where('user_id',$user->id)->value('resource_data'), 'group_alias' => @$user->group->alias, 'group_name' => @$user->group->name, ]; diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c6d18f8..8f3416a 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -73,11 +73,7 @@ class HomeController extends Controller $data['total'] = Dataset::where('instansi_id', session('instansi_id')) ->where('status',1) ->where('tahun',date('Y')) - ->whereIn('template_id', function ($q) { - $q->selectRaw('(jsonb_array_elements_text(resource_data::jsonb))::int') - ->from('ms_instansi') - ->where('MsInstansiId', session('instansi_id')); - })->count(); + ->whereIn('template_id', session('instansi_id'))->count(); // $data['total'] = Instansi::where('MsInstansiId',session('instansi_id'))->join('dataset as d', 'd.instansi_id', '=', 'ms_instansi.MsInstansiId') // ->whereRaw("ms_instansi.resource_data IS NOT NULL diff --git a/app/Http/Controllers/Management/UserController.php b/app/Http/Controllers/Management/UserController.php index e39ac00..529493c 100644 --- a/app/Http/Controllers/Management/UserController.php +++ b/app/Http/Controllers/Management/UserController.php @@ -257,6 +257,7 @@ class UserController extends Controller 'currYear' => date('Y'), 'group_id' => @$user->ms_group_id, 'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_id'), + 'resource_data' => @UserInstansi::where('user_id',$user->id)->value('resource_data'), 'group_alias' => @$user->group->alias, 'group_name' => @$user->group->name, ];