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

add multiple shifts: Fix hour regex and sorting, cleanup and formatting

This commit is contained in:
Igor Scheller 2018-12-26 19:49:01 +01:00
parent 36830c43e7
commit acd9ec6966
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
includes/pages/admin_shifts.php
View File

@ -114,7 +114,7 @@ function admin_shifts()
if ( if (
$request->has('change_hours') $request->has('change_hours')
&& preg_match( && preg_match(
'/^((\d{2}(:\d{2})?(,|$))*)/', '/^(\d{1,2}(:\d{2})?(,|$))+$/',
trim(str_replace(' ', '', $request->input('change_hours'))) trim(str_replace(' ', '', $request->input('change_hours')))
) )
) { ) {
@ -180,6 +180,7 @@ function admin_shifts()
$needed_angel_types[$type['angel_type_id']] = $type['count']; $needed_angel_types[$type['angel_type_id']] = $type['count'];
} }
} }
$shifts = []; $shifts = [];
if ($mode == 'single') { if ($mode == 'single') {
$shifts[] = [ $shifts[] = [
@ -212,22 +213,28 @@ function admin_shifts()
$shift_start = $shift_end; $shift_start = $shift_end;
} while ($shift_end < $end); } while ($shift_end < $end);
} elseif ($mode == 'variable') { } elseif ($mode == 'variable') {
rsort($change_hours); array_walk($change_hours, function (&$value) {
if (!preg_match('/^\d{1,2}:\d{2}$/', $value)) {
$value .= ':00';
}
});
usort($change_hours, function ($a, $b) {
return str_replace(':', '', $a) > str_replace(':', '', $b) ? -1 : 1;
});
$day = parse_date('Y-m-d H:i', date('Y-m-d', $start) . ' 00:00'); $day = parse_date('Y-m-d H:i', date('Y-m-d', $start) . ' 00:00');
$change_index = 0; $change_index = 0;
// Ersten/nächsten passenden Schichtwechsel suchen // Ersten/nächsten passenden Schichtwechsel suchen
foreach ($change_hours as $i => $change_time) { foreach ($change_hours as $i => $change_time) {
if (!preg_match('/\d{2}:\d{2}/', $change_time)) {
$change_time = $change_time . ":00";
}
$change_time = explode(':', $change_time); $change_time = explode(':', $change_time);
$change_hour = $change_time[0]; $change_hour = $change_time[0];
$change_minute = $change_time[1]; $change_minute = $change_time[1];
if ($start < $day + $change_hour * 60 * 60 + $change_minute * 60) { $shift_end = $day + $change_hour * 60 * 60 + $change_minute * 60;
if ($start < $shift_end) {
$change_index = $i; $change_index = $i;
} elseif ($start == $day + $change_hour * 60 * 60 + $change_minute * 60) { } elseif ($start == $shift_end) {
// Start trifft Schichtwechsel // Start trifft Schichtwechsel
$change_index = ($i + count($change_hours) - 1) % count($change_hours); $change_index = ($i + count($change_hours) - 1) % count($change_hours);
break; break;
@ -241,18 +248,12 @@ function admin_shifts()
$day = parse_date('Y-m-d H:i', date('Y-m-d', $shift_start) . ' 00:00'); $day = parse_date('Y-m-d H:i', date('Y-m-d', $shift_start) . ' 00:00');
$change_time = $change_hours[$change_index]; $change_time = $change_hours[$change_index];
if (!preg_match('/\d{2}:\d{2}/', $change_time)) {
$change_time = $change_time . ":00";
}
$change_time = explode(':', $change_time); $change_time = explode(':', $change_time);
$change_hour = $change_time[0]; $change_hour = $change_time[0];
$change_minute = $change_time[1]; $change_minute = $change_time[1];
$shift_end = $day + $change_hour * 60 * 60 + $change_minute * 60; $shift_end = $day + $change_hour * 60 * 60 + $change_minute * 60;
if ($shift_end > $end) { if ($shift_end > $end) {
$shift_end = $end; $shift_end = $end;
} }