Rename user group join table to users_groups

[airbundle] / Controller / ApplicationController.php

diff --git a/Controller/ApplicationController.php b/Controller/ApplicationController.php
index 45538ffe6f7b0e489827ffabdd24e8dca7cb606c..625e7f87cd9b635009e1292455787b254ae6b717 100644 (file)
--- a/Controller/ApplicationController.php
+++ b/Controller/ApplicationController.php
@@ -3,6 +3,7 @@
 namespace Rapsys\AirBundle\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
 namespace Rapsys\AirBundle\Controller;
 
 use Symfony\Component\HttpFoundation\Request;

+use Symfony\Component\HttpFoundation\Response;

 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;


@@ -125,10 +126,10 @@ class ApplicationController extends DefaultController {
                                //Check if afternoon
                                } elseif ($slot == 'Afternoon') {
                                        //Set begin at 14h
                                //Check if afternoon
                                } elseif ($slot == 'Afternoon') {
                                        //Set begin at 14h

-                                       $session->setBegin(new \DateTime('14:00:00'));
+                                       $session->setBegin(new \DateTime('14:30:00'));

 
                                        //Set length at 5h
 
                                        //Set length at 5h

-                                       $session->setLength(new \DateTime('05:00:00'));
+                                       $session->setLength(new \DateTime('04:30:00'));

                                //Check if evening
                                } elseif ($slot == 'Evening') {
                                        //Set begin at 19h
                                //Check if evening
                                } elseif ($slot == 'Evening') {
                                        //Set begin at 19h


@@ -276,6 +277,13 @@ class ApplicationController extends DefaultController {
 
                                //Set length at 4h
                                $session->setLength(new \DateTime('04:00:00'));
 
                                //Set length at 4h
                                $session->setLength(new \DateTime('04:00:00'));

+                       //Jardin du Monde => 14h -> 15h
+                       } elseif ($short == 'Monde' && $slot == 'Morning') {
+                               //Set begin at 14h
+                               $session->setBegin(new \DateTime('14:00:00'));
+
+                               //Set length at 4h
+                               $session->setLength(new \DateTime('01:00:00'));

                        //Combination not supported
                        } else {
                                //Add error in flash message
                        //Combination not supported
                        } else {
                                //Add error in flash message