diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/pages/user_shifts.php | 4 | ||||
| -rw-r--r-- | includes/view/AngelTypes_view.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 89ead0cf..9fd306c9 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -44,7 +44,7 @@ function update_ShiftsFilter(ShiftsFilter $shiftsFilter, $user_shifts_admin, $da if (isset($_REQUEST['types'])) { $shiftsFilter->setTypes(check_request_int_array('types')); } - + if ((isset($_REQUEST['start_time']) && isset($_REQUEST['start_day']) && isset($_REQUEST['end_time']) && isset($_REQUEST['end_day'])) || $shiftsFilter->getStartTime() == null || $shiftsFilter->getEndTime() == null) { $day = date('Y-m-d', time()); $start_day = in_array($day, $days) ? $day : min($days); @@ -352,6 +352,8 @@ function view_user_shifts() { $shifts_table .= '<td rowspan="' . $blocks . '" class="' . $class . '">'; $shifts_table .= $shifts_row; $shifts_table .= "</td>"; + // also output that shift on ical export + $ical_shifts[] = $shift; for ($j = 0; $j < $blocks && $i + $j < $maxshow; $j ++) { $todo[$rid][$i + $j] --; } diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index cdaa9f12..10c02745 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -96,7 +96,7 @@ function AngelType_view($angeltype, $members, $user_angeltype, $admin_user_angel $page = [ msg(), - buttons($buttons) + buttons($buttons) ]; $page[] = '<h3>' . _("Description") . '</h3>'; |