From 84e5be6a600f0a549a866c0f7273c0523f671521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 2 Nov 2022 13:21:26 +0100 Subject: [PATCH] DX: review for hasNoActivityFilter --- .../Export/Filter/ACPFilters/HasNoActivityFilter.php | 10 +--------- .../ChillActivityBundle/translations/messages.fr.yml | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php index 508644a07..570f42ae0 100644 --- a/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php +++ b/src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/HasNoActivityFilter.php @@ -14,10 +14,8 @@ namespace Chill\ActivityBundle\Export\Filter\ACPFilters; use Chill\ActivityBundle\Entity\Activity; use Chill\MainBundle\Export\FilterInterface; use Chill\PersonBundle\Export\Declarations; -use Doctrine\ORM\Query\Expr; use Doctrine\ORM\QueryBuilder; use Symfony\Component\Form\FormBuilderInterface; -use function in_array; class HasNoActivityFilter implements FilterInterface { @@ -28,13 +26,7 @@ class HasNoActivityFilter implements FilterInterface public function alterQuery(QueryBuilder $qb, $data) { - if (!in_array('activity', $qb->getAllAliases(), true)) { - $qb->join(Activity::class, 'activity', Expr\Join::WITH, 'activity.accompanyingPeriod = acp'); - } - $qb - //->andWhere('COUNT(acp.activities) IS NULL') - //TODO check this: ->andWhere(' NOT EXISTS ( SELECT 1 FROM ' . Activity::class . ' activity @@ -55,7 +47,7 @@ class HasNoActivityFilter implements FilterInterface public function describeAction($data, $format = 'string'): array { - return ['Filtered acp which has no activities']; + return ['Filtered acp which has no activities', []]; } public function getTitle(): string diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml index e3fcfd2b2..1d5e7f1f2 100644 --- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml @@ -278,7 +278,7 @@ Filter activity by userscope: Filtrer les activités par service du créateur Accepted userscope: Services Filter acp which has no activity: Filtrer les parcours qui n’ont pas d’activité -Filtered acp which has no activities: Filtrés les parcours qui n'ont pas d'activités +Filtered acp which has no activities: Filtrer les parcours sans activité associée Group acp by activity number: Grouper les parcours par nombre d’activité Group activity by sentreceived: Grouper les activités par envoyé / reçu