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

src/schedule-2.0/src/Controller/ReportController.php

@@ -121,7 +121,7 @@ class ReportController extends AbstractController
                         $st->add(new \DateInterval('P1D'));
                     }
                 }
-                
+
 
                 // On formate le tableau des astreintes
                 $start=new \Datetime('first day of this month');
@@ -206,7 +206,7 @@ class ReportController extends AbstractController
             );
         }
         else {
-            
+
             return $this->render('Report/synthese.html.twig',[
                 "useheader"     => true,
                 "usesidebar"    => ($this->getUser()),
@@ -255,9 +255,11 @@ class ReportController extends AbstractController
 
             // Ne pas prendre les projects sans event dans la durée
             $start=new \Datetime('first day of this month');
+            $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'));
+            $end->setTime(23,59,0);
             $events = $em
                     ->createQueryBuilder('event')
                     ->select('event')
@@ -291,9 +293,11 @@ class ReportController extends AbstractController
 
             // Formater les mois
             $start=new \Datetime('first day of this month');
+            $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'));
+            $end->setTime(23,59,0);
             while($start<$end) {
                 $tbproject["months"][$start->format("Ym")]=[
                     "monthid"=> $start->format("Ym"),
@@ -323,7 +327,7 @@ class ReportController extends AbstractController
                     ->from('App:Event','event')
                     ->Where('task.project=:project')
                     ->andWhere('event.task=task')
-                    ->andWhere('event.end >=:start')
+                    ->andWhere('event.start >=:start')
                     ->andWhere('event.end <:end')
                     ->setParameter('project',$project)
                     ->setParameter('start',$start)
@@ -343,10 +347,11 @@ class ReportController extends AbstractController
 
             // Formater les jours
             $start=new \Datetime('first day of this month');
+            $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'));
-
+            $end->setTime(23,59,0);
             while($start<$end) {
                 $tbday=[
                     "date"=>clone $start,
@@ -367,7 +372,7 @@ class ReportController extends AbstractController
 
                     $tbproject["months"][$start->format("Ym")]["users"][$user->getId()]["days"][$start->format("Ymd")]=$tbday;
                 }
-               
+
                 $start->add(new \DateInterval('P1D'));
             }
             $tbprojects[$project->getId()]=$tbproject;
@@ -375,10 +380,12 @@ class ReportController extends AbstractController
 
         // Formater les utilisateurs
         $start=new \Datetime('first day of this month');
+        $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'));
-        
+        $end->setTime(23,59,0);
+
         foreach($users as $user) {
             $tbevents = $this->getEventuser($user,$start,$end,false);
 
@@ -543,7 +550,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'));
@@ -632,14 +639,14 @@ class ReportController extends AbstractController
                 }
                 $tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["cumul"] = $tbproject["weeks"][$event->getStart()->format("Y")][$event->getStart()->format("W")]["cumul"]+$event->getDuration();
             }
-          
+
             // Somme astreintes validé par semaine
             $start=new \Datetime('first day of this month');
             $start->sub(new \DateInterval('P'.$nbmonth.'M'));
             $start->setTime(0,0,0);
             $endmonth = new \Datetime('first day of this month');
             $endmonth->add(new \DateInterval('P1M'));
-            
+
             $penaltybyweek = $em
 
                 ->createQueryBuilder('penalty')
@@ -681,7 +688,7 @@ class ReportController extends AbstractController
                     ];
                         $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()] = $tbuser;
                 }
-            
+
                 $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()]["cumul"] = $tbproject["weeks_by_name"][$penalty->getStart()->format("Y")][$penalty->getStart()->format("W")]["users"][$penalty->getUser()->getId()]["cumul"]+$penalty->getDuration();
             }
 
@@ -845,7 +852,7 @@ class ReportController extends AbstractController
                 }
             }
         }
-       
+
         if($request->query->get('fgprint')) {
             $render = $this->renderView('Report/report.html.twig',[
                 "useheader"     => true,

src/schedule-2.0/src/Controller/SecurityController.php

@@ -129,11 +129,9 @@ class SecurityController extends AbstractController
             $roles=$user->getRoles();
             if(!in_array("ROLE_VISITOR",$roles))
                 return $this->redirect($this->generateUrl('app_home'));
-            else  {
+            else 
-                dump("here");
                 return $this->redirect($this->generateUrl('app_customer_home'));
-            }
+        }
-            }
     }