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

Shifts overview: select current day during the event

This commit is contained in:
Igor Scheller 2022-07-20 13:48:04 +02:00
parent 58d9750d0c
commit a03472ebc1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
includes/pages/user_shifts.php
View File

@ -1,6 +1,7 @@
<?php <?php
use Engelsystem\Database\Db; use Engelsystem\Database\Db;
use Engelsystem\Helpers\Carbon;
use Engelsystem\Models\Room; use Engelsystem\Models\Room;
use Engelsystem\ShiftsFilter; use Engelsystem\ShiftsFilter;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
@ -49,9 +50,10 @@ function update_ShiftsFilter_timerange(ShiftsFilter $shiftsFilter, $days)
{ {
$start_time = $shiftsFilter->getStartTime(); $start_time = $shiftsFilter->getStartTime();
if (is_null($start_time)) { if (is_null($start_time)) {
$now = (new DateTime())->format('Y-m-d');
$first_day = DateTime::createFromFormat( $first_day = DateTime::createFromFormat(
'Y-m-d', 'Y-m-d',
$days[0] ?? (new DateTime())->format('Y-m-d') in_array($now, $days) ? $now : ($days[0] ?? (new DateTime())->format('Y-m-d'))
)->getTimestamp(); )->getTimestamp();
if (time() < $first_day) { if (time() < $first_day) {
$start_time = $first_day; $start_time = $first_day;
@ -61,8 +63,13 @@ function update_ShiftsFilter_timerange(ShiftsFilter $shiftsFilter, $days)
} }
$end_time = $shiftsFilter->getEndTime(); $end_time = $shiftsFilter->getEndTime();
if ($end_time == null) { if (is_null($end_time)) {
$end_time = $start_time + 24 * 60 * 60; $end_time = $start_time + 24 * 60 * 60;
$end = Carbon::createFromTimestamp($end_time);
if (!in_array($end->format('Y-m-d'), $days)) {
$end->startOfDay()->subSecond(); // the day before
$end_time = $end->timestamp;
}
} }
$shiftsFilter->setStartTime(check_request_datetime( $shiftsFilter->setStartTime(check_request_datetime(