From 2022fa54d32acd324a1f64d1fcb8d790dcd599c9 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Fri, 21 Oct 2022 15:26:53 +0200 Subject: [PATCH] added customer name as pattern option in project dropdown (#3589) --- src/Form/Helper/ProjectHelper.php | 2 ++ src/Form/Type/ProjectTypePatternType.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Form/Helper/ProjectHelper.php b/src/Form/Helper/ProjectHelper.php index 19cf1045..0657d521 100644 --- a/src/Form/Helper/ProjectHelper.php +++ b/src/Form/Helper/ProjectHelper.php @@ -21,6 +21,7 @@ final class ProjectHelper public const PATTERN_DATERANGE = '{daterange}'; public const PATTERN_START = '{start}'; public const PATTERN_END = '{end}'; + public const PATTERN_CUSTOMER = '{parentTitle}'; public const PATTERN_SPACER = '{spacer}'; public const SPACER = ' - '; @@ -70,6 +71,7 @@ final class ProjectHelper $name = $this->getChoicePattern(); $name = str_replace(self::PATTERN_NAME, $project->getName(), $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_START, $start, $name); $name = str_replace(self::PATTERN_END, $end, $name); diff --git a/src/Form/Type/ProjectTypePatternType.php b/src/Form/Type/ProjectTypePatternType.php index f3fa8a44..1508339b 100644 --- a/src/Form/Type/ProjectTypePatternType.php +++ b/src/Form/Type/ProjectTypePatternType.php @@ -37,6 +37,7 @@ class ProjectTypePatternType extends AbstractType $orderNumber = $this->translator->trans('label.orderNumber'); $projectStart = $this->translator->trans('label.project_start'); $projectEnd = $this->translator->trans('label.project_end'); + $customer = $this->translator->trans('label.customer'); $spacer = ProjectHelper::SPACER; @@ -45,6 +46,7 @@ class ProjectTypePatternType extends AbstractType 'choices' => [ $name => ProjectHelper::PATTERN_NAME, $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 . $comment => ProjectHelper::PATTERN_NAME . ProjectHelper::PATTERN_SPACER . ProjectHelper::PATTERN_COMMENT, $name . $spacer . $projectStart . '-' . $projectEnd => ProjectHelper::PATTERN_NAME . ProjectHelper::PATTERN_SPACER . ProjectHelper::PATTERN_DATERANGE,