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

better hour formatting

This commit is contained in:
msquare 2017-12-30 12:07:10 +01:00
parent d66dc43aec
commit c961269bb7
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/controller/users_controller.php
View File

@ -228,7 +228,7 @@ function user_controller()
if($user_source['force_active']) { if($user_source['force_active']) {
$tshirt_score = _('Enough'); $tshirt_score = _('Enough');
} else { } else {
$tshirt_score = round(User_tshirt_score($user_source), 2) . ' h'; $tshirt_score = sprintf('%.2f', User_tshirt_score($user_source)) . ' h';
} }
return [ return [

2
includes/pages/admin_active.php
View File

@ -182,7 +182,7 @@ function admin_active()
$usr['nick'] = User_Nick_render($usr); $usr['nick'] = User_Nick_render($usr);
$usr['shirt_size'] = $tshirt_sizes[$usr['Size']]; $usr['shirt_size'] = $tshirt_sizes[$usr['Size']];
$usr['work_time'] = round($usr['shift_length'] / 60) $usr['work_time'] = round($usr['shift_length'] / 60)
. ' min (' . round($usr['shift_length'] / 3600) . ' h)'; . ' min (' . sprintf('%.2f', $usr['shift_length'] / 3600) . ' h)';
$usr['active'] = glyph_bool($usr['Aktiv'] == 1); $usr['active'] = glyph_bool($usr['Aktiv'] == 1);
$usr['force_active'] = glyph_bool($usr['force_active'] == 1); $usr['force_active'] = glyph_bool($usr['force_active'] == 1);
$usr['tshirt'] = glyph_bool($usr['Tshirt'] == 1); $usr['tshirt'] = glyph_bool($usr['Tshirt'] == 1);

2
includes/view/PublicDashboard_view.php
View File

@ -68,7 +68,7 @@ function public_dashboard_view($stats, $free_shifts)
function public_dashboard_shift_render($shift) function public_dashboard_shift_render($shift)
{ {
$panel_body = glyph('time') . $shift['start'] . ' - ' . $shift['end']; $panel_body = glyph('time') . $shift['start'] . ' - ' . $shift['end'];
$panel_body .= ' (' . $shift['duration'] . ' h)'; $panel_body .= ' (' . $shift['duration'] . ' h)';
$panel_body .= '<br>' . glyph('tasks') . $shift['shifttype_name']; $panel_body .= '<br>' . glyph('tasks') . $shift['shifttype_name'];
if (!empty($shift['title'])) { if (!empty($shift['title'])) {

10
includes/view/User_view.php
View File

@ -356,7 +356,7 @@ function User_view_myshift($shift, $user_source, $its_me)
. glyph('time') . date('H:i', $shift['start']) . glyph('time') . date('H:i', $shift['start'])
. ' - ' . ' - '
. date('H:i', $shift['end']), . date('H:i', $shift['end']),
'duration' => sprintf('%.2f', round(($shift['end'] - $shift['start']) / 3600, 2)) . ' h', 'duration' => sprintf('%.2f', ($shift['end'] - $shift['start']) / 3600) . '&nbsp;h',
'room' => Room_name_render($shift), 'room' => Room_name_render($shift),
'shift_info' => $shift_info, 'shift_info' => $shift_info,
'comment' => '' 'comment' => ''
@ -368,7 +368,7 @@ function User_view_myshift($shift, $user_source, $its_me)
if ($shift['freeloaded']) { if ($shift['freeloaded']) {
$myshift['duration'] = '<p class="text-danger">' $myshift['duration'] = '<p class="text-danger">'
. round(-($shift['end'] - $shift['start']) / 3600 * 2, 2) . ' h' . round(-($shift['end'] - $shift['start']) / 3600 * 2, 2) . '&nbsp;h'
. '</p>'; . '</p>';
if (in_array('user_shifts_admin', $privileges)) { if (in_array('user_shifts_admin', $privileges)) {
$myshift['comment'] .= '<br />' $myshift['comment'] .= '<br />'
@ -431,7 +431,7 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
ksort($myshifts_table); ksort($myshifts_table);
$myshifts_table[] = [ $myshifts_table[] = [
'date' => '<b>' . _('Sum:') . '</b>', 'date' => '<b>' . _('Sum:') . '</b>',
'duration' => '<b>' . sprintf('%.2f', round($timesum / 3600, 2)) . ' h</b>', 'duration' => '<b>' . sprintf('%.2f', round($timesum / 3600, 2)) . '&nbsp;h</b>',
'room' => '', 'room' => '',
'shift_info' => '', 'shift_info' => '',
'comment' => '', 'comment' => '',
@ -440,7 +440,7 @@ function User_view_myshifts($shifts, $user_source, $its_me, $tshirt_score, $tshi
if (config('enable_tshirt_size', false) && ($its_me || $tshirt_admin)) { if (config('enable_tshirt_size', false) && ($its_me || $tshirt_admin)) {
$myshifts_table[] = [ $myshifts_table[] = [
'date' => '<b>' . _('Your t-shirt score') . '&trade;:</b>', 'date' => '<b>' . _('Your t-shirt score') . '&trade;:</b>',
'duration' => '<b>' . sprintf('%.2f', $tshirt_score) . ' h</b>', 'duration' => '<b>' . $tshirt_score . '</b>',
'room' => '', 'room' => '',
'shift_info' => '', 'shift_info' => '',
'comment' => '', 'comment' => '',
@ -475,7 +475,7 @@ function User_view_worklog($worklog, $admin_user_worklog_privilege) {
return [ return [
'date' => glyph('calendar') . date('Y-m-d', $worklog['work_timestamp']), 'date' => glyph('calendar') . date('Y-m-d', $worklog['work_timestamp']),
'duration' => '<b>' . sprintf('%.2f', $worklog['work_hours']) . ' h</b>', 'duration' => '<b>' . sprintf('%.2f', $worklog['work_hours']) . '</b>',
'room' => '', 'room' => '',
'shift_info' => _('Work log entry'), 'shift_info' => _('Work log entry'),
'comment' => $worklog['comment'] . '<br>' 'comment' => $worklog['comment'] . '<br>'