From a524e353db597ec48404feb80c7b4c4032487cbf Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Tue, 1 Sep 2020 10:42:50 +0200
Subject: [PATCH] =?UTF-8?q?cumul=20des=20dur=C3=A9es=20d'=C3=A9v=C3=A9neme?=
 =?UTF-8?q?nts=20dans=20les=20rapports=20si=20deux=20=C3=A9v=C3=A9nements?=
 =?UTF-8?q?=20sur=20une=20meme=20date?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/schedule-2.0/src/Controller/ReportController.php | 4 ++--
 src/schedule-2.0/templates/Report/planning.html.twig | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

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 @@
                     <h2>{{ project.displayname }}</h2>
                     <div class="synthese">
                         Estimé = {{ project.estimate }}<br>
+                        Commandé = {{ project.proposed }}
                         Validé = {{ project.validate }}<br>
                         Planifié  = {{ project.planified }}<br>
-                        <b>RESTE = {{ (project.estimate - project.validate - project.planified) }}</b>
+                        <b>RESTE = {{ ( project.proposed - project.validate - project.planified) }}</b>
                     </div>
                 </div>