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

Add title to "Enough" goodie score

This commit is contained in:
Igor Scheller 2024-02-18 01:50:15 +01:00 committed by xuwhite
parent c0088d6601
commit f56e9c534c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/controller/users_controller.php
View File

@ -239,10 +239,9 @@ function user_controller()
auth()->resetApiKey($user_source); auth()->resetApiKey($user_source);
} }
if ($user_source->state->force_active && config('enable_force_active')) {
$tshirt_score = __('Enough');
} else {
$tshirt_score = sprintf('%.2f', User_tshirt_score($user_source->id)) . ' h'; $tshirt_score = sprintf('%.2f', User_tshirt_score($user_source->id)) . ' h';
if ($user_source->state->force_active && config('enable_force_active')) {
$tshirt_score = '<span title="' . $tshirt_score . '">' . __('Enough') . '</span>';
} }
$worklogs = $user_source->worklogs() $worklogs = $user_source->worklogs()

4
includes/view/User_view.php
View File

@ -414,7 +414,7 @@ function User_view_myshift(Shift $shift, $user_source, $its_me)
* @param Shift[]|Collection $shifts * @param Shift[]|Collection $shifts
* @param User $user_source * @param User $user_source
* @param bool $its_me * @param bool $its_me
* @param int $tshirt_score * @param string $tshirt_score
* @param bool $tshirt_admin * @param bool $tshirt_admin
* @param Worklog[]|Collection $user_worklogs * @param Worklog[]|Collection $user_worklogs
* @param bool $admin_user_worklog_privilege * @param bool $admin_user_worklog_privilege
@ -549,7 +549,7 @@ function User_view_worklog(Worklog $worklog, $admin_user_worklog_privilege)
* @param Group[] $user_groups * @param Group[] $user_groups
* @param Shift[]|Collection $shifts * @param Shift[]|Collection $shifts
* @param bool $its_me * @param bool $its_me
* @param int $tshirt_score * @param string $tshirt_score
* @param bool $tshirt_admin * @param bool $tshirt_admin
* @param bool $admin_user_worklog_privilege * @param bool $admin_user_worklog_privilege
* @param Worklog[]|Collection $user_worklogs * @param Worklog[]|Collection $user_worklogs