change nominatim original function
This commit is contained in:
@@ -219,14 +219,14 @@ class UserActivityController extends Controller
|
||||
GROUP BY user_id
|
||||
ORDER BY majmoe desc;";
|
||||
|
||||
foreach (DB::select(DB::raw($user_activity_quantity_sql)) as $key => $value) {
|
||||
foreach (DB::select($user_activity_quantity_sql) as $key => $value) {
|
||||
$user_activity_quantity_temp[$value->user_id] = [
|
||||
"majmoe" => $value->quantity ?? 0,
|
||||
"name" => $value->user_first_name ? $value->user_first_name." ".$value->user_last_name." (".$value->username.")" : $value->user_name." (".$value->username.")",
|
||||
];
|
||||
}
|
||||
|
||||
foreach (DB::select(DB::raw($user_activity_time_sql)) as $key => $value) {
|
||||
foreach (DB::select($user_activity_time_sql) as $key => $value) {
|
||||
$user_activity_time_temp[$value->user_id] = [
|
||||
"majmoe" => $value->majmoe ?? 0,
|
||||
"name" => $value->user_first_name ? $value->user_first_name." ".$value->user_last_name." (".$value->username.")" : $value->user_name." (".$value->username.")",
|
||||
@@ -245,7 +245,7 @@ class UserActivityController extends Controller
|
||||
LIMIT 5
|
||||
";
|
||||
|
||||
$activity_list = DB::select(DB::raw($user_activity_top_5_temp_sql));
|
||||
$activity_list = DB::select($user_activity_top_5_temp_sql);
|
||||
$sum = 0;
|
||||
foreach ($activity_list as $index => $item) {
|
||||
$sum += (int) $item->quantity;
|
||||
@@ -263,17 +263,17 @@ class UserActivityController extends Controller
|
||||
'fromDate' => $request->fromDate ? $request->fromDate : null,
|
||||
'toDate' => $request->toDate ? $request->toDate : null,
|
||||
'user_activity_time' => $ids_list ? $user_activity_time_temp : null,
|
||||
'hourly_activity_chart' => $ids_list ? DB::select(DB::raw($hourly_activity_chart_sql)): null,
|
||||
'quantitative_activity_chart' => $ids_list ? DB::select(DB::raw($quantitative_activity_chart_sql)): null,
|
||||
'total_activity_quantity' => $ids_list ? DB::select(DB::raw($total_activity_quantity_sql))[0]->total_activity_quantity : null,
|
||||
'total_activity_time' => $ids_list ? DB::select(DB::raw($total_activity_time_sql))[0]->activity : null,
|
||||
'top_10_activity_list' => $ids_list ? DB::select(DB::raw($top_10_activity_list_sql)) : null,
|
||||
'hourly_activity_chart' => $ids_list ? DB::select($hourly_activity_chart_sql): null,
|
||||
'quantitative_activity_chart' => $ids_list ? DB::select($quantitative_activity_chart_sql): null,
|
||||
'total_activity_quantity' => $ids_list ? DB::select($total_activity_quantity_sql)[0]->total_activity_quantity : null,
|
||||
'total_activity_time' => $ids_list ? DB::select($total_activity_time_sql)[0]->activity : null,
|
||||
'top_10_activity_list' => $ids_list ? DB::select($top_10_activity_list_sql) : null,
|
||||
'user_activity_quantity' => $ids_list ? $user_activity_quantity_temp : null,
|
||||
'group_name' => $role->name_fa,
|
||||
'average' => round(($ids_list ? DB::select(DB::raw($total_activity_time_sql))[0]->activity : 0) / count($users), 2) ,
|
||||
'average' => round(($ids_list ? DB::select($total_activity_time_sql)[0]->activity : 0) / count($users), 2) ,
|
||||
'user_activity_top_5_temp' => $user_activity_top_5_temp,
|
||||
'total_user_count' => count($users),
|
||||
'active_user_count' => $ids_list ? DB::select(DB::raw($active_user_count_sql))[0]->active_user_count : null,
|
||||
'active_user_count' => $ids_list ? DB::select($active_user_count_sql)[0]->active_user_count : null,
|
||||
'group_id' => $role->id
|
||||
];
|
||||
|
||||
@@ -382,7 +382,7 @@ class UserActivityController extends Controller
|
||||
) user_activity_by_hour_and_
|
||||
GROUP BY user_id) AS calculated_table;";
|
||||
|
||||
$activity = DB::select(DB::raw($temp_sql))[0]->activity;
|
||||
$activity = DB::select($temp_sql)[0]->activity;
|
||||
$users_activity[] = [
|
||||
'activity_time' => $ids_list ? $activity : null,
|
||||
'average' => round(($ids_list ? $activity : 0) / count($users), 2) ,
|
||||
@@ -424,8 +424,8 @@ class UserActivityController extends Controller
|
||||
GROUP BY user_id) AS calculated_table;";
|
||||
|
||||
$users_activity[] = [
|
||||
'activity_time' => $country_group_ids_list ? DB::select(DB::raw($country_temp_sql))[0]->activity : null,
|
||||
'average' => round(($country_group_ids_list ? DB::select(DB::raw($country_temp_sql))[0]->activity : 0) / $country_group_user_quantity, 2) ,
|
||||
'activity_time' => $country_group_ids_list ? DB::select($country_temp_sql)[0]->activity : null,
|
||||
'average' => round(($country_group_ids_list ? DB::select($country_temp_sql)[0]->activity : 0) / $country_group_user_quantity, 2) ,
|
||||
'group_name' => 'کشوری',
|
||||
'user_count' => $country_group_user_quantity,
|
||||
'is_static' => 1,
|
||||
@@ -464,8 +464,8 @@ class UserActivityController extends Controller
|
||||
GROUP BY user_id) AS calculated_table;";
|
||||
|
||||
$users_activity[] = [
|
||||
'activity_time' => $organization_group_ids_list ? DB::select(DB::raw($organization_temp_sql))[0]->activity : null,
|
||||
'average' => round(($organization_group_ids_list ? DB::select(DB::raw($organization_temp_sql))[0]->activity : 0) / $organization_group_user_quantity, 2) ,
|
||||
'activity_time' => $organization_group_ids_list ? DB::select($organization_temp_sql)[0]->activity : null,
|
||||
'average' => round(($organization_group_ids_list ? DB::select($organization_temp_sql)[0]->activity : 0) / $organization_group_user_quantity, 2) ,
|
||||
'group_name' => 'سازمانی',
|
||||
'user_count' => $organization_group_user_quantity,
|
||||
'is_static' => 2,
|
||||
@@ -696,8 +696,8 @@ class UserActivityController extends Controller
|
||||
dd;";
|
||||
|
||||
$data['labels'][] = $role->name_fa;
|
||||
$data['hourly_activity_chart'][] = isset(DB::select(DB::raw($hourly_activity_chart_sql))[0]->majmoe) ? DB::select(DB::raw($hourly_activity_chart_sql))[0]->majmoe: 0;
|
||||
$data['quantitative_activity_chart'][] = isset(DB::select(DB::raw($quantitative_activity_chart_sql))[0]->quantity) ? DB::select(DB::raw($quantitative_activity_chart_sql))[0]->quantity: 0;
|
||||
$data['hourly_activity_chart'][] = isset(DB::select($hourly_activity_chart_sql)[0]->majmoe) ? DB::select($hourly_activity_chart_sql)[0]->majmoe: 0;
|
||||
$data['quantitative_activity_chart'][] = isset(DB::select($quantitative_activity_chart_sql)[0]->quantity) ? DB::select($quantitative_activity_chart_sql)[0]->quantity: 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -707,7 +707,7 @@ class UserActivityController extends Controller
|
||||
WHERE created_at between '{$request->fromDate}' and '{$request->toDate}' and user_id IN(".$total_ids_list.")
|
||||
";
|
||||
|
||||
$data['total_activity_quantity'] = $total_ids_list ? DB::select(DB::raw($total_activity_quantity_sql))[0]->total_activity_quantity : null;
|
||||
$data['total_activity_quantity'] = $total_ids_list ? DB::select($total_activity_quantity_sql)[0]->total_activity_quantity : null;
|
||||
|
||||
$data['total_user_count'] = count(explode(',', $total_ids_list));
|
||||
|
||||
@@ -721,7 +721,7 @@ class UserActivityController extends Controller
|
||||
GROUP BY user_id
|
||||
) grpuped_by_user_id";
|
||||
|
||||
$data['active_user_count'] = $total_ids_list ? DB::select(DB::raw($active_user_count_sql))[0]->active_user_count : null;
|
||||
$data['active_user_count'] = $total_ids_list ? DB::select($active_user_count_sql)[0]->active_user_count : null;
|
||||
|
||||
$total_activity_time_sql = "
|
||||
SELECT sum(majmoe) AS activity FROM (SELECT *,
|
||||
@@ -739,9 +739,9 @@ class UserActivityController extends Controller
|
||||
) user_activity_by_hour_and_
|
||||
GROUP BY user_id) AS calculated_table;";
|
||||
|
||||
$data['total_activity_time'] = $total_ids_list ? DB::select(DB::raw($total_activity_time_sql))[0]->activity : null;
|
||||
$data['total_activity_time'] = $total_ids_list ? DB::select($total_activity_time_sql)[0]->activity : null;
|
||||
|
||||
$data['average'] = round(($total_ids_list ? DB::select(DB::raw($total_activity_time_sql))[0]->activity : 0) / count(explode(',', $total_ids_list)), 2);
|
||||
$data['average'] = round(($total_ids_list ? DB::select($total_activity_time_sql)[0]->activity : 0) / count(explode(',', $total_ids_list)), 2);
|
||||
|
||||
$top_10_activity_list_sql = "
|
||||
SELECT *,
|
||||
@@ -758,7 +758,7 @@ class UserActivityController extends Controller
|
||||
ORDER BY quantity desc
|
||||
LIMIT 10";
|
||||
|
||||
$data['top_10_activity_list'] = $total_ids_list ? DB::select(DB::raw($top_10_activity_list_sql)) : null;
|
||||
$data['top_10_activity_list'] = $total_ids_list ? DB::select($top_10_activity_list_sql) : null;
|
||||
|
||||
|
||||
$data['fromDate'] = $request->fromDate ? $request->fromDate : null;
|
||||
|
||||
Reference in New Issue
Block a user