]> Raphaël G. Git Repositories - airbundle/blobdiff - Controller/LocationController.php
Rapsys Git / airbundle / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add not found exception on location not found
[airbundle] / Controller / LocationController.php
diff --git a/Controller/LocationController.php b/Controller/LocationController.php
index 33b5870e1b4f05f3daa428370192865c7fe6238a..aa21c341b0f0e06330a9c4d61528f1259958b582 100644 (file)
--- a/Controller/LocationController.php
+++ b/Controller/LocationController.php
@@ -9,155 +9,29 @@ use Rapsys\AirBundle\Entity\Location;
 
 class LocationController extends DefaultController {
        /**
 
 class LocationController extends DefaultController {
        /**
-        * List all locations
+        * List all sessions for the location
         *
         *
-        * @desc Display all sessions by location with an application or login form
+        * @desc Display all sessions for the location with an application or login form
         *
         * @param Request $request The request instance
         *
         * @param Request $request The request instance
+        * @param int $id The location id
         *
         * @return Response The rendered view
         */
         *
         * @return Response The rendered view
         */
-       public function index(Request $request = null) {
-               //Set section
-               $section = $this->translator->trans('Locations');
-
-               //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' => $this->getDoctrine()->getRepository(Slot::class)->findOneById(3)
-                       ]);
-
-                       //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' ]
-                       ]);
-
-                       //Add form to context
-                       $context['login'] = $login->createView();
-               }
-
-               //Fetch doctrine
-               $doctrine = $this->getDoctrine();
-
-               //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('Monday this week + 5 week')
-               );
-
-               //Fetch sessions
-               $sessions = $doctrine->getRepository(Session::class)->findAllByDatePeriod($period);
-
-               //Init calendar
-               $calendar = [];
-
-               //Init month
-               $month = null;
-
-               //Iterate on each day
-               foreach($period as $date) {
-                       //Init day in calendar
-                       $calendar[$Ymd = $date->format('Ymd')] = [
-                               'title' => $date->format('d'),
-                               'class' => [],
-                               'sessions' => []
-                       ];
-                       //Append month for first day of month
-                       if ($month != $date->format('m')) {
-                               $month = $date->format('m');
-                               $calendar[$Ymd]['title'] .= '/'.$month;
-                       }
-                       //Deal with today
-                       if ($date->format('U') == ($today = strtotime('today'))) {
-                               $calendar[$Ymd]['title'] .= '/'.$month;
-                               $calendar[$Ymd]['current'] = true;
-                               $calendar[$Ymd]['class'][] =  'current';
-                       }
-                       //Disable passed days
-                       if ($date->format('U') < $today) {
-                               $calendar[$Ymd]['disabled'] = true;
-                               $calendar[$Ymd]['class'][] =  'disabled';
-                       }
-                       //Set next month days
-                       if ($date->format('m') > date('m')) {
-                               $calendar[$Ymd]['next'] = true;
-                               $calendar[$Ymd]['class'][] =  'next';
-                       }
-                       //Iterate on each session to find the one of the day
-                       foreach($sessions as $session) {
-                               if (($sessionYmd = $session->getDate()->format('Ymd')) == $Ymd) {
-                                       //Count number of application
-                                       $count = count($session->getApplications());
-
-                                       //Compute classes
-                                       $class = [];
-                                       if ($session->getApplication()) {
-                                               $class[] = 'granted';
-                                       } elseif ($count == 0) {
-                                               $class[] = 'orphaned';
-                                       } elseif ($count > 1) {
-                                               $class[] = 'disputed';
-                                       } else {
-                                               $class[] = 'pending';
-                                       }
-
-                                       //Add the session
-                                       $calendar[$Ymd]['sessions'][$session->getSlot()->getId().$session->getLocation()->getId()] = [
-                                               'id' => $session->getId(),
-                                               'title' => ($count > 1?'['.$count.'] ':'').$session->getSlot()->getTitle().' '.$session->getLocation()->getTitle(),
-                                               'class' => $class
-                                       ];
-                               }
-                       }
-
-                       //Sort sessions
-                       ksort($calendar[$Ymd]['sessions']);
-               }
-
-               //Render the view
-               return $this->render('@RapsysAir/location/index.html.twig', ['title' => $title, 'section' => $section, 'calendar' => $calendar]+$context+$this->context);
-       }
-
        public function view(Request $request, $id) {
                //Fetch doctrine
                $doctrine = $this->getDoctrine();
 
                //Fetch location
        public function view(Request $request, $id) {
                //Fetch doctrine
                $doctrine = $this->getDoctrine();
 
                //Fetch location
-               $location = $doctrine->getRepository(Location::class)->findOneById($id);
+               if (empty($location = $doctrine->getRepository(Location::class)->findOneById($id))) {
+                       throw $this->createNotFoundException($this->translator->trans('Unable to find location: %id%', ['%id%' => $id]));
+               }
 
                //Set section
 
                //Set section
-               $section = $this->translator->trans($location);
+               $section = $this->translator->trans('Argentine Tango at '.$location);
 
                //Set title
 
                //Set title
-               $title = $section.' - '.$this->translator->trans($this->config['site']['title']);
+               $title = $this->translator->trans($this->config['site']['title']).' - '.$section;
 
                //Init context
                $context = [];
 
                //Init context
                $context = [];
@@ -176,7 +50,9 @@ class LocationController extends DefaultController {
                                'user' => $this->getUser()->getId(),
                                //Set default slot to evening
                                //XXX: default to Evening (3)
                                'user' => $this->getUser()->getId(),
                                //Set default slot to evening
                                //XXX: default to Evening (3)
-                               'slot' => $this->getDoctrine()->getRepository(Slot::class)->findOneById(3)
+                               'slot' => $doctrine->getRepository(Slot::class)->findOneById(3),
+                               //Set default location to current one
+                               'location' => $location
                        ]);
 
                        //Add form to context
                        ]);
 
                        //Add form to context
@@ -205,76 +81,14 @@ class LocationController extends DefaultController {
                        new \DateTime('Monday this week + 5 week')
                );
 
                        new \DateTime('Monday this week + 5 week')
                );
 
-               //Fetch sessions
-               $sessions = $doctrine->getRepository(Session::class)->findAllByLocationDatePeriod($location, $period);
-
-               //Init calendar
-               $calendar = [];
-               
-               //Init month
-               $month = null;
+               //Fetch calendar
+               $calendar = $doctrine->getRepository(Session::class)->fetchCalendarByDatePeriod($this->translator, $period, $id, $request->get('session'), !$this->isGranted('IS_AUTHENTICATED_REMEMBERED'));
 
 
-               //Iterate on each day
-               foreach($period as $date) {
-                       //Init day in calendar
-                       $calendar[$Ymd = $date->format('Ymd')] = [
-                               'title' => $date->format('d'),
-                               'class' => [],
-                               'sessions' => []
-                       ];
-                       //Append month for first day of month
-                       if ($month != $date->format('m')) {
-                               $month = $date->format('m');
-                               $calendar[$Ymd]['title'] .= '/'.$month;
-                       }
-                       //Deal with today
-                       if ($date->format('U') == ($today = strtotime('today'))) {
-                               $calendar[$Ymd]['title'] .= '/'.$month;
-                               $calendar[$Ymd]['current'] = true;
-                               $calendar[$Ymd]['class'][] =  'current';
-                       }
-                       //Disable passed days
-                       if ($date->format('U') < $today) {
-                               $calendar[$Ymd]['disabled'] = true;
-                               $calendar[$Ymd]['class'][] =  'disabled';
-                       }
-                       //Set next month days
-                       if ($date->format('m') > date('m')) {
-                               $calendar[$Ymd]['next'] = true;
-                               $calendar[$Ymd]['class'][] =  'next';
-                       }
-                       //Iterate on each session to find the one of the day
-                       foreach($sessions as $session) {
-                               if (($sessionYmd = $session->getDate()->format('Ymd')) == $Ymd) {
-                                       //Count number of application
-                                       $count = count($session->getApplications());
-
-                                       //Compute classes
-                                       $class = [];
-                                       if ($session->getApplication()) {
-                                               $class[] = 'granted';
-                                       } elseif ($count == 0) {
-                                               $class[] = 'orphaned';
-                                       } elseif ($count > 1) {
-                                               $class[] = 'disputed';
-                                       } else {
-                                               $class[] = 'pending';
-                                       }
-
-                                       //Add the session
-                                       $calendar[$Ymd]['sessions'][$session->getSlot()->getId().$session->getLocation()->getId()] = [
-                                               'id' => $session->getId(),
-                                               'title' => ($count > 1?'['.$count.'] ':'').$session->getSlot()->getTitle().' '.$session->getLocation()->getTitle(),
-                                               'class' => $class
-                                       ];
-                               }
-                       }
-
-                       //Sort sessions
-                       ksort($calendar[$Ymd]['sessions']);
-               }
+               //Fetch locations
+               //XXX: we want to display all active locations anyway
+               $locations = $doctrine->getRepository(Location::class)->findTranslatedSortedByPeriod($this->translator, $period);
 
                //Render the view
 
                //Render the view
-               return $this->render('@RapsysAir/location/index.html.twig', ['title' => $title, 'section' => $section, 'calendar' => $calendar]+$context+$this->context);
+               return $this->render('@RapsysAir/location/view.html.twig', ['id' => $id, 'title' => $title, 'section' => $section, 'calendar' => $calendar, 'locations' => $locations]+$context+$this->context);
        }
 }
        }
 }
Symfony bundle rapsys/airbundle used to handle libre air features