jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

hide not started projects in widget (#2805)

Browse Source
This commit is contained in:
Kevin Papst
2021-10-03 13:53:52 +02:00
committed by GitHub
parent 6857d92c4f
commit 6fcd50ecdf
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Entity/Project.php
View File

@@ -474,6 +474,9 @@ class Project implements EntityWithMetaFields, EntityWithBudget
if ($this->getCustomer() !== null && !$this->getCustomer()->isVisible()) { if ($this->getCustomer() !== null && !$this->getCustomer()->isVisible()) {
return false; return false;
} }
if ($this->getStart() !== null && $dateTime < $this->getStart()) {
return false;
}
if ($this->getEnd() !== null && $dateTime > $this->getEnd()) { if ($this->getEnd() !== null && $dateTime > $this->getEnd()) {
return false; return false;
} }

6
tests/Entity/ProjectTest.php
View File

@@ -247,5 +247,11 @@ class ProjectTest extends AbstractEntityTest
self::assertTrue($sut->isVisibleAtDate($now)); self::assertTrue($sut->isVisibleAtDate($now));
$sut->setEnd(new \DateTime('-1 hour')); $sut->setEnd(new \DateTime('-1 hour'));
self::assertFalse($sut->isVisibleAtDate($now)); 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));
} }
} }