From 3d0dd46ea5fa454efd05d951c972b149615a0294 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Thu, 14 Jul 2022 14:27:55 +0200 Subject: [PATCH] fix count_accompanying_course query: no centers, not count DRAFT courses --- .../Export/Export/CountAccompanyingCourse.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php index ab9542b7f..39df61cb8 100644 --- a/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php +++ b/src/Bundle/ChillPersonBundle/Export/Export/CountAccompanyingCourse.php @@ -87,17 +87,15 @@ class CountAccompanyingCourse implements ExportInterface, GroupedExportInterface public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder { - $centers = array_map(static function ($el) { - return $el['center']; - }, $acl); - $qb = $this->entityManager->createQueryBuilder(); + $expr = $qb->expr(); $qb->select('COUNT(acp.id) AS export_result') ->from('ChillPersonBundle:AccompanyingPeriod', 'acp') - ->join('acp.center', 'center') - ->andWhere('center IN (:authorized_centers)') - ->setParameter('authorized_centers', $centers); + ->where($expr->neq( + 'acp.step', $expr->literal('DRAFT') + )) + ; return $qb; }