update
parent
cd57095213
commit
69a9217331
|
|
@ -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,
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
];
|
||||
|
|
|
|||
Loading…
Reference in New Issue