EP/myep-team
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: hide called-off assignments and dispositions in teamer overviews

Browse Source
This commit is contained in:
Björn Fromme
2026-03-15 12:42:27 +01:00
parent 2f6dc368b8
commit 3661a3e44e
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Repository/DispositionRepository.php
+15 -3
View File
@@ -35,7 +35,8 @@ class DispositionRepository extends ServiceEntityRepository
->innerJoin('assignment.destination', 'destination') ->innerJoin('assignment.destination', 'destination')
->where($qb->expr()->andX( ->where($qb->expr()->andX(
$qb->expr()->eq('disposition.teamer', ':teamer'), $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()->orX(
$qb->expr()->andX( $qb->expr()->andX(
$qb->expr()->isNull('assignment.dateTo'), $qb->expr()->isNull('assignment.dateTo'),
@@ -48,7 +49,8 @@ class DispositionRepository extends ServiceEntityRepository
) )
)) ))
->setParameter('teamer', $teamer) ->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()) ->setParameter('date', new \DateTimeImmutable())
->getQuery() ->getQuery()
; ;
@@ -75,6 +77,8 @@ class DispositionRepository extends ServiceEntityRepository
->leftJoin('disposition.feedback', 'feedback') ->leftJoin('disposition.feedback', 'feedback')
->where($qb->expr()->andX( ->where($qb->expr()->andX(
$qb->expr()->eq('disposition.teamer', ':teamer'), $qb->expr()->eq('disposition.teamer', ':teamer'),
$qb->expr()->neq('assignment.status', ':assignmentStatus'),
$qb->expr()->neq('disposition.status', ':dispositionStatus'),
$qb->expr()->orX( $qb->expr()->orX(
$qb->expr()->andX( $qb->expr()->andX(
$qb->expr()->isNull('assignment.dateTo'), $qb->expr()->isNull('assignment.dateTo'),
@@ -87,6 +91,8 @@ class DispositionRepository extends ServiceEntityRepository
) )
)) ))
->setParameter('teamer', $teamer) ->setParameter('teamer', $teamer)
->setParameter('assignmentStatus', Assignment::STATUS_CALLED_OFF)
->setParameter('dispositionStatus', Disposition::STATUS_CALLED_OFF)
->setParameter('date', new \DateTimeImmutable()) ->setParameter('date', new \DateTimeImmutable())
->getQuery() ->getQuery()
; ;
@@ -117,8 +123,14 @@ class DispositionRepository extends ServiceEntityRepository
->innerJoin('disposition.assignment', 'assignment') ->innerJoin('disposition.assignment', 'assignment')
->innerJoin('assignment.destination', 'destination') ->innerJoin('assignment.destination', 'destination')
->leftJoin('disposition.feedback', 'feedback') ->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('teamer', $teamer)
->setParameter('assignmentStatus', Assignment::STATUS_CALLED_OFF)
->setParameter('dispositionStatus', Disposition::STATUS_CALLED_OFF)
->orderBy('destination.dateFrom', 'DESC') ->orderBy('destination.dateFrom', 'DESC')
->setMaxResults($limit) ->setMaxResults($limit)
->getQuery() ->getQuery()