jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Release 2.0.28 (#4172)

Browse Source 
See https://github.com/kimai/kimai/pull/4172
This commit is contained in:
Kevin Papst
2023-07-09 15:27:27 +02:00
committed by GitHub
parent 651f812da8
commit 385753fbc3
27 changed files with 182 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
templates/contract/status.html.twig
View File

@@ -212,7 +212,7 @@
</td>
{% set dayCount = 0 %}
{% for day in month.days %}
{% set class = 'text-end contractDay' %}
{% set class = 'text-end contractDay text-nowrap' %}
{% if day.day is weekend %}
{% set class = class ~ ' weekend' %}
{% endif %}
@@ -223,6 +223,16 @@
{% endif %}
<td class="{{ class }}">
{% if (day.workingTime.expectedTime != 0 or day.workingTime.actualTime != 0) and (now > day.day or day.workingTime.actualTime > 0) %}
{% if day.hasAddons() %}
{% set statusTitle = '' %}
{% for addon in day.getAddons() %}
{% set statusTitle = statusTitle ~ (addon.title|trans) ~ ' (' ~ addon.duration|duration(decimal) ~ ')' %}
{% if not loop.last %}
{% set statusTitle = statusTitle ~ '<br>' %}
{% endif %}
{% endfor %}
<span class="status-dot status-azure" data-toggle="tooltip" data-placement="top" title="{{ statusTitle }}"></span>
{% endif %}
{{ work_times_result(day.workingTime.expectedTime, day.workingTime.actualTime, decimal) }}
{% endif %}
</td>

2
templates/user/stats.html.twig
View File

@@ -22,7 +22,7 @@
}) %}
{% endif %}
{% set datagrid = datagrid|merge({
'profile.first_entry' : (firstTimesheet is not null ? firstTimesheet|date_short : '–'),
'profile.first_entry' : (workingSince is not null ? workingSince|date_short : '–'),
'profile.registration_date' : user.registeredAt|date_short,
}) %}
{% set seeOwnRate = false %}