Fix billable mapping (0=billable, 1=non-billable, 2=unproductive)

- Swapped billable/non-billable SQL values to match migrated data
- All 3 pivot tables always render (empty ones show 'No data')
- Added grand total row to pivot tables
- Initialize unprodRows/userColumnsUP to prevent undefined var error

src/Controller/Reporting/TeamSummaryController.php

@@ -35,13 +35,15 @@ final class TeamSummaryController extends AbstractController
         $userColumns = [];
         $nonbillRows = [];
         $userColumnsNB = [];
+        $unprodRows = [];
+        $userColumnsUP = [];
 
         if ($selectedTeamId > 0) {
             $team = $this->teamRepository->find($selectedTeamId);
             if ($team) {
                 $rows = $this->getUserTimeAnalysis($selectedTeamId, $from, $to);
-                [$projectRows, $userColumns] = $this->getProjectPivot($selectedTeamId, $from, $to, '= 1');
+                [$projectRows, $userColumns] = $this->getProjectPivot($selectedTeamId, $from, $to, '= 0');
-                [$nonbillRows, $userColumnsNB] = $this->getProjectPivot($selectedTeamId, $from, $to, '= 0');
+                [$nonbillRows, $userColumnsNB] = $this->getProjectPivot($selectedTeamId, $from, $to, '= 1');
                 [$unprodRows, $userColumnsUP] = $this->getProjectPivot($selectedTeamId, $from, $to, '= 2');
             }
         }
@@ -68,8 +70,8 @@ final class TeamSummaryController extends AbstractController
         $sql = "SELECT
             u.username,
             u.alias,
-            COALESCE(SUM(CASE WHEN p.billable = 1 THEN ts.duration END), 0) / 3600 AS billable_hours,
+            COALESCE(SUM(CASE WHEN p.billable = 0 THEN ts.duration END), 0) / 3600 AS billable_hours,
-            COALESCE(SUM(CASE WHEN p.billable = 0 THEN ts.duration END), 0) / 3600 AS nonbillable_hours,
+            COALESCE(SUM(CASE WHEN p.billable = 1 THEN ts.duration END), 0) / 3600 AS nonbillable_hours,
             COALESCE(SUM(CASE WHEN p.billable IS NULL OR p.billable NOT IN (0,1) THEN ts.duration END), 0) / 3600 AS unproductive_hours,
             COALESCE(SUM(ts.duration), 0) / 3600 AS total_hours
         FROM kimai2_users u

templates/reporting/team_summary.html.twig

@@ -65,7 +65,6 @@
             </table>
 
             {% macro pivot(rows, cols, title) %}
-                {% if rows is not empty %}
                 <h4 class="mt-4">{{ title }}</h4>
                 <div class="table-responsive">
                 <table class="table table-striped table-hover table-sm" style="font-size:11px">
@@ -75,6 +74,9 @@
                         <th class="text-end">TOTAL</th>
                     </tr></thead>
                     <tbody>
+                    {% if rows is empty %}
+                        <tr><td colspan="{{ cols|length + 3 }}" class="text-center text-muted">No data for this period</td></tr>
+                    {% else %}
                     {% for pr in rows %}
                         <tr>
                             <td>{{ pr.company }}</td>
@@ -85,9 +87,19 @@
                             <td class="text-end"><strong>{{ pr.total|number_format(1) }}</strong></td>
                         </tr>
                     {% endfor %}
+                    <tr class="table-active fw-bold">
+                        <td colspan="2">TOTAL</td>
+                        {% set gt = 0 %}
+                        {% for uc in cols %}
+                            {% set ct = 0 %}{% for pr in rows %}{% set ct = ct + pr.users[uc]|default(0) %}{% endfor %}
+                            <td class="text-end"><strong>{{ ct > 0 ? ct|number_format(1) }}</strong></td>
+                            {% set gt = gt + ct %}
+                        {% endfor %}
+                        <td class="text-end"><strong>{{ gt|number_format(1) }}</strong></td>
+                    </tr>
+                    {% endif %}
                     </tbody>
                 </table></div>
-                {% endif %}
             {% endmacro %}
 
             {% import _self as self %}