diff --git a/Kimai2/groupedByProjects.pdf.twig b/Kimai2/groupedByProjects.pdf.twig index 091ac92..0b17ab1 100644 --- a/Kimai2/groupedByProjects.pdf.twig +++ b/Kimai2/groupedByProjects.pdf.twig @@ -246,7 +246,9 @@ margin-bottom: 10pt; } - .items th { + .items caption { + font-size: 10pt; + font-weight: bold; color: {{ weiss }}; background-color: {{ hintergrund }} } @@ -492,10 +494,11 @@ mpdf-->
+ - + @@ -520,6 +523,7 @@ mpdf--> {% set totalAmount = 0 %} {% set currentTag = '' %} + {% set j = 0 %} @@ -531,15 +535,11 @@ mpdf--> - {% for entry in entries %} - {% if entry['entry.type'] == 'timesheet' %} {% if entry['entry.project_id'] == invoice[id ~ '.id'] %} - {% set totalAmount = totalAmount + entry['entry.total_plain'] %} - {% set totalDuration = totalDuration + entry['entry.duration'] %} - {% set pos = pos + 1 %} + {% set j = j + 1 %} {% if entry['entry.tags'] != currentTag %} @@ -549,6 +549,22 @@ mpdf--> {% set currentTag = 'keine Tätigkeit angegeben' %} {% endif %} + {% if j > 1 %} + + + + + + + + + + + + {% set totalDuration = 0 %} + {% set totalAmount = 0 %} + {% endif %} + @@ -566,6 +582,10 @@ mpdf--> {% endif %} + + {% set totalAmount = totalAmount + entry['entry.total_plain'] %} + {% set totalDuration = totalDuration + entry['entry.duration'] %} + {% set pos = pos + 1 %} @@ -593,12 +613,12 @@ mpdf--> - - + + - + {% endif %}
Leistungsstunden
Leistungsstunden
Zwischensumme:{{ totalDuration|duration }}{{ totalAmount|money(invoice['invoice.currency']) }}
 
{{ currentTag }}
{{ entry['entry.begin'] }}
Zwischensumme:{{ totalDuration|duration }}{{ totalDuration|duration }} {{ totalAmount|money(invoice['invoice.currency']) }}