Skip to content

Commit

Permalink
reformatted code due to guidelines
Browse files Browse the repository at this point in the history
  • Loading branch information
jwacalex authored and msquare committed Dec 22, 2018
1 parent 60a9c15 commit 8c5b52a
Showing 1 changed file with 25 additions and 25 deletions.
50 changes: 25 additions & 25 deletions includes/pages/admin_shifts.php
Original file line number Diff line number Diff line change
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 @@ -217,17 +217,17 @@ function admin_shifts()
$change_index = 0;
// Ersten/nächsten passenden Schichtwechsel suchen
foreach ($change_hours as $i => $change_time) {
if(!preg_match('/\d{2}:\d{2}/',$change_time)) {
$change_time = $change_time.":00";
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_minute = $change_time[1];

if ($start < $day + $change_hour * 60 * 60 + $change_minute * 60) {
if ($start < $day + $change_hour * 60 * 60 + $change_minute * 60) {
$change_index = $i;
} elseif ($start == $day + $change_hour * 60 * 60 + $change_minute * 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 @@ -240,12 +240,12 @@ function admin_shifts()
do {
$day = parse_date('Y-m-d H:i', date('Y-m-d', $shift_start) . ' 00:00');

$change_time=$change_hours[$change_index];
if(!preg_match('/\d{2}:\d{2}/',$change_time)) {
$change_time = $change_time.":00";
$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_minute = $change_time[1];

Expand All @@ -261,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 @@ -276,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 @@ -319,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

0 comments on commit 8c5b52a

Please sign in to comment.