From 145e099903762dc283181636d82c02b5a0f2366c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 31 May 2018 22:36:09 +0200 Subject: [PATCH] [repository] add 'equal' to "today is after end|warning|start date" --- Repository/SingleTaskRepository.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Repository/SingleTaskRepository.php b/Repository/SingleTaskRepository.php index 68ba7f5ca..f2bbd06c3 100644 --- a/Repository/SingleTaskRepository.php +++ b/Repository/SingleTaskRepository.php @@ -181,7 +181,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository if ($negative === false) { return $qb->expr()->andX() ->add($qb->expr()->isNotNull('st.endDate')) - ->add($qb->expr()->lt('st.endDate', ':now')) + ->add($qb->expr()->lte('st.endDate', ':now')) ; } else { return $qb->expr()->orX() @@ -199,7 +199,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository { if ($negative === false) { return $qb->expr()->andX() - ->add($qb->expr()->lt( + ->add($qb->expr()->lte( $qb->expr()->diff('st.endDate', 'st.warningInterval'), ':now' ) ); @@ -225,7 +225,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository { if ($negative === false) { return $qb->expr()->orX() - ->add($qb->expr()->lt('st.startDate', ':now')) + ->add($qb->expr()->lte('st.startDate', ':now')) ->add($qb->expr()->isNull('st.startDate')) ; } else {