Merge conflicts fixed

src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php

@@ -0,0 +1,62 @@
+<?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);
+
+namespace Chill\ThirdPartyBundle\Form\Type;
+
+use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Pick user dymically, using vuejs module "AddPerson".
+ */
+class PickThirdpartyDynamicType extends AbstractType
+{
+    private DenormalizerInterface $denormalizer;
+
+    private SerializerInterface $serializer;
+
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer)
+    {
+        $this->denormalizer = $denormalizer;
+        $this->serializer = $serializer;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addViewTransformer(new EntityToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple'], 'thirdparty'));
+    }
+
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['multiple'] = $options['multiple'];
+        $view->vars['types'] = ['thirdparty'];
+        $view->vars['uniqid'] = uniqid('pick_user_dyn');
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('multiple', false)
+            ->setAllowedTypes('multiple', ['bool'])
+            ->setDefault('compound', false);
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'pick_entity_dynamic';
+    }
+}

src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig

@@ -99,7 +99,7 @@
         <div class="item-col">
         {% if options['isConfidential'] %}
             <div class="confidential">
-                <div class="confidential-content blur">
+                <div class="confidential-content">
                     <ul class="list-content fa-ul">
                         <li>
                             {{ thirdparty.getAddress|chill_entity_render_box({

src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyDocGenNormalizerTest.php

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ThirdPartyBundle\Test\Serializer\Normalizer;
+namespace Chill\ThirdPartyBundle\Tests\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\Civility;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;

src/Bundle/ChillThirdPartyBundle/Tests/Serializer/Normalizer/ThirdPartyJsonDenormalizerTest.php

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ThirdPartyBundle\Test\Serializer\Normalizer;
+namespace Chill\ThirdPartyBundle\Tests\Serializer\Normalizer;
 
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;