X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/c6c9f15189b82a9257a382cf9b68ab8041a187f8..HEAD:/Controller/ApplicationController.php

diff --git a/Controller/ApplicationController.php b/Controller/ApplicationController.php
index 9ee5a89..f818dbe 100644
--- a/Controller/ApplicationController.php
+++ b/Controller/ApplicationController.php
@@ -34,7 +34,7 @@ class ApplicationController extends AbstractController {
 	/**
 	 * Add application
 	 *
-	 * @desc Persist application and all required dependencies in database
+	 * Persist application and all required dependencies in database
 	 *
 	 * @param Request $request The request instance
 	 * @param Registry $manager The doctrine registry
@@ -57,7 +57,6 @@ class ApplicationController extends AbstractController {
 		//Set dance default
 		$danceDefault = !empty($danceFavorites)?current($danceFavorites):null;
 
-
 		//Get favorites locations
 		$locationFavorites = $this->doctrine->getRepository(Location::class)->findByUserId($this->security->getUser()->getId());
 
@@ -89,7 +88,7 @@ class ApplicationController extends AbstractController {
 		//Create ApplicationType form
 		$form = $this->factory->create('Rapsys\AirBundle\Form\ApplicationType', null, [
 			//Set the action
-			'action' => $this->generateUrl('rapsys_air_application_add'),
+			'action' => $this->generateUrl('rapsysair_application_add'),
 			//Set the form attribute
 			#'attr' => [ 'class' => 'col' ],
 			//Set dance choices
@@ -115,16 +114,22 @@ class ApplicationController extends AbstractController {
 			'slot_default' => $this->doctrine->getRepository(Slot::class)->findOneByTitle('Evening')
 		]);
 
+		//Set title
+		$this->context['title']['page'] = $this->translator->trans('Application add');
+
+		//Set section
+		$this->context['title']['section'] = $this->translator->trans('Application');
+
+		//Set description
+		$this->context['description'] = $this->translator->trans('Add an application and session');
+
 		//Refill the fields in case of invalid form
 		$form->handleRequest($request);
 
 		//Handle invalid form
 		if (!$form->isSubmitted() || !$form->isValid()) {
-			//Set title
-			$title = $this->translator->trans('Application add');
-
 			//Render the view
-			return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'form' => $form->createView()]+$this->context);
+			return $this->render('@RapsysAir/application/add.html.twig', ['form' => $form->createView()]+$this->context);
 		}
 
 		//Get data
@@ -137,10 +142,7 @@ class ApplicationController extends AbstractController {
 		//Catch no session case
 		} catch (NoResultException $e) {
 			//Create the session
-			$session = new Session();
-			$session->setLocation($data['location']);
-			$session->setDate($data['date']);
-			$session->setSlot($data['slot']);
+			$session = new Session($data['date'], $data['location'], $data['slot']);
 
 			//Get location
 			$location = $data['location']->getTitle();
@@ -335,11 +337,8 @@ class ApplicationController extends AbstractController {
 				//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(strval($data['slot']))), '%date%' => $data['date']->format('Y-m-d')]));
 
-				//Set title
-				$title = $this->translator->trans('Application add');
-
 				//Render the view
-				return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'form' => $form->createView()]+$this->context);
+				return $this->render('@RapsysAir/application/add.html.twig', ['form' => $form->createView()]+$this->context);
 			}
 
 			//Check if admin
@@ -347,11 +346,8 @@ class ApplicationController extends AbstractController {
 				//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(strval($data['slot']))), '%date%' => $data['date']->format('Y-m-d')]));
 
-				//Set title
-				$title = $this->translator->trans('Application add');
-
 				//Render the view
-				return $this->render('@RapsysAir/application/add.html.twig', ['title' => $title, 'form' => $form->createView()]+$this->context);
+				return $this->render('@RapsysAir/application/add.html.twig', ['form' => $form->createView()]+$this->context);
 			}
 
 			//Queue session save
@@ -441,7 +437,7 @@ class ApplicationController extends AbstractController {
 				unset($route['_route'], $route['_controller']);
 
 				//Check if session view route
-				if ($name == 'rapsys_air_session_view' && !empty($route['id'])) {
+				if ($name == 'rapsysair_session_view' && !empty($route['id'])) {
 					//Replace id
 					$route['id'] = $session->getId();
 				//Other routes
@@ -460,6 +456,6 @@ class ApplicationController extends AbstractController {
 		}
 
 		//Redirect to cleanup the form
-		return $this->redirectToRoute('rapsys_air', ['session' => $session->getId()]);
+		return $this->redirectToRoute('rapsysair', ['session' => $session->getId()]);
 	}
 }