Remove return hidden field

Add session loading and computing
Add view fonction listing sessions on selected place

diff --git a/Controller/LocationController.php b/Controller/LocationController.php
index ad28644f0878fe6295c96706b850d3c347acbc92..33b5870e1b4f05f3daa428370192865c7fe6238a 100644 (file)
--- a/Controller/LocationController.php
+++ b/Controller/LocationController.php
@@ -4,6 +4,8 @@ namespace Rapsys\AirBundle\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
 use Rapsys\AirBundle\Entity\Slot;
 
 use Symfony\Component\HttpFoundation\Request;
 use Rapsys\AirBundle\Entity\Slot;

+use Rapsys\AirBundle\Entity\Session;
+use Rapsys\AirBundle\Entity\Location;

 
 class LocationController extends DefaultController {
        /**
 
 class LocationController extends DefaultController {
        /**


@@ -39,9 +41,7 @@ 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),
-                               //Set shorted return url
-                               'return' => $this->slugger->short(json_encode(['_route' => $request->get('_route'), '_route_params' => $request->get('_route_params')]))
+                               'slot' => $this->getDoctrine()->getRepository(Slot::class)->findOneById(3)

                        ]);
 
                        //Add form to context
                        ]);
 
                        //Add form to context


@@ -60,107 +60,139 @@ class LocationController extends DefaultController {
                        $context['login'] = $login->createView();
                }
 
                        $context['login'] = $login->createView();
                }
 

-               $calendar = 'toto';
+               //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);
        }
 
 
                //Render the view
                return $this->render('@RapsysAir/location/index.html.twig', ['title' => $title, 'section' => $section, 'calendar' => $calendar]+$context+$this->context);
        }
 

-       public function show(Request $request, $id) {
-       }
+       public function view(Request $request, $id) {
+               //Fetch doctrine
+               $doctrine = $this->getDoctrine();

 
 

-       public function toto(Request $request) {
-               //Prevent non-admin to access here
-               $this->denyAccessUnlessGranted('ROLE_GUEST', null, 'Unable to access this page without ROLE_GUEST!');
+               //Fetch location
+               $location = $doctrine->getRepository(Location::class)->findOneById($id);

 
                //Set section
 
                //Set section

-               $section = $this->translator->trans('Admin');
+               $section = $this->translator->trans($location);

 
                //Set title
                $title = $section.' - '.$this->translator->trans($this->config['site']['title']);
 
 
                //Set title
                $title = $section.' - '.$this->translator->trans($this->config['site']['title']);
 

-               header('Content-Type: text/plain');
-               var_dump('TODO');
-               exit;
-               //Create the form according to the FormType created previously.
-               //And give the proper parameters
-               $form = $this->createForm('Rapsys\AirBundle\Form\ApplicationType', null, [
-                       // To set the action use $this->generateUrl('route_identifier')
-                       'action' => $this->generateUrl('rapsys_air_admin'),
-                       'method' => 'POST',
-                       'attr' => [ 'class' => 'form_col' ]
-               ]);
-
-               //Get doctrine
-               $doctrine = $this->getDoctrine();
+               //Init context
+               $context = [];

 
 

-               //Handle request
-               if ($request->isMethod('POST')) {
-                       // Refill the fields in case the form is not valid.
-                       $form->handleRequest($request);
-
-                       if ($form->isValid()) {
-                               //Get data
-                               $data = $form->getData();
-
-                               //Get manager
-                               $manager = $doctrine->getManager();
-
-                               //Protect session fetching
-                               try {
-                                       $session = $doctrine->getRepository(Session::class)->findOneByLocationSlotDate($data['location'], $data['slot'], $data['date']);
-                               //Catch no session case
-                               } catch (\Doctrine\ORM\NoResultException $e) {
-                                       //Create the session
-                                       $session = new Session();
-                                       $session->setLocation($data['location']);
-                                       $session->setSlot($data['slot']);
-                                       $session->setDate($data['date']);
-                                       $session->setCreated(new \DateTime('now'));
-                                       $session->setUpdated(new \DateTime('now'));
-                                       $manager->persist($session);
-                                       //Flush to get the ids
-                                       #$manager->flush();
-                               }
+               //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)
+                       ]);

 
 

-                               //Init application
-                               $application = false;
-
-                               //Protect application fetching
-                               try {
-                                       //TODO: handle admin case where we provide a user in extra
-                                       $application = $doctrine->getRepository(Application::class)->findOneBySessionUser($session, $this->getUser());
-
-                                       //Add error message to mail field
-                                       $form->get('slot')->addError(new FormError($this->translator->trans('Application already exists')));
-                               //Catch no application cases
-                               //XXX: combine these catch when php 7.1 is available
-                               } catch (\Doctrine\ORM\NoResultException $e) {
-                               //Catch invalid argument because session is not already persisted
-                               } catch(\Doctrine\ORM\ORMInvalidArgumentException $e) {
-                               }
+                       //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' ]
+                       ]);

 
 

-                               //Create new application if none found
-                               if (!$application) {
-                                       //Create the application
-                                       $application = new Application();
-                                       $application->setSession($session);
-                                       //TODO: handle admin case where we provide a user in extra
-                                       $application->setUser($this->getUser());
-                                       $application->setCreated(new \DateTime('now'));
-                                       $application->setUpdated(new \DateTime('now'));
-                                       $manager->persist($application);
-
-                                       //Flush to get the ids
-                                       $manager->flush();
-
-                                       //Add notice in flash message
-                                       $this->addFlash('notice', $this->translator->trans('Application request the %date% for %location% on the slot %slot% saved', ['%location%' => $data['location']->getTitle(), '%slot%' => $data['slot']->getTitle(), '%date%' => $data['date']->format('Y-m-d')]));
-
-                                       //Redirect to cleanup the form
-                                       return $this->redirectToRoute('rapsys_air_admin');
-                               }
-                       }
+                       //Add form to context
+                       $context['login'] = $login->createView();

                }
 
                //Compute period
                }
 
                //Compute period


@@ -174,7 +206,7 @@ class LocationController extends DefaultController {
                );
 
                //Fetch sessions
                );
 
                //Fetch sessions

-               $sessions = $doctrine->getRepository(Session::class)->findAllByDatePeriod($period);
+               $sessions = $doctrine->getRepository(Session::class)->findAllByLocationDatePeriod($location, $period);

 
                //Init calendar
                $calendar = [];
 
                //Init calendar
                $calendar = [];


@@ -242,35 +274,7 @@ class LocationController extends DefaultController {
                        ksort($calendar[$Ymd]['sessions']);
                }
 
                        ksort($calendar[$Ymd]['sessions']);
                }
 

-               return $this->render('@RapsysAir/admin/index.html.twig', ['title' => $title, 'section' => $section, 'form' => $form->createView(), 'calendar' => $calendar]);
-       }
-
-       public function tata(Request $request, $id) {
-               /*header('Content-Type: text/plain');
-               var_dump($calendar);
-               exit;*/
-
-               //Set section
-               $section = $this->translator->trans('Session %id%', ['%id%' => $id]);
-
-               //Set title
-               $title = $section.' - '.$this->translator->trans($this->config['site']['title']);
-
-               //Create the form according to the FormType created previously.
-               //And give the proper parameters
-               /*$form = $this->createForm('Rapsys\AirBundle\Form\ApplicationType', null, [
-                       // To set the action use $this->generateUrl('route_identifier')
-                       'action' => $this->generateUrl('rapsys_air_admin'),
-                       'method' => 'POST',
-                       'attr' => [ 'class' => 'form_col' ]
-               ]);*/
-
-               //Get doctrine
-               $doctrine = $this->getDoctrine();
-
-               //Fetch session
-               $session = $doctrine->getRepository(Session::class)->findOneById($id);
-
-               return $this->render('@RapsysAir/admin/session.html.twig', ['title' => $title, 'section' => $section, /*'form' => $form->createView(),*/ 'session' => $session]);
+               //Render the view
+               return $this->render('@RapsysAir/location/index.html.twig', ['title' => $title, 'section' => $section, 'calendar' => $calendar]+$context+$this->context);

        }
 }
        }
 }