From 6a9ae5323b3fbae2d5bffacb31948dab122ee2a6 Mon Sep 17 00:00:00 2001
From: root <root@schedule.schedule.cadol.es>
Date: Tue, 22 Sep 2020 14:20:47 +0200
Subject: [PATCH] =?UTF-8?q?mise=20=C3=A0=20plat=20depot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                            | 1 +
 src/schedule-2.0/config/packages/dev/swiftmailer.yaml | 4 ++++
 src/schedule-2.0/src/Repository/ProjectRepository.php | 4 ++--
 src/schedule-2.0/templates/Report/planning.html.twig  | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 src/schedule-2.0/config/packages/dev/swiftmailer.yaml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b25c15b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/src/schedule-2.0/config/packages/dev/swiftmailer.yaml b/src/schedule-2.0/config/packages/dev/swiftmailer.yaml
new file mode 100644
index 0000000..b98158e
--- /dev/null
+++ b/src/schedule-2.0/config/packages/dev/swiftmailer.yaml
@@ -0,0 +1,4 @@
+# See https://symfony.com/doc/current/email/dev_environment.html
+swiftmailer:
+    # send all emails to a specific address
+    #delivery_addresses: ['me@example.com']
diff --git a/src/schedule-2.0/src/Repository/ProjectRepository.php b/src/schedule-2.0/src/Repository/ProjectRepository.php
index b4a435d..fe3ddd5 100644
--- a/src/schedule-2.0/src/Repository/ProjectRepository.php
+++ b/src/schedule-2.0/src/Repository/ProjectRepository.php
@@ -81,14 +81,14 @@ class ProjectRepository extends ServiceEntityRepository
 
     public function sumEstimate($id) {
         $qb = $this->createQueryBuilder('project')
-                    ->select('SUM(task.quantity) as somme1, SUM(task.validate) as somme2 ')
+                    ->select('SUM(task.quantity) as somme')
                     ->from('App:Task','task')
                     ->Where('project.id=:id')
                     ->andWhere('task.project=project')
                     ->setParameter('id',$id);
         $result=$qb->getQuery()->getOneOrNullResult();
         
-        $estimate=($result["somme1"]?$result["somme1"]:0)+($result["somme2"]?$result["somme2"]:0);
+        $estimate=($result["somme"]?$result["somme"]:0);
         return $estimate;
     }
 }
diff --git a/src/schedule-2.0/templates/Report/planning.html.twig b/src/schedule-2.0/templates/Report/planning.html.twig
index fa7ee6d..50dfb35 100644
--- a/src/schedule-2.0/templates/Report/planning.html.twig
+++ b/src/schedule-2.0/templates/Report/planning.html.twig
@@ -99,7 +99,7 @@
                     <h2>{{ project.displayname }}</h2>
                     <div class="synthese">
                         Estimé = {{ project.estimate }}<br>
-                        Commandé = {{ project.proposed }}
+                        Commandé = {{ project.proposed }}<br>
                         Validé = {{ project.validate }}<br>
                         Planifié  = {{ project.planified }}<br>
                         <b>RESTE = {{ ( project.proposed - project.validate - project.planified) }}</b>