From 6fcd50ecdfe021ed2c38faa250518233d6ef162e Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sun, 3 Oct 2021 13:53:52 +0200 Subject: [PATCH] hide not started projects in widget (#2805) --- src/Entity/Project.php | 3 +++ tests/Entity/ProjectTest.php | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/src/Entity/Project.php b/src/Entity/Project.php index 4637d74b..0fb3b69f 100644 --- a/src/Entity/Project.php +++ b/src/Entity/Project.php @@ -474,6 +474,9 @@ class Project implements EntityWithMetaFields, EntityWithBudget if ($this->getCustomer() !== null && !$this->getCustomer()->isVisible()) { return false; } + if ($this->getStart() !== null && $dateTime < $this->getStart()) { + return false; + } if ($this->getEnd() !== null && $dateTime > $this->getEnd()) { return false; } diff --git a/tests/Entity/ProjectTest.php b/tests/Entity/ProjectTest.php index c6b1f0fa..0a2644a1 100644 --- a/tests/Entity/ProjectTest.php +++ b/tests/Entity/ProjectTest.php @@ -247,5 +247,11 @@ class ProjectTest extends AbstractEntityTest self::assertTrue($sut->isVisibleAtDate($now)); $sut->setEnd(new \DateTime('-1 hour')); self::assertFalse($sut->isVisibleAtDate($now)); + $sut->setEnd(new \DateTime('+1 hour')); + self::assertTrue($sut->isVisibleAtDate($now)); + $sut->setStart(new \DateTime('-1 hour')); + self::assertTrue($sut->isVisibleAtDate($now)); + $sut->setStart(new \DateTime('+1 hour')); + self::assertFalse($sut->isVisibleAtDate($now)); } }