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

fixed null project for advanced invoice calculator (#462)

Browse Source
This commit is contained in:
Kevin Papst
2018-12-03 22:36:38 +01:00
committed by GitHub
parent 35305ad107
commit c58c12ea3d
5 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Invoice/Calculator/AbstractMergedCalculator.php
View File

@@ -44,6 +44,10 @@ abstract class AbstractMergedCalculator extends AbstractCalculator
$timesheet->setActivity($entry->getActivity());
}
if (null === $timesheet->getProject()) {
$timesheet->setProject($entry->getProject());
}
if (empty($timesheet->getDescription())) {
$timesheet->setDescription($entry->getActivity()->getName());
}

1
src/Invoice/Renderer/RendererTrait.php
View File

@@ -176,6 +176,7 @@ trait RendererTrait
'entry.date' => $this->getFormattedDateTime($begin),
'entry.user_id' => $user->getId(),
'entry.user_name' => $user->getUsername(),
'entry.user_title' => $user->getTitle(),
'entry.user_alias' => $user->getAlias(),
'entry.activity' => $activity->getName(),
'entry.activity_id' => $activity->getId(),

6
tests/Invoice/Calculator/ActivityInvoiceCalculatorTest.php
View File

@@ -12,6 +12,7 @@ namespace App\Tests\Invoice\Calculator;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\InvoiceTemplate;
use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Invoice\Calculator\ActivityInvoiceCalculator;
@@ -50,6 +51,7 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(293.27)
->setUser($user)
->setActivity($activity1)
->setProject((new Project())->setName('bar'));
;
$timesheet2 = new Timesheet();
@@ -58,6 +60,7 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(84.75)
->setUser($user)
->setActivity($activity2)
->setProject((new Project())->setName('bar'));
;
$timesheet3 = new Timesheet();
@@ -66,6 +69,7 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(111.11)
->setUser($user)
->setActivity($activity1)
->setProject((new Project())->setName('bar'));
;
$timesheet4 = new Timesheet();
@@ -74,6 +78,7 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(1947.99)
->setUser($user)
->setActivity($activity2)
->setProject((new Project())->setName('bar'));
;
$timesheet5 = new Timesheet();
@@ -82,6 +87,7 @@ class ActivityInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(84)
->setUser(new User())
->setActivity(new Activity())
->setProject((new Project())->setName('bar'));
;
$entries = [$timesheet, $timesheet2, $timesheet3, $timesheet4, $timesheet5];

6
tests/Invoice/Calculator/UserInvoiceCalculatorTest.php
View File

@@ -12,6 +12,7 @@ namespace App\Tests\Invoice\Calculator;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\InvoiceTemplate;
use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Invoice\Calculator\UserInvoiceCalculator;
@@ -50,6 +51,7 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(293.27)
->setUser($user1)
->setActivity($activity)
->setProject((new Project())->setName('bar'));
;
$timesheet2 = new Timesheet();
@@ -58,6 +60,7 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(84.75)
->setUser($user2)
->setActivity($activity)
->setProject((new Project())->setName('bar'));
;
$timesheet3 = new Timesheet();
@@ -66,6 +69,7 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(111.11)
->setUser($user1)
->setActivity($activity)
->setProject((new Project())->setName('bar'));
;
$timesheet4 = new Timesheet();
@@ -74,6 +78,7 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(1947.99)
->setUser($user2)
->setActivity($activity)
->setProject((new Project())->setName('bar'));
;
$timesheet5 = new Timesheet();
@@ -82,6 +87,7 @@ class UserInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(84)
->setUser(new User())
->setActivity($activity)
->setProject((new Project())->setName('bar'));
;
$entries = [$timesheet, $timesheet2, $timesheet3, $timesheet4, $timesheet5];

1
tests/Invoice/Renderer/DebugRendererTest.php
View File

@@ -111,6 +111,7 @@ class DebugRendererTest extends AbstractRendererTest
'entry.user_id',
'entry.user_name',
'entry.user_alias',
'entry.user_title',
'entry.activity',
'entry.activity_id',
'entry.project',