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

change data filter on project month report (#2911)

Browse Source
This commit is contained in:
Kevin Papst
2021-11-05 09:45:12 +01:00
committed by GitHub
parent 042c119058
commit c8854b0775
15 changed files with 199 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Controller/Reporting/ProjectDateRangeControllerTest.php
View File

@@ -9,6 +9,7 @@
namespace App\Tests\Controller\Reporting;
use App\Entity\Project;
use App\Entity\User;
use App\Tests\Controller\ControllerBaseTest;
use App\Tests\DataFixtures\ActivityFixtures;
@@ -39,6 +40,9 @@ class ProjectDateRangeControllerTest extends ControllerBaseTest
$projects->setCustomers($customers);
$projects->setAmount(2);
$projects->setIsVisible(true);
$projects->setCallback(function (Project $project) {
$project->setIsMonthlyBudget();
});
$this->importFixture($projects);
$activities = new ActivityFixtures();

19
tests/Reporting/ProjectDateRange/ProjectDateRangeQueryTest.php
View File

@@ -28,8 +28,11 @@ class ProjectDateRangeQueryTest extends TestCase
self::assertEquals($date->getTimestamp(), $sut->getMonth()->getTimestamp());
self::assertSame($user, $sut->getUser());
self::assertNull($sut->getCustomer());
self::assertFalse($sut->isOnlyWithRecords());
self::assertTrue($sut->isIncludeNoWork());
self::assertEquals('month', $sut->getBudgetType());
self::assertFalse($sut->isIncludeNoBudget());
self::assertTrue($sut->isBudgetTypeMonthly());
}
public function testSetterGetter()
@@ -41,12 +44,20 @@ class ProjectDateRangeQueryTest extends TestCase
$sut->setMonth($date);
$sut->setCustomer($customer);
$sut->setIncludeNoBudget(true);
$sut->setOnlyWithRecords(true);
$sut->setIncludeNoWork(false);
self::assertEquals($date->getTimestamp(), $sut->getMonth()->getTimestamp());
self::assertSame($customer, $sut->getCustomer());
self::assertTrue($sut->isOnlyWithRecords());
self::assertFalse($sut->isIncludeNoWork());
$sut->setBudgetType('none');
self::assertEquals('none', $sut->getBudgetType());
self::assertTrue($sut->isIncludeNoBudget());
self::assertFalse($sut->isBudgetTypeMonthly());
$sut->setBudgetType('full');
self::assertEquals('full', $sut->getBudgetType());
self::assertFalse($sut->isBudgetTypeMonthly());
self::assertFalse($sut->isIncludeNoBudget());
}
}