Merge remote-tracking branch 'origin/master' into cire16

src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php

@@ -11,65 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\DataTransformer;
 
-use Chill\PersonBundle\Entity\Person;
-use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\Form\DataTransformerInterface;
-use Symfony\Component\Form\Exception\TransformationFailedException;
+use Chill\MainBundle\Form\DataTransformer\IdToEntityDataTransformer;
+use Chill\PersonBundle\Repository\PersonRepository;
 
-class PersonToIdTransformer implements DataTransformerInterface
+class PersonToIdTransformer extends IdToEntityDataTransformer
 {
-    /**
-     * @var ObjectManager
-     */
-    private $om;
-
-    public function __construct(ObjectManager $om)
+    public function __construct(PersonRepository $repository)
     {
-        $this->om = $om;
-    }
-
-    /**
-     * Transforms a string (id) to an object (issue).
-     *
-     * @param  string $id
-     *
-     * @throws TransformationFailedException if object (issue) is not found.
-     *
-     * @return Person|null
-     */
-    public function reverseTransform($id)
-    {
-        if (!$id) {
-            return null;
-        }
-
-        $issue = $this->om
-            ->getRepository(\Chill\PersonBundle\Entity\Person::class)
-            ->findOneBy(['id' => $id]);
-
-        if (null === $issue) {
-            throw new TransformationFailedException(sprintf(
-                'An issue with id "%s" does not exist!',
-                $id
-            ));
-        }
-
-        return $issue;
-    }
-
-    /**
-     * Transforms an object (issue) to a string (id).
-     *
-     * @param  Person|null $issue
-     *
-     * @return string
-     */
-    public function transform($issue)
-    {
-        if (null === $issue) {
-            return '';
-        }
-
-        return $issue->getId();
+        parent::__construct($repository, false);
     }
 }

src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonsToIdDataTransformer.php

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Chill is a software for social workers.
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Form\DataTransformer;
+
+use Chill\MainBundle\Form\DataTransformer\IdToEntityDataTransformer;
+use Chill\PersonBundle\Repository\PersonRepository;
+
+class PersonsToIdDataTransformer extends IdToEntityDataTransformer
+{
+    public function __construct(PersonRepository $repository)
+    {
+        parent::__construct($repository, true);
+    }
+}

src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php

@@ -16,6 +16,7 @@ use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\UrlType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -52,6 +53,14 @@ class EvaluationType extends AbstractType
             ->add('notificationDelay', DateIntervalType::class, [
                 'label' => 'evaluation.notificationDelay',
                 'required' => false,
+            ])
+            ->add('active', ChoiceType::class, [
+                'label' => 'active',
+                'choices' => [
+                    'active' => true,
+                    'inactive' => false,
+                ],
+                'required' => true,
             ]);
     }
 

src/Bundle/ChillPersonBundle/Form/Type/PickSocialActionType.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Form\Type;
+
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class PickSocialActionType extends AbstractType
+{
+    private SocialActionRender $actionRender;
+
+    private SocialActionRepository $actionRepository;
+
+    public function __construct(
+        SocialActionRender $actionRender,
+        SocialActionRepository $actionRepository
+    ) {
+        $this->actionRender = $actionRender;
+        $this->actionRepository = $actionRepository;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefaults([
+                'class' => SocialAction::class,
+                'choices' => $this->actionRepository->findAllActive(),
+                'choice_label' => function (SocialAction $sa) {
+                    return $this->actionRender->renderString($sa, []);
+                },
+                'placeholder' => 'Pick a social action',
+                'required' => false,
+                'attr' => ['class' => 'select2'],
+                'label' => 'Social actions',
+                'multiple' => false,
+            ])
+            ->setAllowedTypes('multiple', ['bool']);
+    }
+
+    public function getParent(): string
+    {
+        return EntityType::class;
+    }
+}

src/Bundle/ChillPersonBundle/Form/Type/PickSocialIssueType.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Form\Type;
+
+use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class PickSocialIssueType extends AbstractType
+{
+    private SocialIssueRender $issueRender;
+
+    private SocialIssueRepository $issueRepository;
+
+    public function __construct(
+        SocialIssueRender $issueRender,
+        SocialIssueRepository $issueRepository
+    ) {
+        $this->issueRender = $issueRender;
+        $this->issueRepository = $issueRepository;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefaults([
+                'class' => SocialIssue::class,
+                'choices' => $this->issueRepository->findAllActive(),
+                'choice_label' => function (SocialIssue $si) {
+                    return $this->issueRender->renderString($si, []);
+                },
+                'placeholder' => 'Pick a social issue',
+                'required' => false,
+                'attr' => ['class' => 'select2'],
+                'label' => 'Social issues',
+                'multiple' => false,
+            ])
+            ->setAllowedTypes('multiple', ['bool']);
+    }
+
+    public function getParent(): string
+    {
+        return EntityType::class;
+    }
+}