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

Fixed timezone in time entries importer

Browse Source
This commit is contained in:
Constantin Graf
2024-06-06 18:35:19 +02:00
parent f2f128e184
commit 94940be02c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
if ($start === null) { if ($start === null) {
throw new ImportException('Start date ("'.$record['Start Date'].'") or time ("'.$record['Start Time'].'") are invalid'); throw new ImportException('Start date ("'.$record['Start Date'].'") or time ("'.$record['Start Time'].'") are invalid');
} }
$timeEntry->start = $start; $timeEntry->start = $start->utc();
// End // End
try { try {
@@ -136,7 +136,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
if ($end === null) { if ($end === null) {
throw new ImportException('End date ("'.$record['End Date'].'") or time ("'.$record['End Time'].'") are invalid'); throw new ImportException('End date ("'.$record['End Date'].'") or time ("'.$record['End Time'].'") are invalid');
} }
$timeEntry->end = $end; $timeEntry->end = $end->utc();
$timeEntry->setComputedAttributeValue('billable_rate'); $timeEntry->setComputedAttributeValue('billable_rate');
$timeEntry->save(); $timeEntry->save();
$this->timeEntriesCreated++; $this->timeEntriesCreated++;

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

@@ -112,7 +112,7 @@ class TogglTimeEntriesImporter extends DefaultImporter
if ($start === null) { if ($start === null) {
throw new ImportException('Start date ("'.$record['Start date'].'") or time ("'.$record['Start time'].'") are invalid'); throw new ImportException('Start date ("'.$record['Start date'].'") or time ("'.$record['Start time'].'") are invalid');
} }
$timeEntry->start = $start; $timeEntry->start = $start->utc();
try { try {
$end = Carbon::createFromFormat('Y-m-d H:i:s', $record['End date'].' '.$record['End time'], $timezone); $end = Carbon::createFromFormat('Y-m-d H:i:s', $record['End date'].' '.$record['End time'], $timezone);
@@ -122,7 +122,7 @@ class TogglTimeEntriesImporter extends DefaultImporter
if ($end === null) { if ($end === null) {
throw new ImportException('End date ("'.$record['End date'].'") or time ("'.$record['End time'].'") are invalid'); throw new ImportException('End date ("'.$record['End date'].'") or time ("'.$record['End time'].'") are invalid');
} }
$timeEntry->end = $end; $timeEntry->end = $end->utc();
$timeEntry->setComputedAttributeValue('billable_rate'); $timeEntry->setComputedAttributeValue('billable_rate');
$timeEntry->save(); $timeEntry->save();
$this->timeEntriesCreated++; $this->timeEntriesCreated++;