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

2022-03-14 14:21:08 +01:00
parent 8afdd8c4d3 57220794b9
commit d70cd2645f
1 changed files with 3 additions and 1 deletions
--- a/src/schedule-2.0/src/Controller/RestController.php
+++ b/src/schedule-2.0/src/Controller/RestController.php
@@ -64,12 +64,14 @@ class RestController extends AbstractFOSRestController
        }

        // On formate le tableau de jour
+        $mini=new \Datetime('2022-03-07 00:00');
        $start=new \Datetime('00:00');
        $start->modify("monday this week");
        $end=new \Datetime('00:00');
        $end->modify("last day of this month");  
        $end->modify("next sunday");            
-
+        $start->modify("previous month");
+        if($start<$mini) $start=clone $mini;

        $events = $em
                ->createQueryBuilder('event')