Cadoles/schedule
21
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge branch 'master' into dist/eole/2.7.2/master

Browse Source
This commit is contained in:
Arnaud Fornerot
2022-03-14 14:21:08 +01:00
parent 8afdd8c4d3 57220794b9
commit 6bba1d3529
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/schedule-2.0/src/Controller/RestController.php
View File

@@ -64,12 +64,14 @@ class RestController extends AbstractFOSRestController
} }
// On formate le tableau de jour // On formate le tableau de jour
$mini=new \Datetime('2022-03-07 00:00');
$start=new \Datetime('00:00'); $start=new \Datetime('00:00');
$start->modify("monday this week"); $start->modify("monday this week");
$end=new \Datetime('00:00'); $end=new \Datetime('00:00');
$end->modify("last day of this month"); $end->modify("last day of this month");
$end->modify("next sunday"); $end->modify("next sunday");
$start->modify("previous month");
if($start<$mini) $start=clone $mini;
$events = $em $events = $em
->createQueryBuilder('event') ->createQueryBuilder('event')