From 228c7db9f8c4814b64e4bf94062b0af6997b6de8 Mon Sep 17 00:00:00 2001 From: wahyu Date: Thu, 2 Nov 2023 10:54:51 +0700 Subject: [PATCH 1/3] update dashboard bod --- app/Helpers/MasterFunctionsHelper.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Helpers/MasterFunctionsHelper.php b/app/Helpers/MasterFunctionsHelper.php index d1c2c47..53f0be8 100644 --- a/app/Helpers/MasterFunctionsHelper.php +++ b/app/Helpers/MasterFunctionsHelper.php @@ -852,6 +852,7 @@ class MasterFunctionsHelper $arr_ActualM = []; $tempDate = []; + $tempPercentage = []; $tempPercentagePlan = []; $tempPercentagePlanWhr = []; $tempPercentageReal = []; @@ -860,7 +861,8 @@ class MasterFunctionsHelper $currentACWP = 0; $currentBCWP = 0; - + $totalACWP = 0; + $totalBCWP = 0; foreach ($period as $dt) { $minSevenDays = new \Datetime($dt->format("Y-m-d")); $minSevenDays = $minSevenDays->modify('-7 day')->format("Y-m-d"); From 60fe1064a58232296400293d554b32c5c2b402d4 Mon Sep 17 00:00:00 2001 From: wahyu Date: Thu, 2 Nov 2023 13:02:51 +0700 Subject: [PATCH 2/3] update string agg --- app/Http/Controllers/ActivityController.php | 46 ++++++++++++++------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index 16ccb60..70e84ff 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -544,22 +544,36 @@ class ActivityController extends Controller { $dataBuilder = $this->setUpPayload($request->all(), 'm_activity'); $builder = $dataBuilder['builder']; - $dataGet = $builder->select( 'selfTable.name', 'persentase_progress', 'selfTable.start_date', 'selfTable.end_date', 'duration', - 'm_version_gantt.name_version', DB::raw('STRING_AGG(m_users.name, \',\') as user_name'), - DB::raw('SUM(report_activity_material.qty) as qty'), 'assign_material_to_activity.qty_planning', - 'assign_material_to_activity.id as join_third_id') - ->join('m_version_gantt', 'm_version_gantt.id', '=', 'selfTable.version_gantt_id') - ->leftJoin('assign_hr_to_activity', 'assign_hr_to_activity.activity_id', '=', 'selfTable.id') - ->leftJoin('m_users', 'assign_hr_to_activity.user_id', '=', 'm_users.id') - ->leftJoin('report_activity_material', 'report_activity_material.activity_id', '=', 'selfTable.id') - ->join('assign_material_to_activity', 'assign_material_to_activity.activity_id', '=', 'selfTable.id') - ->groupBy("selfTable.id") - ->groupBy("selfTable.name") - ->groupBy("selfTable.persentase_progress") - ->groupBy("m_version_gantt.name_version") - ->groupBy("assign_material_to_activity.qty_planning") - ->groupBy("assign_material_to_activity.id") - ->get(); + $dataGet = $builder->select( + 'selfTable.name', + 'persentase_progress', + 'selfTable.start_date', + 'selfTable.end_date', + 'duration', + 'm_version_gantt.name_version', + DB::raw('user_names.user_name as user_name'), + DB::raw('SUM(report_activity_material.qty) as qty'), + 'assign_material_to_activity.qty_planning', + 'assign_material_to_activity.id as join_third_id' + ) + ->join('m_version_gantt', 'm_version_gantt.id', '=', 'selfTable.version_gantt_id') + ->leftJoin('assign_hr_to_activity', 'assign_hr_to_activity.activity_id', '=', 'selfTable.id') + ->leftJoin('report_activity_material', 'report_activity_material.activity_id', '=', 'selfTable.id') + ->join('assign_material_to_activity', 'assign_material_to_activity.activity_id', '=', 'selfTable.id') + ->leftJoin(DB::raw('(SELECT activity_id, STRING_AGG(m_users.name, \',\') as user_name + FROM assign_hr_to_activity + LEFT JOIN m_users ON assign_hr_to_activity.user_id = m_users.id + GROUP BY activity_id) as user_names'), function ($join) { + $join->on('user_names.activity_id', '=', 'selfTable.id'); + }) + ->groupBy('selfTable.id') + ->groupBy('selfTable.name') + ->groupBy('selfTable.persentase_progress') + ->groupBy('m_version_gantt.name_version') + ->groupBy('assign_material_to_activity.qty_planning') + ->groupBy('assign_material_to_activity.id') + ->groupBy('user_names.user_name') + ->get(); return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet ], 200); } // before upload file From 69a48a16d802e5cfa29e6d6da1bd73616b92b92c Mon Sep 17 00:00:00 2001 From: wahyu Date: Thu, 2 Nov 2023 16:28:48 +0700 Subject: [PATCH 3/3] update report analysis activity --- app/Http/Controllers/ActivityController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index 70e84ff..733ee1d 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -549,6 +549,10 @@ class ActivityController extends Controller 'persentase_progress', 'selfTable.start_date', 'selfTable.end_date', + 'selfTable.planned_start', + 'selfTable.planned_end', + 'selfTable.actual_start', + 'selfTable.actual_end', 'duration', 'm_version_gantt.name_version', DB::raw('user_names.user_name as user_name'),