Merge remote-tracking branch 'origin/master' into calendar/synchro-msgraph

src/Bundle/ChillMainBundle/Form/CivilityType.php

@@ -0,0 +1,45 @@
+<?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\MainBundle\Form;
+
+use Chill\MainBundle\Entity\Civility;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class CivilityType extends \Symfony\Component\Form\AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('name', TranslatableStringFormType::class, [
+                'required' => true,
+            ])
+            ->add('abbreviation', TranslatableStringFormType::class)
+            ->add('active', ChoiceType::class, [
+                'choices' => [
+                    'Active' => true,
+                    'Inactive' => false,
+                ],
+            ])
+            ->add('order', IntegerType::class);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => Civility::class,
+        ]);
+    }
+}

src/Bundle/ChillMainBundle/Form/CountryType.php

@@ -0,0 +1,41 @@
+<?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\MainBundle\Form;
+
+use Chill\MainBundle\Entity\Country;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class CountryType extends \Symfony\Component\Form\AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('name', TranslatableStringFormType::class, [
+                'label' => 'Name',
+                'required' => true,
+            ])
+            ->add('countryCode', TextType::class, [
+                'label' => 'Country code',
+                'required' => true,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => Country::class,
+        ]);
+    }
+}

src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php

@@ -0,0 +1,50 @@
+<?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\MainBundle\Form\DataMapper;
+
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\DataMapperInterface;
+use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\Security\Core\Security;
+
+final class PrivateCommentDataMapper extends AbstractType implements DataMapperInterface
+{
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->security = $security;
+    }
+
+    public function mapDataToForms($viewData, $forms)
+    {
+        if (null === $viewData) {
+            return null;
+        }
+
+        if (!$viewData instanceof PrivateCommentEmbeddable) {
+            throw new UnexpectedTypeException($viewData, PrivateCommentEmbeddable::class);
+        }
+
+        $forms = iterator_to_array($forms);
+
+        $forms['comments']->setData($viewData->getCommentForUser($this->security->getUser()));
+    }
+
+    public function mapFormsToData($forms, &$viewData)
+    {
+        $forms = iterator_to_array($forms);
+
+        $viewData->setCommentForUser($this->security->getUser(), $forms['comments']->getData());
+    }
+}

src/Bundle/ChillMainBundle/Form/LanguageType.php

@@ -0,0 +1,41 @@
+<?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\MainBundle\Form;
+
+use Chill\MainBundle\Entity\Language;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class LanguageType extends \Symfony\Component\Form\AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('id', TextType::class, [
+                'label' => 'Id',
+                'required' => true,
+            ])
+            ->add('name', TranslatableStringFormType::class, [
+                'label' => 'Name',
+                'required' => true,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => Language::class,
+        ]);
+    }
+}

src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.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\MainBundle\Form\Type;
+
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
+use Chill\MainBundle\Form\DataMapper\PrivateCommentDataMapper;
+
+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\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+class PrivateCommentType extends AbstractType
+{
+    protected PrivateCommentDataMapper $dataMapper;
+
+    protected UserInterface $user;
+
+    public function __construct(TokenStorageInterface $tokenStorage, PrivateCommentDataMapper $dataMapper)
+    {
+        $this->user = $tokenStorage->getToken()->getUser();
+        $this->dataMapper = $dataMapper;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('comments', ChillTextareaType::class, [
+                'disable_editor' => $options['disable_editor'],
+                'label' => false,
+            ])
+            ->setDataMapper($this->dataMapper);
+    }
+
+    public function buildView(FormView $view, FormInterface $form, array $options)
+    {
+        $view->vars['hideLabel'] = true;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefined('disable_editor')
+            ->setAllowedTypes('disable_editor', 'bool')
+            ->setDefaults([
+                'data_class' => PrivateCommentEmbeddable::class,
+                'disable_editor' => false,
+            ]);
+    }
+}

src/Bundle/ChillMainBundle/Form/UserType.php

@@ -15,9 +15,11 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
@@ -32,11 +34,16 @@ use Symfony\Component\Validator\Constraints\Regex;
 
 class UserType extends AbstractType
 {
+    protected ParameterBagInterface $parameterBag;
+
     private TranslatableStringHelper $translatableStringHelper;
 
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
+    public function __construct(
+        TranslatableStringHelper $translatableStringHelper,
+        ParameterBagInterface $parameterBag
+    ) {
         $this->translatableStringHelper = $translatableStringHelper;
+        $this->parameterBag = $parameterBag;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -47,6 +54,11 @@ class UserType extends AbstractType
                 'required' => true,
             ])
             ->add('label', TextType::class)
+            ->add('civility', PickCivilityType::class, [
+                'required' => false,
+                'label' => 'Civility',
+                'placeholder' => 'choose civility',
+            ])
             ->add('mainCenter', EntityType::class, [
                 'label' => 'Main center',
                 'required' => false,
@@ -76,6 +88,12 @@ class UserType extends AbstractType
                 'choice_label' => function (UserJob $c) {
                     return $this->translatableStringHelper->localize($c->getLabel());
                 },
+                'query_builder' => static function (EntityRepository $er) {
+                    $qb = $er->createQueryBuilder('uj');
+                    $qb->where('uj.active = TRUE');
+
+                    return $qb;
+                },
             ])
             ->add('mainLocation', EntityType::class, [
                 'label' => 'Main location',
@@ -94,7 +112,8 @@ class UserType extends AbstractType
                 },
             ]);
 
-        if ($options['is_creation']) {
+        // @phpstan-ignore-next-line
+        if ($options['is_creation'] && $this->parameterBag->get('chill_main.access_user_change_password')) {
             $builder->add('plainPassword', RepeatedType::class, [
                 'mapped' => false,
                 'type' => PasswordType::class,