diff --git a/Controller/BackendController.php b/Controller/BackendController.php index b162cc1..4727338 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -200,8 +200,11 @@ final class BackendController extends Controller $list = SessionMapper::getAll() ->with('sessionElements') + ->with('type') + ->with('type/l11n') ->where('employee', $view->data['employee']->id) ->where('start', $start, '<=') + ->where('type/l11n/language', $response->header->l11n->language) ->sort('start', OrderType::DESC) ->executeGetArray(); diff --git a/Theme/Backend/staff-view.tpl.php b/Theme/Backend/staff-view.tpl.php index fa030c5..b822f1a 100644 --- a/Theme/Backend/staff-view.tpl.php +++ b/Theme/Backend/staff-view.tpl.php @@ -378,7 +378,11 @@ echo $this->data['nav']->render(); ?> start->format('Y-m-d'); ?> - getHtml(':D' . $session->start->format('w'), 'HumanResourceTimeRecording', 'Backend'); ?> - getHtml(':CT' . $session->type, 'HumanResourceTimeRecording', 'Backend'); ?> + + + printHtml($session?->type?->getL11n() ?? ''); ?> + + getHtml(':CS' . $session->getStatus(), 'HumanResourceTimeRecording', 'Backend'); ?> start->format('H:i'); ?> getBreak() / 3600); ?>h getBreak() / 60) % 60); ?>m @@ -433,12 +437,12 @@ echo $this->data['nav']->render(); ?> request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>>
- data['media-upload']->render('employee-file', 'files', '', $employee->files, '{/api}humanresource/staff/file?csrf={$CSRF}', (string) $vehicle->id); ?> + data['media-upload']->render('employee-file', 'files', '', $employee->files, '{/api}humanresource/staff/file?csrf={$CSRF}', (string) $employee->id); ?>
request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
- data['employee-notes']->render('employee-notes', '', $employee->notes, '{/api}humanresource/staff/note?csrf={$CSRF}', (string) $vehicle->id); ?> + data['employee-notes']->render('employee-notes', '', $employee->notes, '{/api}humanresource/staff/note?csrf={$CSRF}', (string) $employee->id); ?>
request->uri->fragment === 'c-tab-7' ? ' checked' : ''; ?>>