Avoid double month append

[airbundle] / Controller / DefaultController.php

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index b0aed10306b0d08891cc24732f149f9ed7812fe3..8b27ce6f0dda868c7a4b1e4accb3d8e613e118ab 100644 (file)
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -2,41 +2,95 @@
 
 namespace Rapsys\AirBundle\Controller;
 
 
 namespace Rapsys\AirBundle\Controller;
 

+use Rapsys\AirBundle\Entity\Application;
+use Rapsys\AirBundle\Entity\Location;
+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\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\ContainerInterface;

-use Symfony\Bundle\FrameworkBundle\Translation\Translator;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Rapsys\AirBundle\Entity\Session;
-use Rapsys\AirBundle\Entity\Application;

 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormError;

+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
+use Symfony\Component\Mailer\MailerInterface;
+use Symfony\Component\Mime\Address;
+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
        protected $config;
 
 
 class DefaultController extends AbstractController {
        //Config array
        protected $config;
 

+       //Context array
+       protected $context;
+
+       //Router instance
+       protected $router;
+
+       //Slugger instance
+       protected $slugger;
+

        //Translator instance
        protected $translator;
 
        //Translator instance
        protected $translator;
 

-       public function __construct(ContainerInterface $container, Translator $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, 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;

+
+               //Set the context
+               $this->context = [
+                       'copy_long' => $translator->trans($this->config['copy']['long']),
+                       'copy_short' => $translator->trans($this->config['copy']['short']),
+                       'site_ico' => $this->config['site']['ico'],
+                       'site_logo' => $this->config['site']['logo'],
+                       'site_png' => $this->config['site']['png'],
+                       'site_svg' => $this->config['site']['svg'],
+                       'site_title' => $translator->trans($this->config['site']['title']),
+                       'site_url' => $router->generate($this->config['site']['url'])
+               ];

        }
 
        }
 

-       public function contactAction(Request $request) {
+       /**
+        * 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
                $section = $this->translator->trans('Contact');
 
                //Set title
                //Set section
                $section = $this->translator->trans('Contact');
 
                //Set title

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

 
                //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'
                ]);


@@ -49,162 +103,106 @@ class DefaultController extends AbstractController {
                                //Get data
                                $data = $form->getData();
 
                                //Get data
                                $data = $form->getData();
 

-                               //Get contact name
-                               $contactName = $this->config['contact_name'];
-
-                               //Get contact mail
-                               $contactMail = $this->config['contact_mail'];
-
-                               //Get logo
-                               $logo = $this->config['logo'];
-
-                               //Get title
-                               $title = $this->translator->trans($this->config['title']);
-
-                               //Get subtitle
-                               $subtitle = $this->translator->trans('Hi,').' '.$contactName;
-
-                               //Create sendmail transport
-                               $transport = new \Swift_SendmailTransport();
-
-                               //Create mailer using transport
-                               $mailer = new \Swift_Mailer($transport);
-
-                               //Create the message
-                               ($message = new \Swift_Message($data['subject']))
-                                       #->setSubject($data['subject'])
-                                       ->setFrom([$data['mail'] => $data['name']])
-                                       ->setTo([$contactMail => $contactName])
-                                       ->setBody($data['message'])
-                                       ->addPart(
-                                               $this->renderView(
-                                                       '@RapsysAir/mail/generic.html.twig',
-                                                       [
-                                                               'logo' => $logo,
-                                                               'title' => $title,
-                                                               'subtitle' => $subtitle,
-                                                               'home' => $this->get('router')->generate('rapsys_air_homepage', [], UrlGeneratorInterface::ABSOLUTE_URL),
-                                                               'subject' => $data['subject'],
-                                                               'contact_name' => $contactName,
-                                                               'message' => strip_tags($data['message'])
-                                                       ]
-                                               ),
-                                               'text/html'
+                               //Create message
+                               $message = (new TemplatedEmail())
+                                       //Set sender
+                                       ->from(new Address($data['mail'], $data['name']))
+                                       //Set recipient
+                                       //XXX: remove the debug set in vendor/symfony/mime/Address.php +46
+                                       ->to(new Address($this->config['contact']['mail'], $this->config['contact']['name']))
+                                       //Set subject
+                                       ->subject($data['subject'])
+
+                                       //Set path to twig templates
+                                       ->htmlTemplate('@RapsysAir/mail/contact.html.twig')
+                                       ->textTemplate('@RapsysAir/mail/contact.text.twig')
+
+                                       //Set context
+                                       ->context(
+                                               [
+                                                       'subject' => $data['subject'],
+                                                       'message' => strip_tags($data['message']),
+                                               ]+$this->context

                                        );
 
                                        );
 

-                               //Send the message
-                               if ($mailer->send($message)) {
-                                       //Redirect to cleanup the form
-                                       return $this->redirectToRoute('rapsys_air_contact', ['sent' => 1]);
+                               //Try sending message
+                               //XXX: mail delivery may silently fail
+                               try {
+                                       //Send message
+                                       $mailer->send($message);
+
+                                       //Redirect on the same route with sent=1 to cleanup form
+                                       return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$request->get('_route_params'));
+                               //Catch obvious transport exception
+                               } catch(TransportExceptionInterface $e) {
+                                       if ($message = $e->getMessage()) {
+                                               //Add error message mail unreachable
+                                               $form->get('mail')->addError(new FormError($this->translator->trans('Unable to contact: %mail%: %message%', ['%mail%' => $this->config['contact']['mail'], '%message%' => $this->translator->trans($message)])));
+                                       } else {
+                                               //Add error message mail unreachable
+                                               $form->get('mail')->addError(new FormError($this->translator->trans('Unable to contact: %mail%', ['%mail%' => $this->config['contact']['mail']])));
+                                       }

                                }
                        }
                }
 
                //Render template
                                }
                        }
                }
 
                //Render template

-               return $this->render('@RapsysAir/form/contact.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView(), 'sent' => $request->query->get('sent', 0)]);
-       }
-
-       public function indexAction() {
-               //Set section
-               $section = $this->translator->trans('Index');
-
-               //Set title
-               $title = $section.' - '.$this->translator->trans($this->config['title']);
-
-               //Render template
-               return $this->render('@RapsysAir/page/index.html.twig', ['title' => $title, 'section' => $section]);
+               return $this->render('@RapsysAir/form/contact.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView(), 'sent' => $request->query->get('sent', 0)]+$this->context);

        }
 
        }
 

-       public function adminAction(Request $request) {
-               //Prevent non-admin to access here
-               //TODO: maybe check if user is connected 1st ?
-               $this->denyAccessUnlessGranted('ROLE_ADMIN', null, 'Unable to access this 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(Request $request = null) {
+               //Fetch doctrine
+               $doctrine = $this->getDoctrine();

 
                //Set section
 
                //Set section

-               $section = $this->translator->trans('Admin');
+               $section = $this->translator->trans('Index');

 
                //Set title
 
                //Set title

-               $title = $section.' - '.$this->translator->trans($this->config['title']);
-
-               //Create the form according to the FormType created previously.
-               //And give the proper parameters
-               $form = $this->createForm('Rapsys\AirBundle\Form\ApplicationType', null, [
-                       // To set the action use $this->generateUrl('route_identifier')
-                       'action' => $this->generateUrl('rapsys_air_admin'),
-                       'method' => 'POST',
-                       'attr' => [ 'class' => 'form_col' ]
-               ]);
-
-               //Get doctrine
-               $doctrine = $this->getDoctrine();
-
-               //Handle request
-               if ($request->isMethod('POST')) {
-                       // Refill the fields in case the form is not valid.
-                       $form->handleRequest($request);
-
-                       if ($form->isValid()) {
-                               //Get data
-                               $data = $form->getData();
-
-                               //Get manager
-                               $manager = $doctrine->getManager();
-
-                               //Protect session fetching
-                               try {
-                                       $session = $doctrine->getRepository(Session::class)->findOneByLocationSlotDate($data['location'], $data['slot'], $data['date']);
-                               //Catch no session case
-                               } catch (\Doctrine\ORM\NoResultException $e) {
-                                       //Create the session
-                                       $session = new Session();
-                                       $session->setLocation($data['location']);
-                                       $session->setSlot($data['slot']);
-                                       $session->setDate($data['date']);
-                                       $session->setCreated(new \DateTime('now'));
-                                       $session->setUpdated(new \DateTime('now'));
-                                       $manager->persist($session);
-                                       //Flush to get the ids
-                                       #$manager->flush();
-                               }
-
-                               //Init application
-                               $application = false;
-
-                               //Protect application fetching
-                               try {
-                                       //TODO: handle admin case where we provide a user in extra
-                                       $application = $doctrine->getRepository(Application::class)->findOneBySessionUser($session, $this->getUser());
-
-                                       //Add error message to mail field
-                                       $form->get('slot')->addError(new FormError($this->translator->trans('Application already exists')));
-                               //Catch no application cases
-                               //XXX: combine these catch when php 7.1 is available
-                               } catch (\Doctrine\ORM\NoResultException $e) {
-                               //Catch invalid argument because session is not already persisted
-                               } catch(\Doctrine\ORM\ORMInvalidArgumentException $e) {
-                               }
-
-                               //Create new application if none found
-                               if (!$application) {
-                                       //Create the application
-                                       $application = new Application();
-                                       $application->setSession($session);
-                                       //TODO: handle admin case where we provide a user in extra
-                                       $application->setUser($this->getUser());
-                                       $application->setCreated(new \DateTime('now'));
-                                       $application->setUpdated(new \DateTime('now'));
-                                       $manager->persist($application);
-
-                                       //Flush to get the ids
-                                       $manager->flush();
-
-                                       //Add notice in flash message
-                                       $this->addFlash('notice', $this->translator->trans('Application request the %date% for %location% on the slot %slot% saved', ['%location%' => $data['location']->getTitle(), '%slot%' => $data['slot']->getTitle(), '%date%' => $data['date']->format('Y-m-d')]));
-
-                                       //Redirect to cleanup the form
-                                       return $this->redirectToRoute('rapsys_air_admin');
-                               }
-                       }
+               $title = $section.' - '.$this->context['site_title'];
+
+               //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
                }
 
                //Compute period


@@ -217,108 +215,38 @@ class DefaultController extends AbstractController {
                        new \DateTime('Monday this week + 5 week')
                );
 
                        new \DateTime('Monday this week + 5 week')
                );
 

-               //Fetch sessions
-               $sessions = $doctrine->getRepository(Session::class)->findByDatePeriod($period);
-
-               //Init calendar
-               $calendar = [];
-               
-               //Init month
-               $month = null;
-
-               //Iterate on each day
-               foreach($period as $date) {
-                       //Init day in calendar
-                       $calendar[$Ymd = $date->format('Ymd')] = [
-                               'title' => $date->format('d'),
-                               'class' => [],
-                               'sessions' => []
-                       ];
-                       //Append month for first day of month
-                       if ($month != $date->format('m')) {
-                               $month = $date->format('m');
-                               $calendar[$Ymd]['title'] .= '/'.$month;
-                       }
-                       //Deal with today
-                       if ($date->format('U') == ($today = strtotime('today'))) {
-                               $calendar[$Ymd]['title'] .= '/'.$month;
-                               $calendar[$Ymd]['current'] = true;
-                               $calendar[$Ymd]['class'][] =  'current';
-                       }
-                       //Disable passed days
-                       if ($date->format('U') < $today) {
-                               $calendar[$Ymd]['disabled'] = true;
-                               $calendar[$Ymd]['class'][] =  'disabled';
-                       }
-                       //Set next month days
-                       if ($date->format('m') > date('m')) {
-                               $calendar[$Ymd]['next'] = true;
-                               $calendar[$Ymd]['class'][] =  'next';
-                       }
-                       //Iterate on each session to find the one of the day
-                       foreach($sessions as $session) {
-                               if (($sessionYmd = $session->getDate()->format('Ymd')) == $Ymd) {
-                                       //Count number of application
-                                       $count = count($session->getApplications());
-
-                                       //Compute classes
-                                       $class = [];
-                                       if ($session->getApplication()) {
-                                               $class[] = 'granted';
-                                       } elseif ($count == 0) {
-                                               $class[] = 'orphaned';
-                                       } elseif ($count > 1) {
-                                               $class[] = 'disputed';
-                                       } else {
-                                               $class[] = 'pending';
-                                       }
+               //Fetch calendar
+               $calendar = $doctrine->getRepository(Session::class)->fetchCalendarByDatePeriod($this->translator, $period, null, $request->get('session'), true);

 
 

-                                       //Add the session
-                                       $calendar[$Ymd]['sessions'][$session->getSlot()->getId().$session->getLocation()->getId()] = [
-                                               'id' => $session->getId(),
-                                               'title' => ($count > 1?'['.$count.'] ':'').$session->getSlot()->getTitle().' '.$session->getLocation()->getTitle(),
-                                               'class' => $class
-                                       ];
-                               }
-                       }
+               //Fetch locations
+               $locations = $doctrine->getRepository(Location::class)->fetchTranslatedLocationByDatePeriod($this->translator, $period, true);

 
 

-                       //Sort sessions
-                       ksort($calendar[$Ymd]['sessions']);
-               }
-
-               return $this->render('@RapsysAir/admin/index.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView(), 'calendar' => $calendar]);
+               //Render the view
+               return $this->render('@RapsysAir/default/index.html.twig', ['title' => $title, 'section' => $section, 'calendar' => $calendar, 'locations' => $locations]+$context+$this->context);

        }
 
        }
 

-       public function sessionAction(Request $request, $id) {
-               /*header('Content-Type: text/plain');
-               var_dump($calendar);
-               exit;*/

 
 

+       /**
+        * The regulation page
+        *
+        * @desc Display the regulation policy
+        *
+        * @return Response The rendered view
+        */
+       public function regulation() {

                //Set section
                //Set section

-               $section = $this->translator->trans('Session %id%', ['%id%' => $id]);
+               $section = $this->translator->trans('Regulation');

 
                //Set title
 
                //Set title

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

 
 

-               //Create the form according to the FormType created previously.
-               //And give the proper parameters
-               /*$form = $this->createForm('Rapsys\AirBundle\Form\ApplicationType', null, [
-                       // To set the action use $this->generateUrl('route_identifier')
-                       'action' => $this->generateUrl('rapsys_air_admin'),
-                       'method' => 'POST',
-                       'attr' => [ 'class' => 'form_col' ]
-               ]);*/
-
-               //Get doctrine
-               $doctrine = $this->getDoctrine();
-
-               //Fetch session
-               $session = $doctrine->getRepository(Session::class)->findOneById($id);
-
-               return $this->render('@RapsysAir/admin/session.html.twig', ['title' => $title, 'section' => $section, /*'form' => $form->createView(),*/ 'session' => $session]);
+               //Render template
+               return $this->render('@RapsysAir/default/regulation.html.twig', ['title' => $title, 'section' => $section]+$this->context);

        }
 
        /**
        }
 
        /**

+        * Return the bundle alias
+        *

         * {@inheritdoc}
         */
        public function getAlias() {
         * {@inheritdoc}
         */
        public function getAlias() {