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

add formatting support for months grouping

Browse Source
This commit is contained in:
Gregor Vostrak
2026-08-20 16:13:52 +02:00
parent 3bddd49364
commit 2c540be236
5 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Service/LocalizationService.php
View File

@@ -155,9 +155,10 @@ class LocalizationService
}
/**
* Time group types have no server-side descriptor; Day and Week keys are ISO dates and
* Time group types have no server-side descriptor; their keys are ISO dates and are
* formatted here instead. A Week key is the first day of that week, so it renders as the
* range it covers.
* range it covers. A Year key is already a bare year, so it is returned unchanged - it must
* not be parsed, Carbon reads a four digit string as a time of day.
*/
public function formatTimeGroupKey(?string $key, TimeEntryAggregationType $groupType): ?string
{
@@ -175,6 +176,13 @@ class LocalizationService
return $this->formatDate($weekStart).' - '.$this->formatDate($weekStart->copy()->addDays(6));
}
if ($groupType === TimeEntryAggregationType::Month) {
// Note: the leading "!" resets all fields the format does not name. Without it the
// day of the month is taken from today, and a day that the parsed month does not
// have overflows the date into the next month.
return Carbon::createFromFormat('!Y-m', $key)->format('F Y');
}
return $key;
}