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

add support for activity columns in clockify exports

Browse Source
This commit is contained in:
Gregor Vostrak
2026-06-25 12:10:44 +02:00
parent ab9f6e6afb
commit 50f57f6997
6 changed files with 81 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
View File

@@ -54,6 +54,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
$reader->setEscape('');
$header = $reader->getHeader();
$this->validateHeader($header);
$taskKey = $this->getTaskKey($header);
$records = $reader->getRecords();
foreach ($records as $record) {
$userId = $this->userImportHelper->getKey([
@@ -96,9 +97,9 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
]);
}
$taskId = null;
if ($record['Task'] !== '') {
if ($taskKey !== null && $record[$taskKey] !== '') {
$taskId = $this->taskImportHelper->getKey([
'name' => $record['Task'],
'name' => $record[$taskKey],
'project_id' => $projectId,
'organization_id' => $this->organization->id,
]);
@@ -216,7 +217,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
'Project',
'Client',
'Description',
'Task',
'User',
'Group',
'Email',
@@ -231,6 +231,26 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
}
}
// Clockify names the task column "Task" or "Activity" depending on the export; accept either.
if ($this->getTaskKey($header) === null) {
throw new ImportException('Invalid CSV header, missing field: Task');
}
}
/**
* Clockify names the task column "Task" or "Activity" depending on the export version.
*
* @param array<string> $header
*/
private function getTaskKey(array $header): ?string
{
foreach (['Task', 'Activity'] as $field) {
if (in_array($field, $header, true)) {
return $field;
}
}
return null;
}
#[\Override]