ilham
/
dikplhd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

main
Ilham Wara Nugroho 2026-04-08 15:17:10 +07:00
parent cd57095213
commit 69a9217331
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/CustomLoginController.php
View File

@ -44,6 +44,7 @@ class CustomLoginController extends Controller
'currYear' => date('Y'), 'currYear' => date('Y'),
'group_id' => @$user->ms_group_id, 'group_id' => @$user->ms_group_id,
'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_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_alias' => @$user->group->alias,
'group_name' => @$user->group->name, 'group_name' => @$user->group->name,
]; ];
@ -73,6 +74,7 @@ class CustomLoginController extends Controller
'currYear' => date('Y'), 'currYear' => date('Y'),
'group_id' => @$user->ms_group_id, 'group_id' => @$user->ms_group_id,
'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_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_alias' => @$user->group->alias,
'group_name' => @$user->group->name, 'group_name' => @$user->group->name,
]; ];

6
app/Http/Controllers/HomeController.php
View File

@ -73,11 +73,7 @@ class HomeController extends Controller
$data['total'] = Dataset::where('instansi_id', session('instansi_id')) $data['total'] = Dataset::where('instansi_id', session('instansi_id'))
->where('status',1) ->where('status',1)
->where('tahun',date('Y')) ->where('tahun',date('Y'))
->whereIn('template_id', function ($q) { ->whereIn('template_id', session('instansi_id'))->count();
$q->selectRaw('(jsonb_array_elements_text(resource_data::jsonb))::int')
->from('ms_instansi')
->where('MsInstansiId', session('instansi_id'));
})->count();
// $data['total'] = Instansi::where('MsInstansiId',session('instansi_id'))->join('dataset as d', 'd.instansi_id', '=', 'ms_instansi.MsInstansiId') // $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 // ->whereRaw("ms_instansi.resource_data IS NOT NULL

1
app/Http/Controllers/Management/UserController.php
View File

@ -257,6 +257,7 @@ class UserController extends Controller
'currYear' => date('Y'), 'currYear' => date('Y'),
'group_id' => @$user->ms_group_id, 'group_id' => @$user->ms_group_id,
'instansi_id' => @UserInstansi::where('user_id',$user->id)->value('ms_instansi_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_alias' => @$user->group->alias,
'group_name' => @$user->group->name, 'group_name' => @$user->group->name,
]; ];