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

Release 2.16 (#4780)

Browse Source
This commit is contained in:
Kevin Papst
2024-05-01 14:24:24 +02:00
committed by GitHub
parent 8f8d228fb3
commit 99c296a751
150 changed files with 2498 additions and 1905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
{% extends 'reporting/report_by_user_layout.html.twig' %}
{% block report_content %}
{% embed 'reporting/report_by_user_data.html.twig' %}
{% embed 'reporting/report_by_user_data.html.twig' with {with_links: true} %}
{% block period_name %}
<th class="text-center text-nowrap{% if column is weekend(user) %} weekend{% endif %}{% if column is today %} today{% endif %}">
{{ column|date_weekday }}

23
templates/reporting/report_by_user_data.html.twig
View File

@@ -5,6 +5,7 @@
{%- set totalsDuration = {} -%}
{%- set totalsInternalRate = {} -%}
{%- set totalsRate = {} -%}
{%- set with_links = with_links is defined ? with_links : false -%}
{% if dataType == 'rate' %}
{% set dataTypeTitle = 'stats.amountTotal' %}
{% elseif dataType == 'internalRate' %}
@@ -14,10 +15,16 @@
{% endif %}
{% set columns = 0 %}
{% set totalCurrency = false %}
{% set filter_options = {'begin': begin, 'end': end} %}
{% set filter_route = 'timesheet' %}
{% if is_granted('view_other_timesheet') %}
{% set filter_route = 'admin_timesheet' %}
{% set filter_options = filter_options|merge({'user': user.id}) %}
{% endif %}
<table class="table table-hover dataTable">
<thead>
<tr>
<th>{% block upper_left %}{{ user.displayName }}{% endblock %}</th>
<th>{% block upper_left %}{{ user.displayName|sanitize_dde }}{% endblock %}</th>
<th class="text-center reportDataTypeTitle">{{ dataTypeTitle|trans }}</th>
{% for column in period.dateTimes %}
{% block period_name %}
@@ -42,6 +49,7 @@
<tr class="summary">
<td>{{ widgets.label_customer(data.customer) }}</td>
<td class="text-center total">
{% if with_links %}<a href="{{ widgets.search_filter(filter_route, filter_options|merge({'customer': data.customer.id})) }}">{% endif %}
{% if dataType == 'rate' %}
{{ data.rate|money(currency) }}
{% elseif dataType == 'internalRate' %}
@@ -49,6 +57,7 @@
{% else %}
{{ data.duration|duration(decimal) }}
{% endif %}
{% if with_links %}</a>{% endif %}
</td>
<td colspan="{{ columns }}"></td>
</tr>
@@ -61,13 +70,15 @@
<strong>{{ widgets.label_project(project.project) }}</strong>
</td>
<td class="text-nowrap text-center total">
{% if dataType == 'rate' %}
{% if with_links %}<a href="{{ widgets.search_filter(filter_route, filter_options|merge({'project': project.project.id})) }}">{% endif %}
{%- if dataType == 'rate' -%}
{{ project.rate|money(currency) }}
{% elseif dataType == 'internalRate' %}
{%- elseif dataType == 'internalRate' -%}
{{ project.internalRate|money(currency) }}
{% else %}
{%- else -%}
{{ project.duration|duration(decimal) }}
{% endif %}
{%- endif -%}
{% if with_links %}</a>{% endif %}
</td>
{% for column in project.data.data %}
{% set dateKey = column.date|report_date %}
@@ -93,6 +104,7 @@
{{ widgets.label_activity(activity.activity) }}
</td>
<td class="text-nowrap text-center">
{% if with_links %}<a href="{{ widgets.search_filter(filter_route, filter_options|merge({'activity': activity.activity.id})) }}">{% endif %}
{% if dataType == 'rate' %}
{{ activity.rate|money(currency) }}
{% elseif dataType == 'internalRate' %}
@@ -100,6 +112,7 @@
{% else %}
{{ activity.duration|duration(decimal) }}
{% endif %}
{% if with_links %}</a>{% endif %}
</td>
{% for column in activity.data.data %}
<td class="text-nowrap text-center day-total {% block column_classes_activity %}{% endblock %}">

2
templates/reporting/report_by_user_year.html.twig
View File

@@ -1,7 +1,7 @@
{% extends 'reporting/report_by_user_layout.html.twig' %}
{% block report_content %}
{% embed 'reporting/report_by_user_data.html.twig' %}
{% embed 'reporting/report_by_user_data.html.twig' with {with_links: true} %}
{% block period_name %}
<th class="text-center text-nowrap">
<a href="{{ path('report_user_month', {'date': column|report_date, 'sumType': dataType, 'user': user.id}) }}">

2
templates/reporting/report_user_list_export.html.twig
View File

@@ -6,7 +6,7 @@
{% set dataTypeFormat = ' data-format="' ~ constant('App\\Export\\Base\\AbstractSpreadsheetRenderer::DURATION_DECIMAL') ~ '"' %}
{% endif %}
{% block user_column %}
{{ userPeriod.user.displayName }}
{{ userPeriod.user.displayName|sanitize_dde }}
{% endblock %}
{% block duration -%}
{{ period.totalDuration / 3600 }}

2
templates/reporting/report_user_list_monthly_export.html.twig
View File

@@ -6,7 +6,7 @@
{% set dataTypeFormat = ' data-format="' ~ constant('App\\Export\\Base\\AbstractSpreadsheetRenderer::DURATION_DECIMAL') ~ '"' %}
{% endif %}
{% block user_column %}
{{ userPeriod.user.displayName }}
{{ userPeriod.user.displayName|sanitize_dde }}
{% endblock %}
{% block duration -%}
{{ period.totalDuration / 3600 }}

2
templates/reporting/user_list_period_data.html.twig
View File

@@ -59,7 +59,7 @@
</td>
{% endif %}
<td class="text-nowrap"{% block user_column_cell_attribute %}{% endblock %}>
{{ userPeriod.user.displayName }}
{{ userPeriod.user.displayName|sanitize_dde }}
</td>
{% if showAccountNumber %}
<td>{{ userPeriod.user.accountNumber }}</td>