Merge pull request 'dev-wahyu' (#212) from dev-wahyu into staging

Reviewed-on: ordo/adw-backend#212

app/Http/Controllers/ProjectController.php

@@ -229,6 +229,7 @@ class ProjectController extends Controller
 		$dataBuilder = $this->setUpPayload($payload, 'm_proyek');
 		$builder = $dataBuilder['builder'];
 		$countBuilder = $dataBuilder['count'];
+        // $builder->where("selfTable.created_by",$this->currentName);
 		$dataGet = $builder->get();
 		$totalRecord = $countBuilder->count();
 
@@ -274,7 +275,9 @@ class ProjectController extends Controller
 			'created_by',
 			'updated_at',
 			'updated_by'
-		)->orderBy('id', 'desc')->get();
+        )->orderBy('id', 'desc')
+         // ->where("created_by",$this->currentName)
+         ->get();
 		$countData = $data->count();
 
 		if(!$data)

app/Http/Controllers/UserToActivityController.php

@@ -129,6 +129,16 @@ class UserToActivityController extends Controller
 		return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
 	}
 
+	public function searchAnalysis(Request $request)
+	{
+		$dataBuilder = $this->setUpPayload($request->all(), 'assign_hr_to_activity');
+		$builder = $dataBuilder['builder'];
+		$countBuilder = $dataBuilder['count'];
+		$dataGet = $builder->get();
+		$totalRecord = $countBuilder->count();
+		return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200);
+	}
+
 	public function search(Request $request)
 	{
 		$payload = $request->all();

routes/web.php

@@ -197,6 +197,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/search-analysis', 'UserToActivityController@searchAnalysis');
 		$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');
@@ -204,7 +205,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 
 		$router->get('/sumVolActualM/{id}', 'ActivityController@sumVolumeActualMaterial');
 		$router->get('/activity/{id}/{proyek_id}/get', 'ActivityController@getByGanttId');
-		$router->get('/activity/search', 'ActivityController@search');
+		$router->post('/activity/search', 'ActivityController@search');
     	$router->post('/activity/import', 'ActivityController@import');
     	$router->post('/activity/import-update', 'ActivityController@importUpdate');
     	$router->post('/activity/import-old', 'ActivityController@importOld');