X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/f56d09146b7347e821757e76bd4a2996f36fd2ee..46821e617bffafd12f7d73d9ba47cc021604e9b2:/Controller/ApplicationController.php?ds=sidebyside

diff --git a/Controller/ApplicationController.php b/Controller/ApplicationController.php
index 8a9a8b4..88bb182 100644
--- a/Controller/ApplicationController.php
+++ b/Controller/ApplicationController.php
@@ -3,6 +3,7 @@
 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;
@@ -28,11 +29,6 @@ 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')]));
 
-		//Reject non post requests
-		if (!$request->isMethod('POST')) {
-			throw new \RuntimeException('Request method MUST be POST');
-		}
-
 		//Create ApplicationType form
 		$form = $this->createForm('Rapsys\AirBundle\Form\ApplicationType', null, [
 			//Set the action
@@ -52,12 +48,12 @@ class ApplicationController extends DefaultController {
 		$form->handleRequest($request);
 
 		//Handle invalid form
-		if (!$form->isValid()) {
+		if (!$form->isSubmitted() || !$form->isValid()) {
 			//Set section
 			$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->createView()]+$this->context);
@@ -72,15 +68,6 @@ class ApplicationController extends DefaultController {
 		//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
@@ -139,10 +126,10 @@ class ApplicationController extends DefaultController {
 				//Check if afternoon
 				} elseif ($slot == 'Afternoon') {
 					//Set begin at 14h
-					$session->setBegin(new \DateTime('14:00:00'));
+					$session->setBegin(new \DateTime('14:30:00'));
 
 					//Set length at 5h
-					$session->setLength(new \DateTime('05:00:00'));
+					$session->setLength(new \DateTime('04:30:00'));
 				//Check if evening
 				} elseif ($slot == 'Evening') {
 					//Set begin at 19h
@@ -299,7 +286,7 @@ class ApplicationController extends DefaultController {
 				$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->createView()]+$this->context);
@@ -314,7 +301,7 @@ class ApplicationController extends DefaultController {
 				$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->createView()]+$this->context);
@@ -407,8 +394,18 @@ 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(MethodNotAllowedException|ResourceNotFoundException $e) {
 				//Unset referer to fallback to default route