Rapsys Git
/
airbundle
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change start time
[airbundle]
/
Controller
/
ApplicationController.php
diff --git
a/Controller/ApplicationController.php
b/Controller/ApplicationController.php
index 88bb1824241a79423283416e6bc914521cdf4416..deab0951651b36082a4a60af9a1d5f2a25632eb5 100644
(file)
--- a/
Controller/ApplicationController.php
+++ b/
Controller/ApplicationController.php
@@
-125,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:3
0:00'));
+ //Set begin at 1
6
h
+ $session->setBegin(new \DateTime('1
6:0
0:00'));
- //Set length at
5
h
- $session->setLength(new \DateTime('0
4:3
0:00'));
+ //Set length at
3
h
+ $session->setLength(new \DateTime('0
3:0
0:00'));
//Check if evening
} elseif ($slot == 'Evening') {
//Check if evening
} elseif ($slot == 'Evening') {
- //Set begin at
19h
- $session->setBegin(new \DateTime('
19:0
0:00'));
+ //Set begin at
20h30
+ $session->setBegin(new \DateTime('
20: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
@@
-277,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
@@
-407,7
+417,7
@@
class ApplicationController extends DefaultController {
//Generate url
return $this->redirectToRoute($name, $route);
//No route matched
//Generate url
return $this->redirectToRoute($name, $route);
//No route matched
- } catch(MethodNotAllowedException|ResourceNotFoundException $e) {
+ } catch
(MethodNotAllowedException|ResourceNotFoundException $e) {
//Unset referer to fallback to default route
unset($referer);
}
//Unset referer to fallback to default route
unset($referer);
}