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

Fixed public dashboard stats and sorting

This commit is contained in:
Igor Scheller 2023-04-07 23:48:07 +02:00
parent 460a449a8b
commit 6da0c8a835
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/model/Shifts_model.php
View File

@ -85,6 +85,7 @@ function Shifts_free($start, $end, ShiftsFilter $filter = null)
return Shift::query() return Shift::query()
->whereIn('id', $shifts->pluck('id')->toArray()) ->whereIn('id', $shifts->pluck('id')->toArray())
->orderBy('shifts.start')
->get(); ->get();
} }

5
includes/model/Stats.php
View File

@ -1,6 +1,7 @@
<?php <?php
use Engelsystem\Database\Db; use Engelsystem\Database\Db;
use Engelsystem\Helpers\Carbon;
use Engelsystem\ShiftsFilter; use Engelsystem\ShiftsFilter;
/** /**
@ -76,7 +77,7 @@ function stats_hours_to_work(ShiftsFilter $filter = null)
*/ */
function stats_angels_needed_three_hours(ShiftsFilter $filter = null) function stats_angels_needed_three_hours(ShiftsFilter $filter = null)
{ {
$in3hours = time() + 3 * 60 * 60; $in3hours = Carbon::now()->addHours(3)->toDateTimeString();
$result = Db::selectOne(' $result = Db::selectOne('
SELECT SUM(`count`) AS `count` FROM ( SELECT SUM(`count`) AS `count` FROM (
SELECT SELECT
@ -157,6 +158,8 @@ function stats_angels_needed_for_nightshifts(ShiftsFilter $filter = null)
date('Y-m-d', time() + 12 * 60 * 60) . ' ' . $nightStartTime . ':00' date('Y-m-d', time() + 12 * 60 * 60) . ' ' . $nightStartTime . ':00'
); );
$night_end = $night_start + ($nightEndTime - $nightStartTime) * 60 * 60; $night_end = $night_start + ($nightEndTime - $nightStartTime) * 60 * 60;
$night_start = Carbon::createFromTimestamp($night_start)->toDateTimeString();
$night_end = Carbon::createFromTimestamp($night_end)->toDateTimeString();
$result = Db::selectOne(' $result = Db::selectOne('
SELECT SUM(`count`) AS `count` FROM ( SELECT SUM(`count`) AS `count` FROM (
SELECT SELECT