Browse Source

Merge pull request 'user to activity update filter' (#310) from dev-wahyu into staging

Reviewed-on: ordo/adw-backend#310
pull/1/head
farhantock 12 months ago
parent
commit
c7b61065b8
  1. 4
      app/Http/Controllers/UserToActivityController.php

4
app/Http/Controllers/UserToActivityController.php

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

Loading…
Cancel
Save