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

Added is_imported flag to time entries

Browse Source
This commit is contained in:
Constantin Graf
2024-06-04 14:34:25 +02:00
committed by Constantin Graf
parent 802d9558a3
commit 20f9b344f6
11 changed files with 129 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,6 +79,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
], [
'client_id' => $clientId,
'color' => $this->colorService->getRandomColor(),
'is_billable' => false,
]);
}
$taskId = null;
@@ -105,6 +106,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
}
$timeEntry->billable = $record['Billable'] === 'Yes';
$timeEntry->tags = $this->getTags($record['Tags']);
$timeEntry->is_imported = true;
// Start
try {

2
app/Service/Import/Importers/TogglTimeEntriesImporter.php
View File

@@ -78,6 +78,7 @@ class TogglTimeEntriesImporter extends DefaultImporter
'organization_id' => $this->organization->id,
], [
'client_id' => $clientId,
'is_billable' => false,
'color' => $this->colorService->getRandomColor(),
]);
}
@@ -102,6 +103,7 @@ class TogglTimeEntriesImporter extends DefaultImporter
}
$timeEntry->billable = $record['Billable'] === 'Yes';
$timeEntry->tags = $this->getTags($record['Tags']);
$timeEntry->is_imported = true;
try {
$start = Carbon::createFromFormat('Y-m-d H:i:s', $record['Start date'].' '.$record['Start time'], $timezone);
} catch (InvalidFormatException) {