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

daily stats in timesheet (#552)

Browse Source
This commit is contained in:
Kevin Papst
2019-02-13 15:36:59 +01:00
committed by GitHub
parent fd60d5bb17
commit 2c6f57c7ce
13 changed files with 95 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
templates/timesheet/index.html.twig
View File

@@ -3,6 +3,28 @@
{% import "macros/datatables.html.twig" as tables %}
{% import "macros/toolbar.html.twig" as toolbar %}
{% macro summary(day, duration, dayRates, columns) %}
<tr class="summary info">
<td class="text-nowrap">{{ day }}</td>
<td></td>
<td></td>
<td class="text-nowrap">{{ duration|duration }}</td>
{% if is_granted('view_rate_own_timesheet') %}
<td class="text-nowrap">
{% for currency, rate in dayRates %}
{{ rate|money(currency) }}
{% if not loop.last %}
<br>
{% endif %}
{% endfor %}
</td>
<td colspan="{{ (columns|length) - 5 }}"></td>
{% else %}
<td colspan="{{ (columns|length) - 4 }}"></td>
{% endif %}
</tr>
{% endmacro %}
{% block page_title %}{{ 'timesheet.title'|trans }}{% endblock %}
{% block page_subtitle %}{{ 'timesheet.subtitle'|trans }}{% endblock %}
{% block page_actions %}
@@ -23,7 +45,7 @@
{% endblock %}
{% block main %}
{% import _self as timesheet %}
{% if entries.count == 0 %}
{{ widgets.callout('warning', 'error.no_entries_found') }}
{% else %}
@@ -49,9 +71,22 @@
{% set tableName = 'timesheet' %}
{{ tables.data_table_header(tableName, columns) }}
{{ tables.data_table_header(tableName, columns, showSummary) }}
{% set day = null %}
{% set dayDuration = 0 %}
{% set dayRate = {} %}
{% for entry in entries %}
{% set customerCurrency = entry.project.customer.currency %}
{% if day is same as(null) %}
{% set day = entry.begin|date_short %}
{% endif %}
{% if showSummary and day is not same as(entry.begin|date_short) %}
{{ timesheet.summary(day, dayDuration, dayRate, columns) }}
{% set day = entry.begin|date_short %}
{% set dayDuration = 0 %}
{% set dayRate = {} %}
{% endif %}
<tr>
<td class="text-nowrap {{ tables.data_table_column_class(tableName, columns, 'date') }}">{{ entry.begin|date_short }}</td>
@@ -103,8 +138,19 @@
{{ widgets.button_group(actionButtons) }}
</td>
</tr>
{% if entry.end %}
{% if dayRate[customerCurrency] is not defined %}
{% set dayRate = dayRate|merge({(customerCurrency): 0}) %}
{% endif %}
{% set dayRate = dayRate|merge({(customerCurrency): dayRate[customerCurrency] + entry.rate}) %}
{% endif %}
{% set dayDuration = dayDuration + entry.duration %}
{% endfor %}
{% if showSummary %}
{{ timesheet.summary(day, dayDuration, dayRate, columns) }}
{% endif %}
{{ tables.data_table_footer(entries, 'timesheet_paginated') }}
{% endif %}