Merge remote-tracking branch 'origin/master'

Controller/EventController.php

@@ -12,6 +12,7 @@ use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 
+
 /**
  * Event controller.
  *
@@ -66,9 +67,9 @@ class EventController extends Controller
      */
     private function createCreateForm(Event $entity)
     {
-        $form = $this->createForm(new EventType(), $entity, array(
+        $form = $this->createForm(EventType::class, $entity, array(
             'action' => $this->generateUrl('event_create'),
-            'method' => 'POST',
+            'method' => 'POST'
         ));
 
         $form->add('submit', 'submit', array('label' => 'Create'));

Entity/Event.php

@@ -2,13 +2,13 @@
 
 namespace Chill\EventBundle\Entity;
 
-use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
 
 /**
  * Event
  */
-class Event implements HasScopeInterface, HasCenterInterface
+class Event implements HasCenterInterface, HasScopeInterface
 {
     /**
      * @var integer
@@ -123,7 +123,7 @@ class Event implements HasScopeInterface, HasCenterInterface
     }
     
     /**
-     * 
+     *
      * @return EventType
      */
     public function getType()
@@ -132,7 +132,7 @@ class Event implements HasScopeInterface, HasCenterInterface
     }
 
     /**
-     * 
+     *
      * @param \Chill\EventBundle\Entity\EventType $type
      * @return \Chill\EventBundle\Entity\Event
      */
@@ -143,7 +143,7 @@ class Event implements HasScopeInterface, HasCenterInterface
     }
 
     /**
-     * 
+     *
      * @return \Chill\MainBundle\Entity\Center
      */
     public function getCenter()
@@ -152,7 +152,7 @@ class Event implements HasScopeInterface, HasCenterInterface
     }
     
     /**
-     * 
+     *
      * @return \Chill\MainBundle\Entity\Scope
      */
     public function getCircle()
@@ -161,7 +161,7 @@ class Event implements HasScopeInterface, HasCenterInterface
     }
 
     /**
-     * 
+     *
      * @param \Chill\MainBundle\Entity\Scope $circle
      * @return \Chill\EventBundle\Entity\Event
      */
@@ -172,7 +172,7 @@ class Event implements HasScopeInterface, HasCenterInterface
     }
     
     /**
-     * 
+     *
      * @deprecated
      * @return \Chill\MainBundle\Entity\Scope
      */

Form/EventType.php

@@ -6,15 +6,66 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Chill\EventBundle\Form\Type\TranslatableEventType;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Doctrine\Common\Persistence\ObjectManager;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\MainBundle\Entity\User;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Scope;
+
+use Symfony\Component\Security\Core\Role\Role;
 
 class EventType extends AbstractType
 {
+        
+    /** @var the user running this form */
+    protected $user;
+
+    /** @var AuthorizationHelper  */
+    protected $authorizationHelper;
+
+    /** @var TranslatableStringHelper */
+    protected $translatableStringHelper;
+    
+    public function __construct(
+        TokenStorageInterface $tokenStorage,
+        AuthorizationHelper $authorizationHelper,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        if (!$tokenStorage->getToken()->getUser() instanceof User) {
+            throw new \RuntimeException("you should have a valid user");
+        }
+        $this->user = $tokenStorage->getToken()->getUser();
+        $this->authorizationHelper = $authorizationHelper;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+    
     /**
      * @param FormBuilderInterface $builder
      * @param array $options
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        $userReachableCenters = $this->authorizationHelper
+            ->getReachableCenters($this->user, new Role('CHILL_EVENT_CREATE'));
+            
+        $userReachableCirclesByCircleId = array();
+        $userReachableCentersByCircleId = array();
+        
+        foreach ($userReachableCenters as $center) {
+            foreach ($this->authorizationHelper
+                    ->getReachableCircles($this->user, new Role('CHILL_EVENT_CREATE'), $center) as $circle) {
+                if (array_key_exists($circle->getId(), $userReachableCirclesByCircleId)) {
+                    array_push($userReachableCentersByCircleId[$circle->getId()], $center);
+                } else {
+                    $userReachableCirclesByCircleId[$circle->getId()] = $circle;
+                    $userReachableCentersByCircleId[$circle->getId()] = array($center);
+                }
+            }
+        }
+                
         $builder
             ->add('label')
             ->add(
@@ -26,9 +77,36 @@ class EventType extends AbstractType
                     'format' => 'dd-MM-yyyy'
                 )
             )
-            ->add('center')
+            ->add('center', EntityType::class, array(
+                'class' => Center::class,
+                'choices' => $userReachableCenters,
+                'choice_attr' => function (Center $center) {
+                    return array(
+                        'data-link-category' => $center->getId()
+                    );
+                },
+            ))
+            ->add('circle', EntityType::class, array(
+                'class' => Scope::class,
+                'choices' => array_values($userReachableCirclesByCircleId),
+                'choice_label' => function ($circle) {
+                    $helper = $this->translatableStringHelper;
+                    return $helper->localize($circle->getName());
+                },
+                'choice_attr' => function ($circle) use ($userReachableCentersByCircleId) {
+                    $centersId  = "";
+                    foreach ($userReachableCentersByCircleId[$circle->getId()] as $center) {
+                        print $center;
+                        $centersId = $centersId.($center->getId()).',';
+                    }
+                    $centersId = trim($centersId, ',');
+                    return array(
+                        'data-link-categories' => $centersId,
+
+                    );
+                },
+            ))
             ->add('type', TranslatableEventType::class)
-            //->add('circle')
         ;
     }
     

Resources/config/services/forms.yml

@@ -1,7 +1,16 @@
 services:
-    chill_event.form.event_type_type:
+    chill.event.form.type.translatable_event_type:
         class: Chill\EventBundle\Form\Type\TranslatableEventType
         arguments:
             - "@chill.main.helper.translatable_string"
         tags:
             - { name: form.type }
+            
+    chill.event.form.event_type_test:
+        class: Chill\EventBundle\Form\EventType
+        arguments:
+            - "@security.token_storage"
+            - "@chill.main.security.authorization.helper"
+            - "@chill.main.helper.translatable_string"
+        tags:
+            - { name: form.type }