Avoid double month append

[airbundle] / Controller / DefaultController.php

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index a37fc1f721fb9cc0fc31607550e1f0ca04a619fd..8b27ce6f0dda868c7a4b1e4accb3d8e613e118ab 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;


@@ -11,10 +14,12 @@ use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mailer\MailerInterface;

-use Symfony\Component\Mime\NamedAddress;
+use Symfony\Component\Mime\Address;

 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Translation\TranslatorInterface;

+use Rapsys\UserBundle\Utils\Slugger;
+

 
 class DefaultController extends AbstractController {
        //Config array
 
 class DefaultController extends AbstractController {
        //Config array


@@ -23,16 +28,33 @@ class DefaultController extends AbstractController {
        //Context array
        protected $context;
 
        //Context array
        protected $context;
 

+       //Router instance
+       protected $router;
+
+       //Slugger instance
+       protected $slugger;
+

        //Translator instance
        protected $translator;
 
        /**
         * Inject container and translator interface
        //Translator instance
        protected $translator;
 
        /**
         * Inject container and translator interface

+        *
+        * @param ContainerInterface $container The container instance
+        * @param RouterInterface $router The router instance
+        * @param Slugger $slugger The slugger instance
+        * @param TranslatorInterface $translator The translator instance

         */
         */

-       public function __construct(ContainerInterface $container, TranslatorInterface $translator, RouterInterface $router) {
+       public function __construct(ContainerInterface $container, RouterInterface $router, Slugger $slugger, TranslatorInterface $translator) {

                //Retrieve config
                $this->config = $container->getParameter($this->getAlias());
 
                //Retrieve config
                $this->config = $container->getParameter($this->getAlias());
 

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

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


@@ -45,12 +67,19 @@ class DefaultController extends AbstractController {
                        'site_png' => $this->config['site']['png'],
                        'site_svg' => $this->config['site']['svg'],
                        'site_title' => $translator->trans($this->config['site']['title']),
                        'site_png' => $this->config['site']['png'],
                        'site_svg' => $this->config['site']['svg'],
                        'site_title' => $translator->trans($this->config['site']['title']),

-                       'site_url' => $router->generate('rapsys_air_index')
+                       'site_url' => $router->generate($this->config['site']['url'])

                ];
        }
 
        /**
         * The contact page
                ];
        }
 
        /**
         * The contact page

+        *
+        * @desc Send a contact mail to configured contact
+        *
+        * @param Request $request The request instance
+        * @param MailerInterface $mailer The mailer instance
+        *
+        * @return Response The rendered view or redirection

         */
        public function contact(Request $request, MailerInterface $mailer) {
                //Set section
         */
        public function contact(Request $request, MailerInterface $mailer) {
                //Set section


@@ -62,7 +91,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'
                ]);


@@ -78,10 +106,10 @@ class DefaultController extends AbstractController {
                                //Create message
                                $message = (new TemplatedEmail())
                                        //Set sender
                                //Create message
                                $message = (new TemplatedEmail())
                                        //Set sender

-                                       ->from(new NamedAddress($data['mail'], $data['name']))
+                                       ->from(new Address($data['mail'], $data['name']))

                                        //Set recipient
                                        //XXX: remove the debug set in vendor/symfony/mime/Address.php +46
                                        //Set recipient
                                        //XXX: remove the debug set in vendor/symfony/mime/Address.php +46

-                                       ->to(new NamedAddress($this->config['contact']['mail'], $this->config['contact']['name']))
+                                       ->to(new Address($this->config['contact']['mail'], $this->config['contact']['name']))

                                        //Set subject
                                        ->subject($data['subject'])
 
                                        //Set subject
                                        ->subject($data['subject'])
 


@@ -124,30 +152,96 @@ class DefaultController extends AbstractController {
 
        /**
         * The index page
 
        /**
         * The index page

+        *
+        * @desc Display all granted sessions with an application or login form
+        *
+        * @param Request $request The request instance
+        *
+        * @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
                $title = $section.' - '.$this->context['site_title'];
 
                //Set section
                $section = $this->translator->trans('Index');
 
                //Set title
                $title = $section.' - '.$this->context['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'), true);
+
+               //Fetch locations
+               $locations = $doctrine->getRepository(Location::class)->fetchTranslatedLocationByDatePeriod($this->translator, $period, true);
+
+               //Render the view
+               return $this->render('@RapsysAir/default/index.html.twig', ['title' => $title, 'section' => $section, 'calendar' => $calendar, 'locations' => $locations]+$context+$this->context);

        }
 
        }
 

+

        /**
        /**

-        * The policy page
+        * The regulation page
+        *
+        * @desc Display the regulation policy
+        *
+        * @return Response The rendered view

         */
         */

-       public function policy() {
+       public function regulation() {

                //Set section
                //Set section

-               $section = $this->translator->trans('Policy');
+               $section = $this->translator->trans('Regulation');

 
                //Set title
                $title = $section.' - '.$this->context['site_title'];
 
                //Render template
 
                //Set title
                $title = $section.' - '.$this->context['site_title'];
 
                //Render template

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

        }
 
        /**
        }
 
        /**