Fix incorrect grouping by billable in export report

solidtime-io · Oct 29, 2024 · f145e82 · f145e82
1 parent eaaa834
commit f145e82
Showing 1 changed file with 24 additions and 12 deletions.
diff --git a/resources/views/reports/time-entry-aggregate-index-excel.blade.php b/resources/views/reports/time-entry-aggregate-index-excel.blade.php
@@ -37,21 +37,25 @@
                 $duration = CarbonInterval::seconds($group2Entry['seconds']);
             @endphp
             <tr>
-                <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
+                @if($exportFormat === ExportFormat::ODS || $exportFormat === ExportFormat::CSV)
                     @if ($group === TimeEntryAggregationType::Billable)
-                        {{ $group1Entry['key'] ? 'Yes' : 'No' }}
+                        <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
+                            {{ $group1Entry['key'] ? 'Yes' : 'No' }}
+                        </td>
                     @else
-                        {{ $group1Entry['description'] ?? $group1Entry['key'] ?? '-' }}
+                        <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
+                            {{ $group1Entry['description'] ?? $group1Entry['key'] ?? '-' }}
+                        </td>
                     @endif
-                </td>
-                @if($exportFormat === ExportFormat::ODS || $exportFormat === ExportFormat::CSV)
-                    <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
-                        @if ($subGroup === TimeEntryAggregationType::Billable)
+                    @if ($subGroup === TimeEntryAggregationType::Billable)
+                        <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
                             {{ $group2Entry['key'] ? 'Yes' : 'No' }}
-                        @else
+                        </td>
+                    @else
+                        <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
                             {{ $group2Entry['description'] ?? $group2Entry['key'] ?? '-' }}
-                        @endif
-                    </td>
+                        </td>
+                    @endif
                     <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
                         {{ $interval->format($duration) }}
                     </td>
@@ -62,16 +66,24 @@
                         {{ round(BigDecimal::ofUnscaledValue($group2Entry['cost'], 2)->toFloat(), 2) }}
                     </td>
                 @else
-                    @if ($subGroup === TimeEntryAggregationType::Billable)
+                    @if ($group === TimeEntryAggregationType::Billable)
                         <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
                             {{ $group1Entry['key'] ? 'Yes' : 'No' }}
                         </td>
+                    @else
+                        <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
+                            {{ $group1Entry['description'] ?? $group1Entry['key'] ?? '-' }}
+                        </td>
+                    @endif
+                    @if ($subGroup === TimeEntryAggregationType::Billable)
+                        <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
+                            {{ $group2Entry['key'] ? 'Yes' : 'No' }}
+                        </td>
                     @else
                         <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
                             {{ $group2Entry['description'] ?? $group2Entry['key'] ?? '-' }}
                         </td>
                     @endif
-
                     <td style="border: 1px solid black;" data-type="{{ DataType::TYPE_NUMERIC }}"
                         data-format="[hh]:mm:ss">
                         {{ $duration->totalDays }}