From c6452c9cc231b106ecc748b708c55abdc0112d1d Mon Sep 17 00:00:00 2001 From: wahyu Date: Thu, 2 Nov 2023 09:11:48 +0700 Subject: [PATCH] update report analysis --- app/Http/Controllers/ActivityController.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index ea48586..16ccb60 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -544,8 +544,8 @@ 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', 'assign_hr_to_activity.id', - 'm_version_gantt.name_version', 'm_users.name as user_name', + $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') @@ -557,10 +557,8 @@ class ActivityController extends Controller ->groupBy("selfTable.name") ->groupBy("selfTable.persentase_progress") ->groupBy("m_version_gantt.name_version") - ->groupBy("m_users.name") ->groupBy("assign_material_to_activity.qty_planning") ->groupBy("assign_material_to_activity.id") - ->groupBy("assign_hr_to_activity.id") ->get(); return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet ], 200); }