Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-01 04:23:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

[export] fix date range selection on filtre and grouping "by status of the course at date" on accompanying periods

Browse Source
This commit is contained in:
Julien Fastré
2023-10-19 11:44:53 +02:00
parent 981dc6a959
commit 4c9ea740c8
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/unreleased/Fixed-20231019-114350.yaml Normal file
View File

@@ -0,0 +1,6 @@
kind: Fixed
body: '[export] fix date range selection on filter and grouping "by status of the
course at date", on accompanying periods'
time: 2023-10-19T11:43:50.455829748+02:00
custom:
Issue: "177"

2
src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/StepAggregator.php
View File

@@ -49,7 +49,7 @@ final readonly class StepAggregator implements AggregatorInterface
$qb->expr()->lte(self::A.'.startDate', ':'.self::P),
$qb->expr()->orX(
$qb->expr()->isNull(self::A.'.endDate'),
$qb->expr()->lt(self::A.'.endDate', ':'.self::P)
$qb->expr()->gt(self::A.'.endDate', ':'.self::P)
)
)
)

2
src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/StepFilterOnDate.php
View File

@@ -61,7 +61,7 @@ class StepFilterOnDate implements FilterInterface
$qb->expr()->lte(self::A.'.startDate', ':'.self::P),
$qb->expr()->orX(
$qb->expr()->isNull(self::A.'.endDate'),
$qb->expr()->lt(self::A.'.endDate', ':'.self::P)
$qb->expr()->gt(self::A.'.endDate', ':'.self::P)
)
)
)