Merge branch '111_exports_suite' of gitlab.com:Chill-Projet/chill-bundles into 111_exports_suite

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
 
+use Chill\ActivityBundle\Entity\Activity;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
@@ -23,9 +24,10 @@ class ByActivityNumberAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
-        $qb->addSelect('AS activity_by_number_aggregator')
+        $qb
+            ->addSelect('(SELECT COUNT(activity.id) FROM ' . Activity::class . ' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
             ->addGroupBy('activity_by_number_aggregator');
     }
 
@@ -34,17 +36,23 @@ class ByActivityNumberAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // No form needed
     }
 
     public function getLabels($key, array $values, $data)
     {
-        return static function ($value): string {
+        return static function ($value) {
             if ('_header' === $value) {
                 return '';
             }
+
+            if (null === $value) {
+                return '';
+            }
+
+            return $value;
         };
     }
 

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

@@ -16,15 +16,23 @@ use Chill\MainBundle\Export\AggregatorInterface;
 use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SentReceivedAggregator implements AggregatorInterface
 {
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb->addSelect('activity.sentReceived AS activity_sentreceived_aggregator')
             ->addGroupBy('activity_sentreceived_aggregator');
@@ -35,16 +43,16 @@ class SentReceivedAggregator implements AggregatorInterface
         return Declarations::ACTIVITY;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // No form needed
     }
 
-    public function getLabels($key, array $values, $data)
+    public function getLabels($key, array $values, $data): callable
     {
-        return static function ($value): string {
+        return function (?string $value): string {
             if ('_header' === $value) {
-                return '';
+                return 'export.aggregator.activity.by_sent_received.Sent or received';
             }
 
             switch ($value) {
@@ -52,10 +60,10 @@ class SentReceivedAggregator implements AggregatorInterface
                     return '';
 
                 case 'sent':
-                    return 'is sent';
+                    return $this->translator->trans('export.aggregator.activity.by_sent_received.is sent');
 
                 case 'received':
-                    return 'is received';
+                    return $this->translator->trans('export.aggregator.activity.by_sent_received.is received');
 
                 default:
                     throw new LogicException(sprintf('The value %s is not valid', $value));
@@ -70,6 +78,6 @@ class SentReceivedAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group activity by sentreceived';
+        return 'export.aggregator.activity.by_sent_received.Group activity by sentreceived';
     }
 }

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

@@ -14,10 +14,8 @@ namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class HasNoActivityFilter implements FilterInterface
 {
@@ -28,13 +26,7 @@ class HasNoActivityFilter implements FilterInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('activity', $qb->getAllAliases(), true)) {
-            $qb->join(Activity::class, 'activity', Expr\Join::WITH, 'activity.accompanyingPeriod = acp');
-        }
-
         $qb
-            //->andWhere('COUNT(acp.activities) IS NULL')
-            //TODO check this:
             ->andWhere('
                 NOT EXISTS (
                     SELECT 1 FROM ' . Activity::class . ' activity
@@ -55,7 +47,7 @@ class HasNoActivityFilter implements FilterInterface
 
     public function describeAction($data, $format = 'string'): array
     {
-        return ['Filtered acp which has no activities'];
+        return ['Filtered acp which has no activities', []];
     }
 
     public function getTitle(): string

src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php

@@ -369,8 +369,12 @@ final class ActivityControllerTest extends WebTestCase
                 $center
             );
         $reachableScopesId = array_intersect(
-            array_map(static function ($s) { return $s->getId(); }, $reachableScopesDelete),
+            array_map(static function ($s) {
-            array_map(static function ($s) { return $s->getId(); }, $reachableScopesUpdate)
+                return $s->getId();
+            }, $reachableScopesDelete),
+            array_map(static function ($s) {
+                return $s->getId();
+            }, $reachableScopesUpdate)
         );
 
         if (count($reachableScopesId) === 0) {

src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php

@@ -188,7 +188,9 @@ final class ActivityTypeTest extends KernelTestCase
 
         // map all the values in an array
         $values = array_map(
-            static function ($choice) { return $choice->value; },
+            static function ($choice) {
+                return $choice->value;
+            },
             $view['activity']['durationTime']->vars['choices']
         );
 

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

@@ -260,8 +260,6 @@ 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
@@ -278,9 +276,8 @@ Filter activity by userscope: Filtrer les activités par service du créateur
 Accepted userscope: Services
     
 Filter acp which has no activity: Filtrer les parcours qui n’ont pas d’activité
-Filtered acp which has no activities: Filtrés les parcours qui n'ont pas d'activités
+Filtered acp which has no activities: Filtrer les parcours sans activité associée
 Group acp by activity number: Grouper les parcours par nombre d’activité
-Group activity by sentreceived: Grouper les activités par envoyé / reçu
 
 #aggregators
 Activity type: Type d'activité
@@ -337,3 +334,10 @@ export:
             by_usersscope:
                 Filter by users scope: Filtrer les activités par services d'au moins un utilisateur participant
                 'Filtered activity by users scope: only %scopes%': 'Filtré par service d''au moins un utilisateur participant: seulement %scopes%'
+    aggregator:
+        activity:
+            by_sent_received:
+                Sent or received: Envoyé ou reçu
+                is sent: envoyé
+                is received: reçu
+                Group activity by sentreceived: Grouper les activités par envoyé / reçu

src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php

@@ -31,7 +31,9 @@ class ConfigRepository
 
     public function getChargesKeys(bool $onlyActive = false): array
     {
-        return array_map(static function ($element) { return $element['key']; }, $this->getCharges($onlyActive));
+        return array_map(static function ($element) {
+            return $element['key'];
+        }, $this->getCharges($onlyActive));
     }
 
     /**
@@ -50,7 +52,9 @@ class ConfigRepository
 
     public function getResourcesKeys(bool $onlyActive = false): array
     {
-        return array_map(static function ($element) { return $element['key']; }, $this->getResources($onlyActive));
+        return array_map(static function ($element) {
+            return $element['key'];
+        }, $this->getResources($onlyActive));
     }
 
     /**
@@ -70,14 +74,18 @@ class ConfigRepository
     private function getCharges(bool $onlyActive = false): array
     {
         return $onlyActive ?
-            array_filter($this->charges, static function ($el) { return $el['active']; })
+            array_filter($this->charges, static function ($el) {
+                return $el['active'];
+            })
             : $this->charges;
     }
 
     private function getResources(bool $onlyActive = false): array
     {
         return $onlyActive ?
-            array_filter($this->resources, static function ($el) { return $el['active']; })
+            array_filter($this->resources, static function ($el) {
+                return $el['active'];
+            })
             : $this->resources;
     }
 

src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php

@@ -61,7 +61,9 @@ class SummaryBudget implements SummaryBudgetInterface
             ];
         }
 
-        $personIds = $household->getCurrentPersons()->map(static function (Person $p) { return $p->getId(); });
+        $personIds = $household->getCurrentPersons()->map(static function (Person $p) {
+            return $p->getId();
+        });
         $ids = implode(', ', array_fill(0, count($personIds), '?'));
 
         $parameters = [...$personIds, $household->getId()];

src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php

@@ -239,7 +239,9 @@ final class ParticipationControllerTest extends WebTestCase
         $this->personsIdsCache = array_merge(
             $this->personsIdsCache,
             $event->getParticipations()->map(
-                static function ($p) { return $p->getPerson()->getId(); }
+                static function ($p) {
+                    return $p->getPerson()->getId();
+                }
             )
                 ->toArray()
         );
@@ -303,7 +305,9 @@ final class ParticipationControllerTest extends WebTestCase
         $event = $this->getRandomEventWithMultipleParticipations();
 
         $persons_id = implode(',', $event->getParticipations()->map(
-            static function ($p) { return $p->getPerson()->getId(); }
+            static function ($p) {
+                return $p->getPerson()->getId();
+            }
         )->toArray());
 
         $crawler = $this->client->request(
@@ -329,7 +333,9 @@ final class ParticipationControllerTest extends WebTestCase
         $nbParticipations = $event->getParticipations()->count();
         // get the persons_id participating on this event
         $persons_id = $event->getParticipations()->map(
-            static function ($p) { return $p->getPerson()->getId(); }
+            static function ($p) {
+                return $p->getPerson()->getId();
+            }
         )->toArray();
         // exclude the existing persons_ids from the new person
         $this->personsIdsCache = array_merge($this->personsIdsCache, $persons_id);

src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php

@@ -177,7 +177,9 @@ class ExportAddressHelper
                 $prefixes = array_merge(
                     $prefixes,
                     array_map(
-                        static function ($item) use ($prefix) { return $prefix . $item; },
+                        static function ($item) use ($prefix) {
+                            return $prefix . $item;
+                        },
                         self::COLUMN_MAPPING[$key]
                     )
                 );

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php

@@ -51,7 +51,9 @@ class EntityToJsonTransformer implements DataTransformerInterface
             }
 
             return array_map(
-                function ($item) { return $this->denormalizeOne($item); },
+                function ($item) {
+                    return $this->denormalizeOne($item);
+                },
                 $denormalized
             );
         }

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

@@ -66,7 +66,9 @@ class ScopePickerType extends AbstractType
                 $options['role'] instanceof Role ? $options['role']->getRole() : $options['role'],
                 $options['center']
             ),
-            static function (Scope $s) { return $s->isActive(); }
+            static function (Scope $s) {
+                return $s->isActive();
+            }
         );
 
         if (0 === count($items)) {

src/Bundle/ChillMainBundle/Tests/Entity/NotificationTest.php

@@ -134,7 +134,9 @@ final class NotificationTest extends KernelTestCase
         $this->assertEquals($senderId, $notification->getSender()->getId());
         $this->assertCount(count($addressesIds), $notification->getUnreadBy());
 
-        $unreadIds = $notification->getUnreadBy()->map(static function (User $u) { return $u->getId(); });
+        $unreadIds = $notification->getUnreadBy()->map(static function (User $u) {
+            return $u->getId();
+        });
 
         foreach ($addressesIds as $addresseeId) {
             $this->assertContains($addresseeId, $unreadIds);

src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php

@@ -96,7 +96,9 @@ final class ScopePickerTypeTest extends TypeTestCase
 
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
         $translatableStringHelper->localize(Argument::type('array'))->will(
-            static function ($args) { return $args[0]['fr']; }
+            static function ($args) {
+                return $args[0]['fr'];
+            }
         );
 
         $type = new ScopePickerType(

src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php

@@ -211,7 +211,9 @@ final class AuthorizationHelperTest extends KernelTestCase
                 $centerA
             );
 
-        $usernames = array_map(static function (User $u) { return $u->getUsername(); }, $users);
+        $usernames = array_map(static function (User $u) {
+            return $u->getUsername();
+        }, $users);
 
         $this->assertContains('center a_social', $usernames);
     }

src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationOnTransition.php

@@ -107,7 +107,9 @@ class NotificationOnTransition implements EventSubscriberInterface
                 'dest' => $subscriber,
                 'place' => $place,
                 'workflow' => $workflow,
-                'is_dest' => in_array($subscriber->getId(), array_map(static function (User $u) { return $u->getId(); }, $entityWorkflow->futureDestUsers), true),
+                'is_dest' => in_array($subscriber->getId(), array_map(static function (User $u) {
+                    return $u->getId();
+                }, $entityWorkflow->futureDestUsers), true),
             ];
 
             $notification = new Notification();

src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;
 
 use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -23,9 +24,9 @@ class ByActionNumberAggregator implements AggregatorInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
-        $qb->addSelect('AS acp_by_action_number_aggregator')
+        $qb->addSelect('(SELECT COUNT(acp_by_action_action.id) FROM ' . AccompanyingPeriodWork::class . ' acp_by_action_action WHERE acp_by_action_action.accompanyingPeriod = acp) AS acp_by_action_number_aggregator')
             ->addGroupBy('acp_by_action_number_aggregator');
     }
 
@@ -34,17 +35,23 @@ class ByActionNumberAggregator implements AggregatorInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // No form needed
     }
 
     public function getLabels($key, array $values, $data)
     {
-        return static function ($value): string {
+        return static function ($value) {
             if ('_header' === $value) {
+                return 'export.aggregator.course.by_number_of_action.Number of actions';
+            }
+
+            if (null === $value) {
                 return '';
             }
+
+            return $value;
         };
     }
 

src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php

@@ -14,10 +14,23 @@ namespace Chill\PersonBundle\Export\Aggregator\EvaluationAggregators;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
+use LogicException;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ByStartDateAggregator implements AggregatorInterface
 {
+    private const CHOICES = [
+        'by month' => 'month',
+        'by week' => 'week',
+        'by year' => 'year',
+    ];
+
+    private const DEFAULT_CHOICE = 'year';
+
+    private TranslatorInterface $translator;
+
     public function addRole(): ?string
     {
         return null;
@@ -25,8 +38,29 @@ class ByStartDateAggregator implements AggregatorInterface
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $qb->addSelect('AS eval_by_start_date_aggregator')
+        switch ($data['frequency']) {
-            ->addGroupBy('eval_by_start_date_aggregator');
+            case 'month':
+                $fmt = 'YYYY-MM';
+
+                break;
+
+            case 'week':
+                $fmt = 'YYYY-IW';
+
+                break;
+
+            case 'year':
+                $fmt = 'YYYY';
+
+                break;
+
+            default:
+                throw new LogicException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
+        }
+
+        $qb->addSelect(sprintf("TO_CHAR(workeval.startDate, '%s') AS eval_by_start_date_aggregator", $fmt));
+        $qb->addGroupBy(' eval_by_start_date_aggregator');
+        $qb->addOrderBy(' eval_by_start_date_aggregator', 'ASC');
     }
 
     public function applyOn(): string
@@ -36,15 +70,27 @@ class ByStartDateAggregator implements AggregatorInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        // No form needed
+        $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): string {
             if ('_header' === $value) {
+                return 'export.aggregator.eval.by_start_date_period.Start date period';
+            }
+
+            if (null === $value) {
                 return '';
             }
+
+            return $value;
         };
     }
 
@@ -55,6 +101,6 @@ class ByStartDateAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group by start date evaluations';
+        return 'export.aggregator.eval.by_start_date_period.Group by start date evaluations';
     }
 }

src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php

@@ -16,9 +16,17 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class HavingEndDateAggregator implements AggregatorInterface
 {
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
     public function addRole(): ?string
     {
         return null;
@@ -27,10 +35,7 @@ class HavingEndDateAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $qb
-            ->addSelect('
+            ->addSelect('CASE WHEN workeval.endDate IS NULL THEN true ELSE false END AS eval_enddate_aggregator')
-                CASE true WHEN workeval.endDAte IS NULL ELSE false END
-                AS eval_enddate_aggregator
-            ')
             ->addGroupBy('eval_enddate_aggregator');
     }
 
@@ -46,17 +51,17 @@ class HavingEndDateAggregator implements AggregatorInterface
 
     public function getLabels($key, array $values, $data)
     {
-        return static function ($value): string {
+        return function ($value): string {
             if ('_header' === $value) {
-                return '';
+                return 'export.aggregator.eval.by_end_date.Has end date ?';
             }
 
             switch ($value) {
                 case true:
-                    return 'enddate is specified';
+                    return $this->translator->trans('export.aggregator.eval.by_end_date.enddate is specified');
 
                 case false:
-                    return 'enddate is not specified';
+                    return $this->translator->trans('export.aggregator.eval.by_end_date.enddate is not specified');
 
                 default:
                     throw new LogicException(sprintf('The value %s is not valid', $value));
@@ -71,6 +76,6 @@ class HavingEndDateAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group evaluations having end date';
+        return 'export.aggregator.eval.by_end_date.Group evaluations having end date';
     }
 }

src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php

@@ -16,19 +16,27 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class CurrentActionAggregator implements AggregatorInterface
 {
+    private TranslatorInterface $translator;
+
+    public function __construct(TranslatorInterface $translator)
+    {
+        $this->translator = $translator;
+    }
+
     public function addRole(): ?string
     {
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb
             ->addSelect('
-                (CASE true WHEN acpw.startDate IS NULL ELSE false END)
+                (CASE WHEN acpw.endDate IS NULL THEN true ELSE false END)
                 AS acpw_current_action_aggregator
             ')
             ->addGroupBy('acpw_current_action_aggregator');
@@ -39,24 +47,24 @@ class CurrentActionAggregator implements AggregatorInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // No form needed
     }
 
     public function getLabels($key, array $values, $data)
     {
-        return static function ($value): string {
+        return function ($value): string {
             if ('_header' === $value) {
-                return '';
+                return 'export.aggregator.course_work.by_current_action.Current action ?';
             }
 
             switch ($value) {
                 case true:
-                    return 'Current action';
+                    return $this->translator->trans('export.aggregator.course_work.by_current_action.Current action');
 
                 case false:
-                    return 'Not current action';
+                    return $this->translator->trans('export.aggregator.course_work.by_current_action.Not current action');
 
                 default:
                     throw new LogicException(sprintf('The value %s is not valid', $value));
@@ -71,6 +79,6 @@ class CurrentActionAggregator implements AggregatorInterface
 
     public function getTitle(): string
     {
-        return 'Group by current actions';
+        return 'export.aggregator.course_work.by_current_action.Group by current actions';
     }
 }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php

@@ -12,10 +12,10 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Filter\AccompanyingCourseFilters;
 
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
 
 class HasNoActionFilter implements FilterInterface
 {
@@ -24,13 +24,9 @@ class HasNoActionFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
-        if (!in_array('acpw', $qb->getAllAliases(), true)) {
+        $qb->andWhere('NOT EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWork::class . ' work WHERE work.accompanyingPeriod = acp)');
-            $qb->join('acp.works', 'acpw');
-        }
-
-        $qb->andWhere('COUNT(acp.works) IS NULL');
     }
 
     public function applyOn(): string
@@ -38,7 +34,7 @@ class HasNoActionFilter implements FilterInterface
         return Declarations::ACP_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         // no form
     }

src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php

@@ -15,7 +15,7 @@ use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\UserHistory;
 use Chill\PersonBundle\Export\Declarations;
-use DateTime;
+use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -33,15 +33,15 @@ class HasNoReferrerFilter implements FilterInterface
             ->andWhere('
                 NOT EXISTS (
                     SELECT 1 FROM ' . UserHistory::class . ' uh
-                    WHERE uh.startDate < :date
+                    WHERE uh.startDate <= :has_no_referrer_filter_date
                     AND (
                         uh.endDate IS NULL
-                        or uh.endDate > :date
+                        or uh.endDate > :has_no_referrer_filter_date
                     )
                     AND uh.accompanyingPeriod = acp
                 )
             ')
-            ->setParameter('date', $data['calc_date'], Types::DATE_IMMUTABLE);
+            ->setParameter('has_no_referrer_filter_date', $data['calc_date'], Types::DATE_IMMUTABLE);
     }
 
     public function applyOn(): string
@@ -54,7 +54,8 @@ class HasNoReferrerFilter implements FilterInterface
         $builder
             ->add('calc_date', ChillDateType::class, [
                 'label' => 'Has no referrer on this date',
-                'data' => new DateTime(),
+                'data' => new DateTimeImmutable(),
+                'input' => 'datetime_immutable',
             ]);
     }
 

src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php

@@ -14,7 +14,7 @@ namespace Chill\PersonBundle\Export\Filter\EvaluationFilters;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
-use DateTime;
+use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -26,12 +26,12 @@ class ByEndDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb
-            ->andWhere('workeval.endDate IS BETWEEN :start_date and :end_date')
+            ->andWhere('workeval.endDate BETWEEN :work_eval_by_end_date_start_date and :work_eval_by_end_date_end_date')
-            ->setParameter('start_date', $data['start_date'], Types::DATE_IMMUTABLE)
+            ->setParameter('work_eval_by_end_date_start_date', $data['start_date'], Types::DATE_IMMUTABLE)
-            ->setParameter('end_date', $data['end_date'], Types::DATE_IMMUTABLE);
+            ->setParameter('work_eval_by_end_date_end_date', $data['end_date'], Types::DATE_IMMUTABLE);
     }
 
     public function applyOn(): string
@@ -39,16 +39,18 @@ class ByEndDateFilter implements FilterInterface
         return Declarations::EVAL_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('start_date', ChillDateType::class, [
                 'label' => 'start period date',
-                'data' => new DateTime(),
+                'data' => new DateTimeImmutable('1 year ago'),
+                'input' => 'datetime_immutable',
             ])
             ->add('end_date', ChillDateType::class, [
                 'label' => 'end period date',
-                'data' => new DateTime(),
+                'data' => new DateTimeImmutable(),
+                'input' => 'datetime_immutable',
             ]);
     }
 

src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php

@@ -14,7 +14,7 @@ namespace Chill\PersonBundle\Export\Filter\EvaluationFilters;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\PersonBundle\Export\Declarations;
-use DateTime;
+use DateTimeImmutable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -26,12 +26,12 @@ class ByStartDateFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb
-            ->andWhere('workeval.startDate IS BETWEEN :start_date and :end_date')
+            ->andWhere('workeval.startDate BETWEEN :work_eval_by_start_date_start_date and :work_eval_by_start_date_end_date')
-            ->setParameter('start_date', $data['start_date'], Types::DATE_IMMUTABLE)
+            ->setParameter('work_eval_by_start_date_start_date', $data['start_date'], Types::DATE_IMMUTABLE)
-            ->setParameter('end_date', $data['end_date'], Types::DATE_IMMUTABLE);
+            ->setParameter('work_eval_by_start_date_end_date', $data['end_date'], Types::DATE_IMMUTABLE);
     }
 
     public function applyOn(): string
@@ -39,16 +39,18 @@ class ByStartDateFilter implements FilterInterface
         return Declarations::EVAL_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         $builder
             ->add('start_date', ChillDateType::class, [
                 'label' => 'start period date',
-                'data' => new DateTime(),
+                'data' => new DateTimeImmutable('1 year ago'),
+                'input' => 'datetime_immutable',
             ])
             ->add('end_date', ChillDateType::class, [
                 'label' => 'end period date',
-                'data' => new DateTime(),
+                'data' => new DateTimeImmutable(),
+                'input' => 'datetime_immutable',
             ]);
     }
 

src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php

@@ -23,7 +23,7 @@ class CurrentEvaluationsFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         $qb->andWhere('workeval.endDate IS NULL');
     }
@@ -33,7 +33,7 @@ class CurrentEvaluationsFilter implements FilterInterface
         return Declarations::EVAL_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         //no form needed
     }

src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php

@@ -23,9 +23,9 @@ class CurrentActionFilter implements FilterInterface
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
-        $qb->andWhere('acpw.startDate IS NULL');
+        $qb->andWhere('acpw.endDate IS NULL');
     }
 
     public function applyOn(): string
@@ -33,7 +33,7 @@ class CurrentActionFilter implements FilterInterface
         return Declarations::SOCIAL_WORK_ACTION_TYPE;
     }
 
-    public function buildForm(FormBuilderInterface $builder)
+    public function buildForm(FormBuilderInterface $builder): void
     {
         //no form
     }

src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseApiControllerTest.php

@@ -342,7 +342,9 @@ final class AccompanyingCourseApiControllerTest extends WebTestCase
 
         // check that the person id is contained
         $participationsPersonsIds = array_map(
-            static function ($participation) { return $participation->person->id; },
+            static function ($participation) {
+                return $participation->person->id;
+            },
             $data->participations
         );
 

src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php

@@ -294,23 +294,49 @@ final class PersonControllerUpdateTest extends WebTestCase
     public function validTextFieldsProvider()
     {
         return [
-            ['firstName', 'random Value', static function (Person $person) { return $person->getFirstName(); }],
+            ['firstName', 'random Value', static function (Person $person) {
-            ['lastName', 'random Value', static function (Person $person) { return $person->getLastName(); }],
+                return $person->getFirstName();
+            }],
+            ['lastName', 'random Value', static function (Person $person) {
+                return $person->getLastName();
+            }],
             // reminder: this value is capitalized
-            ['placeOfBirth', 'A PLACE', static function (Person $person) { return $person->getPlaceOfBirth(); }],
+            ['placeOfBirth', 'A PLACE', static function (Person $person) {
-            ['birthdate', '1980-12-15', static function (Person $person) { return $person->getBirthdate()->format('Y-m-d'); }],
+                return $person->getPlaceOfBirth();
+            }],
+            ['birthdate', '1980-12-15', static function (Person $person) {
+                return $person->getBirthdate()->format('Y-m-d');
+            }],
             // TODO test on phonenumber update
             // ['phonenumber', '+32123456789', static function (Person $person) { return $person->getPhonenumber(); }],
-            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static function (Person $person) { return $person->getMemo(); }],
+            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static function (Person $person) {
-            ['countryOfBirth', 'BE', static function (Person $person) { return $person->getCountryOfBirth()->getCountryCode(); }],
+                return $person->getMemo();
-            ['nationality', 'FR', static function (Person $person) { return $person->getNationality()->getCountryCode(); }],
+            }],
-            ['placeOfBirth', '', static function (Person $person) { return $person->getPlaceOfBirth(); }],
+            ['countryOfBirth', 'BE', static function (Person $person) {
-            ['birthdate', '', static function (Person $person) { return $person->getBirthdate(); }],
+                return $person->getCountryOfBirth()->getCountryCode();
+            }],
+            ['nationality', 'FR', static function (Person $person) {
+                return $person->getNationality()->getCountryCode();
+            }],
+            ['placeOfBirth', '', static function (Person $person) {
+                return $person->getPlaceOfBirth();
+            }],
+            ['birthdate', '', static function (Person $person) {
+                return $person->getBirthdate();
+            }],
             //['phonenumber', '', static function (Person $person) { return $person->getPhonenumber(); }],
-            ['memo', '', static function (Person $person) { return $person->getMemo(); }],
+            ['memo', '', static function (Person $person) {
-            ['countryOfBirth', null, static function (Person $person) { return $person->getCountryOfBirth(); }],
+                return $person->getMemo();
-            ['nationality', null, static function (Person $person) { return $person->getNationality(); }],
+            }],
-            ['gender', Person::FEMALE_GENDER, static function (Person $person) { return $person->getGender(); }],
+            ['countryOfBirth', null, static function (Person $person) {
+                return $person->getCountryOfBirth();
+            }],
+            ['nationality', null, static function (Person $person) {
+                return $person->getNationality();
+            }],
+            ['gender', Person::FEMALE_GENDER, static function (Person $person) {
+                return $person->getGender();
+            }],
         ];
     }
 

src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php

@@ -197,12 +197,24 @@ final class PersonControllerUpdateWithHiddenFieldsTest extends WebTestCase
     public function validTextFieldsProvider()
     {
         return [
-            ['firstName', 'random Value', static function (Person $person) { return $person->getFirstName(); }],
+            ['firstName', 'random Value', static function (Person $person) {
-            ['lastName', 'random Value', static function (Person $person) { return $person->getLastName(); }],
+                return $person->getFirstName();
-            ['birthdate', '15-12-1980', static function (Person $person) { return $person->getBirthdate()->format('d-m-Y'); }],
+            }],
-            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static function (Person $person) { return $person->getMemo(); }],
+            ['lastName', 'random Value', static function (Person $person) {
-            ['birthdate', '', static function (Person $person) { return $person->getBirthdate(); }],
+                return $person->getLastName();
-            ['gender', Person::FEMALE_GENDER, static function (Person $person) { return $person->getGender(); }],
+            }],
+            ['birthdate', '15-12-1980', static function (Person $person) {
+                return $person->getBirthdate()->format('d-m-Y');
+            }],
+            ['memo', 'jfkdlmq jkfldmsq jkmfdsq', static function (Person $person) {
+                return $person->getMemo();
+            }],
+            ['birthdate', '', static function (Person $person) {
+                return $person->getBirthdate();
+            }],
+            ['gender', Person::FEMALE_GENDER, static function (Person $person) {
+                return $person->getGender();
+            }],
         ];
     }
 

src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php

@@ -111,7 +111,9 @@ final class MembersEditorTest extends TestCase
         $this->assertCount(1, $notSharing);
         $this->assertCount(1, $sharings);
 
-        $getPerson = static function (HouseholdMember $m) { return $m->getPerson(); };
+        $getPerson = static function (HouseholdMember $m) {
+            return $m->getPerson();
+        };
 
         $this->assertContains($person, $notSharing->map($getPerson));
     }
@@ -151,7 +153,9 @@ final class MembersEditorTest extends TestCase
         $this->assertCount(1, $notSharing);
         $this->assertCount(0, $sharings);
 
-        $getPerson = static function (HouseholdMember $m) { return $m->getPerson(); };
+        $getPerson = static function (HouseholdMember $m) {
+            return $m->getPerson();
+        };
 
         $this->assertContains($person, $notSharing->map($getPerson));
     }

src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/RelationshipDocGenNormalizerTest.php

@@ -118,7 +118,9 @@ final class RelationshipDocGenNormalizerTest extends TestCase
     {
         $translatableStringHelper = $this->prophesize(TranslatableStringHelperInterface::class);
         $translatableStringHelper->localize(Argument::type('array'))->will(
-            static function ($args) { return $args[0][array_keys($args[0])[0]]; }
+            static function ($args) {
+                return $args[0][array_keys($args[0])[0]];
+            }
         );
 
         $normalizer = new RelationshipDocGenNormalizer(

src/Bundle/ChillPersonBundle/config/services/exports_evaluation.yaml

@@ -73,3 +73,10 @@ services:
         autoconfigure: true
         tags:
             - { name: chill.export_aggregator, alias: evaluation_bymaxdate_aggregator }
+
+    Chill\PersonBundle\Export\Aggregator\EvaluationAggregators\HavingEndDateAggregator:
+        autowire: true
+        autoconfigure: true
+        tags:
+            - { name: chill.export_aggregator, alias: evaluation_byend_date_aggregator }
+

src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml

@@ -38,6 +38,10 @@ services:
         - { name: chill.export_filter, alias: social_work_actions_treatingagent_filter }
 
   Chill\PersonBundle\Export\Filter\SocialWorkFilters\CurrentActionFilter:
+      autowire: true
+      autoconfigure: true
+      tags:
+          - { name: chill.export_filter, alias: social_work_actions_current_filter }
 
   ## AGGREGATORS
   chill.person.export.aggregator_action_type:
@@ -89,4 +93,8 @@ services:
       tags:
           - { name: chill.export_aggregator, alias: social_work_actions_goal_result_aggregator }
 
-  Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\CurrentActionAggregator:
+  Chill\PersonBundle\Export\Aggregator\SocialWorkAggregators\CurrentActionAggregator:
+      autowire: true
+      autoconfigure: true
+      tags:
+          - { name: chill.export_aggregator, alias: social_work_actions_current_aggregator }

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

@@ -569,7 +569,7 @@ Filter by which has no referrer: Filtrer les parcours sans référent
 "Filtered acp which has no referrer on date: %date%": "Filtré les parcours sans référent à cette date: %date%"
 Has no referrer on this date: N'a pas de référent à cette date
 Filter by which has no action: Filtrer les parcours qui n’ont pas d’actions
-Filtered acp which has no actions: Filtré les parcours qui n'ont pas d'actions
+Filtered acp which has no actions: 'Filtré: uniquement les parcours qui n''ont pas d''actions'
 Group by number of actions: Grouper les parcours par nombre d’actions
 Filter by creator: Filtrer les parcours par créateur
 'Filtered by creator: only %creators%': 'Filtré par créateur: uniquement %creators%'
@@ -578,10 +578,7 @@ Filter by creator job: Filtrer les parcours par métier du créateur
 Group by creator job: Grouper les parcours par métier du créateur
 
 Filter by current actions: Filtrer les actions en cours
-Filtered by current action: Filtré les actions en cours
+Filtered by current action: 'Filtré: uniquement les actions en cours (sans date de fin)'
-Group by current actions: Grouper les actions en cours
-Current action: Actions en cours
-Not current action: Actions terminées
 Filter by start date evaluations: Filtrer les évaluations par date de début
 Filter by end date evaluations: Filtrer les évaluations par date de fin
 start period date: Date de début de la période
@@ -589,8 +586,7 @@ end period date: Date de fin de la période
 "Filtered by start date: between %start_date% and %end_date%": "Filtré par la date de début: comprise entre %start_date% et %end_date%"
 "Filtered by end date: between %start_date% and %end_date%": "Filtré par la date de fin: comprise entre %start_date% et %end_date%"
 Filter by current evaluations: Filtrer les évaluations en cours
-"Filtered by current evaluations": "Filtré selon les évaluations en cours"
+"Filtered by current evaluations": "Filtré: uniquement les évaluations en cours"
-Group by start date evaluations: Grouper les évaluations par semaine/mois/année de la date de début
 Group by end date evaluations: Grouper les évaluations par semaine/mois/année de la date de fin
 Group by max date evaluations: Grouper les évaluations par semaine/mois/année de la date d'échéance
 
@@ -631,9 +627,6 @@ maxdate is specified: la date d'échéance est spécifiée
 maxdate is not specified: la date d'échéance n'est pas spécifiée
 "Filtered by maxdate: only %choice%": "Filtré par date d'échéance: uniquement si %choice%"
 
-Group evaluations having end date: Grouper les évaluations qui ont une date de fin
-enddate is specified: la date de fin est spécifiée
-enddate is not specified: la date de fin n'est pas spécifiée
 
 ## household filters/aggr
 Filter by composition: Filtrer les ménages par composition familiale
@@ -1015,6 +1008,23 @@ export:
                 Household composition: Composition du ménage
                 Group course by household composition: Grouper les parcours par composition familiale des ménages des usagers concernés
                 Calc date: Date de calcul de la composition du ménage
+            by_number_of_action:
+                Number of actions: Nombre d'actions
+        course_work:
+            by_current_action:
+                Current action ?: Action en cours ?
+                Group by current actions: Grouper les actions en cours
+                Current action: Action en cours
+                Not current action: Action terminée
+        eval:
+            by_end_date:
+                Has end date ?: Évaluation en cours ?
+                Group evaluations having end date: Grouper les évaluations en cours (avec ou sans date de fin)
+                enddate is specified: la date de fin est spécifiée
+                enddate is not specified: la date de fin n'est pas spécifiée
+            by_start_date_period:
+                Start date period: Début (par periode)
+                Group by start date evaluations: Grouper les évaluations par semaine/mois/année de la date de début
     filter:
         course:
             by_user_scope:

src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php

@@ -67,7 +67,9 @@ final class TimelineProviderTest extends WebTestCase
             self::$em
                 ->getRepository(\Chill\MainBundle\Entity\Scope::class)
                 ->findAll(),
-            static function (Scope $scope) { return $scope->getName()['en'] === 'social'; }
+            static function (Scope $scope) {
+                return $scope->getName()['en'] === 'social';
+            }
         );
 
         $report = (new Report())