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

added dateformat and timezone options to project importer (#2042)

Browse Source
This commit is contained in:
Kevin Papst
2020-10-16 12:53:33 +02:00
committed by GitHub
parent 996f05c73a
commit 032db11b48
4 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Importer/DefaultProjectImporter.php
View File

@@ -14,7 +14,7 @@ use App\Entity\ProjectMeta;
final class DefaultProjectImporter extends AbstractProjectImporter
{
protected function convertEntry(Project $project, array $row)
protected function convertEntry(Project $project, array $row, array $options = []): void
{
foreach ($row as $name => $value) {
switch (strtolower($name)) {
@@ -33,7 +33,7 @@ final class DefaultProjectImporter extends AbstractProjectImporter
case 'order-number':
case 'order number':
if (!empty($value)) {
$project->setOrderNumber($value);
$project->setOrderNumber(substr($value, 0, 20));
}
break;
@@ -42,8 +42,20 @@ final class DefaultProjectImporter extends AbstractProjectImporter
case 'order date':
if (!empty($value)) {
$timezone = $project->getCustomer()->getTimezone();
if (isset($options['timezone'])) {
$timezone = $options['timezone'];
}
$timezone = new \DateTimeZone($timezone ?? date_default_timezone_get());
$project->setOrderDate(new \DateTime($value, $timezone));
if (isset($options['dateformat'])) {
$date = \DateTime::createFromFormat($options['dateformat'], $value, $timezone);
} else {
$date = new \DateTime($value, $timezone);
}
if ($date instanceof \DateTime) {
$project->setOrderDate($date);
} else {
throw new \InvalidArgumentException('Invalid order date: ' . $value);
}
}
break;
@@ -84,7 +96,5 @@ final class DefaultProjectImporter extends AbstractProjectImporter
break;
}
}
return $project;
}
}