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

fixes #1169: improve shift change hour sanitation

This commit is contained in:
msquare 2023-08-13 16:52:41 +02:00
parent cffc9854f8
commit 47f0587cd9
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
includes/pages/admin_shifts.php
View File

@ -139,6 +139,23 @@ function admin_shifts()
'trim', 'trim',
explode(',', $request->input('change_hours')) explode(',', $request->input('change_hours'))
); );
// Fehlende Minutenangaben ergänzen, 24 Uhr -> 00 Uhr
array_walk($change_hours, function (&$value) use ($valid) {
if (!preg_match('/^(\d{1,2}):\d{2}$/', $value)) {
$value .= ':00';
}
if ($value == '24:00') {
$value = '00:00';
}
});
// Ensure valid time in change hours
foreach ($change_hours as $change_hour) {
if (!preg_match('/^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/', $change_hour)) {
$valid = false;
error(sprintf(__('Please validate the change hour %s. It should be between 00:00 and 24:00.'), $change_hour));
}
}
$change_hours = array_unique($change_hours);
} else { } else {
$valid = false; $valid = false;
error(__('Please split the shift-change hours by colons.')); error(__('Please split the shift-change hours by colons.'));
@ -224,13 +241,6 @@ 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') {
// Fehlende Minutenangaben ergänzen
array_walk($change_hours, function (&$value) {
if (!preg_match('/^\d{1,2}:\d{2}$/', $value)) {
$value .= ':00';
}
});
// Alle Tage durchgehen // Alle Tage durchgehen
$end_day = Carbon::createFromDatetime($end->format('Y-m-d') . ' 00:00'); $end_day = Carbon::createFromDatetime($end->format('Y-m-d') . ' 00:00');
$day = Carbon::createFromDatetime($start->format('Y-m-d') . ' 00:00'); $day = Carbon::createFromDatetime($start->format('Y-m-d') . ' 00:00');
@ -488,7 +498,7 @@ function admin_shifts()
'change_hours', 'change_hours',
__('Shift change hours'), __('Shift change hours'),
$request->has('change_hours') $request->has('change_hours')
? $request->input('change_hours') ? ($change_hours ? implode(', ', $change_hours) : $request->input('change_hours'))
: '00, 04, 08, 10, 12, 14, 16, 18, 20, 22', : '00, 04, 08, 10, 12, 14, 16, 18, 20, 22',
false, false,
null, null,

3
resources/lang/de_DE/default.po
View File

@ -945,6 +945,9 @@ msgstr "Die Endzeit muss nach der Startzeit liegen."
msgid "Please enter a shift duration in minutes." msgid "Please enter a shift duration in minutes."
msgstr "Gib bitte eine Schichtlänge in Minuten ein." msgstr "Gib bitte eine Schichtlänge in Minuten ein."
msgid "Please validate the change hour %s. It should be between 00:00 and 24:00."
msgstr "Bitte korrigiere die Schichtwechselstunde %s. Sie sollte zwischen 00:00 und 24:00 Uhr liegen."
msgid "Please split the shift-change hours by colons." msgid "Please split the shift-change hours by colons."
msgstr "Trenne die Schichtwechselstunden mit einem Komma." msgstr "Trenne die Schichtwechselstunden mit einem Komma."