|
|
@ -527,6 +527,17 @@ class ActivityController extends Controller |
|
|
|
return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200); |
|
|
|
return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet, 'totalRecord' => $totalRecord], 200); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public function searchAnalysis(Request $request) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
$dataBuilder = $this->setUpPayload($request->all(), 'm_activity'); |
|
|
|
|
|
|
|
$builder = $dataBuilder['builder']; |
|
|
|
|
|
|
|
$dataGet = $builder->select('selfTable.*','m_version_gantt.name_version', 'm_users.name as user_name') |
|
|
|
|
|
|
|
->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') |
|
|
|
|
|
|
|
->get(); |
|
|
|
|
|
|
|
return response()->json(['status' => 'success', 'code' => 200, 'data' => $dataGet ], 200); |
|
|
|
|
|
|
|
} |
|
|
|
// before upload file |
|
|
|
// before upload file |
|
|
|
public function importOld(Request $request) |
|
|
|
public function importOld(Request $request) |
|
|
|
{ |
|
|
|
{ |
|
|
|