From bbd8d9d7631c602908c8e5485f6e1a6bcec007ce Mon Sep 17 00:00:00 2001
From: Wahyu Ramadhan <ssjrama@gmail.com>
Date: Thu, 2 Mar 2023 10:17:41 +0700
Subject: [PATCH] adding new function for filtering activity

---
 .../Controllers/UserToActivityController.php  | 34 ++++++++++++++++++-
 routes/web.php                                |  1 +
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/UserToActivityController.php b/app/Http/Controllers/UserToActivityController.php
index 2b9b403..8cf9ad6 100644
--- a/app/Http/Controllers/UserToActivityController.php
+++ b/app/Http/Controllers/UserToActivityController.php
@@ -134,7 +134,39 @@ class UserToActivityController extends Controller
 		}else{
 			return response()->json(['status'=>'failed','message'=>'failed get list user to activity gantt, please try again later!','code'=>400], 400);
 		}
-	}
+  }
+
+  public function listFiltered(Request $request)
+	{
+    $startDate = $request->start_date;
+    $endDate = $request->end_date;
+    $userId = $request->user_id;
+    $proyekId = $request->proyek_id;
+
+    if (isset($proyekId)) {
+       $data = UserToActivity::select('assign_hr_to_activity.id', 'assign_hr_to_activity.activity_id', 'm_activity.name', 'm_activity.kode_sortname', 'm_activity.start_date', 'm_activity.end_date')
+        ->join('m_activity', 'assign_hr_to_activity.activity_id', '=', 'm_activity.id')
+        ->where('m_activity.start_date', '=', $startDate)
+        ->where('m_activity.end_date', '=', $endDate)
+        ->where('assign_hr_to_activity.user_id', '=', $userId)
+        ->where('assign_hr_to_activity.proyek_id', '=', $proyekId)
+        ->get();
+    }else {
+        $data = UserToActivity::select('assign_hr_to_activity.id', 'assign_hr_to_activity.activity_id', 'm_activity.name', 'm_activity.kode_sortname', 'm_activity.start_date', 'm_activity.end_date')
+        ->join('m_activity', 'assign_hr_to_activity.activity_id', '=', 'm_activity.id')
+        ->where('m_activity.start_date', '=', $startDate)
+        ->where('m_activity.end_date', '=', $endDate)
+        ->where('assign_hr_to_activity.user_id', '=', $userId)
+        ->get();    
+    }
+        $countData = $data->count();
+
+		if($data){
+			return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
+		}else{
+			return response()->json(['status'=>'failed','message'=>'failed get list user to activity gantt, please try again later!','code'=>400], 400);
+		}
+	} 
 
 	public function datatables(Request $request){
 		$id_activity = $request->query('idact');
diff --git a/routes/web.php b/routes/web.php
index 9021ba1..4a66429 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -192,6 +192,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 		$router->get('/user-to-activity/edit/{id}', 'UserToActivityController@edit');
 		$router->put('/user-to-activity/update/{id}', 'UserToActivityController@update');
 		$router->post('/user-to-activity/search', 'UserToActivityController@search');
+		$router->post('/user-to-activity/list-filtered', 'UserToActivityController@listFiltered');
 		$router->delete('/user-to-activity/delete/{id}', 'UserToActivityController@delete');
 		$router->get('/user-to-activity/list', 'UserToActivityController@list');
 		$router->get('/user-to-activity/datatables', 'UserToActivityController@datatables');