From 3661a3e44e36f1a8e4b986d6bbcbf905184cda58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Wed, 21 Jan 2026 09:17:56 +0100 Subject: [PATCH] fix: hide called-off assignments and dispositions in teamer overviews --- src/Repository/DispositionRepository.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Repository/DispositionRepository.php b/src/Repository/DispositionRepository.php index fbda04b..f04bdb5 100644 --- a/src/Repository/DispositionRepository.php +++ b/src/Repository/DispositionRepository.php @@ -35,7 +35,8 @@ class DispositionRepository extends ServiceEntityRepository ->innerJoin('assignment.destination', 'destination') ->where($qb->expr()->andX( $qb->expr()->eq('disposition.teamer', ':teamer'), - $qb->expr()->neq('assignment.status', ':status'), + $qb->expr()->neq('assignment.status', ':assignmentStatus'), + $qb->expr()->neq('disposition.status', ':dispositionStatus'), $qb->expr()->orX( $qb->expr()->andX( $qb->expr()->isNull('assignment.dateTo'), @@ -48,7 +49,8 @@ class DispositionRepository extends ServiceEntityRepository ) )) ->setParameter('teamer', $teamer) - ->setParameter('status', Assignment::STATUS_CALLED_OFF) + ->setParameter('assignmentStatus', Assignment::STATUS_CALLED_OFF) + ->setParameter('dispositionStatus', Disposition::STATUS_CALLED_OFF) ->setParameter('date', new \DateTimeImmutable()) ->getQuery() ; @@ -75,6 +77,8 @@ class DispositionRepository extends ServiceEntityRepository ->leftJoin('disposition.feedback', 'feedback') ->where($qb->expr()->andX( $qb->expr()->eq('disposition.teamer', ':teamer'), + $qb->expr()->neq('assignment.status', ':assignmentStatus'), + $qb->expr()->neq('disposition.status', ':dispositionStatus'), $qb->expr()->orX( $qb->expr()->andX( $qb->expr()->isNull('assignment.dateTo'), @@ -87,6 +91,8 @@ class DispositionRepository extends ServiceEntityRepository ) )) ->setParameter('teamer', $teamer) + ->setParameter('assignmentStatus', Assignment::STATUS_CALLED_OFF) + ->setParameter('dispositionStatus', Disposition::STATUS_CALLED_OFF) ->setParameter('date', new \DateTimeImmutable()) ->getQuery() ; @@ -117,8 +123,14 @@ class DispositionRepository extends ServiceEntityRepository ->innerJoin('disposition.assignment', 'assignment') ->innerJoin('assignment.destination', 'destination') ->leftJoin('disposition.feedback', 'feedback') - ->where($qb->expr()->eq('disposition.teamer', ':teamer')) + ->where($qb->expr()->andX( + $qb->expr()->eq('disposition.teamer', ':teamer'), + $qb->expr()->neq('assignment.status', ':assignmentStatus'), + $qb->expr()->neq('disposition.status', ':dispositionStatus') + )) ->setParameter('teamer', $teamer) + ->setParameter('assignmentStatus', Assignment::STATUS_CALLED_OFF) + ->setParameter('dispositionStatus', Disposition::STATUS_CALLED_OFF) ->orderBy('destination.dateFrom', 'DESC') ->setMaxResults($limit) ->getQuery()