Merge branch '111_exports_suite' into chill_amli

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php

@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
@@ -8,9 +15,9 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class BySocialActionAggregator implements AggregatorInterface
 {
@@ -26,9 +33,41 @@ class BySocialActionAggregator implements AggregatorInterface
         $this->actionRepository = $actionRepository;
     }
 
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
+            $qb->join('activity.socialActions', 'actsocialaction');
+        }
+
+        $qb->addSelect('actsocialaction.id AS socialaction_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('socialaction_aggregator');
+        } else {
+            $qb->groupBy('socialaction_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
     public function getLabels($key, array $values, $data)
     {
-        return function($value) {
+        return function ($value) {
             if ('_header' === $value) {
                 return 'Social action';
             }
@@ -44,40 +83,8 @@ class BySocialActionAggregator implements AggregatorInterface
         return ['socialaction_aggregator'];
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
     public function getTitle(): string
     {
         return 'Group activity by linked socialaction';
     }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if(!in_array('socialaction', $qb->getAllAliases())) {
-            $qb->join('activity.socialActions', 'socialaction');
-        }
-
-        $qb->addSelect('socialaction.id AS socialaction_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('socialaction_aggregator');
-        } else {
-            $qb->groupBy('socialaction_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-}
+}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php

@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
@@ -8,16 +15,16 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class BySocialIssueAggregator implements AggregatorInterface
 {
-    private SocialIssueRepository $issueRepository;
-
     private SocialIssueRender $issueRender;
 
+    private SocialIssueRepository $issueRepository;
+
     public function __construct(
         SocialIssueRepository $issueRepository,
         SocialIssueRender $issueRender
@@ -26,47 +33,18 @@ class BySocialIssueAggregator implements AggregatorInterface
         $this->issueRender = $issueRender;
     }
 
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-
-            if ($value === '_header') {
-                return 'Social issues';
-            }
-
-            $i = $this->issueRepository->find($value);
-
-            return $this->issueRender->renderString($i, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['socialissue_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked socialissue';
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('socialissue', $qb->getAllAliases())) {
-            $qb->join('activity.socialIssues', 'socialissue');
+        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
+            $qb->join('activity.socialIssues', 'actsocialissue');
         }
 
-        $qb->addSelect('socialissue.id AS socialissue_aggregator');
+        $qb->addSelect('actsocialissue.id AS socialissue_aggregator');
 
         $groupBy = $qb->getDQLPart('groupBy');
 
@@ -81,4 +59,32 @@ class BySocialIssueAggregator implements AggregatorInterface
     {
         return Declarations::ACTIVITY_ACP;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Social issues';
+            }
+
+            $i = $this->issueRepository->find($value);
+
+            return $this->issueRender->renderString($i, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['socialissue_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by linked socialissue';
+    }
+}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php

@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
@@ -8,16 +15,16 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ByThirdpartyAggregator implements AggregatorInterface
 {
-    private ThirdPartyRepository $thirdPartyRepository;
-
     private ThirdPartyRender $thirdPartyRender;
 
+    private ThirdPartyRepository $thirdPartyRepository;
+
     public function __construct(
         ThirdPartyRepository $thirdPartyRepository,
         ThirdPartyRender $thirdPartyRender
@@ -26,46 +33,18 @@ class ByThirdpartyAggregator implements AggregatorInterface
         $this->thirdPartyRender = $thirdPartyRender;
     }
 
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ($value === '_header') {
-                return 'Accepted thirdparty';
-            }
-
-            $tp = $this->thirdPartyRepository->find($value);
-
-            return $this->thirdPartyRender->renderString($tp, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['thirdparty_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked thirdparties';
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('thirdparty', $qb->getAllAliases())) {
-            $qb->join('activity.thirdParties', 'thirdparty');
+        if (!in_array('acttparty', $qb->getAllAliases(), true)) {
+            $qb->join('activity.thirdParties', 'acttparty');
         }
 
-        $qb->addSelect('thirdparty.id AS thirdparty_aggregator');
+        $qb->addSelect('acttparty.id AS thirdparty_aggregator');
 
         $groupBy = $qb->getDQLPart('groupBy');
 
@@ -80,4 +59,32 @@ class ByThirdpartyAggregator implements AggregatorInterface
     {
         return Declarations::ACTIVITY_ACP;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Accepted thirdparty';
+            }
+
+            $tp = $this->thirdPartyRepository->find($value);
+
+            return $this->thirdPartyRender->renderString($tp, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['thirdparty_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by linked thirdparties';
+    }
+}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php

@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
@@ -8,16 +15,16 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ByUserAggregator implements AggregatorInterface
 {
-    private UserRepository $userRepository;
-
     private UserRender $userRender;
 
+    private UserRepository $userRepository;
+
     public function __construct(
         UserRepository $userRepository,
         UserRender $userRender
@@ -26,46 +33,18 @@ class ByUserAggregator implements AggregatorInterface
         $this->userRender = $userRender;
     }
 
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ($value === '_header') {
-                return 'Accepted users';
-            }
-
-            $u = $this->userRepository->find($value);
-
-            return $this->userRender->renderString($u, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['users_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked users';
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.users', 'user');
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->join('activity.users', 'actusers');
         }
 
-        $qb->addSelect('user.id AS users_aggregator');
+        $qb->addSelect('actusers.id AS users_aggregator');
 
         $groupBy = $qb->getDQLPart('groupBy');
 
@@ -80,4 +59,32 @@ class ByUserAggregator implements AggregatorInterface
     {
         return Declarations::ACTIVITY_ACP;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Accepted users';
+            }
+
+            $u = $this->userRepository->find($value);
+
+            return $this->userRender->renderString($u, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['users_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by linked users';
+    }
+}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php

@@ -1,12 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Closure;
+use DateTime;
 use Doctrine\ORM\QueryBuilder;
 use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -21,7 +28,7 @@ class DateAggregator implements AggregatorInterface
         'by year' => 'year',
     ];
 
-    private CONST DEFAULT_CHOICE = 'year';
+    private const DEFAULT_CHOICE = 'year';
 
     private TranslatorInterface $translator;
 
@@ -31,55 +38,7 @@ class DateAggregator implements AggregatorInterface
         $this->translator = $translator;
     }
 
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value) use ($data): string {
-            if ($value === '_header') {
-                return 'by '. $data['frequency'];
-            }
-            switch ($data['frequency']) {
-                case 'month':
-                    $month = \DateTime::createFromFormat('!m', $value);
-                    return sprintf(
-                        "%02d (%s)",
-                        $value,
-                        $month->format('M')
-                    );
-
-                case 'week':
-                    //return $this->translator->trans('for week') .' '. $value ;
-
-                case 'year':
-                    //return $this->translator->trans('in year') .' '. $value ;
-
-                default:
-                    return $value;
-            }
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['date_aggregator'];
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('frequency', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by date';
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -90,13 +49,19 @@ class DateAggregator implements AggregatorInterface
 
         switch ($data['frequency']) {
             case 'month':
-                $fmt = 'MM'; break;
+                $fmt = 'MM';
+
+break;
 
             case 'week':
-                $fmt = 'IW'; break;
+                $fmt = 'IW';
+
+break;
 
             case 'year':
-                $fmt = 'YYYY'; $order = 'DESC'; break;
+                $fmt = 'YYYY'; $order = 'DESC';
+
+break; // order DESC does not works !
 
             default:
                 throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
@@ -126,4 +91,53 @@ class DateAggregator implements AggregatorInterface
         return Declarations::ACTIVITY_ACP;
     }
 
-}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('frequency', ChoiceType::class, [
+            'choices' => self::CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return static function ($value) use ($data): string {
+            if ('_header' === $value) {
+                return 'by ' . $data['frequency'];
+            }
+
+            switch ($data['frequency']) {
+                case 'month':
+                    $month = DateTime::createFromFormat('!m', $value);
+
+                    return sprintf(
+                        '%02d (%s)',
+                        $value,
+                        $month->format('M')
+                    );
+
+                case 'week':
+                    //return $this->translator->trans('for week') .' '. $value ;
+
+                case 'year':
+                    //return $this->translator->trans('in year') .' '. $value ;
+
+                default:
+                    return $value;
+            }
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['date_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by date';
+    }
+}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php

@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
@@ -8,9 +15,9 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\LocationTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class LocationTypeAggregator implements AggregatorInterface
 {
@@ -26,10 +33,42 @@ class LocationTypeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actloc', $qb->getAllAliases(), true)) {
+            $qb->join('activity.location', 'actloc');
+        }
+
+        $qb->addSelect('IDENTITY(actloc.locationType) AS locationtype_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('locationtype_aggregator');
+        } else {
+            $qb->groupBy('locationtype_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
-            if ($value === '_header') {
+            if ('_header' === $value) {
                 return 'Accepted locationtype';
             }
 
@@ -46,41 +85,8 @@ class LocationTypeAggregator implements AggregatorInterface
         return ['locationtype_aggregator'];
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
     public function getTitle(): string
     {
         return 'Group activity by locationtype';
     }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('location', $qb->getAllAliases())) {
-            $qb->join('activity.location', 'location');
-        }
-
-        $qb->addSelect('IDENTITY(location.locationType) AS locationtype_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('locationtype_aggregator');
-        } else {
-            $qb->groupBy('locationtype_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-}
+}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php

@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
@@ -8,9 +15,9 @@ use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\ScopeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class UserScopeAggregator implements AggregatorInterface
 {
@@ -26,10 +33,42 @@ class UserScopeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actuser', $qb->getAllAliases(), true)) {
+            $qb->join('activity.user', 'actuser');
+        }
+
+        $qb->addSelect('IDENTITY(actuser.mainScope) AS userscope_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('userscope_aggregator');
+        } else {
+            $qb->groupBy('userscope_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
     public function getLabels($key, array $values, $data)
     {
         return function ($value): string {
-            if ($value === '_header') {
+            if ('_header' === $value) {
                 return 'Scope';
             }
 
@@ -46,41 +85,8 @@ class UserScopeAggregator implements AggregatorInterface
         return ['userscope_aggregator'];
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
     public function getTitle(): string
     {
         return 'Group activity by userscope';
     }
-
-    public function addRole()
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.user', 'user');
-        }
-
-        $qb->addSelect('IDENTITY(user.mainScope) AS userscope_aggregator');
-
-        $groupBy = $qb->getDQLPart('groupBy');
-
-        if (!empty($groupBy)) {
-            $qb->addGroupBy('userscope_aggregator');
-        } else {
-            $qb->groupBy('userscope_aggregator');
-        }
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-}
+}

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -13,14 +13,13 @@ namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityTypeRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Closure;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
+use function in_array;
 
 class ActivityTypeAggregator implements AggregatorInterface
 {
@@ -38,15 +37,15 @@ class ActivityTypeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('type', $qb->getAllAliases())) {
-            $qb->join('activity.activityType', 'type');
+        if (!in_array('acttype', $qb->getAllAliases(), true)) {
+            $qb->join('activity.activityType', 'acttype');
         }
 
         $qb->addSelect(sprintf('IDENTITY(activity.activityType) AS %s', self::KEY));
@@ -95,23 +94,4 @@ class ActivityTypeAggregator implements AggregatorInterface
     {
         return 'Aggregate by activity type';
     }
-
-    /**
-     * Check if a join between Activity and another alias.
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php

@@ -12,23 +12,21 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class ActivityUserAggregator implements AggregatorInterface
 {
     public const KEY = 'activity_user_id';
 
-    private UserRepository $userRepository;
-
     private UserRender $userRender;
 
+    private UserRepository $userRepository;
+
     public function __construct(
         UserRepository $userRepository,
         UserRender $userRender
@@ -37,9 +35,9 @@ class ActivityUserAggregator implements AggregatorInterface
         $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)

src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/ActivityReasonAggregator.php

@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -24,7 +23,6 @@ use Doctrine\ORM\QueryBuilder;
 use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 use function array_key_exists;
@@ -48,9 +46,9 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
@@ -69,29 +67,15 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         $qb->addSelect($elem . ' as ' . $alias);
 
         // make a jointure only if needed
-        $join = $qb->getDQLPart('join');
-
-        if (
-            (
-                array_key_exists('activity', $join)
-            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
-            )
-            || (!array_key_exists('activity', $join))
-        ) {
-            $qb->add(
-                'join',
-                [
-                    'activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons'),
-                ],
-                true
-            );
+        if (!in_array( 'actreasons', $qb->getAllAliases(), true)) {
+            $qb->innerJoin('activity.reasons', 'actreasons');
         }
 
         // join category if necessary
         if ('activity_categories_id' === $alias) {
             // add join only if needed
-            if (!$this->checkJoinAlreadyDefined($qb->getDQLPart('join')['activity'], 'category')) {
-                $qb->join('reasons.category', 'category');
+            if (!in_array('actreasoncat', $qb->getAllAliases(), true)) {
+                $qb->join('actreasons.category', 'actreasoncat');
             }
         }
 
@@ -195,23 +179,4 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
                 ->addViolation();
         }
     }
-
-    /**
-     * Check if a join between Activity and another alias.
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

src/Bundle/ChillActivityBundle/Export/Declarations.php

@@ -18,7 +18,7 @@ abstract class Declarations
 {
     public const ACTIVITY = 'activity';
 
-    public const ACTIVITY_ACP = "activity_linked_to_acp";
+    public const ACTIVITY_ACP = 'activity_linked_to_acp';
 
-    public const ACTIVITY_PERSON = "activity_linked_to_person";
+    public const ACTIVITY_PERSON = 'activity_linked_to_person';
 }

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -8,13 +17,10 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class AvgActivityDuration implements ExportInterface, GroupedExportInterface
 {
@@ -31,11 +37,6 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         // TODO: Implement buildForm() method.
     }
 
-    public function getTitle(): string
-    {
-        return 'Average activity linked to an accompanying period duration';
-    }
-
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -46,6 +47,11 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return 'Average activities linked to an accompanying period duration by various parameters.';
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_duration' !== $key) {
@@ -65,6 +71,11 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
+    public function getTitle(): string
+    {
+        return 'Average activity linked to an accompanying period duration';
+    }
+
     public function getType(): string
     {
         return Declarations::ACTIVITY;
@@ -73,17 +84,16 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
+            ->join('activity.accompanyingPeriod', 'actacp');
 
         $qb->select('AVG(activity.durationTime) as export_avg_activity_duration');
 
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers(): array
@@ -91,13 +101,7 @@ class AvgActivityDuration implements ExportInterface, GroupedExportInterface
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::ACP_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-}
+}

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -8,13 +17,10 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
 {
@@ -31,11 +37,6 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         // TODO: Implement buildForm() method.
     }
 
-    public function getTitle(): string
-    {
-        return 'Average activity linked to an accompanying period visit duration';
-    }
-
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -46,6 +47,11 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return 'Average activities linked to an accompanying period visit duration by various parameters.';
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         if ('export_avg_activity_visit_duration' !== $key) {
@@ -65,6 +71,11 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
+    public function getTitle(): string
+    {
+        return 'Average activity linked to an accompanying period visit duration';
+    }
+
     public function getType(): string
     {
         return Declarations::ACTIVITY;
@@ -73,17 +84,16 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
+            ->join('activity.accompanyingPeriod', 'actacp');
 
         $qb->select('AVG(activity.travelTime) as export_avg_activity_visit_duration');
 
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers(): array
@@ -91,13 +101,7 @@ class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::ACP_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-}
+}

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/CountActivity.php

@@ -23,14 +23,13 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
 {
     protected EntityRepository $repository;
 
     public function __construct(
-         EntityManagerInterface $em
+        EntityManagerInterface $em
     ) {
         $this->repository = $em->getRepository(Activity::class);
     }
@@ -49,6 +48,11 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return 'Count activities linked to an accompanying period by various parameters.';
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         if ('export_count_activity' !== $key) {
@@ -80,18 +84,20 @@ class CountActivity implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
+        $qb = $this->repository->createQueryBuilder('activity');
+
+        if (!in_array('actacp', $qb->getAllAliases(), true)) {
+            $qb->join('activity.accompanyingPeriod', 'actacp');
+        }
 
         $qb->select('COUNT(activity.id) as export_count_activity');
-        
+
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers(): array
@@ -99,12 +105,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::ACP_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
 }

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -8,13 +17,10 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class SumActivityDuration implements ExportInterface, GroupedExportInterface
 {
@@ -31,11 +37,6 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         // TODO: Implement buildForm() method.
     }
 
-    public function getTitle(): string
-    {
-        return 'Sum activity linked to an accompanying period duration';
-    }
-
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -46,6 +47,11 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         return 'Sum activities linked to an accompanying period duration by various parameters.';
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_duration' !== $key) {
@@ -65,6 +71,11 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
+    public function getTitle(): string
+    {
+        return 'Sum activity linked to an accompanying period duration';
+    }
+
     public function getType(): string
     {
         return Declarations::ACTIVITY;
@@ -72,18 +83,20 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
+        $qb = $this->repository->createQueryBuilder('activity');
+
+        if (!in_array('actacp', $qb->getAllAliases(), true)) {
+            $qb->join('activity.accompanyingPeriod', 'actacp');
+        }
 
         $qb->select('SUM(activity.durationTime) as export_sum_activity_duration');
 
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers(): array
@@ -91,13 +104,7 @@ class SumActivityDuration implements ExportInterface, GroupedExportInterface
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::ACP_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-}
+}

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php

@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
 namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -8,13 +17,10 @@ use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Closure;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
 {
@@ -31,11 +37,6 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         // TODO: Implement buildForm() method.
     }
 
-    public function getTitle(): string
-    {
-        return 'Sum activity linked to an accompanying period visit duration';
-    }
-
     public function getAllowedFormattersTypes(): array
     {
         return [FormatterInterface::TYPE_TABULAR];
@@ -46,6 +47,11 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return 'Sum activities linked to an accompanying period visit duration by various parameters.';
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to an accompanying period';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         if ('export_sum_activity_visit_duration' !== $key) {
@@ -65,6 +71,11 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
+    public function getTitle(): string
+    {
+        return 'Sum activity linked to an accompanying period visit duration';
+    }
+
     public function getType(): string
     {
         return Declarations::ACTIVITY;
@@ -72,18 +83,20 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $qb = $this->repository->createQueryBuilder('activity')
-            ->join('activity.accompanyingPeriod', 'acp')
-        ;
+        $qb = $this->repository->createQueryBuilder('activity');
+
+        if (!in_array('actacp', $qb->getAllAliases(), true)) {
+            $qb->join('activity.accompanyingPeriod', 'actacp');
+        }
 
         $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration');
 
         return $qb;
     }
 
-    public function requiredRole(): Role
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers(): array
@@ -91,12 +104,7 @@ class SumActivityVisitDuration implements ExportInterface, GroupedExportInterfac
         return [
             Declarations::ACTIVITY,
             Declarations::ACTIVITY_ACP,
-            //PersonDeclarations::ACP_TYPE,
+            PersonDeclarations::ACP_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-}
+}

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/CountActivity.php

@@ -11,17 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
 
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 class CountActivity implements ExportInterface, GroupedExportInterface
 {
@@ -47,6 +46,11 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return 'Count activities linked to a person by various parameters.';
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         if ('export_count_activity' !== $key) {
@@ -80,23 +84,24 @@ class CountActivity implements ExportInterface, GroupedExportInterface
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
-        $qb = $this->activityRepository->createQueryBuilder('activity')
-            ->join('activity.person', 'person')
-        ;
+        $qb = $this->activityRepository->createQueryBuilder('activity');
+
+        if (!in_array('actperson', $qb->getAllAliases(), true)) {
+            $qb->join('activity.person', 'actperson');
+        }
 
         $qb->select('COUNT(activity.id) as export_count_activity');
 
         $qb
             ->where($qb->expr()->in('person.center', ':centers'))
-            ->setParameter('centers', $centers)
-        ;
+            ->setParameter('centers', $centers);
 
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers()
@@ -107,9 +112,4 @@ class CountActivity implements ExportInterface, GroupedExportInterface
             //PersonDeclarations::PERSON_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
-    }
 }

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php

@@ -12,24 +12,23 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use DateTime;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 
 use function array_key_exists;
 use function count;
@@ -100,6 +99,11 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return 'List activities linked to a person description';
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         switch ($key) {
@@ -206,9 +210,9 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
         $qb
             ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'person')
-            ->join('person.center', 'center')
-            ->andWhere('center IN (:authorized_centers)')
+            ->join('activity.person', 'actperson')
+            ->join('actperson.center', 'actcenter')
+            ->andWhere('actcenter IN (:authorized_centers)')
             ->setParameter('authorized_centers', $centers);
 
         foreach ($this->fields as $f) {
@@ -235,8 +239,8 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         break;
 
                     case 'user_username':
-                        $qb->join('activity.user', 'user');
-                        $qb->addSelect('user.username AS user_username');
+                        $qb->join('activity.user', 'actuser');
+                        $qb->addSelect('actuser.username AS user_username');
 
                         break;
 
@@ -270,9 +274,9 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::LISTS);
+        return ActivityStatsVoter::LISTS;
     }
 
     public function supportsModifiers()
@@ -283,9 +287,4 @@ class ListActivity implements ListInterface, GroupedExportInterface
             //PersonDeclarations::PERSON_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
-    }
 }

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
 
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Entity\Center;
@@ -18,11 +19,9 @@ use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use Chill\ActivityBundle\Export\Declarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 
 /**
  * This export allow to compute stats on activity duration.
@@ -67,6 +66,11 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         }
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         if ('export_stat_activity' !== $key) {
@@ -116,15 +120,15 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         }
 
         return $qb->select($select)
-            ->join('activity.person', 'person')
-            ->join('person.center', 'center')
-            ->where($qb->expr()->in('center', ':centers'))
+            ->join('activity.person', 'actperson')
+            ->join('actperson.center', 'actcenter')
+            ->where($qb->expr()->in('actcenter', ':centers'))
             ->setParameter(':centers', $centers);
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers()
@@ -135,9 +139,4 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
             //PersonDeclarations::PERSON_TYPE,
         ];
     }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
-    }
 }

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php

@@ -1,17 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
-use Chill\MainBundle\Export\FilterInterface;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class BySocialActionFilter implements FilterInterface
 {
@@ -22,6 +30,36 @@ class BySocialActionFilter implements FilterInterface
         $this->actionRender = $actionRender;
     }
 
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
+            $qb->join('activity.socialActions', 'actsocialaction');
+        }
+
+        $clause = $qb->expr()->in('actsocialaction.id', ':socialactions');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('socialactions', $data['accepted_socialactions']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_socialactions', EntityType::class, [
@@ -34,11 +72,6 @@ class BySocialActionFilter implements FilterInterface
         ]);
     }
 
-    public function getTitle(): string
-    {
-        return 'Filter activity by linked socialaction';
-    }
-
     public function describeAction($data, $format = 'string'): array
     {
         $actions = [];
@@ -48,38 +81,12 @@ class BySocialActionFilter implements FilterInterface
         }
 
         return ['Filtered activity by linked socialaction: only %actions%', [
-            '%actions%' => implode(", ou ", $actions)
+            '%actions%' => implode(', ou ', $actions),
         ]];
     }
 
-    public function addRole()
+    public function getTitle(): string
     {
-        return null;
+        return 'Filter activity by linked socialaction';
     }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('socialaction', $qb->getAllAliases())) {
-            $qb->join('activity.socialActions', 'socialaction');
-        }
-
-        $clause = $qb->expr()->in('socialaction.id', ':socialactions');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('socialactions', $data['accepted_socialactions']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-
-}
+}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php

@@ -1,17 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
-use Chill\MainBundle\Export\FilterInterface;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class BySocialIssueFilter implements FilterInterface
 {
@@ -22,37 +30,7 @@ class BySocialIssueFilter implements FilterInterface
         $this->issueRender = $issueRender;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_socialissues', EntityType::class, [
-            'class' => SocialIssue::class,
-            'choice_label' => function(SocialIssue $si) {
-                return $this->issueRender->renderString($si, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by linked socialissue';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $issues = [];
-
-        foreach ($data['accepted_socialissues'] as $si) {
-            $issues[] = $this->issueRender->renderString($si, []);
-        }
-
-        return ['Filtered activity by linked socialissue: only %issues%', [
-            '%issues%' => implode(", ou ", $issues)
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -61,11 +39,11 @@ class BySocialIssueFilter implements FilterInterface
     {
         $where = $qb->getDQLPart('where');
 
-        if (!in_array('socialissue', $qb->getAllAliases())) {
-            $qb->join('activity.socialIssues', 'socialissue');
+        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
+            $qb->join('activity.socialIssues', 'actsocialissue');
         }
 
-        $clause = $qb->expr()->in('socialissue.id', ':socialissues');
+        $clause = $qb->expr()->in('actsocialissue.id', ':socialissues');
 
         if ($where instanceof Andx) {
             $where->add($clause);
@@ -77,9 +55,38 @@ class BySocialIssueFilter implements FilterInterface
         $qb->setParameter('socialissues', $data['accepted_socialissues']);
     }
 
-    public  function applyOn(): string
+    public function applyOn(): string
     {
         return Declarations::ACTIVITY_ACP;
     }
 
-}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_socialissues', EntityType::class, [
+            'class' => SocialIssue::class,
+            'choice_label' => function (SocialIssue $si) {
+                return $this->issueRender->renderString($si, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $issues = [];
+
+        foreach ($data['accepted_socialissues'] as $si) {
+            $issues[] = $this->issueRender->renderString($si, []);
+        }
+
+        return ['Filtered activity by linked socialissue: only %issues%', [
+            '%issues%' => implode(', ou ', $issues),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by linked socialissue';
+    }
+}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php

@@ -1,17 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class ByUserFilter implements FilterInterface
 {
@@ -22,6 +30,36 @@ class ByUserFilter implements FilterInterface
         $this->userRender = $userRender;
     }
 
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        if (!in_array('actusers', $qb->getAllAliases(), true)) {
+            $qb->join('activity.users', 'actusers');
+        }
+
+        $clause = $qb->expr()->in('actusers.id', ':users');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('users', $data['accepted_users']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_users', EntityType::class, [
@@ -34,11 +72,6 @@ class ByUserFilter implements FilterInterface
         ]);
     }
 
-    public function getTitle(): string
-    {
-        return 'Filter activity by linked users';
-    }
-
     public function describeAction($data, $format = 'string'): array
     {
         $users = [];
@@ -48,37 +81,12 @@ class ByUserFilter implements FilterInterface
         }
 
         return ['Filtered activity by linked users: only %users%', [
-            '%users%' => implode(", ou ", $users)
+            '%users%' => implode(', ou ', $users),
         ]];
     }
 
-    public function addRole()
+    public function getTitle(): string
     {
-        return null;
+        return 'Filter activity by linked users';
     }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.users', 'user');
-        }
-
-        $clause = $qb->expr()->in('user.id', ':users');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('users', $data['accepted_users']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-}
+}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php

@@ -1,11 +1,18 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
-use Chill\MainBundle\Export\FilterInterface;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -19,7 +26,7 @@ class EmergencyFilter implements FilterInterface
         'activity is not emergency' => false,
     ];
 
-    private CONST DEFAULT_CHOICE = false;
+    private const DEFAULT_CHOICE = false;
 
     private TranslatorInterface $translator;
 
@@ -28,36 +35,7 @@ class EmergencyFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_emergency', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by emergency';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        foreach (self::CHOICES as $k => $v) {
-            if ($v === $data['accepted_emergency']) {
-                $choice = $k;
-            }
-        }
-
-        return ['Filtered activity by emergency: only %emergency%', [
-            '%emergency%' => $this->translator->trans($choice)
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -78,9 +56,37 @@ class EmergencyFilter implements FilterInterface
         $qb->setParameter('emergency', $data['accepted_emergency']);
     }
 
-    public  function applyOn(): string
+    public function applyOn(): string
     {
-         return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY_ACP;
     }
 
-}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_emergency', ChoiceType::class, [
+            'choices' => self::CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        foreach (self::CHOICES as $k => $v) {
+            if ($v === $data['accepted_emergency']) {
+                $choice = $k;
+            }
+        }
+
+        return ['Filtered activity by emergency: only %emergency%', [
+            '%emergency%' => $this->translator->trans($choice),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by emergency';
+    }
+}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php

@@ -1,17 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class LocationTypeFilter implements FilterInterface
 {
@@ -22,11 +30,40 @@ class LocationTypeFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actloc', $qb->getAllAliases(), true)) {
+            $qb->join('activity.location', 'actloc');
+        }
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('actloc.locationType', ':locationtype');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('locationtype', $data['accepted_locationtype']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_locationtype', EntityType::class, [
             'class' => LocationType::class,
-            'choice_label' => function(LocationType $type) {
+            'choice_label' => function (LocationType $type) {
                 return $this->translatableStringHelper->localize($type->getTitle());
             },
             'multiple' => true,
@@ -34,11 +71,6 @@ class LocationTypeFilter implements FilterInterface
         ]);
     }
 
-    public function getTitle(): string
-    {
-        return 'Filter activity by locationtype';
-    }
-
     public function describeAction($data, $format = 'string'): array
     {
         $types = [];
@@ -50,36 +82,12 @@ class LocationTypeFilter implements FilterInterface
         }
 
         return ['Filtered activity by locationtype: only %types%', [
-            '%types%' => implode(", ou ", $types)
+            '%types%' => implode(', ou ', $types),
         ]];
     }
 
-    public function addRole()
+    public function getTitle(): string
     {
-        return null;
+        return 'Filter activity by locationtype';
     }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('location', $qb->getAllAliases())) {
-            $qb->join('activity.location', 'location');
-        }
-
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('location.locationType', ':locationtype');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('locationtype', $data['accepted_locationtype']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-}
+}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php

@@ -1,12 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Export\FilterInterface;
 use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -20,7 +27,7 @@ class SentReceivedFilter implements FilterInterface
         'is received' => Activity::SENTRECEIVED_RECEIVED,
     ];
 
-    private CONST DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;
+    private const DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;
 
     private TranslatorInterface $translator;
 
@@ -29,32 +36,7 @@ class SentReceivedFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_sentreceived', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by sentreceived';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $sentreceived = array_flip(self::CHOICES)[$data['accepted_sentreceived']];
-
-        return ['Filtered activity by sentreceived: only %sentreceived%', [
-            '%sentreceived%' => $this->translator->trans($sentreceived)
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -75,8 +57,33 @@ class SentReceivedFilter implements FilterInterface
         $qb->setParameter('sentreceived', $data['accepted_sentreceived']);
     }
 
-    public  function applyOn(): string
+    public function applyOn(): string
     {
-         return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY_ACP;
     }
-}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_sentreceived', ChoiceType::class, [
+            'choices' => self::CHOICES,
+            'multiple' => false,
+            'expanded' => true,
+            'empty_data' => self::DEFAULT_CHOICE,
+            'data' => self::DEFAULT_CHOICE,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $sentreceived = array_flip(self::CHOICES)[$data['accepted_sentreceived']];
+
+        return ['Filtered activity by sentreceived: only %sentreceived%', [
+            '%sentreceived%' => $this->translator->trans($sentreceived),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by sentreceived';
+    }
+}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php

@@ -1,12 +1,19 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
@@ -22,38 +29,7 @@ class UserFilter implements FilterInterface
         $this->userRender = $userRender;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_users', EntityType::class, [
-            'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-            'label' => 'Creators'
-        ]);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by user';
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $users = [];
-
-        foreach ($data['accepted_users'] as $u) {
-            $users[] = $this->userRender->renderString($u, []);
-        }
-
-        return ['Filtered activity by user: only %users%', [
-            '%users%' => implode(", ou ", $users)
-        ]];
-    }
-
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -74,9 +50,39 @@ class UserFilter implements FilterInterface
         $qb->setParameter('users', $data['accepted_users']);
     }
 
-    public  function applyOn(): string
+    public function applyOn(): string
     {
-         return Declarations::ACTIVITY_ACP;
+        return Declarations::ACTIVITY_ACP;
     }
 
-}
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_users', EntityType::class, [
+            'class' => User::class,
+            'choice_label' => function (User $u) {
+                return $this->userRender->renderString($u, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+            'label' => 'Creators',
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $users = [];
+
+        foreach ($data['accepted_users'] as $u) {
+            $users[] = $this->userRender->renderString($u, []);
+        }
+
+        return ['Filtered activity by user: only %users%', [
+            '%users%' => implode(', ou ', $users),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by user';
+    }
+}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php

@@ -1,17 +1,25 @@
 <?php
 
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\Query\Expr\Andx;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
 
 class UserScopeFilter implements FilterInterface
 {
@@ -22,6 +30,36 @@ class UserScopeFilter implements FilterInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('actuser', $qb->getAllAliases(), true)) {
+            $qb->join('activity.user', 'actuser');
+        }
+
+        $where = $qb->getDQLPart('where');
+
+        $clause = $qb->expr()->in('actuser.mainScope', ':userscope');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('userscope', $data['accepted_userscope']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ACTIVITY_ACP;
+    }
+
     public function buildForm(FormBuilderInterface $builder)
     {
         $builder->add('accepted_userscope', EntityType::class, [
@@ -32,15 +70,10 @@ class UserScopeFilter implements FilterInterface
                 );
             },
             'multiple' => true,
-            'expanded' => true
+            'expanded' => true,
         ]);
     }
 
-    public function getTitle(): string
-    {
-        return 'Filter activity by userscope';
-    }
-
     public function describeAction($data, $format = 'string'): array
     {
         $scopes = [];
@@ -52,38 +85,12 @@ class UserScopeFilter implements FilterInterface
         }
 
         return ['Filtered activity by userscope: only %scopes%', [
-            '%scopes%' => implode(", ou ", $scopes)
+            '%scopes%' => implode(', ou ', $scopes),
         ]];
     }
 
-    public function addRole()
+    public function getTitle(): string
     {
-        return null;
+        return 'Filter activity by userscope';
     }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('user', $qb->getAllAliases())) {
-            $qb->join('activity.user', 'user');
-        }
-
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->in('user.mainScope', ':userscope');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('userscope', $data['accepted_userscope']);
-    }
-
-    public  function applyOn(): string
-    {
-         return Declarations::ACTIVITY_ACP;
-    }
-
-}
+}

src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php

@@ -33,7 +33,7 @@ class ActivityDateFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -73,8 +73,7 @@ class ActivityDateFilter implements FilterInterface
             ->add('date_to', ChillDateType::class, [
                 'label' => 'Activities before this date',
                 'data' => new DateTime(),
-            ])
-        ;
+            ]);
 
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
             /** @var \Symfony\Component\Form\FormInterface $filterForm */

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Filter;
 use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityTypeRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -23,7 +22,6 @@ use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 use function count;
@@ -42,9 +40,9 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         $this->activityTypeRepository = $activityTypeRepository;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
@@ -104,23 +102,4 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
                 ->addViolation();
         }
     }
-
-    /**
-     * Check if a join between Activity and Reason is already defined.
-     *
-     * @param Join[] $joins
-     * @param mixed $alias
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php

@@ -14,7 +14,6 @@ namespace Chill\ActivityBundle\Export\Filter\PersonFilters;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -24,7 +23,6 @@ use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 use function array_key_exists;
@@ -44,9 +42,9 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $this->activityReasonRepository = $activityReasonRepository;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
@@ -54,20 +52,9 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $where = $qb->getDQLPart('where');
         $join = $qb->getDQLPart('join');
         $clause = $qb->expr()->in('reasons', ':selected_activity_reasons');
-        //dump($join);
-        // add a join to reasons only if needed
-        if (
-            (
-                array_key_exists('activity', $join)
-            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
-            )
-            || (!array_key_exists('activity', $join))
-        ) {
-            $qb->add(
-                'join',
-                ['activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')],
-                true
-            );
+
+        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
+            $qb->join('activity.reasons', 'actreasons');
         }
 
         if ($where instanceof Expr\Andx) {
@@ -125,21 +112,4 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
                 ->addViolation();
         }
     }
-
-    /**
-     * Check if a join between Activity and Reason is already defined.
-     *
-     * @param Join[] $joins
-     * @param mixed $alias
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias): bool
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php

@@ -52,7 +52,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }