From d3d41f3bebf3a6280d3201d98f923479b6affcc3 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Sun, 12 Jan 2025 11:23:27 +0330 Subject: [PATCH 1/2] add city filter to camp --- app/Http/Controllers/CampController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Http/Controllers/CampController.php b/app/Http/Controllers/CampController.php index 83f48508..8360f00d 100644 --- a/app/Http/Controllers/CampController.php +++ b/app/Http/Controllers/CampController.php @@ -17,6 +17,7 @@ class CampController extends Controller public function index(Request $request) { $province = $request->province ?? null; + $city = $request->city ?? null; $blockageDate = $request->blockage_date ?? null; $axisType = $request->axis_type ?? null; $blockageReason = $request->blockage ?? null; @@ -28,6 +29,9 @@ class CampController extends Controller ->when($province, function ($query, $province) { return $query->where('province_id', $province); }) + ->when($city, function ($query, $city) { + return $query->where('city_id', $city); + }) ->when($blockageDate, function ($query, $blockageDate) { return $query->whereBetween('submited_at', [$blockageDate . ' 00:00:00', $blockageDate . ' 23:59:59']); }) @@ -48,6 +52,9 @@ class CampController extends Controller ->when($blockageDate, function ($query, $blockageDate) { return $query->whereBetween('submited_at', [$blockageDate . ' 00:00:00', $blockageDate . ' 23:59:59']); }) + ->when($city, function ($query, $city) { + return $query->where('city_id', $city); + }) ->when($axisType, function ($query, $axisType) { return $query->where('axis_type', $axisType); }) From d05101fe0b418a4bfcf4b797e2593369b731b0e2 Mon Sep 17 00:00:00 2001 From: Witel Group Date: Sun, 12 Jan 2025 08:20:13 +0000 Subject: [PATCH 2/2] add date filter to camp --- app/Http/Controllers/CampController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CampController.php b/app/Http/Controllers/CampController.php index 8360f00d..c122a258 100644 --- a/app/Http/Controllers/CampController.php +++ b/app/Http/Controllers/CampController.php @@ -18,7 +18,11 @@ class CampController extends Controller { $province = $request->province ?? null; $city = $request->city ?? null; - $blockageDate = $request->blockage_date ?? null; + $blockageStartDate = $request->blockage_start_date ?? null; + $blockageEndDate = $request->blockage_end_date ?? null; + $blockageDate = $blockageStartDate && $blockageEndDate ? + [$blockageStartDate . ' 00:00:00', $blockageEndDate . ' 23:59:59'] : + null; $axisType = $request->axis_type ?? null; $blockageReason = $request->blockage ?? null; @@ -33,7 +37,7 @@ class CampController extends Controller return $query->where('city_id', $city); }) ->when($blockageDate, function ($query, $blockageDate) { - return $query->whereBetween('submited_at', [$blockageDate . ' 00:00:00', $blockageDate . ' 23:59:59']); + return $query->whereBetween('submited_at', $blockageDate); }) ->when($axisType, function ($query, $axisType) { return $query->where('axis_type', $axisType);