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

change isWeekend() handling to use work-hour configuration (#4261)

Browse Source
This commit is contained in:
Bruno Paré-Simard
2023-08-31 07:38:58 -04:00
committed by GitHub
parent 18d953e79b
commit 452de88e18
5 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/reporting/report_by_user.html.twig
View File

@@ -3,18 +3,18 @@
{% block report_content %}
{% embed 'reporting/report_by_user_data.html.twig' %}
{% block period_name %}
<th class="text-center text-nowrap{% if column is weekend %} weekend{% endif %}{% if column is today %} today{% endif %}">
<th class="text-center text-nowrap{% if column is weekend(user) %} weekend{% endif %}{% if column is today %} today{% endif %}">
{{ column|date_weekday }}
</th>
{% endblock %}
{% block column_classes_project -%}
{% if column.date is weekend %} weekend{% endif %}{% if column.date is today %} today{% endif %}
{% if column.date is weekend(user) %} weekend{% endif %}{% if column.date is today %} today{% endif %}
{%- endblock %}
{% block column_classes_activity -%}
{% if column.date is weekend %} weekend{% endif %}{% if column.date is today %} today{% endif %}
{% if column.date is weekend(user) %} weekend{% endif %}{% if column.date is today %} today{% endif %}
{%- endblock %}
{% block column_classes_total -%}
{% if column is weekend %} weekend{% endif %}
{% if column is weekend(user) %} weekend{% endif %}
{%- endblock %}
{% endembed %}
{% endblock %}