Resolve "Nouveau filtre: Filtrer les actions ayant reçu une nouvelle évaluation créée entre deux dates"

This commit is contained in:
LenaertsJ 2024-03-08 10:37:43 +00:00 committed by Julien Fastré
parent 96105b101f
commit 5880858191
5 changed files with 163 additions and 0 deletions

View File

@ -0,0 +1,6 @@
kind: Feature
body: New export filter for social actions with an evaluation created between two
dates
time: 2024-02-27T13:31:35.828320711+01:00
custom:
Issue: "237"

View File

@ -0,0 +1,85 @@
<?php
declare(strict_types=1);
/*
* 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.
*/
namespace Chill\PersonBundle\Export\Filter\SocialWorkFilters;
use Chill\MainBundle\Export\FilterInterface;
use Chill\MainBundle\Form\Type\PickRollingDateType;
use Chill\MainBundle\Service\RollingDate\RollingDate;
use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
use Chill\PersonBundle\Export\Declarations;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
final readonly class AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter implements FilterInterface
{
public function __construct(
private RollingDateConverterInterface $rollingDateConverter,
) {
}
public function buildForm(FormBuilderInterface $builder): void
{
$builder
->add('start_date', PickRollingDateType::class, [
'label' => 'export.filter.work.evaluation_between_dates.start_date',
])
->add('end_date', PickRollingDateType::class, [
'label' => 'export.filter.work.evaluation_between_dates.end_date',
]);
}
public function getFormDefaultData(): array
{
return ['start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START), 'end_date' => new RollingDate(RollingDate::T_TODAY)];
}
public function getTitle(): string
{
return 'export.filter.work.evaluation_between_dates.title';
}
public function describeAction($data, $format = 'string'): array
{
return [
'export.filter.work.evaluation_between_dates.description',
[
'%startDate%' => null !== $data['start_date'] ? $this->rollingDateConverter->convert($data['start_date'])->format('d-m-Y') : '',
'%endDate%' => null !== $data['end_date'] ? $this->rollingDateConverter->convert($data['end_date'])->format('d-m-Y') : '',
],
];
}
public function addRole(): ?string
{
return null;
}
public function alterQuery(QueryBuilder $qb, $data): void
{
$s = 'workeval_between_filter_start';
$e = 'workeval_between_filter_end';
$qb->andWhere(
$qb->expr()->exists(
'SELECT 1 FROM '.AccompanyingPeriodWorkEvaluation::class." workeval_between_filter_workeval WHERE workeval_between_filter_workeval.createdAt BETWEEN :{$s} AND :{$e} AND IDENTITY(workeval_between_filter_workeval.accompanyingPeriodWork) = acpw.id"
)
)
->setParameter($s, $this->rollingDateConverter->convert($data['start_date']))
->setParameter($e, $this->rollingDateConverter->convert($data['end_date']));
}
public function applyOn(): string
{
return Declarations::SOCIAL_WORK_ACTION_TYPE;
}
}

View File

@ -0,0 +1,63 @@
<?php
declare(strict_types=1);
/*
* 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.
*/
namespace Export\Filter\SocialWorkFilters;
use Chill\MainBundle\Service\RollingDate\RollingDate;
use Chill\MainBundle\Test\Export\AbstractFilterTest;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
use Chill\PersonBundle\Export\Filter\SocialWorkFilters\AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter;
use Doctrine\ORM\EntityManagerInterface;
/**
* @internal
*
* @coversNothing
*/
final class WithEvaluationBetweenDatesFilterTest extends AbstractFilterTest
{
private AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter $filter;
protected function setUp(): void
{
self::bootKernel();
$this->filter = self::$container->get(AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter::class);
}
public function getFilter()
{
return $this->filter;
}
public function getFormData()
{
return [
[
'start_date' => new RollingDate(RollingDate::T_MONTH_CURRENT_START),
'end_date' => new RollingDate(RollingDate::T_TODAY),
],
];
}
public function getQueryBuilders()
{
self::bootKernel();
$em = self::$container->get(EntityManagerInterface::class);
return [
$em->createQueryBuilder()
->select('acpw.id')
->from(AccompanyingPeriodWork::class, 'acpw'),
];
}
}

View File

@ -79,6 +79,10 @@ services:
tags:
- { name: chill.export_filter, alias: social_work_actions_creator_scope_filter }
Chill\PersonBundle\Export\Filter\SocialWorkFilters\AccompanyingPeriodWorkWithEvaluationBetweenDatesFilter:
tags:
- { name: chill.export_filter, alias: social_work_actions_evaluation_btw_dates_filter }
## AGGREGATORS
chill.person.export.aggregator_action_type:

View File

@ -1291,6 +1291,11 @@ export:
by_creator_scope:
title: Filtrer les actions par service du créateur
"Filtered by creator scope: only %scopes%": "Filtré par service du créateur: uniquement %scopes%"
evaluation_between_dates:
title: Filtrer les actions associées à une évaluation créée entre deux dates
description: Uniquement les actions associées à une évaluation créée entre le %startDate% et le %endDate%
start_date: Date de début
end_date: Date de fin
list:
person_with_acp: