X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/b1edfe46310a658cf09b3cf791b6fb0056f4b219..9d0fc27f4e1d889446092fbee4e7f1fb6914e9c9:/Controller/ApplicationController.php

diff --git a/Controller/ApplicationController.php b/Controller/ApplicationController.php
index 3690b94..a6091cd 100644
--- a/Controller/ApplicationController.php
+++ b/Controller/ApplicationController.php
@@ -3,8 +3,11 @@
 namespace Rapsys\AirBundle\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Form\FormError;
+use Symfony\Component\Routing\Exception\MethodNotAllowedException;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Rapsys\AirBundle\Entity\Slot;
 use Rapsys\AirBundle\Entity\User;
 use Rapsys\AirBundle\Entity\Session;
@@ -41,24 +44,19 @@ class ApplicationController extends DefaultController {
 			'slot' => $this->getDoctrine()->getRepository(Slot::class)->findOneById(3)
 		]);
 
-		//Reject non post requests
-		if (!$request->isMethod('POST')) {
-			throw new \RuntimeException('Request method MUST be POST');
-		}
-
 		//Refill the fields in case of invalid form
 		$form->handleRequest($request);
 
 		//Handle invalid form
-		if (!$form->isValid()) {
+		if (!$form->isSubmitted() || !$form->isValid()) {
 			//Set section
-			$section = $this->translator->trans('Application Add');
+			$section = $this->translator->trans('Application add');
 
 			//Set title
-			$title = $section.' - '.$this->translator->trans($this->config['site']['title']);
+			$title = $this->translator->trans($this->config['site']['title']).' - '.$section;
 
 			//Render the view
-			return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, 'form' => $form]+$this->context);
+			return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView()]+$this->context);
 		}
 
 		//Get doctrine
@@ -127,21 +125,24 @@ class ApplicationController extends DefaultController {
 					$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 16h
+					$session->setBegin(new \DateTime('16:00:00'));
 
-					//Set length at 5h
-					$session->setLength(new \DateTime('05:00:00'));
+					//Set length at 3h
+					$session->setLength(new \DateTime('03:00:00'));
 				//Check if evening
 				} elseif ($slot == 'Evening') {
 					//Set begin at 19h
-					$session->setBegin(new \DateTime('19:00:00'));
+					$session->setBegin(new \DateTime('19:30:00'));
 
 					//Check if next day is premium
 					if ($premium) {
 						//Set length at 7h
 						$session->setLength(new \DateTime('07:00:00'));
 					}
+
+					//Set length at 4h
+					$session->setLength(new \DateTime('04:30:00'));
 				//Check if after
 				} else {
 					//Set begin at 1h
@@ -279,10 +280,41 @@ class ApplicationController extends DefaultController {
 
 				//Set length at 4h
 				$session->setLength(new \DateTime('04:00:00'));
+			//Jardin du Monde => 14h -> 15h
+			} elseif ($short == 'Monde' && $slot == 'Morning') {
+				//Set begin at 14h
+				$session->setBegin(new \DateTime('14:00:00'));
+
+				//Set length at 4h
+				$session->setLength(new \DateTime('01:00:00'));
 			//Combination not supported
 			} 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');
+
+				//Set title
+				$title = $this->translator->trans($this->config['site']['title']).' - '.$section;
+
+				//Render the view
+				return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, '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
+				$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');
+
+				//Set title
+				$title = $this->translator->trans($this->config['site']['title']).' - '.$section;
+
+				//Render the view
+				return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView()]+$this->context);
 			}
 
 			//Queue session save
@@ -372,10 +404,20 @@ class ApplicationController extends DefaultController {
 				//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
-				return $this->redirectToRoute($name, ['session' => $session->getId()]+$route);
+				return $this->redirectToRoute($name, $route);
 			//No route matched
-			} catch(ResourceNotFoundException $e) {
+			} catch(MethodNotAllowedException|ResourceNotFoundException $e) {
 				//Unset referer to fallback to default route
 				unset($referer);
 			}