From 35be25a78642039aba49ad5d6e80ad8ca89a2b1f Mon Sep 17 00:00:00 2001 From: msquare Date: Thu, 14 Dec 2017 19:18:08 +0100 Subject: fix dashboard using needed angeltypes from room config too for frab shifts --- includes/model/Shifts_model.php | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'includes/model/Shifts_model.php') 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,13 +32,25 @@ 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 ]); -- cgit v1.2.3-54-g00ecf