Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fixed: remaining options not linked with PickRollingDateType

Browse Source
This commit is contained in:
Julien Fastré 2022-11-16 14:57:40 +01:00
parent d0e1f31ec7
commit 318d6b6d4e
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
View File

@ -58,9 +58,9 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
$qb->expr()->andX(
'acp_geog_agg_location_history.startDate <= :acp_geog_aggregator_date',
$qb->expr()->orX(
'acp_geog_agg_location_history.endDate IS NULL',
'acp_geog_agg_location_history.endDate > :acp_geog_aggregator_date'
)
'acp_geog_agg_location_history.endDate IS NULL',
'acp_geog_agg_location_history.endDate > :acp_geog_aggregator_date'
)
)
);
@ -73,9 +73,9 @@ final class GeographicalUnitStatAggregator implements AggregatorInterface
'IDENTITY(acp_geog_agg_address_person_location.person) = IDENTITY(acp_geog_agg_location_history.personLocation)',
'acp_geog_agg_address_person_location.validFrom < :acp_geog_aggregator_date',
$qb->expr()->orX(
'acp_geog_agg_address_person_location.validTo > :acp_geog_aggregator_date',
$qb->expr()->isNull('acp_geog_agg_address_person_location.validTo')
)
'acp_geog_agg_address_person_location.validTo > :acp_geog_aggregator_date',
$qb->expr()->isNull('acp_geog_agg_address_person_location.validTo')
)
)
);

2
src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByEndDateFilter.php
View File

@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\PickRollingDateType;
use Chill\MainBundle\Service\RollingDate\RollingDate;
use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
use Chill\PersonBundle\Export\Declarations;
use DateTimeImmutable;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
@ -59,7 +58,6 @@ class ByEndDateFilter implements FilterInterface
->add('start_date', PickRollingDateType::class, [
'label' => 'start period date',
'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
'input' => 'datetime_immutable',
])
->add('end_date', PickRollingDateType::class, [
'label' => 'end period date',

2
src/Bundle/ChillPersonBundle/Export/Filter/EvaluationFilters/ByStartDateFilter.php
View File

@ -16,7 +16,6 @@ use Chill\MainBundle\Form\Type\PickRollingDateType;
use Chill\MainBundle\Service\RollingDate\RollingDate;
use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
use Chill\PersonBundle\Export\Declarations;
use DateTimeImmutable;
use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface;
@ -59,7 +58,6 @@ class ByStartDateFilter implements FilterInterface
->add('start_date', PickRollingDateType::class, [
'label' => 'start period date',
'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
'input' => 'datetime_immutable',
])
->add('end_date', PickRollingDateType::class, [
'label' => 'end period date',