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

Shifts creation: Fix start hours before 10:00

This commit is contained in:
Igor Scheller 2023-08-29 23:41:27 +02:00 committed by Michael Weimann
parent 24ecea0d65
commit 94ba51bc46
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/pages/admin_shifts.php
View File

@ -141,9 +141,15 @@ function admin_shifts()
);
// Fehlende Minutenangaben ergänzen, 24 Uhr -> 00 Uhr
array_walk($change_hours, function (&$value) use ($valid) {
// Add minutes
if (!preg_match('/^(\d{1,2}):\d{2}$/', $value)) {
$value .= ':00';
}
// Add 0 before low hours
if (preg_match('/^\d:\d{2}$/', $value)) {
$value = '0' . $value;
}
// Fix 24:00
if ($value == '24:00') {
$value = '00:00';
}
@ -248,10 +254,10 @@ function admin_shifts()
// Alle Schichtwechselstunden durchgehen
for ($i = 0; $i < count($change_hours); $i++) {
$start_hour = $change_hours[$i];
if ($i < count($change_hours) - 1) {
if (isset($change_hours[$i+1])) {
// Normales Intervall zwischen zwei Schichtwechselstunden
$end_hour = $change_hours[$i + 1];
} elseif ($shift_over_midnight) {
} elseif ($shift_over_midnight && $day != $end_day) {
// Letzte Schichtwechselstunde: Wenn eine 24h Abdeckung gewünscht ist,
// hier die erste Schichtwechselstunde als Ende einsetzen
$end_hour = $change_hours[0];