X-Git-Url: https://git.rapsys.eu/airbundle/blobdiff_plain/0bae4a0f43bfae25b45835728053f7053371d799..d5694756a5e86e504fb8165111882bbfa6828d2a:/Controller/SessionController.php
diff --git a/Controller/SessionController.php b/Controller/SessionController.php
index ce15032..30a0a73 100644
--- a/Controller/SessionController.php
+++ b/Controller/SessionController.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\Routing\Exception\MethodNotAllowedException;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
@@ -24,7 +25,7 @@ class SessionController extends DefaultController {
*
* @throws \RuntimeException When user has not at least guest role
*/
- public function edit(Request $request, $id) {
+ public function edit(Request $request, $id): Response {
//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')]));
@@ -37,7 +38,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 (
@@ -55,8 +56,8 @@ class SessionController extends DefaultController {
//Set now
$now = new \DateTime('now');
- //Create SessionEditType form
- $form = $this->createForm('Rapsys\AirBundle\Form\SessionEditType', null, [
+ //Create SessionType form
+ $form = $this->createForm('Rapsys\AirBundle\Form\SessionType', null, [
//Set the action
'action' => $this->generateUrl('rapsys_air_session_edit', [ 'id' => $id ]),
//Set the form attribute
@@ -299,7 +300,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 +368,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,51 +435,26 @@ class SessionController extends DefaultController {
*
* @return Response The rendered view
*/
- public function index(Request $request = null) {
+ public function index(Request $request): Response {
//Fetch doctrine
$doctrine = $this->getDoctrine();
//Set section
$section = $this->translator->trans('Sessions');
- //Set title
- $title = $section.' - '.$this->translator->trans($this->config['site']['title']);
-
- //Init context
- $context = [];
-
- //Create application form for role_guest
- if ($this->isGranted('ROLE_GUEST')) {
- //Create ApplicationType form
- $application = $this->createForm('Rapsys\AirBundle\Form\ApplicationType', null, [
- //Set the action
- 'action' => $this->generateUrl('rapsys_air_application_add'),
- //Set the form attribute
- 'attr' => [ 'class' => 'col' ],
- //Set admin
- 'admin' => $this->isGranted('ROLE_ADMIN'),
- //Set default user to current
- 'user' => $this->getUser()->getId(),
- //Set default slot to evening
- //XXX: default to Evening (3)
- 'slot' => $doctrine->getRepository(Slot::class)->findOneById(3)
- ]);
+ //Set description
+ $this->context['description'] = $this->translator->trans('Libre Air session list');
- //Add form to context
- $context['application'] = $application->createView();
- //Create login form for anonymous
- } elseif (!$this->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
- //Create ApplicationType form
- $login = $this->createForm('Rapsys\UserBundle\Form\LoginType', null, [
- //Set the action
- 'action' => $this->generateUrl('rapsys_user_login'),
- //Set the form attribute
- 'attr' => [ 'class' => 'col' ]
- ]);
+ //Set keywords
+ $this->context['keywords'] = [
+ $this->translator->trans('sessions'),
+ $this->translator->trans('session list'),
+ $this->translator->trans('listing'),
+ $this->translator->trans('Libre Air')
+ ];
- //Add form to context
- $context['login'] = $login->createView();
- }
+ //Set title
+ $title = $this->translator->trans($this->config['site']['title']).' - '.$section;
//Compute period
$period = new \DatePeriod(
@@ -487,7 +463,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 + 3 week':'Monday this week + 2 week'
+ )
);
//Fetch calendar
@@ -496,10 +474,10 @@ 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);
+ return $this->render('@RapsysAir/session/index.html.twig', ['title' => $title, 'section' => $section, 'calendar' => $calendar, 'locations' => $locations]+$this->context);
}
/**
@@ -512,26 +490,41 @@ class SessionController extends DefaultController {
*
* @return Response The rendered view
*/
- public function view(Request $request, $id) {
+ public function view(Request $request, $id): Response {
//Fetch doctrine
$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 title
- $title = $this->translator->trans('Session %id%', ['%id%' => $id]).' - '.$section.' - '.$this->translator->trans($this->config['site']['title']);
+ //Set localization date formater
+ $intl = new \IntlDateFormatter($request->getLocale(), \IntlDateFormatter::GREGORIAN, \IntlDateFormatter::SHORT);
- //Init context
- $context = [];
+ //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($this->config['site']['title']).' - '.$section.' - '.$this->translator->trans(!empty($session['au_id'])?'Session %id% by %pseudonym%':'Session %id%', ['%id%' => $id, '%pseudonym%' => $session['au_pseudonym']]);
//Create application form for role_guest
if ($this->isGranted('ROLE_GUEST')) {
//Create ApplicationType form
- $application = $this->createForm('Rapsys\AirBundle\Form\ApplicationType', null, [
+ $applicationForm = $this->createForm('Rapsys\AirBundle\Form\ApplicationType', null, [
//Set the action
'action' => $this->generateUrl('rapsys_air_application_add'),
//Set the form attribute
@@ -547,13 +540,13 @@ class SessionController extends DefaultController {
]);
//Add form to context
- $context['application'] = $application->createView();
+ $this->context['forms']['application'] = $applicationForm->createView();
//Set now
$now = new \DateTime('now');
- //Create SessionEditType form
- $session_edit = $this->createForm('Rapsys\AirBundle\Form\SessionEditType', null, [
+ //Create SessionType form
+ $sessionForm = $this->createForm('Rapsys\AirBundle\Form\SessionType', null, [
//Set the action
'action' => $this->generateUrl('rapsys_air_session_edit', [ 'id' => $id ]),
//Set the form attribute
@@ -581,19 +574,7 @@ class SessionController extends DefaultController {
]);
//Add form to context
- $context['session_edit'] = $session_edit->createView();
- //Create login form for anonymous
- } elseif (!$this->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
- //Create ApplicationType form
- $login = $this->createForm('Rapsys\UserBundle\Form\LoginType', null, [
- //Set the action
- 'action' => $this->generateUrl('rapsys_user_login'),
- //Set the form attribute
- 'attr' => [ 'class' => 'col' ]
- ]);
-
- //Add form to context
- $context['login'] = $login->createView();
+ $this->context['forms']['session'] = $sessionForm->createView();
}
//Add session in context
@@ -632,6 +613,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'],
+ 'profile' => $session['p_profile']
+ ],
'applications' => null
];
@@ -640,9 +630,11 @@ 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'],
+ 'canceled' => $session['a_canceled'],
'title' => $this->translator->trans('Application %id%', [ '%id%' => $session['a_id'] ]),
];
}
@@ -686,7 +678,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 + 3 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);
}
}