iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
msquare 2017-12-14 19:18:08 +01:00
parent 952dc6921a
commit 35be25a786
2 changed files with 79 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
includes/model/Shifts_model.php
View File

@ -32,13 +32,25 @@ function Shifts_by_angeltype($angeltype) {
function Shifts_free($start, $end) function Shifts_free($start, $end)
{ {
$shifts = Db::select(" $shifts = Db::select("
SELECT * FROM (
SELECT * SELECT *
FROM `Shifts` FROM `Shifts`
WHERE (`end` > ? AND `start` < ?) WHERE (`end` > ? AND `start` < ?)
AND (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`) AND (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`)
> (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0) > (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0)
ORDER BY `start`
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, $start,
$end $end
]); ]);

63
includes/model/Stats.php
View File

@ -27,12 +27,25 @@ function stats_currently_working()
function stats_hours_to_work() function stats_hours_to_work()
{ {
$result = Db::selectOne(" $result = Db::selectOne("
SELECT ROUND(SUM( SELECT ROUND(SUM(`count`)) as `count` FROM (
SELECT
(SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`) (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`)
* (`Shifts`.`end` - `Shifts`.`start`)/3600 * (`Shifts`.`end` - `Shifts`.`start`)/3600 as `count`
)) as `count`
FROM `Shifts` FROM `Shifts`
WHERE `end` >= ?", [ WHERE `end` >= ?
AND `Shifts`.`PSID` IS NULL
UNION
SELECT
(SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`room_id`=`Shifts`.`RID`)
* (`Shifts`.`end` - `Shifts`.`start`)/3600 as `count`
FROM `Shifts`
WHERE `end` >= ?
AND NOT `Shifts`.`PSID` IS NULL
) as `tmp`
", [
time(),
time() time()
]); ]);
if (empty($result['count'])) { if (empty($result['count'])) {
@ -49,12 +62,27 @@ function stats_angels_needed_three_hours()
$now = time(); $now = time();
$in3hours = $now + 3 * 60 * 60; $in3hours = $now + 3 * 60 * 60;
$result = Db::selectOne(" $result = Db::selectOne("
SELECT SUM( SELECT SUM(`count`) as `count` FROM (
SELECT
(SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`) (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`)
- (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0) - (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0)
) as `count` as `count`
FROM `Shifts` FROM `Shifts`
WHERE `end` > ? AND `start` < ?", [ WHERE `end` > ? AND `start` < ?
AND `Shifts`.`PSID` IS NULL
UNION
SELECT
(SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`room_id`=`Shifts`.`RID`)
- (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0)
as `count`
FROM `Shifts`
WHERE `end` > ? AND `start` < ?
AND NOT `Shifts`.`PSID` IS NULL
) as `tmp`", [
$now,
$in3hours,
$now, $now,
$in3hours $in3hours
]); ]);
@ -72,12 +100,27 @@ function stats_angels_needed_for_nightshifts()
$night_start = parse_date('Y-m-d H:i', date('Y-m-d', time() + 12 * 60 * 60) . ' 02:00'); $night_start = parse_date('Y-m-d H:i', date('Y-m-d', time() + 12 * 60 * 60) . ' 02:00');
$night_end = $night_start + 6 * 60 * 60; $night_end = $night_start + 6 * 60 * 60;
$result = Db::selectOne(" $result = Db::selectOne("
SELECT SUM( SELECT SUM(`count`) as `count` FROM (
SELECT
(SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`) (SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`)
- (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0) - (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0)
) as `count` as `count`
FROM `Shifts` FROM `Shifts`
WHERE `end` > ? AND `start` < ?", [ WHERE `end` > ? AND `start` < ?
AND `Shifts`.`PSID` IS NULL
UNION
SELECT
(SELECT SUM(`count`) FROM `NeededAngelTypes` WHERE `NeededAngelTypes`.`room_id`=`Shifts`.`RID`)
- (SELECT COUNT(*) FROM `ShiftEntry` WHERE `ShiftEntry`.`SID`=`Shifts`.`SID` AND `freeloaded`=0)
as `count`
FROM `Shifts`
WHERE `end` > ? AND `start` < ?
AND NOT `Shifts`.`PSID` IS NULL
) as `tmp`", [
$night_start,
$night_end,
$night_start, $night_start,
$night_end $night_end
]); ]);