piccola revisione funzione filtraggio prenotazioni per cerchie

madbob · Sep 14, 2024 · 2c4f0a2 · 2c4f0a2
1 parent 92f0ec0
commit 2c4f0a2
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/code/app/Helpers/CirclesFilter.php b/code/app/Helpers/CirclesFilter.php
@@ -113,28 +113,25 @@ private function sortByCircle($bookings)
 
     public function sortBookings($bookings)
     {
-        $actual_circles = $this->circles;
+        $tmp_bookings = new Collection();
+        $filter_circles = (empty($this->circles) == false);
 
-        if (empty($this->circles)) {
-            $tmp_bookings = collect($bookings);
-        }
-        else {
-            $tmp_bookings = new Collection();
+        foreach($bookings as $booking) {
+            $valid = true;
 
-            foreach($bookings as $booking) {
+            if ($filter_circles) {
                 $mycircles = $booking->involvedCircles();
-                $valid = true;
 
                 foreach($this->circles as $required_circle) {
                     if (is_null($mycircles->firstWhere('id', $required_circle->id))) {
                         $valid = false;
                         break;
                     }
                 }
+            }
 
-                if ($valid) {
-                    $tmp_bookings->push($booking);
-                }
+            if ($valid) {
+                $tmp_bookings->push($booking);
             }
         }