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

added customer name as pattern option in project dropdown (#3589)

Browse Source
This commit is contained in:
Kevin Papst
2022-10-21 15:26:53 +02:00
committed by GitHub
parent 73ef090b9e
commit 2022fa54d3
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Form/Helper/ProjectHelper.php
View File

@@ -21,6 +21,7 @@ final class ProjectHelper
public const PATTERN_DATERANGE = '{daterange}'; public const PATTERN_DATERANGE = '{daterange}';
public const PATTERN_START = '{start}'; public const PATTERN_START = '{start}';
public const PATTERN_END = '{end}'; public const PATTERN_END = '{end}';
public const PATTERN_CUSTOMER = '{parentTitle}';
public const PATTERN_SPACER = '{spacer}'; public const PATTERN_SPACER = '{spacer}';
public const SPACER = ' - '; public const SPACER = ' - ';
@@ -70,6 +71,7 @@ final class ProjectHelper
$name = $this->getChoicePattern(); $name = $this->getChoicePattern();
$name = str_replace(self::PATTERN_NAME, $project->getName(), $name); $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_CUSTOMER, $project->getCustomer()->getName() ?? '', $name);
$name = str_replace(self::PATTERN_ORDERNUMBER, $project->getOrderNumber() ?? '', $name); $name = str_replace(self::PATTERN_ORDERNUMBER, $project->getOrderNumber() ?? '', $name);
$name = str_replace(self::PATTERN_START, $start, $name); $name = str_replace(self::PATTERN_START, $start, $name);
$name = str_replace(self::PATTERN_END, $end, $name); $name = str_replace(self::PATTERN_END, $end, $name);

2
src/Form/Type/ProjectTypePatternType.php
View File

@@ -37,6 +37,7 @@ class ProjectTypePatternType extends AbstractType
$orderNumber = $this->translator->trans('label.orderNumber'); $orderNumber = $this->translator->trans('label.orderNumber');
$projectStart = $this->translator->trans('label.project_start'); $projectStart = $this->translator->trans('label.project_start');
$projectEnd = $this->translator->trans('label.project_end'); $projectEnd = $this->translator->trans('label.project_end');
$customer = $this->translator->trans('label.customer');
$spacer = ProjectHelper::SPACER; $spacer = ProjectHelper::SPACER;
@@ -45,6 +46,7 @@ class ProjectTypePatternType extends AbstractType
'choices' => [ 'choices' => [
$name => ProjectHelper::PATTERN_NAME, $name => ProjectHelper::PATTERN_NAME,
$comment => ProjectHelper::PATTERN_COMMENT, $comment => ProjectHelper::PATTERN_COMMENT,
$name . $spacer . $customer => ProjectHelper::PATTERN_NAME . ProjectHelper::PATTERN_SPACER . ProjectHelper::PATTERN_CUSTOMER,
$name . $spacer . $orderNumber => ProjectHelper::PATTERN_NAME . ProjectHelper::PATTERN_SPACER . ProjectHelper::PATTERN_ORDERNUMBER, $name . $spacer . $orderNumber => ProjectHelper::PATTERN_NAME . ProjectHelper::PATTERN_SPACER . ProjectHelper::PATTERN_ORDERNUMBER,
$name . $spacer . $comment => ProjectHelper::PATTERN_NAME . ProjectHelper::PATTERN_SPACER . ProjectHelper::PATTERN_COMMENT, $name . $spacer . $comment => ProjectHelper::PATTERN_NAME . ProjectHelper::PATTERN_SPACER . ProjectHelper::PATTERN_COMMENT,
$name . $spacer . $projectStart . '-' . $projectEnd => ProjectHelper::PATTERN_NAME . ProjectHelper::PATTERN_SPACER . ProjectHelper::PATTERN_DATERANGE, $name . $spacer . $projectStart . '-' . $projectEnd => ProjectHelper::PATTERN_NAME . ProjectHelper::PATTERN_SPACER . ProjectHelper::PATTERN_DATERANGE,