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

Export: fix filter household by composition

Browse Source
This commit is contained in:
Julien Fastré 2023-09-12 15:10:23 +02:00
parent c2c14be9d7
commit 9e017b0d66
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Bundle/ChillPersonBundle/Export/Filter/HouseholdFilters/CompositionFilter.php
View File

@ -45,23 +45,23 @@ class CompositionFilter implements FilterInterface
public function alterQuery(QueryBuilder $qb, $data)
{
if (!in_array('composition_type_filter', $qb->getAllAliases(), true)) {
dump(__METHOD__);
// there is no test on the aliases here: the name should be unique
$clause =
$qb->expr()->andX(
$qb->expr()->lte('composition_type_filter.startDate', ':ondate_composition_type_filter'),
$qb->expr()->lte('composition_type_filter_composition.startDate', ':ondate_composition_type_filter'),
$qb->expr()->orX(
$qb->expr()->gt('composition_type_filter.endDate', ':ondate_composition_type_filter'),
$qb->expr()->isNull('composition_type_filter.endDate')
$qb->expr()->gt('composition_type_filter_composition.endDate', ':ondate_composition_type_filter'),
$qb->expr()->isNull('composition_type_filter_composition.endDate')
)
);
$qb->join('household.compositions', 'composition', Expr\Join::WITH, $clause);
}
$qb->join('household.compositions', 'composition_type_filter_composition', Expr\Join::WITH, $clause);
$whereClause = $qb->expr()->in('composition_type_filter.householdCompositionType', ':compositions');
$whereClause = $qb->expr()->in('composition_type_filter_composition.householdCompositionType', ':compositions_composition_type_filter');
$qb->andWhere($whereClause);
$qb->setParameter('compositions', $data['accepted_composition']);
$qb->setParameter('compositions_composition_type_filter', $data['accepted_composition']);
$qb->setParameter(
'ondate_composition_type_filter',
$this->rollingDateConverter->convert($data['on_date'])

1
src/Bundle/ChillPersonBundle/Tests/Export/Filter/HouseholdFilters/CompositionFilterTest.php
View File

@ -15,7 +15,6 @@ use Chill\MainBundle\Test\Export\AbstractFilterTest;
use Chill\PersonBundle\Entity\Household\Household;
use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
use Chill\PersonBundle\Export\Filter\HouseholdFilters\CompositionFilter;
use DateTime;
use Doctrine\ORM\EntityManagerInterface;
/**