diff --git a/src/schedule-2.0/src/Controller/ReportController.php b/src/schedule-2.0/src/Controller/ReportController.php
index c8b4b38..2cb9ab3 100755
--- a/src/schedule-2.0/src/Controller/ReportController.php
+++ b/src/schedule-2.0/src/Controller/ReportController.php
@@ -543,7 +543,7 @@ class ReportController extends AbstractController
                 "offers"=>[],
                 "weeks"=>[],
             ];
-
+            
             // Somme event validé avant la date
             $end=new \Datetime('first day of this month');
             $end->sub(new \DateInterval('P'.$nbmonth.'M'));
@@ -572,7 +572,6 @@ class ReportController extends AbstractController
                 }
                 $tbproject["before"][$event->getStart()->format("Y")][$event->getStart()->format("Ym")]["duration"]=$tbproject["before"][$event->getStart()->format("Y")][$event->getStart()->format("Ym")]["duration"]+$event->getDuration();
             }
-
             // Somme astreinte validé avant la date
             $end=new \Datetime('first day of this month');
             $end->sub(new \DateInterval('P'.$nbmonth.'M'));
@@ -605,13 +604,9 @@ class ReportController extends AbstractController
             // Somme event validé par semaine
             $start=new \Datetime('first day of this month');
             $start->sub(new \DateInterval('P'.$nbmonth.'M'));
-            $start->modify('previous monday');
             $start->setTime(0,0,0);
             $endmonth = new \Datetime('first day of this month');
             $endmonth->add(new \DateInterval('P1M'));
-            $endmonth->modify('next monday');
-            $end->setTime(23,59,0);
-
             $eventsbyweek = $em
                 ->createQueryBuilder('event')
                 ->select('event')
@@ -619,7 +614,7 @@ class ReportController extends AbstractController
                 ->from('App:Event','event')
                 ->Where('task.project=:project')
                 ->andWhere('event.task=task')
-                ->andWhere('event.end >=:start')
+                ->andWhere('event.end >:start')
                 ->andWhere('event.end <:end')
                 ->andWhere('event.validate=:validate')
                 ->setParameter('project',$project)
@@ -641,13 +636,10 @@ class ReportController extends AbstractController
             // Somme astreintes validé par semaine
             $start=new \Datetime('first day of this month');
             $start->sub(new \DateInterval('P'.$nbmonth.'M'));
-            $start->modify('previous monday');
             $start->setTime(0,0,0);
             $endmonth = new \Datetime('first day of this month');
             $endmonth->add(new \DateInterval('P1M'));
-            $endmonth->modify('next monday');
-            $end->setTime(23,59,0);
-
+            
             $penaltybyweek = $em
 
                 ->createQueryBuilder('penalty')
@@ -733,16 +725,15 @@ class ReportController extends AbstractController
                 // Init des taches par mois
                 $endmonth=clone $start;
                 $endmonth->add(new \DateInterval('P1M'));
-
-                $events = $em
+                $ev = $em
                     ->createQueryBuilder('event')
-                    ->select('task.id, task.name, SUM(event.duration) as somme')
+                    ->select('event')
                     ->from('App:Task','task')
                     ->from('App:Event','event')
                     ->Where('task.project=:project')
                     ->andWhere('event.task=task')
-                    ->andWhere('event.end >=:start')
-                    ->andWhere('event.end <:end')
+                    ->andWhere('event.end >:start')
+                    ->andWhere('event.end <=:end')
                     ->andWhere('event.validate=:validate')
                     ->setParameter('project',$project)
                     ->setParameter('validate',true)
@@ -750,6 +741,24 @@ class ReportController extends AbstractController
                     ->setParameter('end',$endmonth)
                     ->groupBy('task.id')
                     ->getQuery()->getResult();
+                    dump($ev);
+                $events = $em
+                    ->createQueryBuilder('event')
+                    ->select('task.id, task.name, SUM(event.duration) as somme')
+                    ->from('App:Task','task')
+                    ->from('App:Event','event')
+                    ->Where('task.project=:project')
+                    ->andWhere('event.task=task')
+                    ->andWhere('event.end >:start')
+                    ->andWhere('event.end <=:end')
+                    ->andWhere('event.validate=:validate')
+                    ->setParameter('project',$project)
+                    ->setParameter('validate',true)
+                    ->setParameter('start',$start)
+                    ->setParameter('end',$endmonth)
+                    ->groupBy('task.id')
+                    ->getQuery()->getResult();
+                    dump($events);
                 foreach($events as $event) {
                     $tbtask= [
                         "id"=>$event["id"],
@@ -765,10 +774,10 @@ class ReportController extends AbstractController
             // Formater les jours
             $start=new \Datetime('first day of this month');
             $start->sub(new \DateInterval('P'.$nbmonth.'M'));
+            $start->setTime(0,0,0);
             $end=new \Datetime('first day of this month');
             $end->add(new \DateInterval('P'.$nbmonth.'M'));
             $end->sub(new \DateInterval('P1D'));
-
             while($start<$end) {
                 $tbday=[
                     "date"=>clone $start,
@@ -802,7 +811,6 @@ class ReportController extends AbstractController
         $end->add(new \DateInterval('P'.$nbmonth.'M'));
         $end->sub(new \DateInterval('P1D'));
         $end->setTime(23,59,0);
-
         foreach($users as $user) {
             $tbevents = $this->getEventuser($user,$start,$end,true);
 
@@ -855,7 +863,7 @@ class ReportController extends AbstractController
                 }
             }
         }
-
+       
         if($request->query->get('fgprint')) {
             $render = $this->renderView('Report/report.html.twig',[
                 "useheader"     => true,