RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'main'

Browse Source 
Develop

See merge request witelgroup/rms_v2!61
This commit is contained in:
amirghasempoor
2025-01-12 10:34:48 +00:00
parent 889a49a1b3 f9215a54c7
commit 6691778a44
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Controllers/PostersController.php
View File

@@ -70,11 +70,11 @@ class PostersController extends Controller
) user_activity_by_hour_and_
GROUP BY user_id) AS calculated_table;";
$data['user_activity'] = (int) DB::select(DB::raw($user_activity_sql))[0]->activity;
$data['user_activity'] = (int) DB::select($user_activity_sql)[0]->activity;
$user_activity_count_sql = "SELECT count(*) as cnt
FROM user_activity_logs
WHERE created_at between '{$request->fromDate}' and '{$request->toDate}' and user_id IN(" . $ids_list . ")";
$data['user_activity_count'] = (int) DB::select(DB::raw($user_activity_count_sql))[0]->cnt;
$data['user_activity_count'] = (int) DB::select($user_activity_count_sql)[0]->cnt;
$user_activity_top_five_provinces_sql = "SELECT province_fa FROM(SELECT province_fa,COUNT(*) AS cnt FROM user_activity_logs WHERE created_at BETWEEN '{$request->fromDate}' and '{$request->toDate}' GROUP BY province_id ORDER BY cnt DESC LIMIT 5)wq";
$user_activity_top_five_provinces_by_users_sql = "SELECT province_fa FROM(SELECT cnt1,cnt2,A.province_fa,cnt2/cnt1 AS cnt
@@ -82,8 +82,8 @@ class PostersController extends Controller
JOIN ( SELECT province_fa,province_id,COUNT(*) AS cnt2 FROM user_activity_logs WHERE created_at BETWEEN '{$request->fromDate}' and '{$request->toDate}' GROUP BY province_id) AS B
ON A.province_id=B.province_id ORDER BY cnt DESC LIMIT 5)wq";
$data['user_activity_top_five_provinces'] = (array) DB::select(DB::raw($user_activity_top_five_provinces_sql));
$data['user_activity_top_five_provinces_by_users'] = (array) DB::select(DB::raw($user_activity_top_five_provinces_by_users_sql));
$data['user_activity_top_five_provinces'] = (array) DB::select($user_activity_top_five_provinces_sql);
$data['user_activity_top_five_provinces_by_users'] = (array) DB::select($user_activity_top_five_provinces_by_users_sql);
// user part end
// road items chart part begin
@@ -176,7 +176,7 @@ class PostersController extends Controller
ON A.province_id = B.province_id) AS B
ON AA.name_fa=B.province_fa
ORDER BY cnt DESC";
$data['road_item_group_province_chunk'] = DB::select(DB::raw($road_item_group_province_chunk_sql));
$data['road_item_group_province_chunk'] = DB::select($road_item_group_province_chunk_sql);
}
// geojson chart end
//// end geo
@@ -192,7 +192,7 @@ class PostersController extends Controller
// ->get();
////// milad
$fast_ract_chart_sql = "SELECT st,ttt/sumall * 100 AS percent FROM(SELECT st,SUM(tt) AS ttt,SUM(tt) OVER () AS sumall FROM(SELECT IF(rms_status > 0, 1, 0) AS st,COUNT(*) AS tt FROM road_observeds where created_at between '" . $request->fromDate . "' and '" . $request->toDate . "' GROUP BY st)a GROUP BY st)q order by st";
$data['fast_react_chart'] = (array) DB::select(DB::raw($fast_ract_chart_sql));
$data['fast_react_chart'] = (array) DB::select($fast_ract_chart_sql);
$data['fast_react_group_by_type'] = DB::table('road_observeds')
->select(DB::raw('count(*) as cnt,FeatureTypeTitle,fk_FeatureType'))
@@ -295,14 +295,14 @@ class PostersController extends Controller
// ->groupBy('status')
// ->get();
$road_tollhouse_count_status_sql = "SELECT st,round(ttt/sumall,2) AS percent FROM(SELECT st,SUM(tt) AS ttt,SUM(tt) OVER () AS sumall FROM(SELECT IF(STATUS > 0, 1, 0) AS st,COUNT(*) AS tt FROM rahdari_points GROUP BY st)a GROUP BY st)q ORDER BY st";
$data['road_tollhouse_count_status'] = DB::select(DB::raw($road_tollhouse_count_status_sql)); /////// faal va gheyre faal
$data['road_tollhouse_count_status'] = DB::select($road_tollhouse_count_status_sql); /////// faal va gheyre faal
$road_tollhouse_count_type_sql = "SELECT st,round(ttt/sumall, 2) AS percent FROM(SELECT st,SUM(tt) AS ttt,SUM(tt) OVER () AS sumall FROM(SELECT IF(TYPE > 2, 1, 0) AS st,COUNT(*) AS tt FROM rahdari_points GROUP BY st)a GROUP BY st)q
WHERE st =1
ORDER BY st ";
$data['road_tollhouse_count_type'] = DB::select(DB::raw($road_tollhouse_count_type_sql))[0]->percent; //// movaghat
$data['road_tollhouse_count_type'] = DB::select($road_tollhouse_count_type_sql)[0]->percent; //// movaghat
$road_tollhouse_spec_sql = "SELECT SUM(team_num) AS ekip,SUM(staff_num) AS rahdar,SUM(machines_heavy) AS sangin, SUM(machines_sheavy) AS nime_sangin,COUNT(*) AS rahdarkhone FROM rahdari_points";
$data['road_tollhouse_spec'] = DB::select(DB::raw($road_tollhouse_spec_sql)); //// movaghat
$data['road_tollhouse_spec'] = DB::select($road_tollhouse_spec_sql); //// movaghat
// road patrol count part end
// road patrol updated part begin
@@ -327,7 +327,7 @@ class PostersController extends Controller
GROUP BY user_id
) grpuped_by_user_id";
$data['active_user_count'] = DB::select(DB::raw($active_user_count_sql))[0]->active_user_count;
$data['active_user_count'] = DB::select($active_user_count_sql)[0]->active_user_count;
// active user count begin
@@ -379,7 +379,7 @@ class PostersController extends Controller
// SELECT *,
// COUNT(*) AS quantity
// FROM (
// SELECT
// SELECT
// *,
// YEAR (created_at) AS yy,
// MONTH (created_at) AS mm,
@@ -394,12 +394,12 @@ class PostersController extends Controller
// hh,
// user_id
// ) user_activity_by_hour_and_
// GROUP BY
// GROUP BY
// yy,
// mm,
// dd;";
$data['hourly_activity_chart'] = $ids_list ? DB::select(DB::raw($hourly_activity_chart_sql)) : null;
$data['quantitative_activity_chart'] = $ids_list ? DB::select(DB::raw($quantitative_activity_chart_sql)) : null;
$data['hourly_activity_chart'] = $ids_list ? DB::select($hourly_activity_chart_sql) : null;
$data['quantitative_activity_chart'] = $ids_list ? DB::select($quantitative_activity_chart_sql) : null;
// user activity chart count begin
// geojson chart begin
@@ -613,7 +613,7 @@ class PostersController extends Controller
->orderBy('avarage', 'desc')
->limit(5)
->get()->toArray();
// $query = "SELECT COUNT(
// $query = "SELECT COUNT(
// CASE
// WHEN progress_project > 0 THEN 1
// END
@@ -769,7 +769,7 @@ class PostersController extends Controller
// $query .= " GROUP BY province_idORDER BY province_id ASC;";
$query .= " ORDER BY average DESC";
$data['contracts']['progress_avrage'] = DB::select(DB::raw($query));
$data['contracts']['progress_avrage'] = DB::select($query);
$data['contracts']['progress_avrage_according_province'] = $this->progressAvrageAccordingProvince($request);
$data['contracts']['top_5_progress_avrage_according_province'] = $this->top5ProgressAvrageAccordingProvince($request);
@@ -791,7 +791,7 @@ class PostersController extends Controller
// $data['contracts']['done_and_in_progress'] = DB::select(DB::raw($query));
// dd(DB::select(DB::raw($query)));
foreach (DB::select(DB::raw($query)) as $key => $value) {
foreach (DB::select($query) as $key => $value) {
$data['contracts']['done_and_in_progress'][$value->last_status_id]['percent'] = $value->percent;
}
// dd($data['contracts']['done_and_in_progress']);
@@ -860,7 +860,7 @@ class PostersController extends Controller
WHERE last_status_id = 2
GROUP BY unique_code
) AS mreged_statistics_table WHERE date_ BETWEEN '{$request->fromDate}' AND '{$request->toDate}' GROUP BY province_id )q WHERE progress_project = 0";
$data['contracts']['province_zero_progress'] = DB::select(DB::raw($query));
$data['contracts']['province_zero_progress'] = DB::select($query);
$data['contracts']['max_contracts_group_by_province'] = DB::table('contract_subitems')
->select('province_fa', DB::raw('count(*) as count_number'))
// ->when($request->province_id, function ($query) use ($request) {
@@ -1078,10 +1078,10 @@ class PostersController extends Controller
$temp_finalArray = [];
foreach (Province::all() as $key => $value) {
// $temp_finalArray[$value->id]['label'] = $value->name_fa;
// $temp_finalArray[$value->id]['label'] = $value->name_fa;
$temp_finalArray[$value->id] = null;
}
foreach (DB::select(DB::raw($query)) as $key => $value) {
foreach (DB::select($query) as $key => $value) {
$temp_finalArray[$value->province_id] = $value->progress_project;
}
foreach ($temp_finalArray as $key => $value) {
@@ -1140,13 +1140,13 @@ class PostersController extends Controller
// $finalArray = [];
// foreach (Province::all() as $key => $value) {
// $finalArray[$value->id]['label'] = $value->name_fa;
// $finalArray[$value->id]['progress_project'] = null;
// $finalArray[$value->id]['label'] = $value->name_fa;
// $finalArray[$value->id]['progress_project'] = null;
// }
// foreach (DB::select(DB::raw($query)) as $key => $value) {
// $finalArray[$value->province_id]['progress_project'] = $value->progress_project;
// }
// dd(DB::select(DB::raw($query)));
return DB::select(DB::raw($query));
return DB::select($query);
}
}