merge exports branch into calendar branch

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -22,6 +22,7 @@ use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -41,7 +42,6 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
-
 use Symfony\Component\Serializer\SerializerInterface;
 use function array_key_exists;
 
@@ -57,6 +57,8 @@ final class ActivityController extends AbstractController
 
     private ActivityTypeRepository $activityTypeRepository;
 
+    private CenterResolverManagerInterface $centerResolver;
+
     private EntityManagerInterface $entityManager;
 
     private EventDispatcherInterface $eventDispatcher;
@@ -86,7 +88,9 @@ final class ActivityController extends AbstractController
         EventDispatcherInterface $eventDispatcher,
         LoggerInterface $logger,
         SerializerInterface $serializer,
-        UserRepositoryInterface $userRepository
+        UserRepositoryInterface $userRepository,
+        CenterResolverManagerInterface $centerResolver
+
     ) {
         $this->activityACLAwareRepository = $activityACLAwareRepository;
         $this->activityTypeRepository = $activityTypeRepository;
@@ -101,6 +105,8 @@ final class ActivityController extends AbstractController
         $this->logger = $logger;
         $this->serializer = $serializer;
         $this->userRepository = $userRepository;
+        $this->centerResolver = $centerResolver;
+
     }
 
     /**
@@ -203,7 +209,7 @@ final class ActivityController extends AbstractController
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
 
         $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
+            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
             'role' => new Role('CHILL_ACTIVITY_UPDATE'),
             'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,
@@ -431,7 +437,7 @@ final class ActivityController extends AbstractController
         $this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);
 
         $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
+            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
             'role' => new Role('CHILL_ACTIVITY_CREATE'),
             'activityType' => $entity->getActivityType(),
             'accompanyingPeriod' => $accompanyingPeriod,

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -61,8 +61,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                 ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
                 ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
                 ActivityVoter::FULL => [
-                    ActivityVoter::CREATE_PERSON,
-                    ActivityVoter::CREATE_ACCOMPANYING_COURSE,
                     ActivityVoter::DELETE,
                     ActivityVoter::UPDATE,
                 ],

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -16,8 +16,8 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
-use Chill\MainBundle\Entity\HasCenterInterface;
-use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasCentersInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
@@ -55,7 +55,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  *     getUserFunction="getUser",
  * path="scope")
  */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface
 {
     public const SENTRECEIVED_RECEIVED = 'received';
 
@@ -306,13 +306,17 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      * get the center
      * center is extracted from person.
      */
-    public function getCenter(): ?Center
+    public function getCenters(): iterable
     {
         if ($this->person instanceof Person) {
-            return $this->person->getCenter();
+            return [$this->person->getCenter()];
         }
 
-        return null;
+        if ($this->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            return $this->getAccompanyingPeriod()->getCenters() ?? [];
+        }
+
+        return [];
     }
 
     public function getComment(): CommentEmbeddable
@@ -422,6 +426,19 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->scope;
     }
 
+    public function getScopes(): iterable
+    {
+        if (null !== $this->getAccompanyingPeriod()) {
+            return $this->getAccompanyingPeriod()->getScopes();
+        }
+
+        if (null !== $this->getPerson()) {
+            return [$this->scope];
+        }
+
+        return [];
+    }
+
     public function getSentReceived(): string
     {
         return $this->sentReceived;

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

@@ -0,0 +1,90 @@
+<?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 Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class BySocialActionAggregator implements AggregatorInterface
+{
+    private SocialActionRender $actionRender;
+
+    private SocialActionRepository $actionRepository;
+
+    public function __construct(
+        SocialActionRender $actionRender,
+        SocialActionRepository $actionRepository
+    ) {
+        $this->actionRender = $actionRender;
+        $this->actionRepository = $actionRepository;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('socialaction', $qb->getAllAliases(), true)) {
+            $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;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value) {
+            if ('_header' === $value) {
+                return 'Social action';
+            }
+
+            $sa = $this->actionRepository->find($value);
+
+            return $this->actionRender->renderString($sa, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['socialaction_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by linked socialaction';
+    }
+}

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

@@ -0,0 +1,90 @@
+<?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 Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class BySocialIssueAggregator implements AggregatorInterface
+{
+    private SocialIssueRender $issueRender;
+
+    private SocialIssueRepository $issueRepository;
+
+    public function __construct(
+        SocialIssueRepository $issueRepository,
+        SocialIssueRender $issueRender
+    ) {
+        $this->issueRepository = $issueRepository;
+        $this->issueRender = $issueRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('socialissue', $qb->getAllAliases(), true)) {
+            $qb->join('activity.socialIssues', 'socialissue');
+        }
+
+        $qb->addSelect('socialissue.id AS socialissue_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('socialissue_aggregator');
+        } else {
+            $qb->groupBy('socialissue_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 ('_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

@@ -0,0 +1,90 @@
+<?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 Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
+use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ByThirdpartyAggregator implements AggregatorInterface
+{
+    private ThirdPartyRender $thirdPartyRender;
+
+    private ThirdPartyRepository $thirdPartyRepository;
+
+    public function __construct(
+        ThirdPartyRepository $thirdPartyRepository,
+        ThirdPartyRender $thirdPartyRender
+    ) {
+        $this->thirdPartyRepository = $thirdPartyRepository;
+        $this->thirdPartyRender = $thirdPartyRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('thirdparty', $qb->getAllAliases(), true)) {
+            $qb->join('activity.thirdParties', 'thirdparty');
+        }
+
+        $qb->addSelect('thirdparty.id AS thirdparty_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('thirdparty_aggregator');
+        } else {
+            $qb->groupBy('thirdparty_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 ('_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

@@ -0,0 +1,90 @@
+<?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 Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Templating\Entity\UserRender;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class ByUserAggregator implements AggregatorInterface
+{
+    private UserRender $userRender;
+
+    private UserRepository $userRepository;
+
+    public function __construct(
+        UserRepository $userRepository,
+        UserRender $userRender
+    ) {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('user', $qb->getAllAliases(), true)) {
+            $qb->join('activity.users', 'user');
+        }
+
+        $qb->addSelect('user.id AS users_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('users_aggregator');
+        } else {
+            $qb->groupBy('users_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 ('_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

@@ -0,0 +1,143 @@
+<?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 DateTime;
+use Doctrine\ORM\QueryBuilder;
+use RuntimeException;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class DateAggregator implements AggregatorInterface
+{
+    private const CHOICES = [
+        'by month' => 'month',
+        'by week' => 'week',
+        'by year' => 'year',
+    ];
+
+    private const DEFAULT_CHOICE = 'year';
+
+    private TranslatorInterface $translator;
+
+    public function __construct(
+        TranslatorInterface $translator
+    ) {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $order = null;
+
+        switch ($data['frequency']) {
+            case 'month':
+                $fmt = 'MM';
+
+break;
+
+            case 'week':
+                $fmt = 'IW';
+
+break;
+
+            case 'year':
+                $fmt = 'YYYY'; $order = 'DESC';
+
+break; // order DESC does not works !
+
+            default:
+                throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
+        }
+
+        $qb->addSelect(sprintf("TO_CHAR(activity.date, '%s') AS date_aggregator", $fmt));
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('date_aggregator');
+        } else {
+            $qb->groupBy('date_aggregator');
+        }
+
+        $orderBy = $qb->getDQLPart('orderBy');
+
+        if (!empty($orderBy)) {
+            $qb->addOrderBy('date_aggregator', $order);
+        } else {
+            $qb->orderBy('date_aggregator', $order);
+        }
+    }
+
+    public function applyOn(): string
+    {
+        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

@@ -0,0 +1,92 @@
+<?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 Chill\MainBundle\Repository\LocationTypeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class LocationTypeAggregator implements AggregatorInterface
+{
+    private LocationTypeRepository $locationTypeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        LocationTypeRepository $locationTypeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->locationTypeRepository = $locationTypeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('location', $qb->getAllAliases(), true)) {
+            $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;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Accepted locationtype';
+            }
+
+            $lt = $this->locationTypeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $lt->getTitle()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['locationtype_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by locationtype';
+    }
+}

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

@@ -0,0 +1,92 @@
+<?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 Chill\MainBundle\Repository\ScopeRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use function in_array;
+
+class UserScopeAggregator implements AggregatorInterface
+{
+    private ScopeRepository $scopeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        ScopeRepository $scopeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('user', $qb->getAllAliases(), true)) {
+            $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;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Scope';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['userscope_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group activity by userscope';
+    }
+}

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

@@ -11,15 +11,15 @@ declare(strict_types=1);
 
 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
 {
@@ -37,23 +37,31 @@ 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)
     {
-        // add select element
-        $qb->addSelect(sprintf('IDENTITY(activity.type) AS %s', self::KEY));
+        if (!in_array('type', $qb->getAllAliases(), true)) {
+            $qb->join('activity.activityType', 'type');
+        }
 
-        // add the "group by" part
-        $qb->addGroupBy(self::KEY);
+        $qb->addSelect(sprintf('IDENTITY(activity.activityType) AS %s', self::KEY));
+
+        $groupby = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy(self::KEY);
+        } else {
+            $qb->groupBy(self::KEY);
+        }
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
-        return 'activity';
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)

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

@@ -11,29 +11,33 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+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 Symfony\Component\Security\Core\Role\Role;
 
 class ActivityUserAggregator implements AggregatorInterface
 {
     public const KEY = 'activity_user_id';
 
+    private UserRender $userRender;
+
     private UserRepository $userRepository;
 
     public function __construct(
-        UserRepository $userRepository
+        UserRepository $userRepository,
+        UserRender $userRender
     ) {
         $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
@@ -47,7 +51,7 @@ class ActivityUserAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return 'activity';
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -62,10 +66,12 @@ class ActivityUserAggregator implements AggregatorInterface
 
         return function ($value) {
             if ('_header' === $value) {
-                return 'activity user';
+                return 'Activity user';
             }
 
-            return $this->userRepository->find($value)->getUsername();
+            $u = $this->userRepository->find($value);
+
+            return $this->userRender->renderString($u, []);
         };
     }
 

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

@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Aggregator;
+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;
@@ -23,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;
@@ -47,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)
@@ -104,9 +103,9 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         }
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
-        return 'activity';
+        return Declarations::ACTIVITY_PERSON;
     }
 
     public function buildForm(FormBuilderInterface $builder)

src/Bundle/ChillActivityBundle/Export/Declarations.php

@@ -0,0 +1,24 @@
+<?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;
+
+/**
+ * This class declare constants used for the export framework.
+ */
+abstract class Declarations
+{
+    public const ACTIVITY = 'activity';
+
+    public const ACTIVITY_ACP = 'activity_linked_to_acp';
+
+    public const ACTIVITY_PERSON = 'activity_linked_to_person';
+}

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

@@ -0,0 +1,107 @@
+<?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;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class AvgActivityDuration implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        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) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_avg_activity_duration'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        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;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->repository->createQueryBuilder('activity')
+            ->join('activity.accompanyingPeriod', 'acp');
+
+        $qb->select('AVG(activity.durationTime) as export_avg_activity_duration');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            //PersonDeclarations::ACP_TYPE,
+        ];
+    }
+}

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

@@ -0,0 +1,107 @@
+<?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;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        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) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_avg_activity_visit_duration'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        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;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->repository->createQueryBuilder('activity')
+            ->join('activity.accompanyingPeriod', 'acp');
+
+        $qb->select('AVG(activity.travelTime) as export_avg_activity_visit_duration');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            //PersonDeclarations::ACP_TYPE,
+        ];
+    }
+}

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

@@ -0,0 +1,108 @@
+<?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;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CountActivity implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        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) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Number of activities linked to an accompanying period' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_count_activity'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Count activities linked to an accompanying period';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ACTIVITY;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->repository->createQueryBuilder('activity')
+            ->join('activity.accompanyingPeriod', 'acp');
+
+        $qb->select('COUNT(activity.id) as export_count_activity');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            //PersonDeclarations::ACP_TYPE,
+        ];
+    }
+}

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

@@ -0,0 +1,107 @@
+<?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;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class SumActivityDuration implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        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) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_sum_activity_duration'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        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;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->repository->createQueryBuilder('activity')
+            ->join('activity.accompanyingPeriod', 'acp');
+
+        $qb->select('SUM(activity.durationTime) as export_sum_activity_duration');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            //PersonDeclarations::ACP_TYPE,
+        ];
+    }
+}

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

@@ -0,0 +1,107 @@
+<?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;
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
+{
+    protected EntityRepository $repository;
+
+    public function __construct(
+        EntityManagerInterface $em
+    ) {
+        $this->repository = $em->getRepository(Activity::class);
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // TODO: Implement buildForm() method.
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        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) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_sum_activity_visit_duration'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        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;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    {
+        $qb = $this->repository->createQueryBuilder('activity')
+            ->join('activity.accompanyingPeriod', 'acp');
+
+        $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return ActivityStatsVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_ACP,
+            //PersonDeclarations::ACP_TYPE,
+        ];
+    }
+}

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

@@ -9,18 +9,20 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Export;
+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\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
+class CountActivity implements ExportInterface, GroupedExportInterface
 {
     protected ActivityRepository $activityRepository;
 
@@ -41,7 +43,12 @@ class CountActivity implements ExportInterface
 
     public function getDescription()
     {
-        return 'Count activities by various parameters.';
+        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)
@@ -50,7 +57,7 @@ class CountActivity implements ExportInterface
             throw new LogicException("the key {$key} is not used by this export");
         }
 
-        return static fn ($value) => '_header' === $value ? 'Number of activities' : $value;
+        return static fn ($value) => '_header' === $value ? 'Number of activities linked to a person' : $value;
     }
 
     public function getQueryKeys($data)
@@ -65,24 +72,23 @@ class CountActivity implements ExportInterface
 
     public function getTitle()
     {
-        return 'Count activities';
+        return 'Count activities linked to a person';
     }
 
-    public function getType()
+    public function getType(): string
     {
-        return 'activity';
+        return Declarations::ACTIVITY;
     }
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
-        $qb = $this
-            ->activityRepository
-            ->createQueryBuilder('activity')
-            ->select('COUNT(activity.id) as export_count_activity')
+        $qb = $this->activityRepository->createQueryBuilder('activity')
             ->join('activity.person', 'person');
 
+        $qb->select('COUNT(activity.id) as export_count_activity');
+
         $qb
             ->where($qb->expr()->in('person.center', ':centers'))
             ->setParameter('centers', $centers);
@@ -90,13 +96,17 @@ class CountActivity implements ExportInterface
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers()
     {
-        return ['person', 'activity'];
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_PERSON,
+            //PersonDeclarations::PERSON_TYPE,
+        ];
     }
 }

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

@@ -9,21 +9,23 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Export;
+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;
@@ -32,7 +34,7 @@ use function array_key_exists;
 use function count;
 use function in_array;
 
-class ListActivity implements ListInterface
+class ListActivity implements ListInterface, GroupedExportInterface
 {
     protected EntityManagerInterface $entityManager;
 
@@ -94,7 +96,12 @@ class ListActivity implements ListInterface
 
     public function getDescription()
     {
-        return 'List activities';
+        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)
@@ -180,12 +187,12 @@ class ListActivity implements ListInterface
 
     public function getTitle()
     {
-        return 'List activities';
+        return 'List activity linked to a person';
     }
 
-    public function getType()
+    public function getType(): string
     {
-        return 'activity';
+        return Declarations::ACTIVITY;
     }
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
@@ -267,13 +274,17 @@ class ListActivity implements ListInterface
         return $qb;
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::LISTS);
+        return ActivityStatsVoter::LISTS;
     }
 
     public function supportsModifiers()
     {
-        return ['activity', 'person'];
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_PERSON,
+            //PersonDeclarations::PERSON_TYPE,
+        ];
     }
 }

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

@@ -9,23 +9,26 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Export;
+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;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+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;
 
 /**
  * This export allow to compute stats on activity duration.
  *
  * The desired stat must be given in constructor.
  */
-class StatActivityDuration implements ExportInterface
+class StatActivityDuration implements ExportInterface, GroupedExportInterface
 {
     public const SUM = 'sum';
 
@@ -59,17 +62,22 @@ class StatActivityDuration implements ExportInterface
     public function getDescription()
     {
         if (self::SUM === $this->action) {
-            return 'Sum activities duration by various parameters.';
+            return 'Sum activities linked to a person duration by various parameters.';
         }
     }
 
+    public function getGroup(): string
+    {
+        return 'Exports of activities linked to a person';
+    }
+
     public function getLabels($key, array $values, $data)
     {
         if ('export_stat_activity' !== $key) {
             throw new LogicException(sprintf('The key %s is not used by this export', $key));
         }
 
-        $header = self::SUM === $this->action ? 'Sum of activities duration' : false;
+        $header = self::SUM === $this->action ? 'Sum activities linked to a person duration' : false;
 
         return static fn (string $value) => '_header' === $value ? $header : $value;
     }
@@ -87,19 +95,19 @@ class StatActivityDuration implements ExportInterface
     public function getTitle()
     {
         if (self::SUM === $this->action) {
-            return 'Sum activity duration';
+            return 'Sum activity linked to a person duration';
         }
     }
 
-    public function getType()
+    public function getType(): string
     {
-        return 'activity';
+        return Declarations::ACTIVITY;
     }
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(
-            static fn (array $el): string => $el['center'],
+            static fn (array $el): Center => $el['center'],
             $acl
         );
 
@@ -118,13 +126,17 @@ class StatActivityDuration implements ExportInterface
             ->setParameter(':centers', $centers);
     }
 
-    public function requiredRole()
+    public function requiredRole(): string
     {
-        return new Role(ActivityStatsVoter::STATS);
+        return ActivityStatsVoter::STATS;
     }
 
     public function supportsModifiers()
     {
-        return ['person', 'activity'];
+        return [
+            Declarations::ACTIVITY,
+            Declarations::ACTIVITY_PERSON,
+            //PersonDeclarations::PERSON_TYPE,
+        ];
     }
 }

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

@@ -0,0 +1,92 @@
+<?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\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
+{
+    private SocialActionRender $actionRender;
+
+    public function __construct(SocialActionRender $actionRender)
+    {
+        $this->actionRender = $actionRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        if (!in_array('socialaction', $qb->getAllAliases(), true)) {
+            $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;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_socialactions', EntityType::class, [
+            'class' => SocialAction::class,
+            'choice_label' => function (SocialAction $sa) {
+                return $this->actionRender->renderString($sa, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $actions = [];
+
+        foreach ($data['accepted_socialactions'] as $sa) {
+            $actions[] = $this->actionRender->renderString($sa, []);
+        }
+
+        return ['Filtered activity by linked socialaction: only %actions%', [
+            '%actions%' => implode(', ou ', $actions),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by linked socialaction';
+    }
+}

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

@@ -0,0 +1,92 @@
+<?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\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
+{
+    private SocialIssueRender $issueRender;
+
+    public function __construct(SocialIssueRender $issueRender)
+    {
+        $this->issueRender = $issueRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        if (!in_array('socialissue', $qb->getAllAliases(), true)) {
+            $qb->join('activity.socialIssues', 'socialissue');
+        }
+
+        $clause = $qb->expr()->in('socialissue.id', ':socialissues');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('socialissues', $data['accepted_socialissues']);
+    }
+
+    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

@@ -0,0 +1,92 @@
+<?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\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
+{
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        if (!in_array('user', $qb->getAllAliases(), true)) {
+            $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;
+    }
+
+    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,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $users = [];
+
+        foreach ($data['accepted_users'] as $u) {
+            $users[] = $this->userRender->renderString($u, []);
+        }
+
+        return ['Filtered activity by linked users: only %users%', [
+            '%users%' => implode(', ou ', $users),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by linked users';
+    }
+}

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

@@ -0,0 +1,92 @@
+<?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\Export\FilterInterface;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class EmergencyFilter implements FilterInterface
+{
+    private const CHOICES = [
+        'activity is emergency' => true,
+        'activity is not emergency' => false,
+    ];
+
+    private const DEFAULT_CHOICE = false;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        $clause = $qb->expr()->eq('activity.emergency', ':emergency');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('emergency', $data['accepted_emergency']);
+    }
+
+    public function applyOn(): string
+    {
+        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

@@ -0,0 +1,93 @@
+<?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\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
+{
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('location', $qb->getAllAliases(), true)) {
+            $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;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_locationtype', EntityType::class, [
+            'class' => LocationType::class,
+            'choice_label' => function (LocationType $type) {
+                return $this->translatableStringHelper->localize($type->getTitle());
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $types = [];
+
+        foreach ($data['accepted_locationtype'] as $type) {
+            $types[] = $this->translatableStringHelper->localize(
+                $type->getTitle()
+            );
+        }
+
+        return ['Filtered activity by locationtype: only %types%', [
+            '%types%' => implode(', ou ', $types),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by locationtype';
+    }
+}

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

@@ -0,0 +1,89 @@
+<?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\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;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class SentReceivedFilter implements FilterInterface
+{
+    private const CHOICES = [
+        'is sent' => Activity::SENTRECEIVED_SENT,
+        'is received' => Activity::SENTRECEIVED_RECEIVED,
+    ];
+
+    private const DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;
+
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        $clause = $qb->expr()->eq('activity.sentReceived', ':sentreceived');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('sentreceived', $data['accepted_sentreceived']);
+    }
+
+    public function applyOn(): string
+    {
+        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

@@ -0,0 +1,88 @@
+<?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\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;
+
+class UserFilter implements FilterInterface
+{
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        $clause = $qb->expr()->in('activity.user', ':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, [
+            '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

@@ -0,0 +1,96 @@
+<?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\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
+{
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(TranslatableStringHelper $translatableStringHelper)
+    {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        if (!in_array('user', $qb->getAllAliases(), true)) {
+            $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;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_userscope', EntityType::class, [
+            'class' => Scope::class,
+            'choice_label' => function (Scope $s) {
+                return $this->translatableStringHelper->localize(
+                    $s->getName()
+                );
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $scopes = [];
+
+        foreach ($data['accepted_userscope'] as $s) {
+            $scopes[] = $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        }
+
+        return ['Filtered activity by userscope: only %scopes%', [
+            '%scopes%' => implode(', ou ', $scopes),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter activity by userscope';
+    }
+}

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

@@ -11,12 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter;
 
+use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\Export\FilterType;
 use DateTime;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
@@ -32,7 +33,7 @@ class ActivityDateFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -57,36 +58,22 @@ class ActivityDateFilter implements FilterInterface
         $qb->setParameter('date_to', $data['date_to']);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
-        return 'activity';
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add(
-            'date_from',
-            DateType::class,
-            [
+        $builder
+            ->add('date_from', ChillDateType::class, [
                 'label' => 'Activities after this date',
                 'data' => new DateTime(),
-                'attr' => ['class' => 'datepicker'],
-                'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy',
-            ]
-        );
-
-        $builder->add(
-            'date_to',
-            DateType::class,
-            [
+            ])
+            ->add('date_to', ChillDateType::class, [
                 'label' => 'Activities before this date',
                 'data' => new DateTime(),
-                'attr' => ['class' => 'datepicker'],
-                'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy',
-            ]
-        );
+            ]);
 
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
             /** @var \Symfony\Component\Form\FormInterface $filterForm */

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

@@ -12,8 +12,8 @@ declare(strict_types=1);
 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;
@@ -22,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;
@@ -41,15 +40,15 @@ 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)
     {
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('activity.type', ':selected_activity_types');
+        $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
 
         if ($where instanceof Expr\Andx) {
             $where->add($clause);
@@ -61,39 +60,33 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         $qb->setParameter('selected_activity_types', $data['types']);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
-        return 'activity';
+        return Declarations::ACTIVITY;
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add(
-            'types',
-            EntityType::class,
-            [
-                'class' => ActivityType::class,
-                'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
-                'multiple' => true,
-                'expanded' => false,
-            ]
-        );
+        $builder->add('types', EntityType::class, [
+            'class' => ActivityType::class,
+            'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
+            'group_by' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getCategory()->getName()),
+            'multiple' => true,
+            'expanded' => false,
+        ]);
     }
 
     public function describeAction($data, $format = 'string')
     {
         // collect all the reasons'name used in this filter in one array
         $reasonsNames = array_map(
-            fn (ActivityType $t): string => '"' . $this->translatableStringHelper->localize($t->getName()) . '"',
+            fn (ActivityType $t): string => $this->translatableStringHelper->localize($t->getName()),
             $this->activityTypeRepository->findBy(['id' => $data['types']->toArray()])
         );
 
-        return [
-            'Filtered by activity type: only %list%',
-            [
-                '%list%' => implode(', ', $reasonsNames),
-            ],
-        ];
+        return ['Filtered by activity type: only %list%', [
+            '%list%' => implode(', ou ', $reasonsNames),
+        ]];
     }
 
     public function getTitle()

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

@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Filter;
+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;
@@ -23,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;
@@ -43,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)
@@ -79,9 +78,9 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $qb->setParameter('selected_activity_reasons', $data['reasons']);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
-        return 'activity';
+        return Declarations::ACTIVITY_PERSON;
     }
 
     public function buildForm(FormBuilderInterface $builder)

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Filter;
+namespace Chill\ActivityBundle\Export\Filter\PersonFilters;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
@@ -52,7 +52,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
         $this->translator = $translator;
     }
 
-    public function addRole()
+    public function addRole(): ?string
     {
         return null;
     }
@@ -102,7 +102,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
         $qb->setParameter('person_having_activity_reasons', $data['reasons']);
     }
 
-    public function applyOn()
+    public function applyOn(): string
     {
         return Declarations::PERSON_IMPLIED_IN;
     }

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -14,17 +14,20 @@ namespace Chill\ActivityBundle\Form;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\DocStoreBundle\Form\StoredObjectType;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
@@ -50,6 +53,7 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
+use Symfony\Component\Security\Core\Role\Role;
 use function in_array;
 
 class ActivityType extends AbstractType
@@ -109,19 +113,18 @@ class ActivityType extends AbstractType
         $activityType = $options['activityType'];
 
         // TODO revoir la gestion des center au niveau du form des activité.
-        if ($options['center']) {
+        if ($options['center'] instanceof Center && null !== $options['data']->getPerson()) {
             $builder->add('scope', ScopePickerType::class, [
                 'center' => $options['center'],
-                'role' => $options['role'],
-                // TODO make required again once scope and rights are fixed
-                'required' => false,
+                'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
+                'required' => true,
             ]);
         }
 
         /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
         $accompanyingPeriod = null;
 
-        if ($options['accompanyingPeriod']) {
+        if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
             $accompanyingPeriod = $options['accompanyingPeriod'];
         }
 
@@ -218,12 +221,10 @@ class ActivityType extends AbstractType
             ]);
         }
 
-        if ($activityType->isVisible('user') && $options['center']) {
-            $builder->add('user', UserPickerType::class, [
+        if ($activityType->isVisible('user') && $options['center'] instanceof Center) {
+            $builder->add('user', PickUserDynamicType::class, [
                 'label' => $activityType->getLabel('user'),
                 'required' => $activityType->isRequired('user'),
-                'center' => $options['center'],
-                'role' => $options['role'],
             ]);
         }
 
@@ -442,8 +443,8 @@ class ActivityType extends AbstractType
 
         $resolver
             ->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
-            ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
-            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
+            ->setAllowedTypes('center', ['null', Center::class])
+            ->setAllowedTypes('role', [Role::class, 'string'])
             ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
             ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
     }

src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -120,3 +120,11 @@
 
 {{ form_end(edit_form) }}
 {# {{ form(delete_form) }} #}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig

@@ -46,7 +46,7 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
 
-    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"

src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig

@@ -119,3 +119,11 @@
   </li>
 </ul>
 {{ form_end(form) }}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php

@@ -133,7 +133,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
 
                 // change attribute CREATE
                 if (self::CREATE === $attribute) {
-                    $attribute = self::CREATE_PERSON;
+                    return $this->voterHelper->voteOnAttribute(self::CREATE_PERSON, $subject->getPerson(), $token);
                 }
             } elseif ($subject->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
                 if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod())) {
@@ -144,7 +144,8 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                     if (AccompanyingPeriod::STEP_CLOSED === $subject->getAccompanyingPeriod()->getStep()) {
                         return false;
                     }
-                    $attribute = self::CREATE_ACCOMPANYING_COURSE;
+
+                    return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject->getAccompanyingPeriod(), $token);
                 }
             } else {
                 throw new RuntimeException('Could not determine context of activity.');
@@ -158,12 +159,12 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
 
             // transform the attribute
             if (self::CREATE === $attribute) {
-                $attribute = self::CREATE_ACCOMPANYING_COURSE;
+                return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject, $token);
             }
         } elseif ($subject instanceof Person) {
             // transform the attribute
             if (self::CREATE === $attribute) {
-                $attribute = self::CREATE_PERSON;
+                return $this->voterHelper->voteOnAttribute(self::CREATE_PERSON, $subject, $token);
             }
         }
 

src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php

@@ -130,8 +130,10 @@ class ActivityContext implements
                         return $this->personRender->renderString($p, []);
                     },
                     'multiple' => false,
+                    'required' => false,
                     'expanded' => true,
                     'label' => $options[$key . 'Label'],
+                    'placeholder' => $this->translator->trans('Any person selected'),
                 ]);
             }
         }

src/Bundle/ChillActivityBundle/config/services/export.yaml

@@ -3,26 +3,48 @@ services:
         autowire: true
         autoconfigure: true
 
-    chill.activity.export.count_activity:
-        class: Chill\ActivityBundle\Export\Export\CountActivity
+    ## Indicators
+    chill.activity.export.count_activity_linked_to_person:
+        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\CountActivity
         tags:
-            - { name: chill.export, alias: 'count_activity' }
+            - { name: chill.export, alias: 'count_activity_linked_to_person' }
 
-    chill.activity.export.sum_activity_duration:
-        class: Chill\ActivityBundle\Export\Export\StatActivityDuration
+    chill.activity.export.sum_activity_duration_linked_to_person:
+        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\StatActivityDuration
         tags:
-            - { name: chill.export, alias: 'sum_activity_duration' }
+            - { name: chill.export, alias: 'sum_activity_duration_linked_to_person' }
 
-    chill.activity.export.list_activity:
-        class: Chill\ActivityBundle\Export\Export\ListActivity
+    chill.activity.export.list_activity_linked_to_person:
+        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\ListActivity
         tags:
-            - { name: chill.export, alias: 'list_activity' }
+            - { name: chill.export, alias: 'list_activity_linked_to_person' }
 
-    chill.activity.export.reason_filter:
-        class: Chill\ActivityBundle\Export\Filter\ActivityReasonFilter
+    chill.activity.export.count_activity_linked_to_acp:
+        class: Chill\ActivityBundle\Export\Export\LinkedToACP\CountActivity
         tags:
-            - { name: chill.export_filter, alias: 'activity_reason_filter' }
+            - { name: chill.export, alias: 'count_activity_linked_to_acp' }
 
+    chill.activity.export.sum_activity_duration_linked_to_acp:
+        class: Chill\ActivityBundle\Export\Export\LinkedToACP\SumActivityDuration
+        tags:
+            - { name: chill.export, alias: 'sum_activity_duration_linked_to_acp' }
+
+    chill.activity.export.sum_activity_visit_duration_linked_to_acp:
+        class: Chill\ActivityBundle\Export\Export\LinkedToACP\SumActivityVisitDuration
+        tags:
+            - { name: chill.export, alias: 'sum_activity_visit_duration_linked_to_acp' }
+
+    chill.activity.export.avg_activity_duration_linked_to_acp:
+        class: Chill\ActivityBundle\Export\Export\LinkedToACP\AvgActivityDuration
+        tags:
+            - { name: chill.export, alias: 'avg_activity_duration_linked_to_acp' }
+
+    chill.activity.export.avg_activity_visit_duration_linked_to_acp:
+        class: Chill\ActivityBundle\Export\Export\LinkedToACP\AvgActivityVisitDuration
+        tags:
+            - { name: chill.export, alias: 'avg_activity_visit_duration_linked_to_acp' }
+
+    ## Filters
     chill.activity.export.type_filter:
         class: Chill\ActivityBundle\Export\Filter\ActivityTypeFilter
         tags:
@@ -33,15 +55,61 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'activity_date_filter' }
 
+    chill.activity.export.reason_filter:
+        class: Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter
+        tags:
+            - { name: chill.export_filter, alias: 'activity_reason_filter' }
+
     chill.activity.export.person_having_an_activity_between_date_filter:
-        class: Chill\ActivityBundle\Export\Filter\PersonHavingActivityBetweenDateFilter
+        class: Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter
         tags:
             - #0 register as a filter
                 name: chill.export_filter
                 alias: 'activity_person_having_ac_bw_date_filter'
 
+    chill.activity.export.locationtype_filter:
+        class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter
+        tags:
+            - { name: chill.export_filter, alias: 'activity_locationtype_filter' }
+
+    chill.activity.export.byuser_filter:  # TMS (M2M)
+        class: Chill\ActivityBundle\Export\Filter\ACPFilters\ByUserFilter
+        tags:
+            - { name: chill.export_filter, alias: 'activity_byuser_filter' }
+
+    chill.activity.export.emergency_filter:
+        class: Chill\ActivityBundle\Export\Filter\ACPFilters\EmergencyFilter
+        tags:
+            - { name: chill.export_filter, alias: 'activity_emergency_filter' }
+
+    chill.activity.export.sentreceived_filter:
+        class: Chill\ActivityBundle\Export\Filter\ACPFilters\SentReceivedFilter
+        tags:
+            - { name: chill.export_filter, alias: 'activity_sentreceived_filter' }
+
+    chill.activity.export.bysocialaction_filter:
+        class: Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter
+        tags:
+            - { name: chill.export_filter, alias: 'activity_bysocialaction_filter' }
+
+    chill.activity.export.bysocialissue_filter:
+        class: Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialIssueFilter
+        tags:
+            - { name: chill.export_filter, alias: 'activity_bysocialissue_filter' }
+
+    chill.activity.export.user_filter: # Creator (M2O)
+        class: Chill\ActivityBundle\Export\Filter\ACPFilters\UserFilter
+        tags:
+            - { name: chill.export_filter, alias: 'activity_user_filter' }
+
+    chill.activity.export.userscope_filter:
+        class: Chill\ActivityBundle\Export\Filter\ACPFilters\UserScopeFilter
+        tags:
+            - { name: chill.export_filter, alias: 'activity_userscope_filter' }
+
+    ## Aggregators
     chill.activity.export.reason_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
+        class: Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator
         tags:
             - { name: chill.export_aggregator, alias: activity_reason_aggregator }
 
@@ -54,3 +122,38 @@ services:
         class: Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
         tags:
             - { name: chill.export_aggregator, alias: activity_user_aggregator }
+
+    chill.activity.export.locationtype_aggregator:
+        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\LocationTypeAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: activity_locationtype_aggregator }
+
+    chill.activity.export.date_aggregator:
+        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\DateAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: activity_date_aggregator }
+
+    chill.activity.export.byuser_aggregator:
+        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByUserAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: activity_byuser_aggregator }
+
+    chill.activity.export.bythirdparty_aggregator:
+        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: activity_bythirdparty_aggregator }
+
+    chill.activity.export.bysocialaction_aggregator:
+        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialActionAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: activity_bysocialaction_aggregator }
+
+    chill.activity.export.bysocialissue_aggregator:
+        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialIssueAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: activity_bysocialissue_aggregator }
+
+    chill.activity.export.userscope_aggregator:
+        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\UserScopeAggregator
+        tags:
+            - { name: chill.export_aggregator, alias: activity_userscope_aggregator }

src/Bundle/ChillActivityBundle/translations/messages.fr.yml

@@ -203,18 +203,39 @@ Are you sure you want to remove the activity about "%name%" ?: Êtes-vous sûr d
 The activity has been successfully removed.: L'activité a été supprimée.
 
 # exports
-Count activities: Nombre d'activités
-Count activities by various parameters.: Compte le nombre d'activités enregistrées en fonction de différents paramètres.
-Sum activity duration: Total de la durée des activités
-Sum activities duration by various parameters.: Additionne la durée des activités en fonction de différents paramètres.
-List activities: Liste les activités
-Number of activities: Nombre d'activités
+Exports of activities linked to a person: Exports des activités liées à une personne
+Number of activities linked to a person: Nombre d'activités liées à une personne
+Count activities linked to a person: Nombre d'activités
+Count activities linked to a person by various parameters.: Compte le nombre d'activités enregistrées et liées à une personne en fonction de différents paramètres.
+Sum activity linked to a person duration: Durée des activités
+Sum activities linked to a person duration: Durée des activités liés à un usager
+Sum activities linked to a person duration by various parameters.: Additionne la durée des activités en fonction de différents paramètres.
+List activity linked to a person: Liste les activités
+List activities linked to a person: Liste des activités liés à un usager
+List activities linked to a person description: Crée la liste des activités en fonction de différents paramètres.
+
+Exports of activities linked to an accompanying period: Exports des activités liées à un parcours
+Number of activities linked to an accompanying period: Nombre d'activités liées à un parcours
+Count activities linked to an accompanying period: Nombre d'activités
+Count activities linked to an accompanying period by various parameters.: Compte le nombre d'activités enregistrées et liées à un parcours en fonction de différents paramètres.
+Sum activity linked to an accompanying period duration: Somme de la durée des activités
+Sum activities linked to an accompanying period duration: Somme de la durée des activités liées à un parcours
+Sum activities linked to an accompanying period duration by various parameters.: Additionne la durée des activités en fonction de différents paramètres.
+Sum activity linked to an accompanying period visit duration: Somme de la durée de déplacement des activités
+Sum activities linked to an accompanying period visit duration: Somme de la durée de déplacement des activités liées à un parcours
+Sum activities linked to an accompanying period visit duration by various parameters.: Additionne la durée de déplacement des activités en fonction de différents paramètres.
+Average activity linked to an accompanying period duration: Moyenne de la durée des activités
+Average activities linked to an accompanying period duration: Moyenne de la durée des activités liées à un parcours
+Average activities linked to an accompanying period duration by various parameters.: Moyenne de la durée des activités en fonction de différents paramètres.
+Average activity linked to an accompanying period visit duration: Moyenne de la durée de déplacement des activités
+Average activities linked to an accompanying period visit duration: Moyenne de la durée de déplacement des activités liées à un parcours
+Average activities linked to an accompanying period visit duration by various parameters.: Moyenne de la durée de déplacement des activités en fonction de différents paramètres.
 
 #filters
-Filter by reason: Filtrer par sujet d'activité
+Filter by reason: Filtrer les activités par sujet
 'Filtered by reasons: only %list%': 'Filtré par sujet: seulement %list%'
-'Filtered by activity type: only %list%': "Filtré par type d'activity: seulement %list%"
-Filtered by date activity: Filtrer par date d'activité
+'Filtered by activity type: only %list%': "Filtré par type d'activité: uniquement %list%"
+Filtered by date activity: Filtrer les activités par date
 Activities after this date: Activités après cette date
 Activities before this date: Activités avant cette date
 "Filtered by date of activity: only between %date_from% and %date_to%": "Filtré par date de l'activité: uniquement entre %date_from% et %date_to%"
@@ -226,18 +247,59 @@ Implied in an activity before this date: Impliqué dans une activité avant cett
 Filtered by person having an activity between %date_from% and %date_to% with reasons %reasons_name%: Filtré par personnes associées à une activité entre %date_from% et %date_to% avec les sujets %reasons_name%
 Activity reasons for those activities: Sujets de ces activités
 
-Filter by activity type: Filtrer par type d'activité
+Filter by activity type: Filtrer les activités par type
+
+Filter activity by locationtype: Filtrer les activités par type de localisation
+'Filtered activity by locationtype: only %types%': "Filtré par type de localisation: uniquement %types%"
+Accepted locationtype: Types de localisation
+Filter activity by linked users: Filtrer les activités par TMS
+'Filtered activity by linked users: only %users%': "Filtré par TMS: uniquement %users%"
+Accepted users: TMS(s)
+Filter activity by emergency: Filtrer les activités par urgence
+'Filtered activity by emergency: only %emergency%': "Filtré par urgence: uniquement si %emergency%"
+activity is emergency: l'activité est urgente
+activity is not emergency: l'activité n'est pas urgente
+Filter activity by sentreceived: Filtrer les activités par envoyé/reçu
+'Filtered activity by sentreceived: only %sentreceived%': "Filtré par envoyé/reçu: uniquement %sentreceived%"
+Accepted sentreceived: ''
+is sent: envoyé
+is received: reçu
+Filter activity by linked socialaction: Filtrer les activités par action liée
+'Filtered activity by linked socialaction: only %actions%': "Filtré par action liée: uniquement %actions%"
+Filter activity by linked socialissue: Filtrer les activités par problématique liée
+'Filtered activity by linked socialissue: only %issues%': "Filtré par problématique liée: uniquement %issues%"
+Filter activity by user: Filtrer les activités par créateur
+'Filtered activity by user: only %users%': "Filtré par créateur: uniquement %users%"
+Creators: Créateurs
+Filter activity by userscope: Filtrer les activités par service du créateur
+'Filtered activity by userscope: only %scopes%': "Filtré par service du créateur: uniquement %scopes%"
+Accepted userscope: Services
 
 #aggregators
 Activity type: Type d'activité
-Activity user: Utilisateur lié à l'activity
+Activity user: Utilisateur lié à l'activité
 By reason: Par sujet
 By category of reason: Par catégorie de sujet
 Reason's level: Niveau du sujet
 Group by reasons: Sujet d'activité
-Aggregate by activity user: Aggréger par utilisateur lié à l'activité
-Aggregate by activity type: Aggréger par type d'activité
-Aggregate by activity reason: Aggréger par sujet de l'activité
+Aggregate by activity user: Grouper les activités par utilisateur
+Aggregate by activity type: Grouper les activités par type
+Aggregate by activity reason: Grouper les activités par sujet
+
+Group activity by locationtype: Grouper les activités par type de localisation
+Group activity by date: Grouper les activités par date
+Frequency: Fréquence
+by month: Par mois
+by week: Par semaine
+for week: Semaine
+by year: Par année
+in year: En
+Group activity by linked users: Grouper les activités par TMS impliqué
+Group activity by linked thirdparties: Grouper les activités par tiers impliqué
+Accepted thirdparty: Tiers impliqué
+Group activity by linked socialaction: Grouper les activités par action liée
+Group activity by linked socialissue: Grouper les activités par problématique liée
+Group activity by userscope: Grouper les activités par service du créateur
 
 Last activities: Les dernières activités
 

src/Bundle/ChillActivityBundle/translations/messages.nl.yaml

@@ -195,7 +195,7 @@ Number of activities: Nombre d'activités
 #filters
 Filter by reason: Filtrer par sujet d'activité
 'Filtered by reasons: only %list%': 'Filtré par sujet: seulement %list%'
-'Filtered by activity type: only %list%': "Filtré par type d'activity: seulement %list%"
+'Filtered by activity type: only %list%': "Filtré par type d'activity: uniquement %list%"
 Filtered by date activity: Filtrer par date d'activité
 Activities after this date: Activités après cette date
 Activities before this date: Activités avant cette date
@@ -217,9 +217,9 @@ By reason: Par sujet
 By category of reason: Par catégorie de sujet
 Reason's level: Niveau du sujet
 Group by reasons: Sujet d'activité
-Aggregate by activity user: Aggréger par utilisateur lié à l'activité
-Aggregate by activity type: Aggréger par type d'activité
-Aggregate by activity reason: Aggréger par sujet de l'activité
+Aggregate by activity user: Grouper par utilisateur lié à l'activité
+Aggregate by activity type: Grouper par type d'activité
+Aggregate by activity reason: Grouper par sujet de l'activité
 
 Last activities: Les dernières activités
 

src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php

@@ -32,6 +32,7 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yml');
+        $loader->load('services/exports.yaml');
         $loader->load('services/controller.yml');
         $loader->load('services/fixtures.yml');
         $loader->load('services/form.yml');

src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php

@@ -0,0 +1,88 @@
+<?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\CalendarBundle\Export\Aggregator;
+
+use Chill\CalendarBundle\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;
+
+final class AgentAggregator implements AggregatorInterface
+{
+    private UserRender $userRender;
+
+    private UserRepository $userRepository;
+
+    public function __construct(
+        UserRepository $userRepository,
+        UserRender $userRender
+    ) {
+        $this->userRepository = $userRepository;
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('cal.user', 'u');
+
+        $qb->addSelect('u.id AS agent_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('agent_aggregator');
+        } else {
+            $qb->groupBy('agent_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Agent';
+            }
+
+            $r = $this->userRepository->find($value);
+
+            return $this->userRender->renderString($r, []);
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['agent_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by agent';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/CancelReasonAggregator.php

@@ -0,0 +1,91 @@
+<?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\CalendarBundle\Export\Aggregator;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\CalendarBundle\Repository\CancelReasonRepository;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Closure;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class CancelReasonAggregator implements AggregatorInterface
+{
+    private CancelReasonRepository $cancelReasonRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        CancelReasonRepository $cancelReasonRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->cancelReasonRepository = $cancelReasonRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        // TODO: still needs to take into account appointments without a cancel reason somehow
+        $qb->join('cal.cancelReason', 'cr');
+
+        $qb->addSelect('IDENTITY(cal.cancelReason) as cancel_reason_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('cancel_reason_aggregator');
+        } else {
+            $qb->groupBy('cancel_reason_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Cancel reason';
+            }
+
+            $j = $this->cancelReasonRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['cancel_reason_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by cancel reason';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php

@@ -0,0 +1,90 @@
+<?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\CalendarBundle\Export\Aggregator;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\UserJobRepository;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Closure;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final class JobAggregator implements AggregatorInterface
+{
+    private UserJobRepository $jobRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        UserJobRepository $jobRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->jobRepository = $jobRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('cal.user', 'u');
+
+        $qb->addSelect('IDENTITY(u.userJob) as job_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('job_aggregator');
+        } else {
+            $qb->groupBy('job_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Job';
+            }
+
+            $j = $this->jobRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['job_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by agent job';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationAggregator.php

@@ -0,0 +1,83 @@
+<?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\CalendarBundle\Export\Aggregator;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\MainBundle\Repository\LocationRepository;
+use Closure;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
+
+final class LocationAggregator implements AggregatorInterface
+{
+    private LocationRepository $locationRepository;
+
+    public function __construct(
+        LocationRepository $locationRepository
+    ) {
+        $this->locationRepository = $locationRepository;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('cal.location', 'l');
+        $qb->addSelect('IDENTITY(cal.location) as location_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('location_aggregator');
+        } else {
+            $qb->groupBy('location_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Location';
+            }
+
+            $l = $this->locationRepository->find($value);
+
+            return $l->getName();
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['location_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by location';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/LocationTypeAggregator.php

@@ -0,0 +1,90 @@
+<?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\CalendarBundle\Export\Aggregator;
+
+use Chill\CalendarBundle\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;
+
+final class LocationTypeAggregator implements AggregatorInterface
+{
+    private LocationTypeRepository $locationTypeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        LocationTypeRepository $locationTypeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->locationTypeRepository = $locationTypeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('cal.location', 'l');
+
+        $qb->addSelect('IDENTITY(l.locationType) as location_type_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('location_type_aggregator');
+        } else {
+            $qb->groupBy('location_type_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Location type';
+            }
+
+            $j = $this->locationTypeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $j->getTitle()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['location_type_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by location type';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php

@@ -0,0 +1,74 @@
+<?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\CalendarBundle\Export\Aggregator;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Closure;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
+
+class MonthYearAggregator implements AggregatorInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->addSelect("to_char(cal.startDate, 'MM-YYYY') AS month_year_aggregator");
+        // $qb->addSelect("extract(month from age(cal.startDate, cal.endDate)) AS month_aggregator");
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('month_year_aggregator');
+        } else {
+            $qb->groupBy('month_year_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // No form needed
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return static function ($value): string {
+            if ('_header' === $value) {
+                return 'by month and year';
+            }
+
+            $month = substr($value, 0, 2);
+            $year = substr($value, 3, 4);
+
+            return strftime('%B %G', mktime(0, 0, 0, $month, '1', $year));
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['month_year_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by month and year';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php

@@ -0,0 +1,90 @@
+<?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\CalendarBundle\Export\Aggregator;
+
+use Chill\CalendarBundle\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;
+
+final class ScopeAggregator implements AggregatorInterface
+{
+    private ScopeRepository $scopeRepository;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        ScopeRepository $scopeRepository,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->scopeRepository = $scopeRepository;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('cal.user', 'u');
+
+        $qb->addSelect('IDENTITY(u.mainScope) as scope_aggregator');
+
+        $groupBy = $qb->getDQLPart('groupBy');
+
+        if (!empty($groupBy)) {
+            $qb->addGroupBy('scope_aggregator');
+        } else {
+            $qb->groupBy('scope_aggregator');
+        }
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // no form
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'Scope';
+            }
+
+            $s = $this->scopeRepository->find($value);
+
+            return $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['scope_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Group appointments by agent scope';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Declarations.php

@@ -0,0 +1,20 @@
+<?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\CalendarBundle\Export;
+
+/**
+ * This class declare constants used for the export framework.
+ */
+abstract class Declarations
+{
+    public const CALENDAR_TYPE = 'calendar';
+}

src/Bundle/ChillCalendarBundle/Export/Export/CountAppointments.php

@@ -0,0 +1,118 @@
+<?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\CalendarBundle\Export\Export;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\CalendarBundle\Repository\CalendarRepository;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Closure;
+use Doctrine\ORM\AbstractQuery;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Process\Exception\LogicException;
+use Symfony\Component\Security\Core\Role\Role;
+
+class CountAppointments implements ExportInterface, GroupedExportInterface
+{
+    private CalendarRepository $calendarRepository;
+
+    public function __construct(CalendarRepository $calendarRepository)
+    {
+        $this->calendarRepository = $calendarRepository;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // No form necessary
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Count appointments by various parameters.';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of calendar';
+    }
+
+    public function getLabels($key, array $values, $data): Closure
+    {
+        if ('export_result' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static function ($value) use ($labels) {
+            return $labels[$value];
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_result'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(AbstractQuery::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Count appointments';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    /**
+     * Initiate the query.
+     */
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    {
+        $centers = array_map(static function ($el) {
+            return $el['center'];
+        }, $acl);
+
+        $qb = $this->calendarRepository->createQueryBuilder('cal');
+
+        $qb->select('COUNT(cal.id) AS export_result');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        // which role should we give here?
+        return PersonVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::CALENDAR_TYPE,
+        ];
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentAvgDuration.php

@@ -0,0 +1,110 @@
+<?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\CalendarBundle\Export\Export;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\CalendarBundle\Repository\CalendarRepository;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class StatAppointmentAvgDuration implements ExportInterface, GroupedExportInterface
+{
+    private CalendarRepository $calendarRepository;
+
+    public function __construct(
+        CalendarRepository $calendarRepository
+    ) {
+        $this->calendarRepository = $calendarRepository;
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // no form needed
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Get the average of appointment duration according to various filters';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of calendar';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_result' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static function ($value) use ($labels) {
+            return $labels[$value];
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_result'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Average appointment duration';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    {
+        $qb = $this->calendarRepository->createQueryBuilder('cal');
+
+        $qb
+            ->select('AVG(cal.endDate - cal.startDate) AS export_result');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AccompanyingPeriodVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::CALENDAR_TYPE,
+        ];
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Export/StatAppointmentSumDuration.php

@@ -0,0 +1,110 @@
+<?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\CalendarBundle\Export\Export;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\CalendarBundle\Repository\CalendarRepository;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class StatAppointmentSumDuration implements ExportInterface, GroupedExportInterface
+{
+    private CalendarRepository $calendarRepository;
+
+    public function __construct(
+        CalendarRepository $calendarRepository
+    ) {
+        $this->calendarRepository = $calendarRepository;
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // no form needed
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'Get the sum of appointment durations according to various filters';
+    }
+
+    public function getGroup(): string
+    {
+        return 'Exports of calendar';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_result' !== $key) {
+            throw new LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static function ($value) use ($labels) {
+            return $labels[$value];
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_result'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'Sum of appointment durations';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data = []): QueryBuilder
+    {
+        $qb = $this->calendarRepository->createQueryBuilder('cal');
+
+        $qb
+            ->select('SUM(cal.endDate - cal.startDate) AS export_result');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AccompanyingPeriodVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::CALENDAR_TYPE,
+        ];
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php

@@ -0,0 +1,87 @@
+<?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\CalendarBundle\Export\Filter;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Export\FilterInterface;
+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;
+
+class AgentFilter implements FilterInterface
+{
+    private UserRender $userRender;
+
+    public function __construct(UserRender $userRender)
+    {
+        $this->userRender = $userRender;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('cal.user', ':agents');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('agents', $data['accepted_agents']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('accepted_agents', EntityType::class, [
+            'class' => User::class,
+            'choice_label' => function (User $u) {
+                return $this->userRender->renderString($u, []);
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $users = [];
+
+        foreach ($data['accepted_agents'] as $r) {
+            $users[] = $r;
+        }
+
+        return [
+            'Filtered by agent: only %agents%', [
+                '%agents' => implode(', ou ', $users),
+            ], ];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter appointments by agent';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Filter/BetweenDatesFilter.php

@@ -0,0 +1,79 @@
+<?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\CalendarBundle\Export\Filter;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use DateTime;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Query\Expr\Andx;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class BetweenDatesFilter implements FilterInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $where = $qb->getDQLPart('where');
+
+        $clause = $qb->expr()->andX(
+            $qb->expr()->gte('cal.startDate', ':dateFrom'),
+            $qb->expr()->lte('cal.endDate', ':dateTo')
+        );
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('dateFrom', $data['date_from'], Types::DATE_MUTABLE);
+        // modify dateTo so that entire day is also taken into account up until the beginning of the next day.
+        $qb->setParameter('dateTo', $data['date_to']->modify('+1 day'), Types::DATE_MUTABLE);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder
+            ->add('date_from', ChillDateType::class, [
+                'data' => new DateTime(),
+            ])
+            ->add('date_to', ChillDateType::class, [
+                'data' => new DateTime(),
+            ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        return ['Filtered by appointments between %dateFrom% and %dateTo%', [
+            '%dateFrom%' => $data['date_from']->format('d-m-Y'),
+            '%dateTo%' => $data['date_to']->format('d-m-Y'),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter appointments between certain dates';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php

@@ -0,0 +1,98 @@
+<?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\CalendarBundle\Export\Filter;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Export\FilterInterface;
+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 Symfony\Contracts\Translation\TranslatorInterface;
+
+class JobFilter implements FilterInterface
+{
+    protected TranslatorInterface $translator;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->translator = $translator;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('cal.user', 'u');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('u.userJob', ':job');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('job', $data['job']);
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('job', EntityType::class, [
+            'class' => UserJob::class,
+            'choice_label' => function (UserJob $j) {
+                return $this->translatableStringHelper->localize(
+                    $j->getLabel()
+                );
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string'): array
+    {
+        $userJobs = [];
+
+        foreach ($data['job'] as $j) {
+            $userJobs[] = $this->translatableStringHelper->localize(
+                $j->getLabel()
+            );
+        }
+
+        return ['Filtered by agent job: only %jobs%', [
+            '%jobs%' => implode(', ou ', $userJobs),
+        ]];
+    }
+
+    public function getTitle(): string
+    {
+        return 'Filter appointments by agent job';
+    }
+}

src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php

@@ -0,0 +1,98 @@
+<?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\CalendarBundle\Export\Filter;
+
+use Chill\CalendarBundle\Export\Declarations;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Export\FilterInterface;
+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 Symfony\Contracts\Translation\TranslatorInterface;
+
+class ScopeFilter implements FilterInterface
+{
+    protected TranslatorInterface $translator;
+
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        TranslatorInterface $translator,
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->translator = $translator;
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join('cal.user', 'u');
+
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('u.mainScope', ':scope');
+
+        if ($where instanceof Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
+        $qb->setParameter('scope', $data['scope']);
+    }
+
+    public function applyOn()
+    {
+        return Declarations::CALENDAR_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('scope', EntityType::class, [
+            'class' => Scope::class,
+            'choice_label' => function (Scope $s) {
+                return $this->translatableStringHelper->localize(
+                    $s->getName()
+                );
+            },
+            'multiple' => true,
+            'expanded' => true,
+        ]);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        $scopes = [];
+
+        foreach ($data['scope'] as $s) {
+            $scopes[] = $this->translatableStringHelper->localize(
+                $s->getName()
+            );
+        }
+
+        return ['Filtered by agent scope: only %scopes%', [
+            '%scopes%' => implode(', ou ', $scopes),
+        ]];
+    }
+
+    public function getTitle()
+    {
+        return 'Filter appointments by agent scope';
+    }
+}

src/Bundle/ChillCalendarBundle/Resources/config/services/exports.yaml

@@ -0,0 +1,104 @@
+services:
+
+  ## Indicators
+  chill.calendar.export.count_appointments:
+    class: Chill\CalendarBundle\Export\Export\CountAppointments
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export, alias: count_appointments }
+
+  chill.calendar.export.average_duration_appointments:
+    class: Chill\CalendarBundle\Export\Export\StatAppointmentAvgDuration
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export, alias: average_duration_appointments }
+
+  chill.calendar.export.sum_duration_appointments:
+    class: Chill\CalendarBundle\Export\Export\StatAppointmentSumDuration
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export, alias: sum_duration_appointments }
+
+  ## Filters
+
+  chill.calendar.export.agent_filter:
+    class: Chill\CalendarBundle\Export\Filter\AgentFilter
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_filter, alias: agent_filter }
+
+  chill.calendar.export.job_filter:
+    class: Chill\CalendarBundle\Export\Filter\JobFilter
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_filter, alias: job_filter }
+
+  chill.calendar.export.scope_filter:
+    class: Chill\CalendarBundle\Export\Filter\ScopeFilter
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_filter, alias: scope_filter }
+
+  chill.calendar.export.between_dates_filter:
+    class: Chill\CalendarBundle\Export\Filter\BetweenDatesFilter
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_filter, alias: between_dates_filter }
+
+  ## Aggregator
+
+  chill.calendar.export.agent_aggregator:
+    class: Chill\CalendarBundle\Export\Aggregator\AgentAggregator
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_aggregator, alias: agent_aggregator }
+
+  chill.calendar.export.job_aggregator:
+    class: Chill\CalendarBundle\Export\Aggregator\JobAggregator
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_aggregator, alias: job_aggregator }
+
+  chill.calendar.export.scope_aggregator:
+    class: Chill\CalendarBundle\Export\Aggregator\ScopeAggregator
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_aggregator, alias: scope_aggregator }
+
+  chill.calendar.export.location_type_aggregator:
+    class: Chill\CalendarBundle\Export\Aggregator\LocationTypeAggregator
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_aggregator, alias: location_type_aggregator }
+
+  chill.calendar.export.location_aggregator:
+    class: Chill\CalendarBundle\Export\Aggregator\LocationAggregator
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_aggregator, alias: location_aggregator }
+
+  chill.calendar.export.cancel_reason_aggregator:
+    class: Chill\CalendarBundle\Export\Aggregator\CancelReasonAggregator
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_aggregator, alias: cancel_reason_aggregator }
+
+  chill.calendar.export.month_aggregator:
+    class: Chill\CalendarBundle\Export\Aggregator\MonthYearAggregator
+    autowire: true
+    autoconfigure: true
+    tags:
+      - { name: chill.export_aggregator, alias: month_aggregator }

src/Bundle/ChillCalendarBundle/translations/messages.fr.yml

@@ -69,3 +69,36 @@ invite:
     declined: Refusé
     pending: En attente
     tentative: Accepté provisoirement
+
+# exports
+Exports of calendar: Exports des rendez-vous
+Count appointments: Nombre de rendez-vous
+Count appointments by various parameters.: Compte le nombre de rendez-vous en fonction de différents paramètres.
+
+Average appointment duration: Moyenne de la durée des rendez-vous
+Get the average of appointment duration according to various filters: Calcule la moyenne des durées des rendez-vous en fonction de différents paramètres.
+
+Sum of appointment durations: Somme de la durée des rendez-vous
+Get the sum of appointment durations according to various filters: Calcule la somme des durées des rendez-vous en fonction de différents paramètres.
+
+'Filtered by agent: only %agents%': "Filtré par agents: uniquement %agents%"
+Filter appointments by agent: Filtrer les rendez-vous par agents
+Filter appointments by agent job: Filtrer les rendez-vous par métiers des agents
+'Filtered by agent job: only %jobs%': 'Filtré par métiers des agents: uniquement les %jobs%'
+Filter appointments by agent scope: Filtrer les rendez-vous par services des agents
+'Filtered by agent scope: only %scopes%': 'Filtré par services des agents: uniquement les services %scopes%'
+Filter appointments between certain dates: Filtrer les rendez-vous par date du rendez-vous
+'Filtered by appointments between %dateFrom% and %dateTo%': 'Filtré par rendez-vous entre %dateFrom% et %dateTo%'
+
+Group appointments by agent: Grouper les rendez-vous par agent
+Group appointments by agent job: Grouper les rendez-vous par métier de l'agent
+Group appointments by agent scope: Grouper les rendez-vous par service de l'agent
+Group appointments by location type: Grouper les rendez-vous par type de localisation
+Group appointments by location: Grouper les rendez-vous par lieu de rendez-vous
+Group appointments by cancel reason: Grouper les rendez-vous par motif d'annulation
+Group appointments by month and year: Grouper les rendez-vous par mois et année
+Scope: Service
+Job: Métier
+Location type: Type de localisation
+Location: Lieu de rendez-vous
+by month and year: Par mois et année

src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php

@@ -188,7 +188,7 @@ class CustomFieldChoice extends AbstractCustomField
             $choices = [];
 
             foreach ($cf->getOptions()[self::CHOICES] as $choice) {
-                if (false === $choices['active']) {
+                if (false === $choice['active']) {
                     continue;
                 }
                 $choices[$choice['slug']] = $this->translatableStringHelper

src/Bundle/ChillDocStoreBundle/Entity/AccompanyingCourseDocument.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\DocStoreBundle\Entity;
 
+use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Doctrine\ORM\Mapping as ORM;
 
@@ -18,7 +19,7 @@ use Doctrine\ORM\Mapping as ORM;
  * @ORM\Entity
  * @ORM\Table("chill_doc.accompanyingcourse_document")
  */
-class AccompanyingCourseDocument extends Document
+class AccompanyingCourseDocument extends Document implements HasScopesInterface
 {
     /**
      * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class)
@@ -31,6 +32,15 @@ class AccompanyingCourseDocument extends Document
         return $this->course;
     }
 
+    public function getScopes(): iterable
+    {
+        if (null !== $this->course) {
+            return [];
+        }
+
+        return $this->course->getScopes();
+    }
+
     public function setCourse(?AccompanyingPeriod $course): self
     {
         $this->course = $course;

src/Bundle/ChillDocStoreBundle/Entity/Document.php

@@ -16,8 +16,6 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
-use Chill\MainBundle\Entity\HasScopeInterface;
-use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use DateTimeInterface;
 use Doctrine\ORM\Mapping as ORM;
@@ -26,7 +24,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 /**
  * @ORM\MappedSuperclass
  */
-class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdateInterface
+class Document implements TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
 
@@ -70,13 +68,6 @@ class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdate
      */
     private $object;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
-     *
-     * @var \Chill\MainBundle\Entity\Scope The document's center
-     */
-    private $scope;
-
     /**
      * @ORM\ManyToOne(targetEntity="Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate")
      */
@@ -122,16 +113,6 @@ class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdate
         return $this->object;
     }
 
-    /**
-     * Get scope.
-     *
-     * @return \Chill\MainBundle\Entity\Scope
-     */
-    public function getScope(): ?Scope
-    {
-        return $this->scope;
-    }
-
     public function getTemplate(): ?DocGeneratorTemplate
     {
         return $this->template;
@@ -175,13 +156,6 @@ class Document implements HasScopeInterface, TrackCreationInterface, TrackUpdate
         return $this;
     }
 
-    public function setScope($scope): self
-    {
-        $this->scope = $scope;
-
-        return $this;
-    }
-
     public function setTemplate(?DocGeneratorTemplate $template): self
     {
         $this->template = $template;

src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php

@@ -13,6 +13,7 @@ namespace Chill\DocStoreBundle\Entity;
 
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\Scope;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\Mapping as ORM;
 
@@ -27,6 +28,13 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt
      */
     private Person $person;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
+     *
+     * @var \Chill\MainBundle\Entity\Scope The document's center
+     */
+    private $scope;
+
     public function getCenter()
     {
         return $this->getPerson()->getCenter();
@@ -37,10 +45,22 @@ class PersonDocument extends Document implements HasCenterInterface, HasScopeInt
         return $this->person;
     }
 
+    public function getScope(): ?Scope
+    {
+        return $this->scope;
+    }
+
     public function setPerson($person): self
     {
         $this->person = $person;
 
         return $this;
     }
+
+    public function setScope($scope): self
+    {
+        $this->scope = $scope;
+
+        return $this;
+    }
 }

src/Bundle/ChillDocStoreBundle/Form/AccompanyingCourseDocumentType.php

@@ -88,10 +88,5 @@ class AccompanyingCourseDocumentType extends AbstractType
         $resolver->setDefaults([
             'data_class' => Document::class,
         ]);
-
-        // $resolver->setRequired(['role', 'center'])
-        //     ->setAllowedTypes('role', [ \Symfony\Component\Security\Core\Role\Role::class ])
-        //     ->setAllowedTypes('center', [ \Chill\MainBundle\Entity\Center::class ])
-        //     ;
     }
 }

src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php

@@ -65,7 +65,7 @@ class PersonDocumentACLAwareRepository implements PersonDocumentACLAwareReposito
         $this->addACL($qb, $person);
 
         foreach ($orderBy as $field => $order) {
-            $qb->addOrderBy($field, $order);
+            $qb->addOrderBy('d.' . $field, $order);
         }
 
         $qb->setFirstResult($offset)->setMaxResults($limit);

src/Bundle/ChillDocStoreBundle/Security/Authorization/AccompanyingCourseDocumentVoter.php

@@ -106,6 +106,10 @@ class AccompanyingCourseDocumentVoter extends AbstractChillVoter implements Prov
             ) {
                 return false;
             }
+
+            if (self::CREATE === $attribute && null !== $subject->getCourse()) {
+                return $this->voterHelper->voteOnAttribute($attribute, $subject->getCourse(), $token);
+            }
         }
 
         return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);

src/Bundle/ChillEventBundle/Menu/AdminMenuBuilder.php

@@ -35,10 +35,10 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
 
         $menu->addChild('Events', [
             'route' => 'chill_event_admin_index',
-            ])
+        ])
             ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
-                'order' => 6500
+                'order' => 6500,
             ]);
 
         $menu->addChild('Event type', [

src/Bundle/ChillEventBundle/migrations/Version20160318111334.php

@@ -126,7 +126,7 @@ class Version20160318111334 extends AbstractMigration
         $this->addSql('ALTER TABLE chill_event_participation '
                 . 'ADD CONSTRAINT FK_4E7768AC217BBB47 '
                 . 'FOREIGN KEY (person_id) '
-                . 'REFERENCES Person (id) '
+                . 'REFERENCES chill_person_person(id) '
                 . 'NOT DEFERRABLE INITIALLY IMMEDIATE');
         $this->addSql('ALTER TABLE chill_event_participation '
                 . 'ADD CONSTRAINT FK_4E7768ACD60322AC '

src/Bundle/ChillMainBundle/Controller/ExportController.php

@@ -86,6 +86,9 @@ class ExportController extends AbstractController
     {
         /** @var \Chill\MainBundle\Export\ExportManager $exportManager */
         $exportManager = $this->exportManager;
+
+        $export = $exportManager->getExport($alias);
+
         $key = $request->query->get('key', null);
 
         [$dataCenters, $dataExport, $dataFormatter] = $this->rebuildData($key);
@@ -100,7 +103,8 @@ class ExportController extends AbstractController
 
         $viewVariables = [
             'alias' => $alias,
-            'export' => $exportManager->getExport($alias),
+            'export' => $export,
+            'export_group' => $this->getExportGroup($export),
         ];
 
         if ($formater instanceof \Chill\MainBundle\Export\Formatter\CSVListFormatter) {
@@ -316,6 +320,7 @@ class ExportController extends AbstractController
             'form' => $form->createView(),
             'export_alias' => $alias,
             'export' => $export,
+            'export_group' => $this->getExportGroup($export),
         ]);
     }
 
@@ -371,6 +376,7 @@ class ExportController extends AbstractController
             [
                 'form' => $form->createView(),
                 'export' => $export,
+                'export_group' => $this->getExportGroup($export),
             ]
         );
     }
@@ -514,10 +520,26 @@ class ExportController extends AbstractController
             [
                 'form' => $form->createView(),
                 'export' => $export,
+                'export_group' => $this->getExportGroup($export),
             ]
         );
     }
 
+    private function getExportGroup($target): string
+    {
+        $exportManager = $this->exportManager;
+
+        $groups = $exportManager->getExportsGrouped(true);
+
+        foreach ($groups as $group => $array) {
+            foreach ($array as $alias => $export) {
+                if ($export === $target) {
+                    return $group;
+                }
+            }
+        }
+    }
+
     /**
      * get the next step. If $reverse === true, the previous step is returned.
      *

src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php

@@ -92,5 +92,8 @@ final class PostalCodeAPIController extends ApiController
             $qb->where('e.country = :country')
                 ->setParameter('country', $request->query->get('country'));
         }
+
+        $qb->andWhere('e.origin = :zero')
+            ->setParameter('zero', 0);
     }
 }

src/Bundle/ChillMainBundle/Controller/UserApiController.php

@@ -12,7 +12,9 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
 class UserApiController extends ApiController
@@ -58,4 +60,14 @@ class UserApiController extends ApiController
             ['groups' => ['read']]
         );
     }
+
+    /**
+     * @param QueryBuilder $query
+     */
+    protected function customizeQuery(string $action, Request $request, $query): void
+    {
+        if ('_index' === $action) {
+            $query->andWhere($query->expr()->eq('e.enabled', "'TRUE'"));
+        }
+    }
 }

src/Bundle/ChillMainBundle/Controller/UserJobApiController.php

@@ -0,0 +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\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
+
+class UserJobApiController extends ApiController
+{
+    protected function customizeQuery(string $action, Request $request, $query): void
+    {
+        if ('_index' === $action) {
+            $query->andWhere($query->expr()->eq('e.active', "'TRUE'"));
+        }
+    }
+}

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -19,8 +19,10 @@ use Chill\MainBundle\Controller\LanguageController;
 use Chill\MainBundle\Controller\LocationController;
 use Chill\MainBundle\Controller\LocationTypeController;
 use Chill\MainBundle\Controller\UserController;
+use Chill\MainBundle\Controller\UserJobApiController;
 use Chill\MainBundle\Controller\UserJobController;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
+use Chill\MainBundle\Doctrine\DQL\Extract;
 use Chill\MainBundle\Doctrine\DQL\GetJsonFieldByKey;
 use Chill\MainBundle\Doctrine\DQL\JsonAggregate;
 use Chill\MainBundle\Doctrine\DQL\JsonbArrayLength;
@@ -30,6 +32,7 @@ use Chill\MainBundle\Doctrine\DQL\Replace;
 use Chill\MainBundle\Doctrine\DQL\Similarity;
 use Chill\MainBundle\Doctrine\DQL\STContains;
 use Chill\MainBundle\Doctrine\DQL\StrictWordSimilarityOPS;
+use Chill\MainBundle\Doctrine\DQL\ToChar;
 use Chill\MainBundle\Doctrine\DQL\Unaccent;
 use Chill\MainBundle\Doctrine\ORM\Hydration\FlatHierarchyEntityHydrator;
 use Chill\MainBundle\Doctrine\Type\NativeDateIntervalType;
@@ -240,6 +243,10 @@ class ChillMainExtension extends Extension implements
                                 'ST_CONTAINS' => STContains::class,
                                 'JSONB_ARRAY_LENGTH' => JsonbArrayLength::class,
                             ],
+                            'datetime_functions' => [
+                                'EXTRACT' => Extract::class,
+                                'TO_CHAR' => ToChar::class,
+                            ],
                         ],
                         'hydrators' => [
                             'chill_flat_hierarchy_list' => FlatHierarchyEntityHydrator::class,
@@ -504,6 +511,7 @@ class ChillMainExtension extends Extension implements
                     'name' => 'user_job',
                     'base_path' => '/api/1.0/main/user-job',
                     'base_role' => 'ROLE_USER',
+                    'controller' => UserJobApiController::class,
                     'actions' => [
                         '_index' => [
                             'methods' => [

src/Bundle/ChillMainBundle/Doctrine/DQL/Extract.php

@@ -0,0 +1,61 @@
+<?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\MainBundle\Doctrine\DQL;
+
+use Doctrine\ORM\Query\AST\Functions\DateDiffFunction;
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\AST\PathExpression;
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+/**
+ * Extract postgresql function
+ * https://www.postgresql.org/docs/current/functions-datetime.html#FUNCTIONS-DATETIME-EXTRACT.
+ *
+ * Usage : EXTRACT(field FROM timestamp)
+ * TODO allow interval usage -> EXTRACT(field FROM interval)
+ */
+class Extract extends FunctionNode
+{
+    private string $field;
+
+    private $value;
+    //private PathExpression $value;
+    //private FunctionNode $value;
+    //private DateDiffFunction $value;
+
+    public function getSql(SqlWalker $sqlWalker)
+    {
+        return sprintf(
+            'EXTRACT(%s FROM %s)',
+            $this->field,
+            $this->value->dispatch($sqlWalker)
+        );
+    }
+
+    public function parse(Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+        $parser->match(Lexer::T_IDENTIFIER);
+        $this->field = $parser->getLexer()->token['value'];
+
+        $parser->match(Lexer::T_FROM);
+
+        //$this->value = $parser->ScalarExpression();
+        $this->value = $parser->ArithmeticPrimary();
+
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}

src/Bundle/ChillMainBundle/Doctrine/DQL/ToChar.php

@@ -0,0 +1,46 @@
+<?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\MainBundle\Doctrine\DQL;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+/**
+ * Usage : TO_CHAR(datetime, fmt).
+ */
+class ToChar extends FunctionNode
+{
+    private $datetime;
+
+    private $fmt;
+
+    public function getSql(SqlWalker $sqlWalker)
+    {
+        return sprintf(
+            'TO_CHAR(%s, %s)',
+            $sqlWalker->walkArithmeticPrimary($this->datetime),
+            $sqlWalker->walkArithmeticPrimary($this->fmt)
+        );
+    }
+
+    public function parse(Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $this->datetime = $parser->ArithmeticExpression();
+        $parser->match(Lexer::T_COMMA);
+        $this->fmt = $parser->StringExpression();
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}

src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php

@@ -0,0 +1,72 @@
+<?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\MainBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Table(name="chill_main_geographical_unit")
+ * @ORM\Entity
+ */
+class GeographicalUnit
+{
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     */
+    private $geom;
+
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    private $layerName;
+
+    /**
+     * @ORM\Column(type="string", length=255, nullable=true)
+     */
+    private $unitName;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getLayerName(): ?string
+    {
+        return $this->layerName;
+    }
+
+    public function getUnitName(): ?string
+    {
+        return $this->unitName;
+    }
+
+    public function setLayerName(?string $layerName): self
+    {
+        $this->layerName = $layerName;
+
+        return $this;
+    }
+
+    public function setUnitName(?string $unitName): self
+    {
+        $this->unitName = $unitName;
+
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Export/ExportInterface.php

@@ -139,10 +139,8 @@ interface ExportInterface extends ExportElementInterface
 
     /**
      * Return the required Role to execute the Export.
-     *
-     * @return \Symfony\Component\Security\Core\Role\Role
      */
-    public function requiredRole();
+    public function requiredRole(): string;
 
     /**
      * Inform which ModifiersInterface (i.e. AggregatorInterface, FilterInterface)

src/Bundle/ChillMainBundle/Export/ExportManager.php

@@ -550,7 +550,7 @@ class ExportManager
         if (null === $centers) {
             $centers = $this->authorizationHelper->getReachableCenters(
                 $this->user,
-                $role->getRole(),
+                $role
             );
         }
 
@@ -568,6 +568,10 @@ class ExportManager
                     'role' => $role->getRole(),
                 ]);
 
+                ///// Bypasse les autorisations qui empêche d'afficher les nouveaux exports
+                return true;
+                ///// TODO supprimer le return true
+
                 return false;
             }
         }

src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php

@@ -449,7 +449,9 @@ class SpreadSheetFormatter implements FormatterInterface
 
     protected function getTitle()
     {
-        return $this->translator->trans($this->export->getTitle());
+        $title = $this->translator->trans($this->export->getTitle());
+
+        return substr($title, 0, 30) . '…';
     }
 
     protected function initializeCache($key)

src/Bundle/ChillMainBundle/Export/ModifierInterface.php

@@ -26,9 +26,9 @@ interface ModifierInterface extends ExportElementInterface
      * If null, will used the ExportInterface::requiredRole role from
      * the current executing export.
      *
-     * @return \Symfony\Component\Security\Core\Role\Role|null A role required to execute this ModifiersInterface
+     * @return string|null A role required to execute this ModifiersInterface
      */
-    public function addRole();
+    public function addRole(): ?string;
 
     /**
      * Alter the query initiated by the export, to add the required statements

src/Bundle/ChillMainBundle/Form/Type/CommentType.php

@@ -59,7 +59,7 @@ class CommentType extends AbstractType
         $view->vars = array_replace(
             $view->vars,
             [
-                'hideLabel' => true,
+                'fullWidth' => true,
             ]
         );
     }

src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php

@@ -75,8 +75,6 @@ class PickCenterType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-
-
         $export = $this->exportManager->getExport($options['export_alias']);
         $centers = $this->authorizationHelper->getReachableCenters(
             $this->user,

src/Bundle/ChillMainBundle/Form/Type/PrivateCommentType.php

@@ -46,7 +46,7 @@ class PrivateCommentType extends AbstractType
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars['hideLabel'] = true;
+        $view->vars['fullWidth'] = true;
     }
 
     public function configureOptions(OptionsResolver $resolver)

src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php

@@ -108,7 +108,7 @@ class ScopePickerType extends AbstractType
         $view->vars = array_replace(
             $view->vars,
             [
-                'hideLabel' => true,
+                'fullWidth' => true,
             ]
         );
     }

src/Bundle/ChillMainBundle/Repository/CountryRepository.php

@@ -14,6 +14,7 @@ namespace Chill\MainBundle\Repository;
 use Chill\MainBundle\Entity\Country;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
 final class CountryRepository implements ObjectRepository
@@ -25,6 +26,11 @@ final class CountryRepository implements ObjectRepository
         $this->repository = $entityManager->getRepository(Country::class);
     }
 
+    public function createQueryBuilder(string $alias, ?string $indexBy = null): QueryBuilder
+    {
+        return $this->repository->createQueryBuilder($alias, $indexBy);
+    }
+
     public function find($id, $lockMode = null, $lockVersion = null): ?Country
     {
         return $this->repository->find($id, $lockMode, $lockVersion);

src/Bundle/ChillMainBundle/Resources/public/chill/index.js

@@ -46,7 +46,6 @@ require('../lib/collection/index.js');
 require('../lib/breadcrumb/index.js');
 require('../lib/download-report/index.js');
 require('../lib/select_interactive_loading/index.js');
-require('../lib/export-list/index.js');
 
 //require('../lib/show_hide/index.js');
 //require('../lib/tabs/index.js');

src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss

@@ -99,11 +99,14 @@ div.flex-table {
     div.item-bloc {
         flex-direction: column;
 
-        &:nth-child(even) {
-            background-color: $gray-200;
+        &:not(.no-altern) { // class to avoid even/odd
 
-            .chill-user-quote {
-                background-color: shade-color($gray-200, 5%)
+            &:nth-child(even) {
+                background-color: $gray-200;
+
+                .chill-user-quote {
+                    background-color: shade-color($gray-200, 5%)
+                }
             }
         }
 

src/Bundle/ChillMainBundle/Resources/public/lib/export-list/export-list.scss

@@ -1,20 +0,0 @@
-.container-export {
-    margin-left: 1rem;
-    margin-right: 1rem;
-    
-    .export-list {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-
-        .export-list__element {
-            min-width: 18rem;
-            max-width: 20rem;
-            padding: 1rem;
-            margin: 1rem;
-            flex-grow: 1;
-            
-            border: 1px solid var(--chill-gray);
-        }
-    }
-}

src/Bundle/ChillMainBundle/Resources/public/lib/export-list/index.js

@@ -1 +0,0 @@
-require('./export-list.scss');

src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/_shared.scss

@@ -1,14 +1,23 @@
-// Configuration
+/*
+ * This shared file is used in Chill sass sheets and Vue sass styles to use some bootstrap/chill variables.
+ * Search on @import 'ChillMainAssets/module/bootstrap/shared';
+ */
+
+// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
 @import "bootstrap/scss/functions";
 
-/*
-*  Replaced by CHILL variables
-*  it is necessary to keep the possibility of making a diff with original !
-*  original: "bootstrap/scss/variables";
-*/
+// 2. Include any default variable overrides here
 @import "custom/_variables";
 
+// 3. Include remainder of required Bootstrap stylesheets
+@import "bootstrap/scss/variables";
+
+// 4. Include any default map overrides here
+@import "custom/_maps";
+
+// 5. Include remainder of required parts
 @import "bootstrap/scss/mixins";
-@import "bootstrap/scss/utilities";
+@import "bootstrap/scss/root";
+
 
 

src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/bootstrap.scss

@@ -1,18 +1,8 @@
-/*!
- * Bootstrap v5.0.1 (https://getbootstrap.com/)
- * Copyright 2011-2021 The Bootstrap Authors
- * Copyright 2011-2021 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- *
- * Enable / disable bootstrap assets
- */
-
-// Bootstrap configuration files are shared with chill entrypoint
+// Some Bootstrap variables and configuration files are shared with chill entrypoint
 @import "shared";
 
-// scss-docs-start import-stack
-// Layout & components
-@import "bootstrap/scss/root";
+// 6. Optionally include any other parts as needed
+@import "bootstrap/scss/utilities";
 @import "bootstrap/scss/reboot";
 @import "bootstrap/scss/type";
 @import "bootstrap/scss/images";
@@ -42,14 +32,11 @@
 @import "bootstrap/scss/carousel";
 @import "bootstrap/scss/spinners";
 @import "bootstrap/scss/offcanvas";
-
-// Helpers
 @import "bootstrap/scss/helpers";
 
-// Utilities
+// 7. Optionally include utilities API last to generate classes based on the Sass map in
 @import "bootstrap/scss/utilities/api";
-// scss-docs-end import-stack
 
-// CHILL custom
+// 8. Add additional custom code here
 @import "custom";
 @import "custom/_debug";

src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_maps.scss

@@ -0,0 +1,69 @@
+//// CHILL OVERRIDE DEFAULT BOOTSTRAP COLORS MAP
+
+// 'beige' variations
+$beige-100: tint-color($beige, 80%);
+$beige-200: tint-color($beige, 60%);
+$beige-300: tint-color($beige, 40%);
+$beige-400: tint-color($beige, 20%);
+$beige-500: $beige;
+$beige-600: shade-color($beige, 20%);
+$beige-700: shade-color($beige, 40%);
+$beige-800: shade-color($beige, 60%);
+$beige-900: shade-color($beige, 80%);
+
+$chill-blue:         $blue;
+$chill-green:        $green;
+$chill-green-dark:   $green-600;
+$chill-orange:       $orange;
+$chill-yellow:       $yellow;
+$chill-red:          $red;
+$chill-beige:        $beige;
+$chill-pink:         $pink;
+$chill-dark-gray:    $gray-800;
+$chill-gray:         $gray-600;
+$chill-l-gray:       $gray-400;
+$chill-ll-gray:      $gray-300;
+$chill-light-gray:   $gray-200;
+$chill-llight-gray:  $gray-100;
+
+$colors: (
+    "blue":       $blue,
+    "green":      $green,
+    "green-dark": $green-600,
+    "yellow":     $yellow,
+    "orange":     $orange,
+    "red":        $red,
+    "pink":       $pink,
+    "beige":      $beige,
+    "white":      $white,
+    "gray":       $gray-600,
+    "dark":       $gray-800,
+    "black":      $black
+);
+
+$chill-colors: (
+    "chill-blue":         $chill-blue,
+    "chill-green":        $chill-green,
+    "chill-green-dark":   $chill-green-dark,
+    "chill-orange":       $chill-orange,
+    "chill-yellow":       $chill-yellow,
+    "chill-red":          $chill-red,
+    "chill-beige":        $chill-beige,
+    "chill-pink":         $chill-pink,
+    "chill-dark-gray":    $chill-dark-gray,
+    "chill-gray":         $chill-gray,
+    "chill-l-gray":       $chill-l-gray,
+    "chill-ll-gray":      $chill-ll-gray,
+    "chill-light-gray":   $chill-light-gray,
+    "chill-llight-gray":  $chill-llight-gray,
+);
+
+// Merge the maps
+$theme-colors: map-merge($theme-colors, $chill-colors);
+
+// Chill color classes
+@each $color, $value in $chill-colors {
+    .#{$color} {
+        color: $value;
+    }
+}

src/Bundle/ChillMainBundle/Resources/public/module/scratch/_custom.scss

@@ -1,190 +0,0 @@
-/*
- * NOTE 2021.04
- * scss/chill.scss is the main sass file for the new chill.2
- * scratch will be replaced by bootstrap, please avoid to edit in modules/scratch/_custom.scss
- */
-
-// YOUR CUSTOM SCSS
-@import 'custom/config/colors';
-@import 'custom/config/variables';
-@import 'custom/fonts';
-@import 'custom/timeline';
-@import 'custom/mixins/entity';
-@import 'custom/report';
-@import 'custom/person';
-@import 'custom/pagination';
-@import 'custom/custom-fields';
-@import 'custom/address';
-@import 'custom/record_actions';
-@import 'custom/flash_messages';
-@import 'custom/box';
-
-
-html,body {
-   min-height:100%;
-   font-family: 'Open Sans';
-}
-
-header {
-   position: relative;
-}
-
-#content_conainter {
-   position: relative;
-   min-height: calc(100% - 145px);
-}
-
-#content_conainter:before {
-   bottom: 0;
-   content: "";
-   left: 0;
-   opacity: 0.1;
-   position: absolute;
-   right: 0;
-   top: 0;
-   z-index: -1;
-   //background-image: url('./../../img/background/desert.jpg');
-   background-attachment: fixed;
-   background-repeat: no-repeat;
-   background-size: cover;
-   background-position: center;
-}
-
-/* CUSTOM FIELDS -> */
-.cf-title {
-   font-size: 2em;
-}
-
-.cf-subtitle {
-   font-size: 1.5em;
-}
-/* <- CUSTOM FIELDS */
-
-@each $len in 11, 15 {
-   ul.submenu.width-#{$len}-em {
-      min-width: #{$len}em;
-   }
-}
-
-.content {
-   padding-top: 1em;
-   padding-bottom: 1em;
-}
-
-.select2 {
-   width: 100%;
-}
-
-ul.custom_fields.choice li {
-   list-style:none;
-}
-
-.errors {
-   color: $red;
-}
-
-.footer {
-   p {
-      font-family: 'Open Sans';
-      font-weight: 300;
-   }
-
-   a {
-        color: white;
-        text-decoration: underline;
-      }
-}
-
-// inline time input
-.time_compound {
-    input[type=text], select {
-        width: 4em;
-        display: inline-block;
-        text-align: center;
-    }
-
-    .separator {
-        margin-left: 0.2em;
-        margin-right: 0.2em;
-    }
-}
-
-.open_sansbold {
-  font-family: 'Open Sans';
-  font-weight: bold;
-
-}
-
-
-dd {
-  margin-left: 0;
-}
-
-dt {
-  font-family: 'Open Sans';
-  font-weight: 600;
-}
-
-
-/* INPUT CLASS -> */
-div.input_with_post_text {
-    display: flex;
-    align-items: center;
-}
-
-div.input_with_post_text span.post_text {
-    flex: 1;
-    margin-left: 0.5em;
-}
-div.input_with_post_text input {
-    width: 70%;
-    display: inline-block;
-    flex: 2;
-}
-/* <- INPUT CLASS */
-
-dl.chill_report_view_data,
-dl.chill_view_data {
-
-    dt {
-        margin-top: 1.5em;
-        color: $chill-blue;
-    }
-
-    dd {
-        padding-left: 1.5em;
-        margin-top: 0.2em;
-
-        ul {
-            padding-left: 0;
-        }
-    }
-
-}
-
-blockquote.chill-user-quote,
-div.chill-user-quote {
-    border-left: 10px solid $chill-yellow;
-    margin: 1.5em 10px;
-    padding: 0.5em 10px;
-    quotes: "\201C""\201D""\2018""\2019";
-    background-color: $chill-llight-gray;
-
-    blockquote {
-        margin: 1.5em 10px;
-        padding: 0.5em 10px;
-    }
-
-    blockquote:before {
-        color: #ccc;
-        content: open-quote;
-        font-size: 4em;
-        line-height: 0.1em;
-        margin-right: 0.25em;
-        vertical-align: -0.4em;
-    }
-}
-
-.chill-no-data-statement {
-    font-style: italic;
-}

src/Bundle/ChillMainBundle/Resources/public/module/scratch/config/_buttons.scss

@@ -1,7 +0,0 @@
-// Buttons
-$button-font-size       : 15px !default;
-$button-text-color      : #000 !default;
-$button-text-weight     : 300 !default;
-$button-padding         : 8px 12px !default;
-$button-background      : #eee !default;
-$button-margin          : 5px !default;

src/Bundle/ChillMainBundle/Resources/public/module/scratch/config/_colors.scss

@@ -1,64 +0,0 @@
-// BODY
-$body-background            : #fff !default;
-
-// PLAIN TEXT
-$text-color                 : #555 !default;
-
-// HEADINGS
-$headings-color             : #404040 !default;
-
-// LINKS
-$link-color                 : #6998C9 !default;
-$link-visited-color         : #808080 !default;
-$link-active-color          : shade(red,5%) !default;
-$link-hover-color           : #007ED5 !default;
-$link-focus-color           : $link-color !default;
-
-$white                      : #fff !default;
-$black                      : #000 !default;
-$orange                     : #FF622C !default;
-$red                        : #C83D3D !default;
-$green                      : #27806f !default;
-$blue                       : #2980b9 !default;
-$yellow                     : #FFC82C !default;
-
-$light-blue : #4995C7;
-$llight-blue : #72B0D9;
-$dark-blue                  : #096EB0 !default;
-$ddark-blue                 : #07507F !default;
-
-$light-green : #419484 !default;
-$llight-green : #6CB3A5 !default;
-
-$warning-bg                 : $orange !default;
-$caution-bg                 : $red !default;
-$error-bg                   : $red !default;
-$success-bg                 : $green !default;
-$info-bg                    : $blue !default;
-
-$grey-95                    : lighten($black, 5%) !default;
-$grey-90                    : lighten($black, 10%) !default;
-$grey-85                    : lighten($black, 15%) !default;
-$grey-80                    : lighten($black, 20%) !default;
-$grey-75                    : lighten($black, 25%) !default;
-$grey-70                    : lighten($black, 30%) !default;
-$grey-65                    : lighten($black, 35%) !default;
-$grey-60                    : lighten($black, 40%) !default;
-$grey-55                    : lighten($black, 45%) !default;
-$grey-50                    : lighten($black, 50%) !default;
-$grey-45                    : lighten($black, 55%) !default;
-$grey-40                    : lighten($black, 60%) !default;
-$grey-35                    : lighten($black, 65%) !default;
-$grey-30                    : lighten($black, 70%) !default;
-$grey-25                    : lighten($black, 75%) !default;
-$grey-20                    : lighten($black, 80%) !default;
-$grey-15                    : lighten($black, 85%) !default;
-$grey-10                    : lighten($black, 90%) !default;
-$grey-5                     : lighten($black, 95%) !default;
-
-
-$dark-grey: $grey-80; //#333;
-$medium-grey: $grey-50; //#999;
-$light-grey: $grey-20; //#DDD;
-
-@import "../custom/config/colors";

src/Bundle/ChillMainBundle/Resources/public/module/scratch/config/_variables.scss

@@ -1,115 +0,0 @@
-// Typography
-//$sans-serif: $helvetica;
-//$serif: $georgia;
-//$base-font-family: $sans-serif;
-//$header-font-family: $base-font-family;
-
-// Font Sizes
-$base-font-size: 1em;
-$h1-font-size: $base-font-size * 2.25;
-$h2-font-size: $base-font-size * 2;
-$h3-font-size: $base-font-size * 1.75;
-$h4-font-size: $base-font-size * 1.5;
-$h5-font-size: $base-font-size * 1.25;
-$h6-font-size: $base-font-size;
-
-// Line height
-$base-line-height: 1.5;
-$header-line-height: 1.25;
-
-// Other Sizes
-$base-border-radius: 3px;
-$base-spacing: $base-line-height * 1em;
-$base-z-index: 0;
-
-// Background Color
-$base-background-color: white;
-
-// Font Colors
-$base-font-color: $dark-grey;
-$base-accent-color: $blue;
-
-// Link Colors
-$base-link-color: $base-accent-color;
-$hover-link-color: darken($base-accent-color, 15);
-$base-button-color: $base-link-color;
-$hover-button-color: $hover-link-color;
-
-/*
-// Flash Colors
-$alert-color: $light-yellow;
-$error-color: $light-red;
-$notice-color: lighten($base-accent-color, 40);
-$success-color: $light-green;
-*/
-
-// Border color
-$base-border-color: $light-grey;
-$base-border: 1px solid $base-border-color;
-
-// Footer
-$footer-background: $grey-50;//-blue;// desaturate(darken($base-accent-color, 20), 30);
-$footer-color: white;
-$footer-link-color: transparentize($footer-color, .6);
-$footer-disclaimer-color: transparentize($footer-color, .6);
-$footer-vertical-padding: 0;
-
-// Forms
-$form-border-size: 1px;
-$form-border-color: $base-border-color;
-$form-border-color-hover: darken($base-border-color, 10);
-$form-border-color-focus: $base-accent-color;
-$form-border-radius: $base-border-radius;
-$form-box-shadow: inset 0 1px 3px rgba(black,0.06);
-$form-box-shadow-focus: $form-box-shadow, 0 0 5px rgba(darken($form-border-color-focus, 5), 0.7);
-$form-font-size: $base-font-size;
-//$form-font-family: $base-font-family;
-
-// Navigation
-$navigation-background: $dark-grey;
-$navigation-color: transparentize(white, 0.3);
-$navigation-color-hover: white;
-$navigation-height: 60px;
-$navigation-active-link-color: transparentize(white, 0.5);
-$navigation-submenu-padding: 1em;
-$navigation-submenu-width: 12em;
-$navigation-border-radius: $base-border-radius;
-$navigation-first-padding-top: 1em;
-$navigation-last-padding-bottom: 0.7em;
-$navigation-more-pin: '\25BE';
-$navigation-more-pin-color: $navigation-color;
-$navigation-ul-submenu-top: 1.5em;
-$navigation-ul-submenu-padding-left: 0;
-$navigation-search-padding: .85em .6em;
-$navigation-border-bottom: 1px solid darken($navigation-background, 10);
-
-//Table
-$table-width: 100%;
-
-$table-head-bg-color: $orange;
-$table-head-td-border: unset;
-$table-head-td-text-align: center;
-$table-head-td-padding: 0.3em;
-$table-head-text-color: $white;
-
-$table-body-tr-bg-color-even: $grey-5;
-$table-body-tr-bg-color-odd: unset;
-$table-body-td-border: unset;
-$table-body-td-text-align: left;
-$table-body-td-padding: 0.3em;
-$table-body-text-color: unset;
-
-//Tabs
-$tabs-nav-margin-bottom: none;
-$tabs-nav-title-bg-color: $blue;
-$tabs-nav-title-text-color: $white;
-$tabs-nav-title-padding: 0.5em 0.5em 0.5em 1em;
-$tabs-nav-bg-color: none;
-$tabs-nav-text-color: inherit;
-$tabs-new-border: 3px solid transparent;
-$tabs-nav-hover-border: 3px solid $orange;
-$tabs-nav-hover-text-color: inherit;
-$tabs-nav-font-family: unset;
-$tabs-nav-padding: 0.5em 0.5em 0.5em 1.5em;
-
-@import "../custom/config/variables";

src/Bundle/ChillMainBundle/Resources/public/module/scratch/contrib/bourbon/_bourbon-deprecated-upcoming.scss

@@ -1,411 +0,0 @@
-// The following features have been deprecated and will be removed in the next MAJOR version release
-
-@mixin inline-block {
-  display: inline-block;
-
-  @warn "The inline-block mixin is deprecated and will be removed in the next major version release";
-}
-
-@mixin button ($style: simple, $base-color: #4294f0, $text-size: inherit, $padding: 7px 18px) {
-
-  @if type-of($style) == string and type-of($base-color) == color {
-    @include buttonstyle($style, $base-color, $text-size, $padding);
-  }
-
-  @if type-of($style) == string and type-of($base-color) == number {
-    $padding: $text-size;
-    $text-size: $base-color;
-    $base-color: #4294f0;
-
-    @if $padding == inherit {
-      $padding: 7px 18px;
-    }
-
-    @include buttonstyle($style, $base-color, $text-size, $padding);
-  }
-
-  @if type-of($style) == color and type-of($base-color) == color {
-    $base-color: $style;
-    $style: simple;
-    @include buttonstyle($style, $base-color, $text-size, $padding);
-  }
-
-  @if type-of($style) == color and type-of($base-color) == number {
-    $padding: $text-size;
-    $text-size: $base-color;
-    $base-color: $style;
-    $style: simple;
-
-    @if $padding == inherit {
-      $padding: 7px 18px;
-    }
-
-    @include buttonstyle($style, $base-color, $text-size, $padding);
-  }
-
-  @if type-of($style) == number {
-    $padding: $base-color;
-    $text-size: $style;
-    $base-color: #4294f0;
-    $style: simple;
-
-    @if $padding == #4294f0 {
-      $padding: 7px 18px;
-    }
-
-    @include buttonstyle($style, $base-color, $text-size, $padding);
-  }
-
-  &:disabled {
-    cursor: not-allowed;
-    opacity: 0.5;
-  }
-
-  @warn "The button mixin is deprecated and will be removed in the next major version release";
-}
-
-// Selector Style Button
-@mixin buttonstyle($type, $b-color, $t-size, $pad) {
-  // Grayscale button
-  @if $type == simple and $b-color == grayscale($b-color) {
-    @include simple($b-color, true, $t-size, $pad);
-  }
-
-  @if $type == shiny and $b-color == grayscale($b-color) {
-    @include shiny($b-color, true, $t-size, $pad);
-  }
-
-  @if $type == pill and $b-color == grayscale($b-color) {
-    @include pill($b-color, true, $t-size, $pad);
-  }
-
-  @if $type == flat and $b-color == grayscale($b-color) {
-    @include flat($b-color, true, $t-size, $pad);
-  }
-
-  // Colored button
-  @if $type == simple {
-    @include simple($b-color, false, $t-size, $pad);
-  }
-
-  @else if $type == shiny {
-    @include shiny($b-color, false, $t-size, $pad);
-  }
-
-  @else if $type == pill {
-    @include pill($b-color, false, $t-size, $pad);
-  }
-
-  @else if $type == flat {
-    @include flat($b-color, false, $t-size, $pad);
-  }
-}
-
-// Simple Button
-@mixin simple($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
-  $color:         hsl(0, 0, 100%);
-  $border:        adjust-color($base-color, $saturation:  9%,  $lightness: -14%);
-  $inset-shadow:  adjust-color($base-color, $saturation: -8%,  $lightness:  15%);
-  $stop-gradient: adjust-color($base-color, $saturation:  9%,  $lightness: -11%);
-  $text-shadow:   adjust-color($base-color, $saturation:  15%, $lightness: -18%);
-
-  @if is-light($base-color) {
-    $color:       hsl(0, 0, 20%);
-    $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
-  }
-
-  @if $grayscale == true {
-    $border:        grayscale($border);
-    $inset-shadow:  grayscale($inset-shadow);
-    $stop-gradient: grayscale($stop-gradient);
-    $text-shadow:   grayscale($text-shadow);
-  }
-
-  border: 1px solid $border;
-  border-radius: 3px;
-  box-shadow: inset 0 1px 0 0 $inset-shadow;
-  color: $color;
-  display: inline-block;
-  font-size: $textsize;
-  font-weight: bold;
-  @include linear-gradient ($base-color, $stop-gradient);
-  padding: $padding;
-  text-decoration: none;
-  text-shadow: 0 1px 0 $text-shadow;
-  background-clip: padding-box;
-
-  &:hover:not(:disabled) {
-    $base-color-hover:    adjust-color($base-color, $saturation: -4%, $lightness: -5%);
-    $inset-shadow-hover:  adjust-color($base-color, $saturation: -7%, $lightness:  5%);
-    $stop-gradient-hover: adjust-color($base-color, $saturation:  8%, $lightness: -14%);
-
-    @if $grayscale == true {
-      $base-color-hover:    grayscale($base-color-hover);
-      $inset-shadow-hover:  grayscale($inset-shadow-hover);
-      $stop-gradient-hover: grayscale($stop-gradient-hover);
-    }
-
-    @include linear-gradient ($base-color-hover, $stop-gradient-hover);
-
-    box-shadow: inset 0 1px 0 0 $inset-shadow-hover;
-    cursor: pointer;
-  }
-
-  &:active:not(:disabled),
-  &:focus:not(:disabled) {
-    $border-active:       adjust-color($base-color, $saturation: 9%, $lightness: -14%);
-    $inset-shadow-active: adjust-color($base-color, $saturation: 7%, $lightness: -17%);
-
-    @if $grayscale == true {
-      $border-active:       grayscale($border-active);
-      $inset-shadow-active: grayscale($inset-shadow-active);
-    }
-
-    border: 1px solid $border-active;
-    box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active;
-  }
-}
-
-// Shiny Button
-@mixin shiny($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
-  $color:         hsl(0, 0, 100%);
-  $border:        adjust-color($base-color, $red: -117, $green: -111, $blue: -81);
-  $border-bottom: adjust-color($base-color, $red: -126, $green: -127, $blue: -122);
-  $fourth-stop:   adjust-color($base-color, $red: -79,  $green: -70,  $blue: -46);
-  $inset-shadow:  adjust-color($base-color, $red:  37,  $green:  29,  $blue:  12);
-  $second-stop:   adjust-color($base-color, $red: -56,  $green: -50,  $blue: -33);
-  $text-shadow:   adjust-color($base-color, $red: -140, $green: -141, $blue: -114);
-  $third-stop:    adjust-color($base-color, $red: -86,  $green: -75,  $blue: -48);
-
-  @if is-light($base-color) {
-    $color:       hsl(0, 0, 20%);
-    $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
-  }
-
-  @if $grayscale == true {
-    $border:        grayscale($border);
-    $border-bottom: grayscale($border-bottom);
-    $fourth-stop:   grayscale($fourth-stop);
-    $inset-shadow:  grayscale($inset-shadow);
-    $second-stop:   grayscale($second-stop);
-    $text-shadow:   grayscale($text-shadow);
-    $third-stop:    grayscale($third-stop);
-  }
-
-  @include linear-gradient(top, $base-color 0%, $second-stop 50%, $third-stop 50%, $fourth-stop 100%);
-
-  border: 1px solid $border;
-  border-bottom: 1px solid $border-bottom;
-  border-radius: 5px;
-  box-shadow: inset 0 1px 0 0 $inset-shadow;
-  color: $color;
-  display: inline-block;
-  font-size: $textsize;
-  font-weight: bold;
-  padding: $padding;
-  text-align: center;
-  text-decoration: none;
-  text-shadow: 0 -1px 1px $text-shadow;
-
-  &:hover:not(:disabled) {
-    $first-stop-hover:  adjust-color($base-color, $red: -13, $green: -15, $blue: -18);
-    $second-stop-hover: adjust-color($base-color, $red: -66, $green: -62, $blue: -51);
-    $third-stop-hover:  adjust-color($base-color, $red: -93, $green: -85, $blue: -66);
-    $fourth-stop-hover: adjust-color($base-color, $red: -86, $green: -80, $blue: -63);
-
-    @if $grayscale == true {
-      $first-stop-hover:  grayscale($first-stop-hover);
-      $second-stop-hover: grayscale($second-stop-hover);
-      $third-stop-hover:  grayscale($third-stop-hover);
-      $fourth-stop-hover: grayscale($fourth-stop-hover);
-    }
-
-    @include linear-gradient(top, $first-stop-hover  0%,
-                                  $second-stop-hover 50%,
-                                  $third-stop-hover  50%,
-                                  $fourth-stop-hover 100%);
-    cursor: pointer;
-  }
-
-  &:active:not(:disabled),
-  &:focus:not(:disabled) {
-    $inset-shadow-active: adjust-color($base-color, $red: -111, $green: -116, $blue: -122);
-
-    @if $grayscale == true {
-      $inset-shadow-active: grayscale($inset-shadow-active);
-    }
-
-    box-shadow: inset 0 0 20px 0 $inset-shadow-active;
-  }
-}
-
-// Pill Button
-@mixin pill($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
-  $color:         hsl(0, 0, 100%);
-  $border-bottom: adjust-color($base-color, $hue:  8, $saturation: -11%, $lightness: -26%);
-  $border-sides:  adjust-color($base-color, $hue:  4, $saturation: -21%, $lightness: -21%);
-  $border-top:    adjust-color($base-color, $hue: -1, $saturation: -30%, $lightness: -15%);
-  $inset-shadow:  adjust-color($base-color, $hue: -1, $saturation: -1%,  $lightness:  7%);
-  $stop-gradient: adjust-color($base-color, $hue:  8, $saturation:  14%, $lightness: -10%);
-  $text-shadow:   adjust-color($base-color, $hue:  5, $saturation: -19%, $lightness: -15%);
-
-  @if is-light($base-color) {
-    $color:       hsl(0, 0, 20%);
-    $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
-  }
-
-  @if $grayscale == true {
-    $border-bottom: grayscale($border-bottom);
-    $border-sides:  grayscale($border-sides);
-    $border-top:    grayscale($border-top);
-    $inset-shadow:  grayscale($inset-shadow);
-    $stop-gradient: grayscale($stop-gradient);
-    $text-shadow:   grayscale($text-shadow);
-  }
-
-  border: 1px solid $border-top;
-  border-color: $border-top $border-sides $border-bottom;
-  border-radius: 16px;
-  box-shadow: inset 0 1px 0 0 $inset-shadow;
-  color: $color;
-  display: inline-block;
-  font-size: $textsize;
-  font-weight: normal;
-  line-height: 1;
-  @include linear-gradient ($base-color, $stop-gradient);
-  padding: $padding;
-  text-align: center;
-  text-decoration: none;
-  text-shadow: 0 -1px 1px $text-shadow;
-  background-clip: padding-box;
-
-  &:hover:not(:disabled) {
-    $base-color-hover:    adjust-color($base-color,                                $lightness: -4.5%);
-    $border-bottom:       adjust-color($base-color, $hue:  8, $saturation:  13.5%, $lightness: -32%);
-    $border-sides:        adjust-color($base-color, $hue:  4, $saturation: -2%,    $lightness: -27%);
-    $border-top:          adjust-color($base-color, $hue: -1, $saturation: -17%,   $lightness: -21%);
-    $inset-shadow-hover:  adjust-color($base-color,           $saturation: -1%,    $lightness:  3%);
-    $stop-gradient-hover: adjust-color($base-color, $hue:  8, $saturation: -4%,    $lightness: -15.5%);
-    $text-shadow-hover:   adjust-color($base-color, $hue:  5, $saturation: -5%,    $lightness: -22%);
-
-    @if $grayscale == true {
-      $base-color-hover:    grayscale($base-color-hover);
-      $border-bottom:       grayscale($border-bottom);
-      $border-sides:        grayscale($border-sides);
-      $border-top:          grayscale($border-top);
-      $inset-shadow-hover:  grayscale($inset-shadow-hover);
-      $stop-gradient-hover: grayscale($stop-gradient-hover);
-      $text-shadow-hover:   grayscale($text-shadow-hover);
-    }
-
-    @include linear-gradient ($base-color-hover, $stop-gradient-hover);
-
-    background-clip: padding-box;
-    border: 1px solid $border-top;
-    border-color: $border-top $border-sides $border-bottom;
-    box-shadow: inset 0 1px 0 0 $inset-shadow-hover;
-    cursor: pointer;
-    text-shadow: 0 -1px 1px $text-shadow-hover;
-  }
-
-  &:active:not(:disabled),
-  &:focus:not(:disabled) {
-    $active-color:         adjust-color($base-color, $hue: 4,  $saturation: -12%,  $lightness: -10%);
-    $border-active:        adjust-color($base-color, $hue: 6,  $saturation: -2.5%, $lightness: -30%);
-    $border-bottom-active: adjust-color($base-color, $hue: 11, $saturation:  6%,   $lightness: -31%);
-    $inset-shadow-active:  adjust-color($base-color, $hue: 9,  $saturation:  2%,   $lightness: -21.5%);
-    $text-shadow-active:   adjust-color($base-color, $hue: 5,  $saturation: -12%,  $lightness: -21.5%);
-
-    @if $grayscale == true {
-      $active-color:         grayscale($active-color);
-      $border-active:        grayscale($border-active);
-      $border-bottom-active: grayscale($border-bottom-active);
-      $inset-shadow-active:  grayscale($inset-shadow-active);
-      $text-shadow-active:   grayscale($text-shadow-active);
-    }
-
-    background: $active-color;
-    border: 1px solid $border-active;
-    border-bottom: 1px solid $border-bottom-active;
-    box-shadow: inset 0 0 6px 3px $inset-shadow-active;
-    text-shadow: 0 -1px 1px $text-shadow-active;
-  }
-}
-
-// Flat Button
-@mixin flat($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
-  $color:         hsl(0, 0, 100%);
-
-  @if is-light($base-color) {
-    $color:       hsl(0, 0, 20%);
-  }
-
-  background-color: $base-color;
-  border-radius: 3px;
-  border: 0;
-  color: $color;
-  display: inline-block;
-  font-size: $textsize;
-  font-weight: bold;
-  padding: $padding;
-  text-decoration: none;
-  background-clip: padding-box;
-
-  &:hover:not(:disabled){
-    $base-color-hover:    adjust-color($base-color, $saturation: 4%, $lightness: 5%);
-
-    @if $grayscale == true {
-      $base-color-hover: grayscale($base-color-hover);
-    }
-
-    background-color: $base-color-hover;
-    cursor: pointer;
-  }
-
-  &:active:not(:disabled),
-  &:focus:not(:disabled) {
-    $base-color-active: adjust-color($base-color, $saturation: -4%, $lightness: -5%);
-
-    @if $grayscale == true {
-      $base-color-active: grayscale($base-color-active);
-    }
-
-    background-color: $base-color-active;
-    cursor: pointer;
-  }
-}
-
-// Flexible grid
-@function flex-grid($columns, $container-columns: $fg-max-columns) {
-  $width: $columns * $fg-column + ($columns - 1) * $fg-gutter;
-  $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
-  @return percentage($width / $container-width);
-
-  @warn "The flex-grid function is deprecated and will be removed in the next major version release";
-}
-
-// Flexible gutter
-@function flex-gutter($container-columns: $fg-max-columns, $gutter: $fg-gutter) {
-  $container-width: $container-columns * $fg-column + ($container-columns - 1) * $fg-gutter;
-  @return percentage($gutter / $container-width);
-
-  @warn "The flex-gutter function is deprecated and will be removed in the next major version release";
-}
-
-@function grid-width($n) {
-  @return $n * $gw-column + ($n - 1) * $gw-gutter;
-
-  @warn "The grid-width function is deprecated and will be removed in the next major version release";
-}
-
-@function golden-ratio($value, $increment) {
-  @return modular-scale($increment, $value, $ratio: $golden);
-
-  @warn "The golden-ratio function is deprecated and will be removed in the next major version release. Please use the modular-scale function, instead.";
-}
-
-@mixin box-sizing($box) {
-  @include prefixer(box-sizing, $box, webkit moz spec);
-
-  @warn "The box-sizing mixin is deprecated and will be removed in the next major version release. This property can now be used un-prefixed.";
-}