daily stats in timesheet (#552)

templates/macros/datatables.html.twig

@@ -69,24 +69,15 @@
 {% endspaceless %}
 {% endmacro %}
 
-{% macro data_table_header(name, entries, form, collapseClass) %}
+{% macro data_table_header(name, entries, skipStripped) %}
 {% import _self as macro %}
 {{ macro.data_table_column_modal(name, entries) }}
 <div class="box data_table" id="datatable_{{ name }}">
-    {% if form %}
-        {% import "macros/toolbar.html.twig" as macro %}
-        {{ macro.toolbar(form, collapseClass) }}
-    {% endif %}
-
     <div class="box-body no-padding">
         <div class="dataTables_wrapper form-inline dt-bootstrap">
-            <div class="row">
-                <div class="col-sm-6"></div>
-                <div class="col-sm-6"></div>
-            </div>
             <div class="row">
                 <div class="col-sm-12">
-                    <table class="table table-striped table-hover dataTable" role="grid">
+                    <table class="table {% if not skipStripped %}table-striped {% endif %}table-hover dataTable" role="grid">
                         <thead>
                         <tr>
                             {%- for title, class in entries -%}

templates/navbar/active-entries.html.twig

@@ -18,12 +18,7 @@
                                 <i class="{{ 'stop-small'|icon }} fa-2x"></i>
                             </div>
                             <h4>
-                                {# TODO find a CSS solution for this #}
-                                {% if entry.activity.name|length > 23 %}
-                                    {{ entry.activity.name|slice(0,20) }}...
-                                {% else %}
-                                    {{ entry.activity.name }}
-                                {% endif %}
+                                <span>{{ entry.activity.name }}</span>
                                 <small><i class="{{ 'timesheet'|icon }}"></i> {{ entry|duration }}</small>
                             </h4>
                             <p>{{ entry.project.name }} ({{ entry.project.customer.name }})</p>

templates/timesheet/index.html.twig

@@ -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 %}