From e4133253373ff0140d50701c70eb97eb33ca62b7 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Wed, 16 Nov 2022 23:02:26 +0100 Subject: [PATCH] added project + customer setting for calendar entry titles (#3636) --- src/Form/Type/CalendarTitlePatternType.php | 2 ++ templates/calendar/user.html.twig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Form/Type/CalendarTitlePatternType.php b/src/Form/Type/CalendarTitlePatternType.php index b99518a7..1726ce7f 100644 --- a/src/Form/Type/CalendarTitlePatternType.php +++ b/src/Form/Type/CalendarTitlePatternType.php @@ -27,6 +27,7 @@ class CalendarTitlePatternType extends AbstractType public const PATTERN_ACTIVITY_DESCRIPTION = self::PATTERN_ACTIVITY . self::SPACER . self::PATTERN_DESCRIPTION; public const PATTERN_PROJECT_DESCRIPTION = self::PATTERN_PROJECT . self::SPACER . self::PATTERN_DESCRIPTION; public const PATTERN_CUSTOMER_DESCRIPTION = self::PATTERN_CUSTOMER . self::SPACER . self::PATTERN_DESCRIPTION; + public const PATTERN_PROJECT_CUSTOMER = self::PATTERN_PROJECT . self::SPACER . self::PATTERN_CUSTOMER; private $translator; @@ -52,6 +53,7 @@ class CalendarTitlePatternType extends AbstractType $activity . self::SPACER . $description => CalendarTitlePatternType::PATTERN_ACTIVITY_DESCRIPTION, $project . self::SPACER . $description => CalendarTitlePatternType::PATTERN_PROJECT_DESCRIPTION, $customer . self::SPACER . $description => CalendarTitlePatternType::PATTERN_CUSTOMER_DESCRIPTION, + $project . self::SPACER . $customer => CalendarTitlePatternType::PATTERN_PROJECT_CUSTOMER, ] ]); } diff --git a/templates/calendar/user.html.twig b/templates/calendar/user.html.twig index 9f484d8c..355bc507 100644 --- a/templates/calendar/user.html.twig +++ b/templates/calendar/user.html.twig @@ -148,6 +148,8 @@ title = apiItem.project.name + description; {% elseif config.entryTitlePattern == constant('\\App\\Form\\Type\\CalendarTitlePatternType::PATTERN_CUSTOMER_DESCRIPTION') %} title = apiItem.project.customer.name + description; + {% elseif config.entryTitlePattern == constant('\\App\\Form\\Type\\CalendarTitlePatternType::PATTERN_PROJECT_CUSTOMER') %} + title = apiItem.project.name + apiItem.project.customer.name; {% endif %} if (title === '' || title === null) {