add date filter to camp
This commit is contained in:
@@ -18,7 +18,11 @@ class CampController extends Controller
|
|||||||
{
|
{
|
||||||
$province = $request->province ?? null;
|
$province = $request->province ?? null;
|
||||||
$city = $request->city ?? 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;
|
$axisType = $request->axis_type ?? null;
|
||||||
$blockageReason = $request->blockage ?? null;
|
$blockageReason = $request->blockage ?? null;
|
||||||
|
|
||||||
@@ -33,7 +37,7 @@ class CampController extends Controller
|
|||||||
return $query->where('city_id', $city);
|
return $query->where('city_id', $city);
|
||||||
})
|
})
|
||||||
->when($blockageDate, function ($query, $blockageDate) {
|
->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) {
|
->when($axisType, function ($query, $axisType) {
|
||||||
return $query->where('axis_type', $axisType);
|
return $query->where('axis_type', $axisType);
|
||||||
|
|||||||
Reference in New Issue
Block a user