diff --git a/src/Validator/Constraints/ApplicationValidator.php b/src/Validator/Constraints/ApplicationValidator.php index c359757..4243e5f 100644 --- a/src/Validator/Constraints/ApplicationValidator.php +++ b/src/Validator/Constraints/ApplicationValidator.php @@ -2,6 +2,8 @@ namespace App\Validator\Constraints; +use App\Entity\Assignment; +use App\Entity\Disposition; use App\Repository\DispositionRepository; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; @@ -40,6 +42,8 @@ class ApplicationValidator extends ConstraintValidator ->innerJoin('assignment.destination', 'destination') ->where($qb->expr()->andX( $qb->expr()->eq('disposition.teamer', ':teamer'), + $qb->expr()->neq('disposition.status', ':disposition_called_off'), + $qb->expr()->neq('assignment.status', ':assignment_called_off'), $qb->expr()->isNull('assignment.deletedAt'), $qb->expr()->isNull('destination.deletedAt'), $qb->expr()->orX( @@ -54,6 +58,8 @@ class ApplicationValidator extends ConstraintValidator ) )) ->setParameter('teamer', $teamer) + ->setParameter('disposition_called_off', Disposition::STATUS_CALLED_OFF) + ->setParameter('assignment_called_off', Assignment::STATUS_CALLED_OFF) ->setParameter('application_date_from', $applicationDateFrom) ->setParameter('application_date_to', $applicationDateTo) ->getQuery()