Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 05:44:24 +00:00
Code Issues Actions Projects Releases Wiki Activity

[repository] add 'equal' to "today is after end|warning|start date"

Browse Source
This commit is contained in:
Julien Fastré 2018-05-31 22:36:09 +02:00
parent c4248f4e73
commit 145e099903
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Repository/SingleTaskRepository.php
View File

@ -181,7 +181,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
if ($negative === false) { if ($negative === false) {
return $qb->expr()->andX() return $qb->expr()->andX()
->add($qb->expr()->isNotNull('st.endDate')) ->add($qb->expr()->isNotNull('st.endDate'))
->add($qb->expr()->lt('st.endDate', ':now')) ->add($qb->expr()->lte('st.endDate', ':now'))
; ;
} else { } else {
return $qb->expr()->orX() return $qb->expr()->orX()
@ -199,7 +199,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
{ {
if ($negative === false) { if ($negative === false) {
return $qb->expr()->andX() return $qb->expr()->andX()
->add($qb->expr()->lt( ->add($qb->expr()->lte(
$qb->expr()->diff('st.endDate', 'st.warningInterval'), ':now' $qb->expr()->diff('st.endDate', 'st.warningInterval'), ':now'
) )
); );
@ -225,7 +225,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
{ {
if ($negative === false) { if ($negative === false) {
return $qb->expr()->orX() return $qb->expr()->orX()
->add($qb->expr()->lt('st.startDate', ':now')) ->add($qb->expr()->lte('st.startDate', ':now'))
->add($qb->expr()->isNull('st.startDate')) ->add($qb->expr()->isNull('st.startDate'))
; ;
} else { } else {