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

Merge branch 'adjust_list_household_export' into 'master'

Browse Source 
Adjust list household export

See merge request Chill-Projet/chill-bundles!750
This commit is contained in:
LenaertsJ 2024-11-14 08:53:44 +00:00
commit a8660ecdb2
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/unreleased/Fixed-20241029-143304.yaml Normal file
View File

@ -0,0 +1,6 @@
kind: Fixed
body: Adjust household list export to include households even if their address is
NULL
time: 2024-10-29T14:33:04.393943822+01:00
custom:
Issue: ""

3
src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
View File

@ -219,6 +219,8 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
$qb $qb
->leftJoin('household.addresses', 'addresses') ->leftJoin('household.addresses', 'addresses')
->andWhere( ->andWhere(
$qb->expr()->orX(
$qb->expr()->isNull('addresses'), // Include households without any address
$qb->expr()->andX( $qb->expr()->andX(
$qb->expr()->lte('addresses.validFrom', ':calcDate'), $qb->expr()->lte('addresses.validFrom', ':calcDate'),
$qb->expr()->orX( $qb->expr()->orX(
@ -226,6 +228,7 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
$qb->expr()->gt('addresses.validTo', ':calcDate') $qb->expr()->gt('addresses.validTo', ':calcDate')
) )
) )
)
); );
$this->addressHelper->addSelectClauses( $this->addressHelper->addSelectClauses(
ExportAddressHelper::F_ALL, ExportAddressHelper::F_ALL,