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

1.18.1 - fix description pattern in title (#3179)

Browse Source 
* bump version
* add comment to customer/project/activity entity and collections api 
* improve title pattern usage
This commit is contained in:
Kevin Papst
2022-02-28 16:32:41 +01:00
committed by GitHub
parent 2ad7629c2a
commit b08c156552
17 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Constants.php
View File

@@ -17,11 +17,11 @@ class Constants
/**
* The current release version
*/
public const VERSION = '1.18';
public const VERSION = '1.18.1';
/**
* The current release: major * 10000 + minor * 100 + patch
*/
public const VERSION_ID = 11800;
public const VERSION_ID = 11801;
/**
* The current release status, either "stable" or "dev"
*/

2
src/Entity/Activity.php
View File

@@ -102,7 +102,7 @@ class Activity implements EntityWithMetaFields, EntityWithBudget
* @var string|null
*
* @Serializer\Expose()
* @Serializer\Groups({"Activity_Entity"})
* @Serializer\Groups({"Default"})
*
* @Exporter\Expose(label="label.comment")
*

2
src/Entity/Customer.php
View File

@@ -79,7 +79,7 @@ class Customer implements EntityWithMetaFields, EntityWithBudget
* @var string|null
*
* @Serializer\Expose()
* @Serializer\Groups({"Customer_Entity"})
* @Serializer\Groups({"Default"})
*
* @Exporter\Expose(label="label.comment")
*

2
src/Entity/Project.php
View File

@@ -176,7 +176,7 @@ class Project implements EntityWithMetaFields, EntityWithBudget
* @var string|null
*
* @Serializer\Expose()
* @Serializer\Groups({"Project_Entity"})
* @Serializer\Groups({"Default"})
*
* @Exporter\Expose(label="label.comment")
*

4
src/Form/Type/ActivityType.php
View File

@@ -57,7 +57,7 @@ class ActivityType extends AbstractType
{
$name = $this->getPattern();
$name = str_replace(self::PATTERN_NAME, $activity->getName(), $name);
$name = str_replace(self::PATTERN_COMMENT, $activity->getComment(), $name);
$name = str_replace(self::PATTERN_COMMENT, $activity->getComment() ?? '', $name);
$name = ltrim($name, self::SPACER);
$name = rtrim($name, self::SPACER);
@@ -66,7 +66,7 @@ class ActivityType extends AbstractType
$name = $activity->getName();
}
return $name;
return substr($name, 0, 110);
}
/**

8
src/Form/Type/CustomerType.php
View File

@@ -60,9 +60,9 @@ class CustomerType extends AbstractType
{
$name = $this->getPattern();
$name = str_replace(self::PATTERN_NAME, $customer->getName(), $name);
$name = str_replace(self::PATTERN_COMMENT, $customer->getComment(), $name);
$name = str_replace(self::PATTERN_NUMBER, $customer->getNumber(), $name);
$name = str_replace(self::PATTERN_COMPANY, $customer->getCompany() ?? $customer->getName(), $name);
$name = str_replace(self::PATTERN_COMMENT, $customer->getComment() ?? '', $name);
$name = str_replace(self::PATTERN_NUMBER, $customer->getNumber() ?? '', $name);
$name = str_replace(self::PATTERN_COMPANY, $customer->getCompany() ?? '', $name);
$name = ltrim($name, self::SPACER);
$name = rtrim($name, self::SPACER);
@@ -71,7 +71,7 @@ class CustomerType extends AbstractType
$name = $customer->getName();
}
return $name;
return substr($name, 0, 110);
}
public function getChoiceAttributes(Customer $customer, $key, $value): array

4
src/Form/Type/ProjectType.php
View File

@@ -81,7 +81,7 @@ class ProjectType extends AbstractType
$name = $this->getPattern();
$name = str_replace(self::PATTERN_NAME, $project->getName(), $name);
$name = str_replace(self::PATTERN_COMMENT, $project->getComment(), $name);
$name = str_replace(self::PATTERN_COMMENT, $project->getComment() ?? '', $name);
$name = str_replace(self::PATTERN_ORDERNUMBER, $project->getOrderNumber(), $name);
$name = str_replace(self::PATTERN_START, $start, $name);
$name = str_replace(self::PATTERN_END, $end, $name);
@@ -94,7 +94,7 @@ class ProjectType extends AbstractType
$name = $project->getName();
}
return $name;
return substr($name, 0, 110);
}
/**