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

colors for visual grouping of customer, projects and activities (#751)

Browse Source
This commit is contained in:
Kevin Papst
2019-05-04 01:45:52 +02:00
committed by GitHub
parent e92c2d168e
commit 65df1ff909
40 changed files with 523 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/API/ActivityControllerTest.php
View File

@@ -224,7 +224,7 @@ class ActivityControllerTest extends APIControllerBaseTest
$expectedKeys = ['id', 'name', 'visible', 'project', 'hourlyRate', 'fixedRate'];
if ($full) {
$expectedKeys = array_merge($expectedKeys, ['comment']);
$expectedKeys = array_merge($expectedKeys, ['comment', 'color']);
}
$actual = array_keys($result);

2
tests/API/CustomerControllerTest.php
View File

@@ -168,7 +168,7 @@ class CustomerControllerTest extends APIControllerBaseTest
if ($full) {
$expectedKeys = array_merge($expectedKeys, [
'homepage', 'number', 'comment', 'company', 'contact', 'address', 'country', 'currency', 'phone', 'fax', 'mobile', 'email', 'timezone'
'homepage', 'number', 'comment', 'company', 'contact', 'address', 'country', 'currency', 'phone', 'fax', 'mobile', 'email', 'timezone', 'color'
]);
}

2
tests/API/ProjectControllerTest.php
View File

@@ -220,7 +220,7 @@ class ProjectControllerTest extends APIControllerBaseTest
if ($full) {
$expectedKeys = array_merge(
$expectedKeys,
['comment', 'budget', 'orderNumber']
['comment', 'budget', 'orderNumber', 'color']
);
}