marital status filter

src/Bundle/ChillPersonBundle/Export/Filter/PersonFilters/MaritalStatusFilter.php

@@ -13,6 +13,8 @@ namespace Chill\PersonBundle\Export\Filter\PersonFilters;
 
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Export\FilterInterface;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Household\HouseholdCompositionType;
 use Chill\PersonBundle\Entity\MaritalStatus;
 use Chill\PersonBundle\Export\Declarations;
@@ -20,9 +22,18 @@ use DateTime;
 use Doctrine\ORM\Query\Expr\Andx;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class MaritalStatusFilter implements FilterInterface
 {
+    private TranslatableStringHelper $translatableStringHelper;
+
+    public function __construct(
+        TranslatableStringHelper $translatableStringHelper
+    ) {
+        $this->translatableStringHelper = $translatableStringHelper;
+    }
+
     public function addRole()
     {
         return null;
@@ -33,8 +44,11 @@ class MaritalStatusFilter implements FilterInterface
         $where = $qb->getDQLPart('where');
 
         $clause = $qb->expr()->andX(
-            $qb->expr()->in('p.maritalStatus', ':maritalStatus'),
-            $qb->expr()->eq('p.maritalStatusDate', ':calc_date')
+            $qb->expr()->in('person.maritalStatus', ':maritalStatus'),
+            $qb->expr()->orX(
+                $qb->expr()->eq('person.maritalStatusDate', ':calc_date'),
+                $qb->expr()->isNull('person.maritalStatusDate')
+            )
         );
 
         if ($where instanceof Andx) {
@@ -45,7 +59,7 @@ class MaritalStatusFilter implements FilterInterface
 
         $qb->add('where', $where);
         $qb->setParameter('maritalStatus', $data['maritalStatus']);
-        $qb->setParameter('maritalStatusDate', $data['calc_date']);
+        $qb->setParameter('calc_date', $data['calc_date']);
     }
 
     public function applyOn()
@@ -59,14 +73,14 @@ class MaritalStatusFilter implements FilterInterface
             'class' => MaritalStatus::class,
             'choice_label' => function (MaritalStatus $ms) {
                 return $this->translatableStringHelper->localize(
-                    $ms->getLabel()
+                    $ms->getName()
                 );
             },
             'multiple' => true,
             'expanded' => true
         ]);
 
-        $builder->add('date_calc', DateType::class, [
+        $builder->add('calc_date', ChillDateType::class, [
             'label' => 'Marital status at this time',
             'data' => new DateTime(),
         ]);