RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/CampFilter' into 'develop'

Browse Source 
Feature/camp filter

See merge request witelgroup/rms_v2!58
This commit is contained in:
amirghasempoor
2025-01-12 08:26:01 +00:00
parent 1b8de4271a d05101fe0b
commit 3edb3d2f0f
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/CampController.php
View File

@@ -17,7 +17,12 @@ class CampController extends Controller
public function index(Request $request)
{
$province = $request->province ?? null;
$blockageDate = $request->blockage_date ?? null;
$city = $request->city ?? 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;
@@ -28,8 +33,11 @@ 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']);
return $query->whereBetween('submited_at', $blockageDate);
})
->when($axisType, function ($query, $axisType) {
return $query->where('axis_type', $axisType);
@@ -48,6 +56,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);
})