Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 22:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix ClosingMotiveRender: rendering of label 'canceled' at the end of child, and remove trailing spaces

Browse Source
This commit is contained in:
Julien Fastré
2023-10-17 10:29:03 +02:00
parent 48e0a0af7d
commit 75e15c1389
2 changed files with 95 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
View File

@@ -11,10 +11,9 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Templating\Entity;
use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
use Chill\MainBundle\Templating\Entity\BoxUtilsChillEntityRenderTrait;
use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive;
use Symfony\Contracts\Translation\TranslatorInterface;
@@ -29,7 +28,7 @@ final readonly class ClosingMotiveRender implements ChillEntityRenderInterface
private const SEPARATOR = ' > ';
public function __construct(
private TranslatableStringHelper $translatableStringHelper,
private TranslatableStringHelperInterface $translatableStringHelper,
private TranslatorInterface $translator
) {}
@@ -45,7 +44,7 @@ final readonly class ClosingMotiveRender implements ChillEntityRenderInterface
{
return $this->renderStringRecursive(
$entity,
'', //$this->translatableStringHelper->localize($entity->getName()),
'',
$options
);
}
@@ -55,27 +54,30 @@ final readonly class ClosingMotiveRender implements ChillEntityRenderInterface
return $entity instanceof ClosingMotive;
}
private function renderStringRecursive(ClosingMotive $motive, string $existing, array $options)
private function renderStringRecursive(ClosingMotive $motive, string $existing, array $options): string
{
$newExisting = $this->translatableStringHelper->localize($motive->getName());
$isCanceled = $motive->getIsCanceledAccompanyingPeriod() ? $this->translator->trans('( Canceled period )') : '';
$str = $this->translatableStringHelper->localize($motive->getName());
if ($motive->hasParent()) {
if ('' !== $existing) {
$newExisting = $newExisting . self::SEPARATOR . $existing;
$str = $str . self::SEPARATOR . $existing;
}
return $this->renderStringRecursive(
$str = $this->renderStringRecursive(
$motive->getParent(),
$newExisting . ' ' . $isCanceled,
$str,
$options
);
}
if ('' !== $existing) {
return $newExisting . self::SEPARATOR . $existing;
$str = $str . self::SEPARATOR . $existing;
}
return $newExisting . ' ' . $isCanceled;
if ($motive->isLeaf() && $motive->isCanceledAccompanyingPeriod()) {
$str = $str . ' ' . $this->translator->trans('( Canceled period )');
}
return $str;
}
}