adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-20 22:22:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format date group labels in all aggregate exports

Browse Source
This commit is contained in:
Andrew Herron
2026-07-30 11:56:27 +00:00
committed by Gregor Vostrak
parent 111e12df12
commit 97fd882878
7 changed files with 178 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/reports/time-entry-aggregate/spreadsheet.blade.php
View File

@@ -44,7 +44,7 @@
</td>
@else
<td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
{{ $group1Entry['description'] ?? $group1Entry['key'] ?? '-' }}
{{ $group1Entry['description'] ?? $localization->formatTimeGroupKey($group1Entry['key'], $group) ?? '-' }}
</td>
@endif
@if ($subGroup === TimeEntryAggregationType::Billable)
@@ -53,7 +53,7 @@
</td>
@else
<td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
{{ $group2Entry['description'] ?? $group2Entry['key'] ?? '-' }}
{{ $group2Entry['description'] ?? $localization->formatTimeGroupKey($group2Entry['key'], $subGroup) ?? '-' }}
</td>
@endif
<td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
@@ -74,7 +74,7 @@
</td>
@else
<td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
{{ $group1Entry['description'] ?? $group1Entry['key'] ?? '-' }}
{{ $group1Entry['description'] ?? $localization->formatTimeGroupKey($group1Entry['key'], $group) ?? '-' }}
</td>
@endif
@if ($subGroup === TimeEntryAggregationType::Billable)
@@ -83,7 +83,7 @@
</td>
@else
<td style="border: 1px solid black;" data-type="{{ DataType::TYPE_STRING }}">
{{ $group2Entry['description'] ?? $group2Entry['key'] ?? '-' }}
{{ $group2Entry['description'] ?? $localization->formatTimeGroupKey($group2Entry['key'], $subGroup) ?? '-' }}
</td>
@endif
<td style="border: 1px solid black;" data-type="{{ DataType::TYPE_NUMERIC }}"