Rapsys Git
/
airbundle
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup
[airbundle]
/
Controller
/
ApplicationController.php
diff --git
a/Controller/ApplicationController.php
b/Controller/ApplicationController.php
index 45538ffe6f7b0e489827ffabdd24e8dca7cb606c..a6091cd0f1ba9ee2e60d3ad351662ffb351d4622 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;
@@
-124,21
+125,24
@@
class ApplicationController extends DefaultController {
$session->setLength(new \DateTime('05:00:00'));
//Check if afternoon
} elseif ($slot == 'Afternoon') {
$session->setLength(new \DateTime('05:00:00'));
//Check if afternoon
} elseif ($slot == 'Afternoon') {
- //Set begin at 1
4
h
- $session->setBegin(new \DateTime('1
4
:00:00'));
+ //Set begin at 1
6
h
+ $session->setBegin(new \DateTime('1
6
:00:00'));
- //Set length at
5
h
- $session->setLength(new \DateTime('0
5
:00:00'));
+ //Set length at
3
h
+ $session->setLength(new \DateTime('0
3
:00:00'));
//Check if evening
} elseif ($slot == 'Evening') {
//Set begin at 19h
//Check if evening
} elseif ($slot == 'Evening') {
//Set begin at 19h
- $session->setBegin(new \DateTime('19:
0
0:00'));
+ $session->setBegin(new \DateTime('19:
3
0:00'));
//Check if next day is premium
if ($premium) {
//Set length at 7h
$session->setLength(new \DateTime('07:00:00'));
}
//Check if next day is premium
if ($premium) {
//Set length at 7h
$session->setLength(new \DateTime('07:00:00'));
}
+
+ //Set length at 4h
+ $session->setLength(new \DateTime('04:30:00'));
//Check if after
} else {
//Set begin at 1h
//Check if after
} else {
//Set begin at 1h
@@
-276,6
+280,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