|
|
|
@ -200,8 +200,8 @@ class UserToActivityController extends Controller
|
|
|
|
|
->join('m_version_gantt as mvg', 'mvg.id', '=', 'ma.version_gantt_id') |
|
|
|
|
->join('m_proyek as mp', 'mp.id', '=', 'ma.proyek_id') |
|
|
|
|
->where('ahta.user_id', $payload['user_id']) |
|
|
|
|
->where('ma.start_date', '<=', $payload['start_date']) |
|
|
|
|
->where('ma.end_date', '>=', $payload['end_date']) |
|
|
|
|
->where('ma.start_date', '<=', $payload['end_date']) |
|
|
|
|
->where('ma.end_date', '>=', $payload['start_date']) |
|
|
|
|
->where('ma.proyek_id', $payload['proyek_id']) |
|
|
|
|
->get(); |
|
|
|
|
|
|
|
|
|