From 8764be8604f1180116dd285104de7cd547cd024f Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Fri, 26 Dec 2014 14:31:37 +0100 Subject: display room per shift in shift table --- includes/pages/user_shifts.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'includes') diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index f57478ed..10d06e6c 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -524,7 +524,10 @@ function view_user_shifts() { if ($colspan == 0) $colspan = 1; $todo[$rid] = array_fill(0, $maxshow, $colspan); - $shifts_table .= " 1) ? ' colspan="' . $colspan . '"' : '') . ">${room['name']}\n"; + $shifts_table .= " 1) ? ' colspan="' . $colspan . '"' : '') . ">" . Room_name_render([ + 'RID' => $room['id'], + 'Name' => $room['name'] + ]) . "\n"; } unset($block, $blocks, $firstblock, $colspan, $key, $room); @@ -561,7 +564,12 @@ function view_user_shifts() { // qqqqqq $is_free = false; - $shifts_row = '' . date('d.m. H:i', $shift['start']); + + $shifts_row = Room_name_render([ + 'RID' => $room['id'], + 'Name' => $room['name'] + ]) . '
'; + $shifts_row .= '
' . date('d.m. H:i', $shift['start']); $shifts_row .= " – "; $shifts_row .= date('H:i', $shift['end']); $shifts_row .= "
"; -- cgit v1.2.3-54-g00ecf