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 @@

{{ project.displayname }}

Estimé = {{ project.estimate }}
- Commandé = {{ project.proposed }} + Commandé = {{ project.proposed }}
Validé = {{ project.validate }}
Planifié = {{ project.planified }}
RESTE = {{ ( project.proposed - project.validate - project.planified) }}