diff --git a/resources/views/reports/time-entry-aggregate-index-excel.blade.php b/resources/views/reports/time-entry-aggregate-index-excel.blade.php
index 180c24a9..0c9d14d1 100644
--- 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
-
+ @if($exportFormat === ExportFormat::ODS || $exportFormat === ExportFormat::CSV)
@if ($group === TimeEntryAggregationType::Billable)
- {{ $group1Entry['key'] ? 'Yes' : 'No' }}
+ |
+ {{ $group1Entry['key'] ? 'Yes' : 'No' }}
+ |
@else
- {{ $group1Entry['description'] ?? $group1Entry['key'] ?? '-' }}
+
+ {{ $group1Entry['description'] ?? $group1Entry['key'] ?? '-' }}
+ |
@endif
-
- @if($exportFormat === ExportFormat::ODS || $exportFormat === ExportFormat::CSV)
-
- @if ($subGroup === TimeEntryAggregationType::Billable)
+ @if ($subGroup === TimeEntryAggregationType::Billable)
+ |
{{ $group2Entry['key'] ? 'Yes' : 'No' }}
- @else
+ |
+ @else
+
{{ $group2Entry['description'] ?? $group2Entry['key'] ?? '-' }}
- @endif
- |
+
+ @endif
{{ $interval->format($duration) }}
|
@@ -62,16 +66,24 @@
{{ round(BigDecimal::ofUnscaledValue($group2Entry['cost'], 2)->toFloat(), 2) }}
@else
- @if ($subGroup === TimeEntryAggregationType::Billable)
+ @if ($group === TimeEntryAggregationType::Billable)
{{ $group1Entry['key'] ? 'Yes' : 'No' }}
|
+ @else
+
+ {{ $group1Entry['description'] ?? $group1Entry['key'] ?? '-' }}
+ |
+ @endif
+ @if ($subGroup === TimeEntryAggregationType::Billable)
+
+ {{ $group2Entry['key'] ? 'Yes' : 'No' }}
+ |
@else
{{ $group2Entry['description'] ?? $group2Entry['key'] ?? '-' }}
|
@endif
-
{{ $duration->totalDays }}
|