Merge branch 'master' into VSR-issues

src/Bundle/ChillMainBundle/Form/RegroupmentType.php

@@ -0,0 +1,47 @@
+<?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\MainBundle\Form;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Regroupment;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class RegroupmentType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('name', TextType::class, [
+                'label' => 'Nom',
+            ])
+            ->add('centers', EntityType::class, [
+                'class' => Center::class,
+                'multiple' => true,
+                'attr' => ['class' => 'select2'],
+            ])
+            ->add('isActive', CheckboxType::class, [
+                'label' => 'Actif ?',
+                'required' => false,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', Regroupment::class);
+    }
+}

src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php

@@ -27,7 +27,6 @@ class ChillDateTimeType extends AbstractType
     {
         $resolver
             ->setDefault('date_widget', 'single_text')
-            ->setDefault('date_format', 'dd-MM-yyyy')
             ->setDefault('time_widget', 'choice')
             ->setDefault('minutes', range(0, 59, 5))
             ->setDefault('hours', range(8, 22))