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

2025-08-20 14:43:49 +00:00 · 2022-11-02 18:39:11 +01:00
parent 9c3533d106 0255f12fa9
commit 4524240ad8
35 changed files with 325 additions and 137 deletions
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ByActionNumberAggregator.php
+++ b/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;
        };
    }

--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php
+++ b/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')
-            ->addGroupBy('eval_by_start_date_aggregator');
+        switch ($data['frequency']) {
+            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';
    }
 }
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/HavingEndDateAggregator.php
+++ b/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('
-                CASE true WHEN workeval.endDAte IS NULL ELSE false END
-                AS eval_enddate_aggregator
-            ')
+            ->addSelect('CASE WHEN workeval.endDate IS NULL THEN true 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';
    }
 }
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/SocialWorkAggregators/CurrentActionAggregator.php
+++ b/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';
    }
 }
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoActionFilter.php
+++ b/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->join('acp.works', 'acpw');
-        }
-
-        $qb->andWhere('COUNT(acp.works) IS NULL');
+        $qb->andWhere('NOT EXISTS (SELECT 1 FROM ' . AccompanyingPeriodWork::class . ' work WHERE work.accompanyingPeriod = acp)');
    }

    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
    }
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/HasNoReferrerFilter.php
+++ b/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',
            ]);
    }

--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
+++ b/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')
-            ->setParameter('start_date', $data['start_date'], Types::DATE_IMMUTABLE)
-            ->setParameter('end_date', $data['end_date'], Types::DATE_IMMUTABLE);
+            ->andWhere('workeval.endDate BETWEEN :work_eval_by_end_date_start_date and :work_eval_by_end_date_end_date')
+            ->setParameter('work_eval_by_end_date_start_date', $data['start_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',
            ]);
    }

--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
+++ b/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')
-            ->setParameter('start_date', $data['start_date'], Types::DATE_IMMUTABLE)
-            ->setParameter('end_date', $data['end_date'], Types::DATE_IMMUTABLE);
+            ->andWhere('workeval.startDate BETWEEN :work_eval_by_start_date_start_date and :work_eval_by_start_date_end_date')
+            ->setParameter('work_eval_by_start_date_start_date', $data['start_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',
            ]);
    }

--- a/src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/CurrentEvaluationsFilter.php
+++ b/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
    }
--- a/src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/CurrentActionFilter.php
+++ b/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
    }