diff options
author | marudor <marudor@marudor.de> | 2018-01-03 01:19:36 +0100 |
---|---|---|
committer | marudor <marudor@marudor.de> | 2018-01-03 01:19:36 +0100 |
commit | 7af09433def2fda9ec47b12823b16e3392b5f6cf (patch) | |
tree | 5ee8e0fdf80cd92609263d28e9ae6e6bc3efeea7 /includes/controller/users_controller.php | |
parent | 7f722314e4fc21419552ec27eb91e6f7e6347b71 (diff) | |
parent | ddadaada9dc1bd288c82da840a4c4f02767d3e43 (diff) |
Merge branch 'master' of https://github.com/engelsystem/engelsystem
Diffstat (limited to 'includes/controller/users_controller.php')
-rw-r--r-- | includes/controller/users_controller.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php index a2a28410..8a325621 100644 --- a/includes/controller/users_controller.php +++ b/includes/controller/users_controller.php @@ -228,7 +228,7 @@ function user_controller() if($user_source['force_active']) { $tshirt_score = _('Enough'); } else { - $tshirt_score = round(User_tshirt_score($user_source), 2) . ' h'; + $tshirt_score = sprintf('%.2f', User_tshirt_score($user_source)) . ' h'; } return [ @@ -242,7 +242,9 @@ function user_controller() $shifts, $user['UID'] == $user_source['UID'], $tshirt_score, - in_array('admin_active', $privileges) + in_array('admin_active', $privileges), + in_array('admin_user_worklog', $privileges), + UserWorkLogsForUser($user_source) ) ]; } |