New layout with header

[airbundle] / Controller / ApplicationController.php

diff --git a/Controller/ApplicationController.php b/Controller/ApplicationController.php
index 8a9a8b4ca2c24a98ea686d463fe2288e1c91374f..5a787dc4a95af423da5db58084517030d9c386c2 100644 (file)
--- a/Controller/ApplicationController.php
+++ b/Controller/ApplicationController.php
@@ -1,24 +1,44 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys AirBundle package.
+ *
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */

 
 namespace Rapsys\AirBundle\Controller;
 
 
 namespace Rapsys\AirBundle\Controller;
 

-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\RequestContext;
+use Doctrine\ORM\NoResultException;
+use Doctrine\ORM\ORMInvalidArgumentException;

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

+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;

 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;

+use Symfony\Component\Routing\RequestContext;
+
+use Rapsys\AirBundle\Entity\Application;
+use Rapsys\AirBundle\Entity\Dance;
+use Rapsys\AirBundle\Entity\Location;
+use Rapsys\AirBundle\Entity\Session;

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

-use Rapsys\AirBundle\Entity\Session;
-use Rapsys\AirBundle\Entity\Application;

 
 

-class ApplicationController extends DefaultController {
+/**
+ * {@inheritdoc}
+ */
+class ApplicationController extends AbstractController {

        /**
         * Add application
         *
         * @desc Persist application and all required dependencies in database
         *
         * @param Request $request The request instance
        /**
         * Add application
         *
         * @desc Persist application and all required dependencies in database
         *
         * @param Request $request The request instance

+        * @param Registry $manager The doctrine registry
+        * @param EntityManagerInterface $manager The doctrine entity manager

         *
         * @return Response The rendered view or redirection
         *
         *
         * @return Response The rendered view or redirection
         *


@@ -28,9 +48,39 @@ class ApplicationController extends DefaultController {
                //Prevent non-guest to access here
                $this->denyAccessUnlessGranted('ROLE_GUEST', null, $this->translator->trans('Unable to access this page without role %role%!', ['%role%' => $this->translator->trans('Guest')]));
 
                //Prevent non-guest to access here
                $this->denyAccessUnlessGranted('ROLE_GUEST', null, $this->translator->trans('Unable to access this page without role %role%!', ['%role%' => $this->translator->trans('Guest')]));
 

-               //Reject non post requests
-               if (!$request->isMethod('POST')) {
-                       throw new \RuntimeException('Request method MUST be POST');
+               //Get favorites dances
+               $danceFavorites = $this->doctrine->getRepository(Dance::class)->findByUserId($this->getUser()->getId());
+
+               //Set dance default
+               $danceDefault = !empty($danceFavorites)?current($danceFavorites):null;
+
+
+               //Get favorites locations
+               $locationFavorites = $this->doctrine->getRepository(Location::class)->findByUserId($this->getUser()->getId());
+
+               //Set location default
+               $locationDefault = !empty($locationFavorites)?current($locationFavorites):null;
+
+               //With admin
+               if ($this->isGranted('ROLE_ADMIN')) {
+                       //Get dances
+                       $dances = $this->doctrine->getRepository(Dance::class)->findAll();
+
+                       //Get locations
+                       $locations = $this->doctrine->getRepository(Location::class)->findAll();
+               //Without admin
+               } else {
+                       //Restrict to favorite dances
+                       $dances = $danceFavorites;
+
+                       //Reset favorites
+                       $danceFavorites = [];
+
+                       //Restrict to favorite locations
+                       $locations = $locationFavorites;
+
+                       //Reset favorites
+                       $locationFavorites = [];

                }
 
                //Create ApplicationType form
                }
 
                //Create ApplicationType form


@@ -39,89 +89,65 @@ class ApplicationController extends DefaultController {
                        'action' => $this->generateUrl('rapsys_air_application_add'),
                        //Set the form attribute
                        #'attr' => [ 'class' => 'col' ],
                        'action' => $this->generateUrl('rapsys_air_application_add'),
                        //Set the form attribute
                        #'attr' => [ 'class' => 'col' ],

-                       //Set admin
-                       'admin' => $this->isGranted('ROLE_ADMIN'),
+                       //Set dance choices
+                       'dance_choices' => $dances,
+                       //Set dance default
+                       'dance_default' => $danceDefault,
+                       //Set dance favorites
+                       'dance_favorites' => $danceFavorites,
+                       //Set location choices
+                       'location_choices' => $locations,
+                       //Set location default
+                       'location_default' => $locationDefault,
+                       //Set location favorites
+                       'location_favorites' => $locationFavorites,
+                       //With user
+                       'user' => $this->isGranted('ROLE_ADMIN'),
+                       //Set user choices
+                       'user_choices' => $this->doctrine->getRepository(User::class)->findIndexByGroupPseudonym(),

                        //Set default user to current
                        //Set default user to current

-                       'user' => $this->getUser()->getId(),
+                       'user_default' => $this->getUser()->getId(),

                        //Set default slot to evening
                        //XXX: default to Evening (3)
                        //Set default slot to evening
                        //XXX: default to Evening (3)

-                       'slot' => $this->getDoctrine()->getRepository(Slot::class)->findOneById(3)
+                       'slot_default' => $this->doctrine->getRepository(Slot::class)->findOneByTitle('Evening')

                ]);
 
                //Refill the fields in case of invalid form
                $form->handleRequest($request);
 
                //Handle invalid form
                ]);
 
                //Refill the fields in case of invalid form
                $form->handleRequest($request);
 
                //Handle invalid form

-               if (!$form->isValid()) {
-                       //Set section
-                       $section = $this->translator->trans('Application add');
-
+               if (!$form->isSubmitted() || !$form->isValid()) {

                        //Set title
                        //Set title

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

 
                        //Render the view
 
                        //Render the view

-                       return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView()]+$this->context);
+                       return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'form' => $form->createView()]+$this->context);

                }
 
                }
 

-               //Get doctrine
-               $doctrine = $this->getDoctrine();
-
-               //Get manager
-               $manager = $doctrine->getManager();
-

                //Get data
                $data = $form->getData();
 
                //Get data
                $data = $form->getData();
 

-               //Count session at location in last month for guest
-               if (!$this->isGranted('ROLE_REGULAR') && !empty($session = $doctrine->getRepository(Session::class)->findOneWithinLastMonthByLocationUser($data['location']->getId(), $this->getUser()->getId()))) {
-                       //Add warning in flash message
-                       $this->addFlash('warning', $this->translator->trans('Monthly application %location% already exists', ['%location%' => $this->translator->trans('at '.$data['location'])]));
-
-                       //Redirect to cleanup the form
-                       return $this->redirectToRoute('rapsys_air_session_view', ['id' => $session['id']]);
-               }
-

                //Protect session fetching
                try {
                        //Fetch session
                //Protect session fetching
                try {
                        //Fetch session

-                       $session = $doctrine->getRepository(Session::class)->findOneByLocationSlotDate($data['location'], $data['slot'], $data['date']);
+                       $session = $this->doctrine->getRepository(Session::class)->findOneByLocationSlotDate($data['location'], $data['slot'], $data['date']);

                //Catch no session case
                //Catch no session case

-               } catch (\Doctrine\ORM\NoResultException $e) {
+               } catch (NoResultException $e) {

                        //Create the session
                        $session = new Session();
                        $session->setLocation($data['location']);
                        $session->setDate($data['date']);
                        $session->setSlot($data['slot']);
                        //Create the session
                        $session = new Session();
                        $session->setLocation($data['location']);
                        $session->setDate($data['date']);
                        $session->setSlot($data['slot']);

-                       $session->setCreated(new \DateTime('now'));
-                       $session->setUpdated(new \DateTime('now'));

 
 

-                       //Get short location
-                       $short = $data['location']->getShort();
+                       //Get location
+                       $location = $data['location']->getTitle();

 
                        //Get slot
                        $slot = $data['slot']->getTitle();
 
 
                        //Get slot
                        $slot = $data['slot']->getTitle();
 

-                       //Set premium
-                       $session->setPremium($premium = false);
-
-                       //Check if slot is afternoon
-                       //XXX: premium is stored only for Afternoon and Evening
-                       if ($slot == 'Afternoon') {
-                               //Compute premium
-                               //XXX: a session is considered premium a day off
-                               $session->setPremium($premium = $this->isPremium($data['date']));
-                       //Check if slot is evening
+                       //Get premium

                        //XXX: premium is stored only for Afternoon and Evening
                        //XXX: premium is stored only for Afternoon and Evening

-                       } elseif ($slot == 'Evening') {
-                               //Compute premium
-                               //XXX: a session is considered premium the eve of a day off
-                               $session->setPremium($premium = $this->isPremium((clone $data['date'])->add(new \DateInterval('P1D'))));
-                       //Check if slot is after
-                       } elseif ($slot == 'After') {
-                               //Compute premium
-                               //XXX: a session is considered premium the eve of a day off
-                               $premium = $this->isPremium((clone $data['date'])->add(new \DateInterval('P1D')));
-                       }
+                       $premium = $session->isPremium();

 
                        //Set default length at 6h
                        //XXX: date part will be truncated on save
 
                        //Set default length at 6h
                        //XXX: date part will be truncated on save


@@ -138,20 +164,23 @@ class ApplicationController extends DefaultController {
                                        $session->setLength(new \DateTime('05:00:00'));
                                //Check if afternoon
                                } elseif ($slot == 'Afternoon') {
                                        $session->setLength(new \DateTime('05:00:00'));
                                //Check if afternoon
                                } elseif ($slot == 'Afternoon') {

-                                       //Set begin at 14h
-                                       $session->setBegin(new \DateTime('14:00:00'));
+                                       //Set begin at 18h
+                                       $session->setBegin(new \DateTime('15:30:00'));

 
                                        //Set length at 5h
 
                                        //Set length at 5h

-                                       $session->setLength(new \DateTime('05:00:00'));
+                                       $session->setLength(new \DateTime('05:30:00'));

                                //Check if evening
                                } elseif ($slot == 'Evening') {
                                //Check if evening
                                } elseif ($slot == 'Evening') {

-                                       //Set begin at 19h
-                                       $session->setBegin(new \DateTime('19:00:00'));
+                                       //Set begin at 19h00
+                                       $session->setBegin(new \DateTime('19:30:00'));
+
+                                       //Set length at 5h
+                                       $session->setLength(new \DateTime('05:30:00'));

 
                                        //Check if next day is premium
                                        if ($premium) {
                                                //Set length at 7h
 
                                        //Check if next day is premium
                                        if ($premium) {
                                                //Set length at 7h

-                                               $session->setLength(new \DateTime('07:00:00'));
+                                               $session->setLength(new \DateTime('06:30:00'));

                                        }
                                //Check if after
                                } else {
                                        }
                                //Check if after
                                } else {


@@ -170,9 +199,8 @@ class ApplicationController extends DefaultController {
                                                $session->setLength(new \DateTime('03:00:00'));
                                        }
                                }
                                                $session->setLength(new \DateTime('03:00:00'));
                                        }
                                }

-                       //Docks => 14h -> 19h | 19h -> 01/02h
-                       //XXX: remove Garnier from here to switch back to 21h
-                       } elseif (in_array($short, ['Docks', 'Garnier']) && in_array($slot, ['Afternoon', 'Evening', 'After'])) {
+                       //Tino-Rossi garden => 14h -> 19h | 19h -> 01/02h
+                       } elseif (in_array($location, ['Tino-Rossi garden']) && in_array($slot, ['Afternoon', 'Evening', 'After'])) {

                                //Check if afternoon
                                if ($slot == 'Afternoon') {
                                        //Set begin at 14h
                                //Check if afternoon
                                if ($slot == 'Afternoon') {
                                        //Set begin at 14h


@@ -207,8 +235,8 @@ class ApplicationController extends DefaultController {
                                                $session->setLength(new \DateTime('03:00:00'));
                                        }
                                }
                                                $session->setLength(new \DateTime('03:00:00'));
                                        }
                                }

-                       //Garnier => 21h -> 01/02h
-                       } elseif ($short == 'Garnier' && in_array($slot, ['Evening', 'After'])) {
+                       //Garnier opera => 21h -> 01/02h
+                       } elseif ($location == 'Garnier opera' && in_array($slot, ['Evening', 'After'])) {

                                //Check if evening
                                if ($slot == 'Evening') {
                                        //Set begin at 21h
                                //Check if evening
                                if ($slot == 'Evening') {
                                        //Set begin at 21h


@@ -239,8 +267,8 @@ class ApplicationController extends DefaultController {
                                                $session->setLength(new \DateTime('03:00:00'));
                                        }
                                }
                                                $session->setLength(new \DateTime('03:00:00'));
                                        }
                                }

-                       //Trocadero|Tokyo|Swan|Honore|Orsay => 19h -> 01/02h
-                       } elseif (in_array($short, ['Trocadero', 'Tokyo', 'Swan', 'Honore', 'Orsay']) && in_array($slot, ['Evening', 'After'])) {
+                       //Trocadero esplanade|Tokyo palace|Swan island|Saint-Honore market|Orsay museum => 19h -> 01/02h
+                       } elseif (in_array($location, ['Trocadero esplanade', 'Tokyo palace', 'Swan island', 'Saint-Honore market', 'Orsay museum']) && in_array($slot, ['Evening', 'After'])) {

                                //Check if evening
                                if ($slot == 'Evening') {
                                        //Set begin at 19h
                                //Check if evening
                                if ($slot == 'Evening') {
                                        //Set begin at 19h


@@ -268,65 +296,68 @@ class ApplicationController extends DefaultController {
                                                $session->setLength(new \DateTime('03:00:00'));
                                        }
                                }
                                                $session->setLength(new \DateTime('03:00:00'));
                                        }
                                }

-                       //La Villette => 14h -> 19h
-                       } elseif ($short == 'Villette' && $slot == 'Afternoon') {
+                       //Drawings' garden (Villette) => 14h -> 19h
+                       } elseif ($location == 'Drawings\' garden' && $slot == 'Afternoon') {

                                //Set begin at 14h
                                $session->setBegin(new \DateTime('14:00:00'));
 
                                //Set length at 5h
                                $session->setLength(new \DateTime('05:00:00'));
                                //Set begin at 14h
                                $session->setBegin(new \DateTime('14:00:00'));
 
                                //Set length at 5h
                                $session->setLength(new \DateTime('05:00:00'));

-                       //Place Colette => 14h -> 21h
+                       //Colette place => 14h -> 21h

                        //TODO: add check here that it's a millegaux account ?
                        //TODO: add check here that it's a millegaux account ?

-                       } elseif ($short == 'Colette' && $slot == 'Afternoon') {
+                       } elseif ($location == 'Colette place' && $slot == 'Afternoon') {

                                //Set begin at 14h
                                $session->setBegin(new \DateTime('14:00:00'));
 
                                //Set length at 7h
                                $session->setLength(new \DateTime('07:00:00'));
                                //Set begin at 14h
                                $session->setBegin(new \DateTime('14:00:00'));
 
                                //Set length at 7h
                                $session->setLength(new \DateTime('07:00:00'));

-                       //Galerie d'Orléans => 14h -> 18h
-                       } elseif ($short == 'Orleans' && $slot == 'Afternoon') {
+                       //Orleans gallery => 14h -> 18h
+                       } elseif ($location == 'Orleans gallery' && $slot == 'Afternoon') {

                                //Set begin at 14h
                                $session->setBegin(new \DateTime('14:00:00'));
 
                                //Set length at 4h
                                $session->setLength(new \DateTime('04:00:00'));
                                //Set begin at 14h
                                $session->setBegin(new \DateTime('14:00:00'));
 
                                //Set length at 4h
                                $session->setLength(new \DateTime('04:00:00'));

+                       //Monde garden => 14h -> 19h
+                       //TODO: add check here that it's a raphael account ?
+                       } elseif ($location == 'Monde garden' && $slot == 'Afternoon') {
+                               //Set begin at 14h
+                               $session->setBegin(new \DateTime('14:00:00'));
+
+                               //Set length at 4h
+                               $session->setLength(new \DateTime('05:00:00'));

                        //Combination not supported
                        //Combination not supported

+                       //TODO: add Madeleine place|Bastille place|Vendome place ?

                        } else {
                                //Add error in flash message
                        } else {
                                //Add error in flash message

-                               $this->addFlash('error', $this->translator->trans('Session on %date% %location% %slot% not yet supported', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower($data['slot'])), '%date%' => $data['date']->format('Y-m-d')]));
-
-                               //Set section
-                               $section = $this->translator->trans('Application add');
+                               $this->addFlash('error', $this->translator->trans('Session on %date% %location% %slot% not yet supported', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower(strval($data['slot']))), '%date%' => $data['date']->format('Y-m-d')]));

 
                                //Set title
 
                                //Set title

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

 
                                //Render the view
 
                                //Render the view

-                               return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView()]+$this->context);
+                               return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'form' => $form->createView()]+$this->context);

                        }
 
                        //Check if admin
                        if (!$this->isGranted('ROLE_ADMIN') && $session->getStart() < new \DateTime('00:00:00')) {
                                //Add error in flash message
                        }
 
                        //Check if admin
                        if (!$this->isGranted('ROLE_ADMIN') && $session->getStart() < new \DateTime('00:00:00')) {
                                //Add error in flash message

-                               $this->addFlash('error', $this->translator->trans('Session in the past on %date% %location% %slot% not yet supported', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower($data['slot'])), '%date%' => $data['date']->format('Y-m-d')]));
-
-                               //Set section
-                               $section = $this->translator->trans('Application add');
+                               $this->addFlash('error', $this->translator->trans('Session in the past on %date% %location% %slot% not yet supported', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower(strval($data['slot']))), '%date%' => $data['date']->format('Y-m-d')]));

 
                                //Set title
 
                                //Set title

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

 
                                //Render the view
 
                                //Render the view

-                               return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView()]+$this->context);
+                               return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'form' => $form->createView()]+$this->context);

                        }
 
                        //Queue session save
                        }
 
                        //Queue session save

-                       $manager->persist($session);
+                       $this->manager->persist($session);

 
                        //Flush to get the ids
 
                        //Flush to get the ids

-                       #$manager->flush();
+                       #$this->manager->flush();

 
 

-                       $this->addFlash('notice', $this->translator->trans('Session on %date% %location% %slot% created', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower($data['slot'])), '%date%' => $data['date']->format('Y-m-d')]));
+                       $this->addFlash('notice', $this->translator->trans('Session on %date% %location% %slot% created', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower(strval($data['slot']))), '%date%' => $data['date']->format('Y-m-d')]));

                }
 
                //Set user
                }
 
                //Set user


@@ -340,33 +371,32 @@ class ApplicationController extends DefaultController {
                //Protect application fetching
                try {
                        //Retrieve application
                //Protect application fetching
                try {
                        //Retrieve application

-                       $application = $doctrine->getRepository(Application::class)->findOneBySessionUser($session, $user);
+                       $application = $this->doctrine->getRepository(Application::class)->findOneBySessionUser($session, $user);

 
                        //Add warning in flash message
 
                        //Add warning in flash message

-                       $this->addFlash('warning', $this->translator->trans('Application on %date% %location% %slot% already exists', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower($data['slot'])), '%date%' => $data['date']->format('Y-m-d')]));
+                       $this->addFlash('warning', $this->translator->trans('Application on %date% %location% %slot% already exists', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower(strval($data['slot']))), '%date%' => $data['date']->format('Y-m-d')]));

                //Catch no application and session without identifier (not persisted&flushed) cases
                //Catch no application and session without identifier (not persisted&flushed) cases

-               } catch (\Doctrine\ORM\NoResultException|\Doctrine\ORM\ORMInvalidArgumentException $e) {
+               } catch (NoResultException|ORMInvalidArgumentException $e) {

                        //Create the application
                        $application = new Application();
                        //Create the application
                        $application = new Application();

+                       $application->setDance($data['dance']);

                        $application->setSession($session);
                        $application->setUser($user);
                        $application->setSession($session);
                        $application->setUser($user);

-                       $application->setCreated(new \DateTime('now'));
-                       $application->setUpdated(new \DateTime('now'));

 
                        //Refresh session updated field
                        $session->setUpdated(new \DateTime('now'));
 
                        //Queue session save
 
                        //Refresh session updated field
                        $session->setUpdated(new \DateTime('now'));
 
                        //Queue session save

-                       $manager->persist($session);
+                       $this->manager->persist($session);

 
                        //Queue application save
 
                        //Queue application save

-                       $manager->persist($application);
+                       $this->manager->persist($application);

 
                        //Flush to get the ids
 
                        //Flush to get the ids

-                       $manager->flush();
+                       $this->manager->flush();

 
                        //Add notice in flash message
 
                        //Add notice in flash message

-                       $this->addFlash('notice', $this->translator->trans('Application on %date% %location% %slot% created', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower($data['slot'])), '%date%' => $data['date']->format('Y-m-d')]));
+                       $this->addFlash('notice', $this->translator->trans('Application on %date% %location% %slot% created', ['%location%' => $this->translator->trans('at '.$data['location']), '%slot%' => $this->translator->trans('the '.strtolower(strval($data['slot']))), '%date%' => $data['date']->format('Y-m-d')]));

                }
 
                //Extract and process referer
                }
 
                //Extract and process referer


@@ -407,10 +437,20 @@ class ApplicationController extends DefaultController {
                                //Remove route and controller from route defaults
                                unset($route['_route'], $route['_controller']);
 
                                //Remove route and controller from route defaults
                                unset($route['_route'], $route['_controller']);
 

+                               //Check if session view route
+                               if ($name == 'rapsys_air_session_view' && !empty($route['id'])) {
+                                       //Replace id
+                                       $route['id'] = $session->getId();
+                               //Other routes
+                               } else {
+                                       //Set session
+                                       $route['session'] = $session->getId();
+                               }
+

                                //Generate url
                                //Generate url

-                               return $this->redirectToRoute($name, ['session' => $session->getId()]+$route);
+                               return $this->redirectToRoute($name, $route);

                        //No route matched
                        //No route matched

-                       } catch(MethodNotAllowedException|ResourceNotFoundException $e) {
+                       } catch (MethodNotAllowedException|ResourceNotFoundException $e) {

                                //Unset referer to fallback to default route
                                unset($referer);
                        }
                                //Unset referer to fallback to default route
                                unset($referer);
                        }


@@ -419,108 +459,4 @@ class ApplicationController extends DefaultController {
                //Redirect to cleanup the form
                return $this->redirectToRoute('rapsys_air', ['session' => $session->getId()]);
        }
                //Redirect to cleanup the form
                return $this->redirectToRoute('rapsys_air', ['session' => $session->getId()]);
        }

-
-       /**
-        * Compute eastern for selected year
-        *
-        * @param int $year The eastern year
-        *
-        * @return DateTime The eastern date
-        */
-       function getEastern($year) {
-               //Set static
-               static $data = null;
-               //Check if already computed
-               if (isset($data[$year])) {
-                       //Return computed eastern
-                       return $data[$year];
-               //Check if data is null
-               } elseif (is_null($data)) {
-                       //Init data array
-                       $data = [];
-               }
-               $d = (19 * ($year % 19) + 24) % 30;
-               $e = (2 * ($year % 4) + 4 * ($year % 7) + 6 * $d + 5) % 7;
-
-               $day = 22 + $d + $e;
-               $month = 3;
-
-               if ($day > 31) {
-                       $day = $d + $e - 9;
-                       $month = 4;
-               } elseif ($d == 29 && $e == 6) {
-                       $day = 10;
-                       $month = 4;
-               } elseif ($d == 28 && $e == 6) {
-                       $day = 18;
-                       $month = 4;
-               }
-
-               //Store eastern in data
-               return ($data[$year] = new \DateTime(sprintf('%04d-%02d-%02d', $year, $month, $day)));
-       }
-
-       /**
-        * Check if date is a premium day
-        *
-        * @desc Consider as premium a day off
-        *
-        * @param DateTime $date The date to check
-        * @return bool Whether the date is off or not
-        */
-       function isPremium($date) {
-               //Get day number
-               $w = $date->format('w');
-
-               //Check if weekend day
-               if ($w == 0 || $w == 6) {
-                       //Date is weekend day
-                       return true;
-               }
-
-               //Get date day
-               $d = $date->format('d');
-
-               //Get date month
-               $m = $date->format('m');
-
-               //Check if fixed holiday
-               if (
-                       //Check if 1st january
-                       ($d == 1 && $m == 1) ||
-                       //Check if 1st may
-                       ($d == 1 && $m == 5) ||
-                       //Check if 8st may
-                       ($d == 8 && $m == 5) ||
-                       //Check if 14st july
-                       ($d == 14 && $m == 7) ||
-                       //Check if 15st august
-                       ($d == 15 && $m == 8) ||
-                       //Check if 1st november
-                       ($d == 1 && $m == 11) ||
-                       //Check if 11st november
-                       ($d == 11 && $m == 11) ||
-                       //Check if 25st december
-                       ($d == 25 && $m == 12)
-               ) {
-                       //Date is a fixed holiday
-                       return true;
-               }
-
-               //Get eastern
-               $eastern = $this->getEastern($date->format('Y'));
-
-               //Check dynamic holidays
-               if (
-                       (clone $eastern)->add(new \DateInterval('P1D')) == $date ||
-                       (clone $eastern)->add(new \DateInterval('P39D')) == $date ||
-                       (clone $eastern)->add(new \DateInterval('P50D')) == $date
-               ) {
-                       //Date is a dynamic holiday
-                       return true;
-               }
-
-               //Date is not a holiday and week day
-               return false;
-       }

 }
 }