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

restore ical export

This commit is contained in:
msquare 2016-10-03 19:37:00 +02:00
parent f3a0ce865d
commit 51d270db28
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/pages/user_shifts.php
View File

@ -44,7 +44,7 @@ function update_ShiftsFilter(ShiftsFilter $shiftsFilter, $user_shifts_admin, $da
if (isset($_REQUEST['types'])) { if (isset($_REQUEST['types'])) {
$shiftsFilter->setTypes(check_request_int_array('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) { 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()); $day = date('Y-m-d', time());
$start_day = in_array($day, $days) ? $day : min($days); $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 .= '<td rowspan="' . $blocks . '" class="' . $class . '">';
$shifts_table .= $shifts_row; $shifts_table .= $shifts_row;
$shifts_table .= "</td>"; $shifts_table .= "</td>";
// also output that shift on ical export
$ical_shifts[] = $shift;
for ($j = 0; $j < $blocks && $i + $j < $maxshow; $j ++) { for ($j = 0; $j < $blocks && $i + $j < $maxshow; $j ++) {
$todo[$rid][$i + $j] --; $todo[$rid][$i + $j] --;
} }

2
includes/view/AngelTypes_view.php
View File

@ -96,7 +96,7 @@ function AngelType_view($angeltype, $members, $user_angeltype, $admin_user_angel
$page = [ $page = [
msg(), msg(),
buttons($buttons) buttons($buttons)
]; ];
$page[] = '<h3>' . _("Description") . '</h3>'; $page[] = '<h3>' . _("Description") . '</h3>';