From 366ac1477762d209c6bcb70c96ef7d6dd73f3b15 Mon Sep 17 00:00:00 2001 From: wahyu Date: Tue, 26 Sep 2023 10:24:01 +0700 Subject: [PATCH] fix date filter --- .../Controllers/UserToActivityController.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/UserToActivityController.php b/app/Http/Controllers/UserToActivityController.php index f9b9ef3..5951aa6 100644 --- a/app/Http/Controllers/UserToActivityController.php +++ b/app/Http/Controllers/UserToActivityController.php @@ -131,10 +131,6 @@ class UserToActivityController extends Controller $payload = $request->all(); if (isset($payload['join_column'])) { $join_column = $payload['join_column']; - $startDate = $join_column['start_date']; - $endDate = $join_column['end_date']; - $startDate = date("Y-m-d H:i:sO", strtotime($startDate)); - $endDate = date("Y-m-d H:i:sO", strtotime($endDate)); unset($payload['join_column']); } @@ -142,14 +138,18 @@ class UserToActivityController extends Controller $builder = $dataBuilder['builder']; $countBuilder = $dataBuilder['count']; if (isset($join_column)) { + $startDate = $join_column['start_date']; + $endDate = $join_column['end_date']; + $startDate = date("Y-m-d H:i:sO", strtotime($startDate)); + $endDate = date("Y-m-d H:i:sO", strtotime($endDate)); $builder->where(function ($query) use ($startDate, $endDate) { $query - ->where('m_proyek.mulai_proyek', '<=', $startDate) - ->where('m_proyek.akhir_proyek', '>=', $endDate) + ->where('m_proyek.mulai_proyek', '>=', $startDate) + ->where('m_proyek.akhir_proyek', '<=', $endDate) ->where(function ($query) use ($endDate, $startDate) { $query - ->where('m_activity.start_date', '<=', $startDate) - ->where('m_activity.end_date', '>=', $endDate); + ->where('m_activity.start_date', '>=', $startDate) + ->where('m_activity.end_date', '<=', $endDate); }); }); }