Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow to specify also minutes for shift change hours. #537

Merged
merged 2 commits into from
Dec 22, 2018
Merged

Allow to specify also minutes for shift change hours. #537

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bdff09
first draft for #536
jwacalex Dec 22, 2018
ff8ce93
reformatted code due to guidelines
jwacalex Dec 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
62 changes: 41 additions & 21 deletions includes/pages/admin_shifts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function admin_shifts()
if (
$request->has('change_hours')
&& preg_match(
'/^(\d{2}(,|$))/',
'/^((\d{2}(:\d{2})?(,|$))*)/',
trim(str_replace(' ', '', $request->input('change_hours')))
)
) {
Expand Down Expand Up @@ -183,10 +183,10 @@ function admin_shifts()
$shifts = [];
if ($mode == 'single') {
$shifts[] = [
'start' => $start,
'end' => $end,
'RID' => $rid,
'title' => $title,
'start' => $start,
'end' => $end,
'RID' => $rid,
'title' => $title,
'shifttype_id' => $shifttype_id
];
} elseif ($mode == 'multi') {
Expand All @@ -202,10 +202,10 @@ function admin_shifts()
}

$shifts[] = [
'start' => $shift_start,
'end' => $shift_end,
'RID' => $rid,
'title' => $title,
'start' => $shift_start,
'end' => $shift_end,
'RID' => $rid,
'title' => $title,
'shifttype_id' => $shifttype_id
];

Expand All @@ -216,10 +216,18 @@ function admin_shifts()
$day = parse_date('Y-m-d H:i', date('Y-m-d', $start) . ' 00:00');
$change_index = 0;
// Ersten/nächsten passenden Schichtwechsel suchen
foreach ($change_hours as $i => $change_hour) {
if ($start < $day + $change_hour * 60 * 60) {
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_hour = $change_time[0];
$change_minute = $change_time[1];

if ($start < $day + $change_hour * 60 * 60 + $change_minute * 60) {
$change_index = $i;
} elseif ($start == $day + $change_hour * 60 * 60) {
} elseif ($start == $day + $change_hour * 60 * 60 + $change_minute * 60) {
// Start trifft Schichtwechsel
$change_index = ($i + count($change_hours) - 1) % count($change_hours);
break;
Expand All @@ -231,7 +239,19 @@ function admin_shifts()
$shift_start = $start;
do {
$day = parse_date('Y-m-d H:i', date('Y-m-d', $shift_start) . ' 00:00');
$shift_end = $day + $change_hours[$change_index] * 60 * 60;

$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_hour = $change_time[0];
$change_minute = $change_time[1];


$shift_end = $day + $change_hour * 60 * 60 + $change_minute * 60;


if ($shift_end > $end) {
$shift_end = $end;
Expand All @@ -241,10 +261,10 @@ function admin_shifts()
}

$shifts[] = [
'start' => $shift_start,
'end' => $shift_end,
'RID' => $rid,
'title' => $title,
'start' => $shift_start,
'end' => $shift_end,
'RID' => $rid,
'title' => $title,
'shifttype_id' => $shifttype_id
];

Expand All @@ -256,14 +276,14 @@ function admin_shifts()
$shifts_table = [];
foreach ($shifts as $shift) {
$shifts_table_entry = [
'timeslot' =>
'timeslot' =>
'<span class="glyphicon glyphicon-time"></span> '
. date('Y-m-d H:i', $shift['start'])
. ' - '
. date('H:i', $shift['end'])
. '<br />'
. Room_name_render(Room($shift['RID'])),
'title' =>
'title' =>
ShiftType_name_render(ShiftType($shifttype_id))
. ($shift['title'] ? '<br />' . $shift['title'] : ''),
'needed_angels' => ''
Expand Down Expand Up @@ -299,8 +319,8 @@ function admin_shifts()
form_hidden('angelmode', $angelmode),
form_submit('back', __('back')),
table([
'timeslot' => __('Time and location'),
'title' => __('Type and title'),
'timeslot' => __('Time and location'),
'title' => __('Type and title'),
'needed_angels' => __('Needed angels')
], $shifts_table),
form_submit('submit', __('Save'))
Expand Down