fix error in user loading and validate scope/user consistency

Form/ActivityType.php

@@ -5,7 +5,6 @@ namespace Chill\ActivityBundle\Form;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Chill\MainBundle\Form\Type\AppendScopeChoiceTypeTrait;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Doctrine\Common\Persistence\ObjectManager;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -16,16 +15,15 @@ use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Chill\ActivityBundle\Form\Type\TranslatableActivityType;
 use Chill\ActivityBundle\Form\Type\TranslatableActivityReason;
+use Chill\MainBundle\Form\Type\UserPickerType;
+use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Form\Type\ChillDateType;
 
 class ActivityType extends AbstractType
 {
 
-    use AppendScopeChoiceTypeTrait;
-
     /**
      * the user running this form
      *
@@ -91,11 +89,9 @@ class ActivityType extends AbstractType
         );
 
         $builder
-            ->add('date', DateType::class, array(
-               'required' => true,
-               'widget' => 'single_text',
-               'format' => 'dd-MM-yyyy')
-            )
+            ->add('date', ChillDateType::class, array(
+               'required' => true
+            ))
             ->add('durationTime', ChoiceType::class, $durationTimeOptions)
             ->add('remark', TextareaType::class, array(
                'required' => false,
@@ -110,8 +106,14 @@ class ActivityType extends AbstractType
                   'not present' => false
                )
             ))
-            ->add('user')
-            ->add('scope')
+            ->add('user', UserPickerType::class, [
+                'center' => $options['center'],
+                'role'   => $options['role']                                                                                                                                                                                                                                                 
+            ])
+            ->add('scope', ScopePickerType::class, [
+                'center' => $options['center'],
+                'role'   => $options['role']
+            ])
             ->add('reasons', TranslatableActivityReason::class, array(
                 'multiple' => true,
                 'required' => false
@@ -122,10 +124,6 @@ class ActivityType extends AbstractType
             ))
         ;
 
-        $this->appendScopeChoices($builder, $options['role'],
-              $options['center'], $this->user, $this->authorizationHelper,
-              $this->translatableStringHelper, $this->om);
-
         $builder->get('durationTime')
                 ->addModelTransformer($durationTimeTransformer);
 
@@ -181,7 +179,11 @@ class ActivityType extends AbstractType
             'data_class' => 'Chill\ActivityBundle\Entity\Activity'
         ));
 
-        $this->appendScopeChoicesOptions($resolver);
+        $resolver
+              ->setRequired(array('center', 'role'))
+              ->setAllowedTypes('center', 'Chill\MainBundle\Entity\Center')
+              ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
+              ;
     }
 
     /**