jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix locale date format in report header and more (#2520)

Browse Source 
* fix problem with empty end datetime in edit time
* fixed calendar creation with tags in "pre-defined tags" mode
* fix locale date format in report header
This commit is contained in:
Kevin Papst
2021-04-21 22:23:32 +02:00
committed by GitHub
parent 305a2fd4f6
commit ff7a402bd4
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Calendar/TimesheetEntry.php
View File

@@ -32,11 +32,16 @@ final class TimesheetEntry implements DragAndDropEntry
public function getData(): array
{
$tags = null;
if (!empty($this->timesheet->getTagsAsArray())) {
$tags = implode(',', $this->timesheet->getTagsAsArray());
}
return [
'description' => $this->timesheet->getDescription(),
'activity' => $this->timesheet->getActivity() !== null ? $this->timesheet->getActivity()->getId() : null,
'project' => $this->timesheet->getProject() !== null ? $this->timesheet->getProject()->getId() : null,
'tags' => implode(',', $this->timesheet->getTagsAsArray()),
'tags' => $tags,
];
}