fix dashboard using needed angeltypes from room config too for frab shifts

1 files changed, 18 insertions, 6 deletions

diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index b0d82a5b..2a77fd35 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -32,14 +32,26 @@ function Shifts_by_angeltype($angeltype) {
 function Shifts_free($start, $end)
 {
     $shifts = Db::select("
-        SELECT *
-        FROM `Shifts`
-        WHERE (`end` > ? AND `start` < ?)
-        AND (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`)
-        > (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0)
-        ORDER BY `start`
+        SELECT * FROM (
+            SELECT *
+            FROM `Shifts`
+            WHERE (`end` > ? AND `start` < ?)
+            AND (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`)
+            > (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0)
+        
+            UNION
+        
+            SELECT *
+            FROM `Shifts`
+            WHERE (`end` > ? AND `start` < ?)
+            AND (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`room_id`=`Shifts`.`RID`)
+            > (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0)
+        ) as `tmp`
+        ORDER BY `tmp`.`start`
         ", [
                 $start,
+                $end,
+                $start,
                 $end
             ]);
     $free_shifts = [];