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

Merge branch '185-fix-inconsistencies-person-geog-unit-aggregator' into 'master'

Browse Source 
Fix geographical unit stat aggregator by course: show also the course if they...

Closes #194 and #185

See merge request Chill-Projet/chill-bundles!607
This commit is contained in:
Julien Fastré
2023-11-07 15:15:12 +00:00
parent 3a269ba953 bb1602934c
commit f756c0d71e
12 changed files with 255 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,12 @@ final readonly class GeographicalUnitStatAggregator implements AggregatorInterfa
'acp_geog_units'
);
$qb->andWhere($qb->expr()->in('acp_geog_units.layer', ':acp_geog_unit_layer'));
$qb->andWhere(
$qb->expr()->orX(
$qb->expr()->isNull('acp_geog_units'),
$qb->expr()->in('acp_geog_units.layer', ':acp_geog_unit_layer')
)
);
$qb->setParameter('acp_geog_unit_layer', $data['level']);