From 6cf586ddfafc645bbd9d25407d6666e7529be891 Mon Sep 17 00:00:00 2001
From: Martin Rattensberger <martin@rattensberger.com>
Date: Wed, 9 Aug 2023 17:41:48 +0200
Subject: [PATCH] =?UTF-8?q?Sortierung=20=C3=BCber=20eigenens=20InvoiceCalc?=
 =?UTF-8?q?ulator-Modul=20umgesetzt=20Layout=20mit=20Zwischensummen=20ange?=
 =?UTF-8?q?passt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Kimai2/groupedByProjects.pdf.twig | 40 +++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 10 deletions(-)

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-->
 
         <div class="items">
             <table cellpadding="0" cellspacing="0" width="100%" border="0">
+                <caption>Leistungsstunden</caption>
                 <thead>
                 <tr>
                     <th class="t-center"></th>
-                    <th class="t-left">Leistungsstunden</th>
+                    <th class="t-left"></th>
                     <th class="t-right text-nowrap"></th>
                     <th class="t-center text-nowrap"></th>
                     <th class="t-right text-nowrap"></th>
@@ -520,6 +523,7 @@ mpdf-->
                             {% set totalAmount = 0 %}
 
                             {% set currentTag = '' %}
+                            {% set j = 0 %}
 
                             <tr>
                                 <td class="project-name"></td>
@@ -531,15 +535,11 @@ mpdf-->
 
                     <!-- group by keywords: assuming, there is not more keywords found then groupByMaxKeywords (defined on top of the file) -->
 
-
                             {% for entry in entries %}
                                 <!-- only timesheets, rest will be 'Auslagen' later -->
-
                                 {% 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&auml;tigkeit angegeben' %}
                                             {% endif %}
 
+                                            {% if j > 1 %}
+                                                <tr>
+                                                    <td></td>
+                                                    <td class="project-total t-left">Zwischensumme:</td>
+                                                    <td class="project-total t-nowrap t-center"></td>
+                                                    <td class="project-total t-nowrap t-right">{{ totalDuration|duration }}</td>
+                                                    <td class="project-total t-nowrap t-right">{{ totalAmount|money(invoice['invoice.currency']) }}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td colspan="5">&nbsp;</td>
+                                                </tr>
+
+                                                {% set totalDuration = 0 %}
+                                                {% set totalAmount = 0 %}
+                                            {% endif %}
+
                                             <tr>
                                                 <td class="tag-name"></td>
                                                 <td class="tag-name">{{ currentTag }}</td>
@@ -566,6 +582,10 @@ mpdf-->
                                             </tr>
                                         {% endif %}
 
+                            
+                                        {% set totalAmount = totalAmount + entry['entry.total_plain'] %}
+                                        {% set totalDuration = totalDuration + entry['entry.duration'] %}
+                                        {% set pos = pos + 1 %}
 
                                         <tr>
                                             <td class="t-nowrap t-center">{{ entry['entry.begin'] }}</td>
@@ -593,12 +613,12 @@ mpdf-->
                             <tr>
                                 <td></td>
                                 <td class="project-total t-left">Zwischensumme:</td>
-                                <td class="project-total t-nowrap t-center">{{ totalDuration|duration }}</td>
-                                <td></td>
+                                <td class="project-total t-nowrap t-center"></td>
+                                <td class="project-total t-nowrap t-right">{{ totalDuration|duration }}</td>
                                 <td class="project-total t-nowrap t-right">{{ totalAmount|money(invoice['invoice.currency']) }}</td>
                             </tr>
                             <tr>
-                                <td></td>
+                                <td colspan="5">&nbsp;</td>
                             </tr>
 
                         {% endif %}