From abd79df8cd3a318821a7f5edef47501ba361dd59 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 2 Nov 2022 14:42:44 +0100 Subject: [PATCH] count aside activity --- .../src/Export/Export/CountAsideActivity.php | 8 +++----- .../src/translations/messages.fr.yml | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php index d12bc7471..ebf90dc66 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/CountAsideActivity.php @@ -13,6 +13,7 @@ namespace Chill\AsideActivityBundle\Export\Export; use Chill\AsideActivityBundle\Export\Declarations; use Chill\AsideActivityBundle\Repository\AsideActivityRepository; +use Chill\AsideActivityBundle\Security\AsideActivityVoter; use Chill\MainBundle\Export\ExportInterface; use Chill\MainBundle\Export\FormatterInterface; use Chill\MainBundle\Export\GroupedExportInterface; @@ -33,7 +34,6 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface public function buildForm(FormBuilderInterface $builder) { - // TODO: Implement buildForm() method. } public function getAllowedFormattersTypes(): array @@ -89,16 +89,14 @@ class CountAsideActivity implements ExportInterface, GroupedExportInterface { $qb = $this->repository->createQueryBuilder('aside'); - $qb->andWhere(); - - $qb->select('COUNT() AS export_result'); + $qb->select('COUNT(DISTINCT aside.id) AS export_result'); return $qb; } public function requiredRole(): string { - return ''; + return AsideActivityVoter::STATS; } public function supportsModifiers(): array diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml index 5b298ed68..ed54fd488 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml +++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml @@ -168,6 +168,7 @@ Aside activity type configuration: Configuration des categories d'activités ann Aside activity configuration: Configuration des activités annexes # exports +Exports of aside activities: Exports des activités annexes Count aside activities: Nombre d'activités annexes Count aside activities by various parameters.: Compte le nombre d'activités annexes selon divers critères Filter by aside activity date: Filtrer les activités annexes par date