diff --git a/src/schedule-2.0/src/Controller/ReportController.php b/src/schedule-2.0/src/Controller/ReportController.php index 039fb5c..74e59e8 100755 --- a/src/schedule-2.0/src/Controller/ReportController.php +++ b/src/schedule-2.0/src/Controller/ReportController.php @@ -352,7 +352,7 @@ class ReportController extends AbstractController $end=new \Datetime('first day of this month'); $end->add(new \DateInterval('P'.$nbmonth.'M')); $end->sub(new \DateInterval('P1D')); - + foreach($users as $user) { $tbevents = $this->getEventuser($user,$start,$end,false); @@ -955,7 +955,7 @@ class ReportController extends AbstractController ]; } - $tbevents[$idproject][$idday]["duration"]=($event->getAllday()?1:0.5); + $tbevents[$idproject][$idday]["duration"]+=($event->getAllday()?1:0.5); $st->add(new \DateInterval('P1D')); diff --git a/src/schedule-2.0/templates/Report/planning.html.twig b/src/schedule-2.0/templates/Report/planning.html.twig index 9186e25..fa7ee6d 100644 --- a/src/schedule-2.0/templates/Report/planning.html.twig +++ b/src/schedule-2.0/templates/Report/planning.html.twig @@ -99,9 +99,10 @@