summaryrefslogtreecommitdiff
path: root/includes/view
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2015-07-15 21:53:19 +0200
committerPhilip Häusler <msquare@notrademark.de>2015-07-15 21:53:19 +0200
commit18644cac7abab887536dd4e5a2fc7ff1dc9c9c26 (patch)
tree448821d1695964ff3507e4076b152fdf4f7c901e /includes/view
parent430eaa019a6bd852a23d86660c81ffd397d1dd2d (diff)
fixes #196: make users planned arrival date editable in user settings and show it in their own profile
Diffstat (limited to 'includes/view')
-rw-r--r--includes/view/User_view.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index da52a913..0125f4af 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -171,7 +171,7 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
'<h4>' . _("User state") . '</h4>',
($admin_user_privilege && $freeloader) ? '<span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"></span> ' . _("Freeloader") . '</span><br />' : '',
$user_source['Gekommen'] ? User_shift_state_render($user_source) . '<br />' : '',
- $admin_user_privilege
+ $admin_user_privilege || $its_me
? ($user_source['Gekommen'] ? '<span class="text-success"><span class="glyphicon glyphicon-home"></span> ' . sprintf(_("Arrived at %s"), date('Y-m-d', $user_source['arrival_date'])) . '</span>' : '<span class="text-danger">' . sprintf(_("Not arrived (Planned: %s)"), date('Y-m-d', $user_source['planned_arrival_date'])) . '</span>')
: ($user_source['Gekommen'] ? '<span class="text-success"><span class="glyphicon glyphicon-home"></span> ' . _("Arrived") . '</span>' : '<span class="text-danger">' . _("Not arrived") . '</span>'),
$admin_user_privilege ? ($user_source['got_voucher'] ? '<br /><span class="text-success">' . glyph('cutlery') . _("Got vouchers") . '</span>' : '<br /><span class="text-danger">' . _("Got no vouchers") . '</span>') : '',