Fix error display

[airbundle] / Controller / DefaultController.php

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index 86a280f3128afc8260cd3a90801ed27021e2d4bc..f119ee3c80c8da808bc6ed02b74438c42a327cd4 100644 (file)
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -3,66 +3,164 @@
 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\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;

+use Symfony\Component\HttpFoundation\RequestStack;

 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 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;
+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;
 

-       //Translator instance
+       ///Router instance
+       protected $router;
+
+       ///Translator instance

        protected $translator;
 
        protected $translator;
 

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

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

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

         */
         */

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

                //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 translator
                $this->translator = $translator;
 
                //Set the context
                $this->context = [
                //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('rapsys_air_index')
+                       'copy' => [
+                               'long' => $translator->trans($this->config['copy']['long']),
+                               'short' => $translator->trans($this->config['copy']['short'])
+                       ],
+                       'site' => [
+                               'ico' => $this->config['site']['ico'],
+                               'logo' => $this->config['site']['logo'],
+                               'png' => $this->config['site']['png'],
+                               'svg' => $this->config['site']['svg'],
+                               'title' => $translator->trans($this->config['site']['title']),
+                               'url' => $router->generate($this->config['site']['url']),
+                       ],
+                       'canonical' => null,
+                       'alternates' => []

                ];
                ];

+
+               //Get current locale
+               #$currentLocale = $router->getContext()->getParameters()['_locale'];
+               $currentLocale = $requestStack->getCurrentRequest()->getLocale();
+
+               //Set translator locale
+               //XXX: allow LocaleSubscriber on the fly locale change for first page
+               $this->translator->setLocale($currentLocale);
+
+               //Iterate on locales excluding current one
+               foreach($this->config['locales'] as $locale) {
+                       //Set titles
+                       $titles = [];
+
+                       //Iterate on other locales
+                       foreach(array_diff($this->config['locales'], [$locale]) as $other) {
+                               $titles[$other] = $translator->trans($this->config['languages'][$locale], [], null, $other);
+                       }
+
+                       //Get context path
+                       $path = $router->getContext()->getPathInfo();
+
+                       //Retrieve route matching path
+                       $route = $router->match($path);
+
+                       //Get route name
+                       $name = $route['_route'];
+
+                       //Unset route name
+                       unset($route['_route']);
+
+                       //With current locale
+                       if ($locale == $currentLocale) {
+                               //Set locale locales context
+                               $this->context['canonical'] = $router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL);
+                       } else {
+                               //Set locale locales context
+                               $this->context['alternates'][] = [
+                                       'lang' => $locale,
+                                       'absolute' => $router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL),
+                                       'relative' => $router->generate($name, ['_locale' => $locale]+$route),
+                                       'title' => implode('/', $titles),
+                                       'translated' => $translator->trans($this->config['languages'][$locale], [], null, $locale)
+                               ];
+                       }
+               }

        }
 
        /**
         * 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
                $section = $this->translator->trans('Contact');
 
         */
        public function contact(Request $request, MailerInterface $mailer) {
                //Set section
                $section = $this->translator->trans('Contact');
 

+               //Set description
+               $this->context['description'] = $this->translator->trans('Contact Libre Air');
+
+               //Set keywords
+               $this->context['keywords'] = [
+                       $this->translator->trans('contact'),
+                       $this->translator->trans('Libre Air'),
+                       $this->translator->trans('outdoor'),
+                       $this->translator->trans('Argentine Tango'),
+                       $this->translator->trans('calendar')
+               ];
+

                //Set title
                //Set title

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

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


@@ -124,30 +222,144 @@ 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) {
+               //Fetch doctrine
+               $doctrine = $this->getDoctrine();
+
+               //Set section
+               $section = $this->translator->trans('Argentine Tango in Paris');
+
+               //Set description
+               $this->context['description'] = $this->translator->trans('Outdoor Argentine Tango session calendar in Paris');
+
+               //Set keywords
+               $this->context['keywords'] = [
+                       $this->translator->trans('Argentine Tango'),
+                       $this->translator->trans('Paris'),
+                       $this->translator->trans('outdoor'),
+                       $this->translator->trans('calendar'),
+                       $this->translator->trans('Libre Air')
+               ];
+
+               //Set title
+               $title = $this->translator->trans($this->config['site']['title']).' - '.$section;
+
+               //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)->findTranslatedSortedByPeriod($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 organizer regulation page
+        *
+        * @desc Display the organizer regulation policy
+        *
+        * @return Response The rendered view
+        */
+       public function organizerRegulation() {

                //Set section
                //Set section

-               $section = $this->translator->trans('Index');
+               $section = $this->translator->trans('Organizer regulation');
+
+               //Set description
+               $this->context['description'] = $this->translator->trans('Libre Air organizer regulation');
+
+               //Set keywords
+               $this->context['keywords'] = [
+                       $this->translator->trans('organizer regulation'),
+                       $this->translator->trans('Libre Air')
+               ];

 
                //Set title
 
                //Set title

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

 
                //Render template
 
                //Render template

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

        }
 
        /**
        }
 
        /**

-        * The policy page
+        * The terms of service page
+        *
+        * @desc Display the terms of service policy
+        *
+        * @return Response The rendered view

         */
         */

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

                //Set section
                //Set section

-               $section = $this->translator->trans('Policy');
+               $section = $this->translator->trans('Terms of service');
+
+               //Set description
+               $this->context['description'] = $this->translator->trans('Libre Air terms of service');
+
+               //Set keywords
+               $this->context['keywords'] = [
+                       $this->translator->trans('terms of service'),
+                       $this->translator->trans('Libre Air')
+               ];

 
                //Set title
 
                //Set title

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

 
                //Render template
 
                //Render template

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

        }
 
        /**
        }
 
        /**