|
|
@ -202,7 +202,7 @@ class UserToActivityController extends Controller |
|
|
|
->where('ahta.user_id', $payload['user_id']) |
|
|
|
->where('ahta.user_id', $payload['user_id']) |
|
|
|
->where('ma.start_date', '<=', $payload['start_date']) |
|
|
|
->where('ma.start_date', '<=', $payload['start_date']) |
|
|
|
->where('ma.end_date', '>=', $payload['end_date']) |
|
|
|
->where('ma.end_date', '>=', $payload['end_date']) |
|
|
|
->where('ma.proyek', $payload['proyek_id']) |
|
|
|
->where('ma.proyek_id', $payload['proyek_id']) |
|
|
|
->get(); |
|
|
|
->get(); |
|
|
|
|
|
|
|
|
|
|
|
if ($payload['status'] != "") { |
|
|
|
if ($payload['status'] != "") { |
|
|
|