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

added global activities (#259)

Browse Source
This commit is contained in:
Kevin Papst
2018-11-06 23:10:34 +01:00
committed by GitHub
parent c66dfbc653
commit db7de3aac1
70 changed files with 1168 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Invoice/Calculator/AbstractInvoiceCalculatorTest.php
View File

@@ -72,7 +72,7 @@ abstract class AbstractCalculatorTest extends TestCase
->setRate(293.27)
->setUser(new User())
->setActivity((new Activity())->setName('foo'))
;
->setProject((new Project())->setName('bar'));
$model = new InvoiceModel();
$model->setCustomer($customer);

8
tests/Invoice/Calculator/ShortInvoiceCalculatorTest.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\ShortInvoiceCalculator;
@@ -35,8 +36,12 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$template = new InvoiceTemplate();
$template->setVat(19);
$project = new Project();
$project->setName('sdfsdf');
$activity = new Activity();
$activity->setName('activity description');
$activity->setProject($project);
$timesheet = new Timesheet();
$timesheet
@@ -44,6 +49,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(293.27)
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
@@ -54,6 +60,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(84)
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
@@ -64,6 +71,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
->setRate(111.11)
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;

5
tests/Invoice/Renderer/AbstractRendererTest.php
View File

@@ -104,6 +104,7 @@ abstract class AbstractRendererTest extends KernelTestCase
->setRate(293.27)
->setUser($user1)
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
@@ -114,6 +115,7 @@ abstract class AbstractRendererTest extends KernelTestCase
->setRate(84.75)
->setUser($user2)
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
@@ -124,6 +126,7 @@ abstract class AbstractRendererTest extends KernelTestCase
->setRate(111.11)
->setUser($user1)
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
@@ -134,6 +137,7 @@ abstract class AbstractRendererTest extends KernelTestCase
->setRate(1947.99)
->setUser($user2)
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
@@ -144,6 +148,7 @@ abstract class AbstractRendererTest extends KernelTestCase
->setFixedRate(84)
->setUser((new User())->setUsername('kevin'))
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;