Fix presentation assigned count

bluecraank · Feb 26, 2024 · 5da84d7 · 5da84d7
1 parent 4624edd
commit 5da84d7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/app/Http/Controllers/PresentationController.php b/app/Http/Controllers/PresentationController.php
@@ -28,18 +28,14 @@ public function index()
 
         // Loop through groups and devices and see which presentations are unused
         foreach($presentations as $presentation) {
-            foreach($groups as $group) {
-                if($group->presentation?->id == $presentation->id) {
-                    $countUsed++;
-                    break;
-                }
-            }
-
-            foreach($devices as $device) {
-                if($device->presentation?->id == $presentation->id) {
-                    $countUsed++;
-                    break;
-                }
+            $devices = $presentation->devices->count();
+            $groups = $presentation->groups->count();
+            $schedules = $presentation->schedules->count();
+
+            if($devices == 0 && $groups == 0 && $schedules == 0) {
+                $countUnused++;
+            } else {
+                $countUsed++;
             }
         }
 

diff --git a/config/app.php b/config/app.php
@@ -16,7 +16,7 @@
     | any other location as required by the application or its packages.
     |
     */
-    'version' => '1.5.4',
+    'version' => '1.5.5',
 
     'placeholder_image' => 'https://placehold.co/600x338?text=Assign\nTemplate',