This commit is contained in:
Julien Fastré 2022-10-31 17:53:25 +01:00
parent 6ffe99a2be
commit c331f94201
2 changed files with 4 additions and 3 deletions

View File

@ -39,9 +39,9 @@ class UsersJobFilter implements FilterInterface
$qb $qb
->andWhere( ->andWhere(
$qb->expr()->exists( $qb->expr()->exists(
'SELECT 1 FROM ' . Activity::class . ' activity_users_job_filter_act 'SELECT 1 FROM ' . Activity::class . ' activity_users_job_filter_act
JOIN activity_users_job_filter_act.users users WHERE users.userJob IN (:activity_users_job_filter_jobs) AND activity_users_job_filter_act = activity ' JOIN activity_users_job_filter_act.users users WHERE users.userJob IN (:activity_users_job_filter_jobs) AND activity_users_job_filter_act = activity '
) )
) )
->setParameter('activity_users_job_filter_jobs', $data['jobs']); ->setParameter('activity_users_job_filter_jobs', $data['jobs']);
} }

View File

@ -18,6 +18,7 @@ use Chill\PersonBundle\Entity\Household\HouseholdComposition;
use Chill\PersonBundle\Entity\Household\HouseholdMember; use Chill\PersonBundle\Entity\Household\HouseholdMember;
use Chill\PersonBundle\Export\Declarations; use Chill\PersonBundle\Export\Declarations;
use Chill\PersonBundle\Repository\Household\HouseholdCompositionTypeRepositoryInterface; use Chill\PersonBundle\Repository\Household\HouseholdCompositionTypeRepositoryInterface;
use DateTimeImmutable;
use Doctrine\ORM\Query\Expr\Join; use Doctrine\ORM\Query\Expr\Join;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
@ -96,7 +97,7 @@ class ByHouseholdCompositionAggregator implements AggregatorInterface
$builder->add('date_calc', ChillDateType::class, [ $builder->add('date_calc', ChillDateType::class, [
'label' => 'export.aggregator.course.by_household_composition.Calc date', 'label' => 'export.aggregator.course.by_household_composition.Calc date',
'input_format' => 'datetime_immutable', 'input_format' => 'datetime_immutable',
'data' => new \DateTimeImmutable('now'), 'data' => new DateTimeImmutable('now'),
]); ]);
} }