various improvements

src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Service\DocGenerator;
 
-use Chill\DocGeneratorBundle\Context\DocGeneratorContextInterface;
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
@@ -29,8 +28,10 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use function array_key_exists;
 
 class AccompanyingPeriodContext implements
@@ -47,28 +48,26 @@ class AccompanyingPeriodContext implements
 
     private TranslatableStringHelperInterface $translatableStringHelper;
 
+    private TranslatorInterface $translator;
+
     public function __construct(
         DocumentCategoryRepository $documentCategoryRepository,
         NormalizerInterface $normalizer,
         TranslatableStringHelperInterface $translatableStringHelper,
         EntityManagerInterface $em,
-        PersonRender $personRender
+        PersonRender $personRender,
+        TranslatorInterface $translator
     ) {
         $this->documentCategoryRepository = $documentCategoryRepository;
         $this->normalizer = $normalizer;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->em = $em;
         $this->personRender = $personRender;
+        $this->translator = $translator;
     }
 
     public function adminFormReverseTransform(array $data): array
     {
-        $data = [
-            'mainPerson' => $data['mainPerson'],
-            'person1' => $data['person1'],
-            'person2' => $data['person2'],
-        ];
-
         if (array_key_exists('category', $data)) {
             $data['category'] = [
                 'idInsideBundle' => $data['category']->getIdInsideBundle(),
@@ -83,8 +82,11 @@ class AccompanyingPeriodContext implements
     {
         $data = [
             'mainPerson' => $data['mainPerson'] ?? false,
+            'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
             'person1' => $data['person1'] ?? false,
+            'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'),
             'person2' => $data['person2'] ?? false,
+            'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
         ];
 
         if (array_key_exists('category', $data)) {
@@ -100,12 +102,27 @@ class AccompanyingPeriodContext implements
         $builder
             ->add('mainPerson', CheckboxType::class, [
                 'required' => false,
+                'label' => 'Ask for main person',
+            ])
+            ->add('mainPersonLabel', TextType::class, [
+                'label' => 'main person label',
+                'required' => true,
             ])
             ->add('person1', CheckboxType::class, [
                 'required' => false,
+                'label' => 'Ask for person 1'
+            ])
+            ->add('person1Label', TextType::class, [
+                'label' => 'person 1 label',
+                'required' => true,
             ])
             ->add('person2', CheckboxType::class, [
                 'required' => false,
+                'label' => 'Ask for person 2'
+            ])
+            ->add('person2Label', TextType::class, [
+                'label' => 'person 2 label',
+                'required' => true,
             ])
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
@@ -138,6 +155,7 @@ class AccompanyingPeriodContext implements
                     'choice_label' => function (Person $p) { return $this->personRender->renderString($p, []); },
                     'multiple' => false,
                     'expanded' => true,
+                    'label' => $options[$key.'Label'],
                 ]);
             }
         }
@@ -175,7 +193,7 @@ class AccompanyingPeriodContext implements
     public function getFormData(DocGeneratorTemplate $template, $entity): array
     {
         return [
-            'course' => $entity
+            'course' => $entity,
         ];
     }