Merge branch 'main' of github.com:solidtime-io/solidtime into feature/reporting

# Conflicts:
#	tests/Feature/RegistrationTest.php
This commit is contained in:
Gregor Vostrak
2024-05-16 17:39:18 +02:00
34 changed files with 868 additions and 522 deletions

View File

@@ -32,7 +32,7 @@ class TimeEntryResource extends BaseResource
*/
'end' => $this->formatDateTime($this->resource->end),
/** @var int|null $duration Duration of time entry in seconds */
'duration' => $this->resource->getDuration()?->seconds,
'duration' => (int) $this->resource->getDuration()?->totalSeconds,
/** @var string|null $description Description of time entry */
'description' => $this->resource->description,
/** @var string|null $task_id ID of task */