add subregion filter

FogosPT · Mar 18, 2024 · 535b982 · 535b982
1 parent 9a9567b
commit 535b982
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/app/Http/Controllers/IncidentController.php b/app/Http/Controllers/IncidentController.php
@@ -38,6 +38,9 @@ public function active(Request $request): JsonResponse
         $csv = $request->get('csv');
         $csv2 = $request->get('csv2');
 
+        $subRegion = $request->get('subRegion');
+
+
         $incidents = Incident::isActive()
                             ->when(!$all, function ($query, $all){
                                 return $query->isFire();
@@ -47,6 +50,8 @@ public function active(Request $request): JsonResponse
                                 return $query->isOtherFire();
                             })->when($concelho, function ($query, $concelho){
                                 return $query->where('concelho', $concelho);
+                            })->when($subRegion, function ($query, $subRegion){
+                                return $query->where('sub_regiao', $subRegion);
                             })
                             ->orderBy('created_at', 'desc')
                             ->paginate($limit);
@@ -334,6 +339,8 @@ public function search(IncidentSearchRequest $request)
         $extend = $request->get('extend');
         $concelho = $request->get('concelho');
 
+        $subRegion = $request->get('subRegion');
+
 
         $incidents = Incident::when($day, function($query, $day){
             return $query->whereBetween(
@@ -362,6 +369,8 @@ public function search(IncidentSearchRequest $request)
             return $query->isFMA();
         })->when($naturezaCode, function ($query, $naturezaCode){
             return $query->where('naturezaCode', (string)$naturezaCode);
+        })->when($subRegion, function ($query, $subRegion){
+            return $query->where('sub_regiao', (string)$subRegion);
         });
 
         $csv2 = $request->get('csv2');