From 4e03656f13efe641eed5e8b4934ba6d98f701862 Mon Sep 17 00:00:00 2001 From: wahyu Date: Mon, 30 Oct 2023 12:45:14 +0700 Subject: [PATCH] update report analysis --- app/Http/Controllers/ActivityController.php | 11 ++++++----- app/Http/Controllers/UserToActivityController.php | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index 1c7fa55..3375682 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -534,7 +534,7 @@ class ActivityController extends Controller ->select('m_activity.name') ->where('m_activity.proyek_id', $data['columns'][0]['value']) ->where('m_activity.type_activity', 'task') - ->where('m_activity.persentase_progress', '>', 0) + // ->where('m_activity.persentase_progress', '>', 0) ->groupByRaw('m_activity.name') ->get(); return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet ], 200); @@ -544,14 +544,14 @@ class ActivityController extends Controller { $dataBuilder = $this->setUpPayload($request->all(), 'm_activity'); $builder = $dataBuilder['builder']; - $dataGet = $builder->select( 'selfTable.name', 'persentase_progress', + $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', 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') - ->join('assign_hr_to_activity', 'assign_hr_to_activity.activity_id', '=', 'selfTable.id') - ->join('m_users', 'assign_hr_to_activity.user_id', '=', 'm_users.id') - ->join('report_activity_material', 'report_activity_material.activity_id', '=', 'selfTable.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") @@ -560,6 +560,7 @@ class ActivityController extends Controller ->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); } diff --git a/app/Http/Controllers/UserToActivityController.php b/app/Http/Controllers/UserToActivityController.php index 4ca00f8..b387c24 100644 --- a/app/Http/Controllers/UserToActivityController.php +++ b/app/Http/Controllers/UserToActivityController.php @@ -138,6 +138,8 @@ class UserToActivityController extends Controller $builder->addSelect(DB::raw('SUM(report_activity_material.qty) as volume_actual')); $builder->groupBy("m_activity.id"); $builder->groupBy("selfTable.id"); + $builder->groupBy("selfTable.start_date"); + $builder->groupBy("selfTable.end_date"); $builder->groupBy("m_users.name"); $builder->groupBy("assign_material_to_activity.id"); $builder->groupBy("m_version_gantt.name_version");