report analysis user group update

app/Http/Controllers/UserToActivityController.php

@@ -11,7 +11,8 @@ use Datatables;
 
 class UserToActivityController extends Controller
 {
-	public function add(Request $request){
+	public function add(Request $request)
+	{
 		$this->validate($request, [
 			'activity_id'        => 'required',
 			'user_id'           => 'required'
@@ -26,7 +27,8 @@ class UserToActivityController extends Controller
 		return response()->json(['status' => 'success', 'message' => 'Data added!', 'code' => 200]);
 	}
 
-	public function addMultiple(Request $request){
+	public function addMultiple(Request $request)
+	{
 		$users_id = $request->user_id;
 		$users_role = $request->role_proyek_id;
 
@@ -75,10 +77,10 @@ class UserToActivityController extends Controller
 		} else {
 			return response()->json(['status' => 'success', 'message' => 'Data added!', 'code' => 200]);
 		}
-
 	}
 
-	private function updatedCostPlanning($parent_id) {
+	private function updatedCostPlanning($parent_id)
+	{
 		$sumBiaya = Activity::selectRaw('sum(cast(rencana_biaya as double precision))')
 			->where("parent_id", $parent_id)
 			->first();
@@ -89,7 +91,8 @@ class UserToActivityController extends Controller
 		}
 	}
 
-	public function update(Request $request, $id){
+	public function update(Request $request, $id)
+	{
 		if (empty($id) || !is_int((int)$id))
 			return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 
@@ -116,7 +119,8 @@ class UserToActivityController extends Controller
 		return response()->json(['status' => 'failed', 'message' => 'Failed to delete!', 'code' => 500], 500);
 	}
 
-	public function edit($id){
+	public function edit($id)
+	{
 		if (!$id || (int) $id < 0 || $id == "") {
 			return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 			die();
@@ -136,12 +140,19 @@ class UserToActivityController extends Controller
 		$builder = $dataBuilder['builder'];
 		$countBuilder = $dataBuilder['count'];
 		$builder->addSelect(DB::raw('SUM(report_activity_material.qty) as volume_actual'));
-        $builder->groupBy("m_activity.id");
+		$builder->groupBy("m_activity.name");
+		$builder->groupBy("m_activity.persentase_progress");
+		$builder->groupBy("m_activity.actual_start");
+		$builder->groupBy("m_activity.actual_end");
+		$builder->groupBy("m_activity.planned_start");
+		$builder->groupBy("m_activity.planned_end");
+		$builder->groupBy("m_activity.start_date");
+		$builder->groupBy("m_activity.end_date");
+		$builder->groupBy("m_activity.duration");
 		$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.qty_planning");
-        $builder->groupBy("assign_material_to_activity.id");
 		$builder->groupBy("m_version_gantt.name_version");
 		$dataGet = $builder->get();
 		$totalRecord = $countBuilder->count();
@@ -191,11 +202,22 @@ class UserToActivityController extends Controller
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => count($dataGet)], 200);
 	}
 
-	public function activityUser(Request $request){
+	public function activityUser(Request $request)
+	{
 		$payload = $request->all();
 		$activity = DB::table('m_activity as ma')
-				->select('ahta.id', 'ma.id as activity_id', 'ma.proyek_id', 'ma.name as join_second_name', 'ma.start_date as join_second_start_date', 
+			->select(
-				'ma.end_date as join_second_end_date', 'ma.persentase_progress', 'mvg.name_version', 'mp.nama as nama_proyek', 'mp.type_proyek_id')
+				'ahta.id',
+				'ma.id as activity_id',
+				'ma.proyek_id',
+				'ma.name as join_second_name',
+				'ma.start_date as join_second_start_date',
+				'ma.end_date as join_second_end_date',
+				'ma.persentase_progress',
+				'mvg.name_version',
+				'mp.nama as nama_proyek',
+				'mp.type_proyek_id'
+			)
 			->join('assign_hr_to_activity as ahta', 'ahta.activity_id', '=', 'ma.id')
 			->join('m_version_gantt as mvg', 'mvg.id', '=', 'ma.version_gantt_id')
 			->join('m_proyek as mp', 'mp.id', '=', 'ma.proyek_id')
@@ -262,7 +284,8 @@ class UserToActivityController extends Controller
 		}
 	}
 
-	public function datatables(Request $request){
+	public function datatables(Request $request)
+	{
 		$id_activity = $request->query('idact');
 		$data = UserToActivity::select("assign_hr_to_activity.id as id", "assign_hr_to_activity.start_date", "assign_hr_to_activity.end_date", "u.name as user_name", "mrp.name as role_name")
 			->join("m_role_proyek as mrp", "mrp.id", "=", "assign_hr_to_activity.role_proyek_id")