Check on slot id unnecessary joining and title fetching

[airbundle] / Controller / DefaultController.php

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index 3d45a552d12622f4e791f6c6385ba84de72a02c0..7f3037ca4a8586ee92305f25725e5e9fbcef46a6 100644 (file)
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -3,7 +3,10 @@
 namespace Rapsys\AirBundle\Controller;
 
 use Rapsys\AirBundle\Entity\Application;
 namespace Rapsys\AirBundle\Controller;
 
 use Rapsys\AirBundle\Entity\Application;

+use Rapsys\AirBundle\Entity\Location;

 use Rapsys\AirBundle\Entity\Session;
 use Rapsys\AirBundle\Entity\Session;

+use Rapsys\AirBundle\Entity\Slot;
+use Rapsys\AirBundle\Entity\User;

 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\ContainerInterface;


@@ -16,23 +19,33 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Rapsys\UserBundle\Utils\Slugger;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Rapsys\UserBundle\Utils\Slugger;

+use Symfony\Bundle\FrameworkBundle\Controller\ControllerTrait;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;

 
 

-class DefaultController extends AbstractController {
-       //Config array
+
+class DefaultController {
+       use ControllerTrait;
+
+       ///Config array

        protected $config;
 
        protected $config;
 

-       //Context array
+       ///Context array

        protected $context;
 
        protected $context;
 

-       //Router instance
+       ///Router instance

        protected $router;
 
        protected $router;
 

-       //Slugger instance
+       ///Slugger instance

        protected $slugger;
 
        protected $slugger;
 

-       //Translator instance
+       ///Translator instance

        protected $translator;
 
        protected $translator;
 

+       /**
+        * @var ContainerInterface
+        */
+       protected $container;
+

        /**
         * Inject container and translator interface
         *
        /**
         * Inject container and translator interface
         *


@@ -45,6 +58,9 @@ class DefaultController extends AbstractController {
                //Retrieve config
                $this->config = $container->getParameter($this->getAlias());
 
                //Retrieve config
                $this->config = $container->getParameter($this->getAlias());
 

+               //Set the container
+               $this->container = $container;
+

                //Set the router
                $this->router = $router;
 
                //Set the router
                $this->router = $router;
 


@@ -87,7 +103,6 @@ class DefaultController extends AbstractController {
                //Create the form according to the FormType created previously.
                //And give the proper parameters
                $form = $this->createForm('Rapsys\AirBundle\Form\ContactType', null, [
                //Create the form according to the FormType created previously.
                //And give the proper parameters
                $form = $this->createForm('Rapsys\AirBundle\Form\ContactType', null, [

-                       // To set the action use $this->generateUrl('route_identifier')

                        'action' => $this->generateUrl('rapsys_air_contact'),
                        'method' => 'POST'
                ]);
                        'action' => $this->generateUrl('rapsys_air_contact'),
                        'method' => 'POST'
                ]);


@@ -150,21 +165,80 @@ class DefaultController extends AbstractController {
        /**
         * The index page
         *
        /**
         * The index page
         *

-        * @desc Welcome the user
+        * @desc Display all granted sessions with an application or login form
+        *
+        * @param Request $request The request instance

         *
         * @return Response The rendered view
         */
         *
         * @return Response The rendered view
         */

-       public function index() {
+       public function index(Request $request = null) {
+               //Fetch doctrine
+               $doctrine = $this->getDoctrine();
+

                //Set section
                $section = $this->translator->trans('Index');
 
                //Set title
                //Set section
                $section = $this->translator->trans('Index');
 
                //Set title

-               $title = $section.' - '.$this->context['site_title'];
+               $title = $section.' - '.$this->translator->trans($this->config['site']['title']);

 
 

-               //Render template
-               return $this->render('@RapsysAir/default/index.html.twig', ['title' => $title, 'section' => $section]+$this->context);
+               //Init context
+               $context = [];
+
+               //Create application form for role_guest
+               if ($this->isGranted('ROLE_GUEST')) {
+                       //Create ApplicationType form
+                       $application = $this->createForm('Rapsys\AirBundle\Form\ApplicationType', null, [
+                               //Set the action
+                               'action' => $this->generateUrl('rapsys_air_application_add'),
+                               //Set the form attribute
+                               'attr' => [ 'class' => 'col' ],
+                               //Set admin
+                               'admin' => $this->isGranted('ROLE_ADMIN'),
+                               //Set default user to current
+                               'user' => $this->getUser()->getId(),
+                               //Set default slot to evening
+                               //XXX: default to Evening (3)
+                               'slot' => $doctrine->getRepository(Slot::class)->findOneById(3)
+                       ]);
+
+                       //Add form to context
+                       $context['application'] = $application->createView();
+               //Create login form for anonymous
+               } elseif (!$this->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
+                       //Create ApplicationType form
+                       $login = $this->createForm('Rapsys\UserBundle\Form\LoginType', null, [
+                               //Set the action
+                               'action' => $this->generateUrl('rapsys_user_login'),
+                               //Set the form attribute
+                               'attr' => [ 'class' => 'col' ]
+                       ]);
+
+                       //Add form to context
+                       $context['login'] = $login->createView();
+               }
+
+               //Compute period
+               $period = new \DatePeriod(
+                       //Start from first monday of week
+                       new \DateTime('Monday this week'),
+                       //Iterate on each day
+                       new \DateInterval('P1D'),
+                       //End with next sunday and 4 weeks
+                       new \DateTime('Monday this week + 5 week')
+               );
+
+               //Fetch calendar
+               $calendar = $doctrine->getRepository(Session::class)->fetchCalendarByDatePeriod($this->translator, $period, null, $request->get('session'), !$this->isGranted('IS_AUTHENTICATED_REMEMBERED'));
+
+               //Fetch locations
+               //XXX: we want to display all active locations anyway
+               $locations = $doctrine->getRepository(Location::class)->fetchTranslatedLocationByDatePeriod($this->translator, $period/*, !$this->isGranted('IS_AUTHENTICATED_REMEMBERED')*/);
+
+               //Render the view
+               return $this->render('@RapsysAir/default/index.html.twig', ['title' => $title, 'section' => $section, 'calendar' => $calendar, 'locations' => $locations]+$context+$this->context);

        }
 
        }
 

+

        /**
         * The regulation page
         *
        /**
         * The regulation page
         *


@@ -177,7 +251,7 @@ class DefaultController extends AbstractController {
                $section = $this->translator->trans('Regulation');
 
                //Set title
                $section = $this->translator->trans('Regulation');
 
                //Set title

-               $title = $section.' - '.$this->context['site_title'];
+               $title = $section.' - '.$this->translator->trans($this->config['site']['title']);

 
                //Render template
                return $this->render('@RapsysAir/default/regulation.html.twig', ['title' => $title, 'section' => $section]+$this->context);
 
                //Render template
                return $this->render('@RapsysAir/default/regulation.html.twig', ['title' => $title, 'section' => $section]+$this->context);