X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/95a285d745a7f4ca685576b23bf30027dc6d32cc..5f49b1005af0bc9e89fdc13688fc5ed8a1247dce:/Controller/SessionController.php?ds=sidebyside

diff --git a/Controller/SessionController.php b/Controller/SessionController.php
index ce15032..e15fef6 100644
--- a/Controller/SessionController.php
+++ b/Controller/SessionController.php
@@ -37,7 +37,7 @@ class SessionController extends DefaultController {
 		$doctrine = $this->getDoctrine();
 
 		//Fetch session
-		$session = $doctrine->getRepository(Session::class)->fetchOneById($id);
+		$session = $doctrine->getRepository(Session::class)->fetchOneById($id, $request->getLocale());
 
 		//Check if
 		if (
@@ -299,7 +299,7 @@ class SessionController extends DefaultController {
 				$this->addFlash('notice', $this->translator->trans('Session %id% auto attributed', ['%id%' => $id]));
 			//No application
 			} else {
-				//Add notice in flash message
+				//Add warning in flash message
 				$this->addFlash('warning', $this->translator->trans('Session %id% not auto attributed', ['%id%' => $id]));
 			}
 		//With lock
@@ -367,7 +367,7 @@ class SessionController extends DefaultController {
 			$this->addFlash('notice', $this->translator->trans('Session %id% updated', ['%id%' => $id]));
 		//Unknown action
 		} else {
-			//Add notice in flash message
+			//Add warning in flash message
 			$this->addFlash('warning', $this->translator->trans('Session %id% not updated', ['%id%' => $id]));
 		}
 
@@ -434,15 +434,26 @@ class SessionController extends DefaultController {
 	 *
 	 * @return Response The rendered view
 	 */
-	public function index(Request $request = null) {
+	public function index(Request $request) {
 		//Fetch doctrine
 		$doctrine = $this->getDoctrine();
 
 		//Set section
 		$section = $this->translator->trans('Sessions');
 
+		//Set description
+		$this->context['description'] = $this->translator->trans('Libre Air session list');
+
+		//Set keywords
+		$this->context['keywords'] = [
+			$this->translator->trans('sessions'),
+			$this->translator->trans('session list'),
+			$this->translator->trans('listing'),
+			$this->translator->trans('Libre Air')
+		];
+
 		//Set title
-		$title = $section.' - '.$this->translator->trans($this->config['site']['title']);
+		$title = $this->translator->trans($this->config['site']['title']).' - '.$section;
 
 		//Init context
 		$context = [];
@@ -487,7 +498,9 @@ class SessionController extends DefaultController {
 			//Iterate on each day
 			new \DateInterval('P1D'),
 			//End with next sunday and 4 weeks
-			new \DateTime('Monday this week + 5 week')
+			new \DateTime(
+				$this->isGranted('IS_AUTHENTICATED_REMEMBERED')?'Monday this week + 4 week':'Monday this week + 2 week'
+			)
 		);
 
 		//Fetch calendar
@@ -496,7 +509,7 @@ class SessionController extends DefaultController {
 
 		//Fetch locations
 		//XXX: we want to display all active locations anyway
-		$locations = $doctrine->getRepository(Location::class)->fetchTranslatedLocationByDatePeriod($this->translator, $period/*, !$this->isGranted('IS_AUTHENTICATED_REMEMBERED')*/);
+		$locations = $doctrine->getRepository(Location::class)->findTranslatedSortedByPeriod($this->translator, $period);
 
 		//Render the view
 		return $this->render('@RapsysAir/session/index.html.twig', ['title' => $title, 'section' => $section, 'calendar' => $calendar, 'locations' => $locations]+$context+$this->context);
@@ -517,13 +530,31 @@ class SessionController extends DefaultController {
 		$doctrine = $this->getDoctrine();
 
 		//Fetch session
-		$session = $doctrine->getRepository(Session::class)->fetchOneById($id);
+		if (empty($session = $doctrine->getRepository(Session::class)->fetchOneById($id, $request->getLocale()))) {
+			throw $this->createNotFoundException($this->translator->trans('Unable to find session: %id%', ['%id%' => $id]));
+		}
 
 		//Set section
 		$section = $this->translator->trans($session['l_title']);
 
+		//Set localization date formater
+		$intl = new \IntlDateFormatter($request->getLocale(), \IntlDateFormatter::GREGORIAN, \IntlDateFormatter::SHORT);
+
+		//Set description
+		$this->context['description'] = $this->translator->trans('Outdoor Argentine Tango session the %date%', [ '%date%' => $intl->format($session['start']) ]);
+
+		//Set keywords
+		$this->context['keywords'] = [
+			$this->translator->trans('outdoor'),
+			$this->translator->trans('Argentine Tango'),
+		];
+
+		//With granted session
+		if (!empty($session['au_id'])) {
+			$this->context['keywords'][0] = $session['au_pseudonym'];
+		}
 		//Set title
-		$title = $this->translator->trans('Session %id%', ['%id%' => $id]).' - '.$section.' - '.$this->translator->trans($this->config['site']['title']);
+		$title = $this->translator->trans($this->config['site']['title']).' - '.$section.' - '.$this->translator->trans(!empty($session['au_id'])?'Session %id% by %pseudonym%':'Session %id%', ['%id%' => $id, '%pseudonym%' => $session['au_pseudonym']]);
 
 		//Init context
 		$context = [];
@@ -632,6 +663,15 @@ class SessionController extends DefaultController {
 				'id' => $session['t_id'],
 				'title' => $this->translator->trans($session['t_title'])
 			],
+			'snippet' => [
+				'id' => $session['p_id'],
+				'description' => $session['p_description'],
+				'class' => $session['p_class'],
+				'contact' => $session['p_contact'],
+				'donate' => $session['p_donate'],
+				'link' => $session['p_link'],
+				'social' => $session['p_social']
+			],
 			'applications' => null
 		];
 
@@ -640,6 +680,7 @@ class SessionController extends DefaultController {
 			$context['session']['application'] = [
 				'user' => [
 					'id' => $session['au_id'],
+					'by' => $this->translator->trans('by %pseudonym%', [ '%pseudonym%' => $session['au_pseudonym'] ]),
 					'title' => $session['au_pseudonym']
 				],
 				'id' => $session['a_id'],
@@ -686,7 +727,23 @@ class SessionController extends DefaultController {
 			}
 		}
 
+		//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(
+				$this->isGranted('IS_AUTHENTICATED_REMEMBERED')?'Monday this week + 4 week':'Monday this week + 2 week'
+			)
+		);
+
+		//Fetch locations
+		//XXX: we want to display all active locations anyway
+		$locations = $doctrine->getRepository(Location::class)->findTranslatedSortedByPeriod($this->translator, $period, $session['au_id']);
+
 		//Render the view
-		return $this->render('@RapsysAir/session/view.html.twig', ['title' => $title, 'section' => $section]+$context+$this->context);
+		return $this->render('@RapsysAir/session/view.html.twig', ['title' => $title, 'section' => $section, 'locations' => $locations]+$context+$this->context);
 	}
 }