diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php index 799967c82..c770c03bc 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php @@ -46,6 +46,7 @@ final class PersonResourceController extends AbstractController $form->handleRequest($request); if ($request->getMethod() === Request::METHOD_POST && $form->isValid()) { + dump($personResource); $this->em->persist($personResource); $this->em->flush(); diff --git a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php index fabc30e5e..6db7be525 100644 --- a/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php +++ b/src/Bundle/ChillPersonBundle/Form/PersonResourceType.php @@ -17,6 +17,7 @@ use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\Person\PersonResource; use Chill\PersonBundle\Entity\Person\PersonResourceKind; use Chill\PersonBundle\Templating\Entity\PersonRender; +use Chill\PersonBundle\Templating\Entity\ResourceKindRender; use Chill\ThirdPartyBundle\Entity\ThirdParty; use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender; use Doctrine\ORM\EntityRepository; @@ -29,13 +30,13 @@ use Symfony\Component\OptionsResolver\OptionsResolver; final class PersonResourceType extends AbstractType { - private CategoryRender $categoryRender; + private ResourceKindRender $resourceKindRender; private PersonRender $personRender; private ThirdPartyRender $thirdPartyRender; - public function __construct(CategoryRender $categoryRender, PersonRender $personRender, ThirdPartyRender $thirdPartyRender) + public function __construct(ResourceKindRender $resourceKindRender, PersonRender $personRender, ThirdPartyRender $thirdPartyRender) { - $this->categoryRender = $categoryRender; + $this->resourceKindRender = $resourceKindRender; $this->personRender = $personRender; $this->thirdPartyRender = $thirdPartyRender; } @@ -54,18 +55,9 @@ final class PersonResourceType extends AbstractType }, 'choice_label' => function (PersonResourceKind $personResourceKind) { $options = []; - return $this->categoryRender->renderString($personResourceKind, $options); + return $this->resourceKindRender->renderString($personResourceKind, $options); } ]) - ->add('linkedEntity', ChoiceType::class, [ - 'choices' => [ - 'Usager' => 'person', - 'Tiers' => 'thirdparty', - 'Description libre' => 'freeText' - ], - 'expanded' => true, - 'label' => 'Associer un' - ]) ->add('person', EntityType::class, [ 'label' => 'Usager', 'class' => Person::class, diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig index 74bdeb57e..86c4ef9d1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig @@ -7,7 +7,27 @@ {{ form_row(form.kind) }}
- {{ form_row(form.linkedEntity) }} +
+
+ Associer un +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
@@ -21,13 +41,12 @@
{{ form_row(form.comment) }} - -