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

automatic billable calculation (#3200)

Browse Source
This commit is contained in:
Kevin Papst
2022-03-18 22:31:50 +01:00
committed by GitHub
parent f7480902b4
commit 30c7782d6e
34 changed files with 409 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/API/APIControllerBaseTest.php
View File

@@ -374,6 +374,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'bool',
'billable' => 'bool',
'color' => '@string',
'number' => '@string',
'comment' => '@string',
@@ -385,6 +386,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'boolean',
'billable' => 'bool',
'color' => '@string',
'number' => '@string',
'comment' => '@string',
@@ -399,6 +401,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'bool',
'billable' => 'bool',
'color' => '@string',
'metaFields' => ['result' => 'array', 'type' => 'CustomerMeta'],
'teams' => ['result' => 'array', 'type' => 'Team'],
@@ -427,6 +430,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'bool',
'billable' => 'bool',
'color' => '@string',
'customer' => 'int',
'comment' => '@string',
@@ -438,6 +442,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'bool',
'billable' => 'bool',
'color' => '@string',
'customer' => ['result' => 'object', 'type' => 'Customer'],
'comment' => '@string',
@@ -449,6 +454,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'bool',
'billable' => 'bool',
'customer' => 'int',
'color' => '@string',
'metaFields' => ['result' => 'array', 'type' => 'ProjectMeta'],
@@ -465,6 +471,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'bool',
'billable' => 'bool',
'customer' => 'int',
'color' => '@string',
'metaFields' => ['result' => 'array', 'type' => 'ProjectMeta'],
@@ -486,6 +493,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'bool',
'billable' => 'bool',
'project' => '@int',
'color' => '@string',
'comment' => '@string',
@@ -496,6 +504,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'bool',
'billable' => 'bool',
'project' => ['result' => 'object', 'type' => '@ProjectExpanded'],
'color' => '@string',
'comment' => '@string',
@@ -507,6 +516,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'bool',
'billable' => 'bool',
'project' => '@int',
'color' => '@string',
'metaFields' => ['result' => 'array', 'type' => 'ProjectMeta'],
@@ -521,6 +531,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'id' => 'int',
'name' => 'string',
'visible' => 'bool',
'billable' => 'bool',
'project' => '@int',
'color' => '@string',
'metaFields' => ['result' => 'array', 'type' => 'ProjectMeta'],

2
tests/Controller/PermissionControllerTest.php
View File

@@ -35,7 +35,7 @@ class PermissionControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->assertAccessIsGranted($client, '/admin/permissions');
$this->assertHasDataTable($client);
$this->assertDataTableRowCount($client, 'datatable_user_admin_permissions', 121);
$this->assertDataTableRowCount($client, 'datatable_user_admin_permissions', 123);
$this->assertPageActions($client, [
//'back' => $this->createUrl('/admin/user/'),
'create modal-ajax-form' => $this->createUrl('/admin/permissions/roles/create'),

7
tests/Entity/ActivityTest.php
View File

@@ -32,6 +32,7 @@ class ActivityTest extends AbstractEntityTest
$this->assertNull($sut->getName());
$this->assertNull($sut->getComment());
$this->assertTrue($sut->isVisible());
$this->assertTrue($sut->isBillable());
$this->assertTrue($sut->isGlobal());
$this->assertNull($sut->getColor());
self::assertFalse($sut->hasColor());
@@ -57,6 +58,11 @@ class ActivityTest extends AbstractEntityTest
$this->assertInstanceOf(Activity::class, $sut->setVisible(false));
$this->assertFalse($sut->isVisible());
$sut->setVisible(false);
self::assertFalse($sut->isVisible());
$sut->setVisible(true);
self::assertTrue($sut->isVisible());
$this->assertInstanceOf(Activity::class, $sut->setComment('hello world'));
$this->assertEquals('hello world', $sut->getComment());
@@ -145,6 +151,7 @@ class ActivityTest extends AbstractEntityTest
['label.color', 'string'],
['label.visible', 'boolean'],
['label.comment', 'string'],
['label.billable', 'boolean'],
];
self::assertCount(\count($expected), $columns);

7
tests/Entity/CustomerTest.php
View File

@@ -31,6 +31,7 @@ class CustomerTest extends AbstractEntityTest
self::assertNull($sut->getNumber());
self::assertNull($sut->getComment());
self::assertTrue($sut->isVisible());
self::assertTrue($sut->isBillable());
self::assertNull($sut->getCompany());
self::assertNull($sut->getVatId());
@@ -71,6 +72,11 @@ class CustomerTest extends AbstractEntityTest
self::assertInstanceOf(Customer::class, $sut->setVisible(false));
self::assertFalse($sut->isVisible());
$sut->setVisible(false);
self::assertFalse($sut->isVisible());
$sut->setVisible(true);
self::assertTrue($sut->isVisible());
self::assertInstanceOf(Customer::class, $sut->setComment('hello world'));
self::assertEquals('hello world', $sut->getComment());
@@ -198,6 +204,7 @@ class CustomerTest extends AbstractEntityTest
['label.color', 'string'],
['label.visible', 'boolean'],
['label.comment', 'string'],
['label.billable', 'boolean'],
];
self::assertCount(\count($expected), $columns);

7
tests/Entity/ProjectTest.php
View File

@@ -36,6 +36,7 @@ class ProjectTest extends AbstractEntityTest
self::assertNull($sut->getEnd());
self::assertNull($sut->getComment());
self::assertTrue($sut->isVisible());
self::assertTrue($sut->isBillable());
self::assertNull($sut->getColor());
self::assertFalse($sut->hasColor());
self::assertInstanceOf(Collection::class, $sut->getMetaFields());
@@ -96,6 +97,11 @@ class ProjectTest extends AbstractEntityTest
self::assertInstanceOf(Project::class, $sut->setVisible(false));
self::assertFalse($sut->isVisible());
$sut->setVisible(false);
self::assertFalse($sut->isVisible());
$sut->setVisible(true);
self::assertTrue($sut->isVisible());
}
public function testMetaFields()
@@ -173,6 +179,7 @@ class ProjectTest extends AbstractEntityTest
['label.color', 'string'],
['label.visible', 'boolean'],
['label.comment', 'string'],
['label.billable', 'boolean'],
];
self::assertCount(\count($expected), $columns);

1
tests/Export/Spreadsheet/EntityWithMetaFieldsExporterTest.php
View File

@@ -72,6 +72,7 @@ class EntityWithMetaFieldsExporterTest extends TestCase
self::assertEquals('#ababab', $worksheet->getCellByColumnAndRow(++$i, 2)->getValue());
self::assertFalse($worksheet->getCellByColumnAndRow(++$i, 2)->getValue());
self::assertEquals('Lorem Ipsum', $worksheet->getCellByColumnAndRow(++$i, 2)->getValue());
self::assertTrue($worksheet->getCellByColumnAndRow(++$i, 2)->getValue());
self::assertEquals('some magic', $worksheet->getCellByColumnAndRow(++$i, 2)->getValue());
self::assertEquals('is happening', $worksheet->getCellByColumnAndRow(++$i, 2)->getValue());
}