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

added hourly and money budgets to activity, project and customer (#843)

Browse Source
This commit is contained in:
Kevin Papst
2019-06-11 13:18:57 +02:00
committed by GitHub
parent 833968a87d
commit 5702d7afa8
118 changed files with 1743 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Voter/AbstractVoterTest.php
View File

@@ -64,9 +64,9 @@ abstract class AbstractVoterTest extends TestCase
protected function getRolePermissionManager(array $permissions = [], bool $overwrite = false)
{
if (!$overwrite) {
$activities = ['view_activity', 'edit_activity', 'delete_activity', 'create_activity'];
$projects = ['view_project', 'edit_project', 'delete_project', 'create_project'];
$customers = ['view_customer', 'edit_customer', 'delete_customer', 'create_customer'];
$activities = ['view_activity', 'edit_activity', 'budget_activity', 'delete_activity', 'create_activity'];
$projects = ['view_project', 'edit_project', 'budget_project', 'delete_project', 'create_project'];
$customers = ['view_customer', 'edit_customer', 'budget_customer', 'delete_customer', 'create_customer'];
$invoice = ['view_invoice', 'create_invoice'];
$invoiceTemplate = ['view_invoice_template', 'create_invoice_template', 'edit_invoice_template', 'delete_invoice_template'];
$timesheet = ['view_own_timesheet', 'start_own_timesheet', 'stop_own_timesheet', 'create_own_timesheet', 'edit_own_timesheet', 'export_own_timesheet', 'delete_own_timesheet'];

3
tests/Voter/ActivityVoterTest.php
View File

@@ -43,6 +43,7 @@ class ActivityVoterTest extends AbstractVoterTest
foreach ([$user3, $user4] as $user) {
yield [$user, new Activity(), 'view', $result];
yield [$user, new Activity(), 'edit', $result];
yield [$user, new Activity(), 'budget', $result];
yield [$user, new Activity(), 'delete', $result];
}
@@ -50,6 +51,7 @@ class ActivityVoterTest extends AbstractVoterTest
foreach ([$user0, $user1, $user2] as $user) {
yield [$user, new Activity(), 'view', $result];
yield [$user, new Activity(), 'edit', $result];
yield [$user, new Activity(), 'budget', $result];
yield [$user, new Activity(), 'delete', $result];
}
@@ -57,6 +59,7 @@ class ActivityVoterTest extends AbstractVoterTest
foreach ([$user0, $user1, $user2] as $user) {
yield [$user, new Activity(), 'view_activity', $result];
yield [$user, new Activity(), 'edit_activity', $result];
yield [$user, new Activity(), 'budget_activity', $result];
yield [$user, new Activity(), 'delete_activity', $result];
yield [$user, new \stdClass(), 'view', $result];
yield [$user, null, 'edit', $result];

3
tests/Voter/CustomerVoterTest.php
View File

@@ -43,6 +43,7 @@ class CustomerVoterTest extends AbstractVoterTest
foreach ([$user3, $user4] as $user) {
yield [$user, new Customer(), 'view', $result];
yield [$user, new Customer(), 'edit', $result];
yield [$user, new Customer(), 'budget', $result];
yield [$user, new Customer(), 'delete', $result];
}
@@ -50,6 +51,7 @@ class CustomerVoterTest extends AbstractVoterTest
foreach ([$user0, $user1, $user2] as $user) {
yield [$user, new Customer(), 'view', $result];
yield [$user, new Customer(), 'edit', $result];
yield [$user, new Customer(), 'budget', $result];
yield [$user, new Customer(), 'delete', $result];
}
@@ -57,6 +59,7 @@ class CustomerVoterTest extends AbstractVoterTest
foreach ([$user0, $user1, $user2] as $user) {
yield [$user, new Customer(), 'view_customer', $result];
yield [$user, new Customer(), 'edit_customer', $result];
yield [$user, new Customer(), 'budget_customer', $result];
yield [$user, new Customer(), 'delete_customer', $result];
yield [$user, new \stdClass(), 'view', $result];
yield [$user, null, 'edit', $result];

3
tests/Voter/ProjectVoterTest.php
View File

@@ -43,6 +43,7 @@ class ProjectVoterTest extends AbstractVoterTest
foreach ([$user3, $user4] as $user) {
yield [$user, new Project(), 'view', $result];
yield [$user, new Project(), 'edit', $result];
yield [$user, new Project(), 'budget', $result];
yield [$user, new Project(), 'delete', $result];
}
@@ -50,6 +51,7 @@ class ProjectVoterTest extends AbstractVoterTest
foreach ([$user0, $user1, $user2] as $user) {
yield [$user, new Project(), 'view', $result];
yield [$user, new Project(), 'edit', $result];
yield [$user, new Project(), 'budget', $result];
yield [$user, new Project(), 'delete', $result];
}
@@ -58,6 +60,7 @@ class ProjectVoterTest extends AbstractVoterTest
yield [$user, new Project(), 'create_project', $result];
yield [$user, new Project(), 'view_project', $result];
yield [$user, new Project(), 'edit_project', $result];
yield [$user, new Project(), 'budget_project', $result];
yield [$user, new Project(), 'delete_project', $result];
yield [$user, new \stdClass(), 'view', $result];
yield [$user, null, 'edit', $result];