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

Support for changeable work contract types (#5069)

Browse Source
This commit is contained in:
Kevin Papst
2024-09-22 16:18:21 +02:00
committed by GitHub
parent 8de54e1fa7
commit 4076e1c3d3
23 changed files with 830 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/Controller/ProfileControllerTest.php
View File

@@ -14,6 +14,7 @@ use App\Entity\User;
use App\Entity\UserPreference;
use App\Tests\DataFixtures\TeamFixtures;
use App\Tests\DataFixtures\TimesheetFixtures;
use App\WorkingTime\Mode\WorkingTimeModeDay;
use Symfony\Component\DomCrawler\Field\ChoiceFormField;
use Symfony\Component\HttpKernel\HttpKernelBrowser;
use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
@@ -552,14 +553,15 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$user = $this->getUserByRole(User::ROLE_USER);
$calculator = (new WorkingTimeModeDay())->getCalculator($user);
$this->assertEquals(0, $user->getWorkHoursMonday());
$this->assertEquals(0, $user->getWorkHoursTuesday());
$this->assertEquals(0, $user->getWorkHoursWednesday());
$this->assertEquals(0, $user->getWorkHoursThursday());
$this->assertEquals(0, $user->getWorkHoursFriday());
$this->assertEquals(0, $user->getWorkHoursSaturday());
$this->assertEquals(0, $user->getWorkHoursSunday());
$this->assertEquals(0, $calculator->getWorkHoursForDay(new \DateTime('monday this week')));
$this->assertEquals(0, $calculator->getWorkHoursForDay(new \DateTime('tuesday this week')));
$this->assertEquals(0, $calculator->getWorkHoursForDay(new \DateTime('wednesday this week')));
$this->assertEquals(0, $calculator->getWorkHoursForDay(new \DateTime('thursday this week')));
$this->assertEquals(0, $calculator->getWorkHoursForDay(new \DateTime('friday this week')));
$this->assertEquals(0, $calculator->getWorkHoursForDay(new \DateTime('saturday this week')));
$this->assertEquals(0, $calculator->getWorkHoursForDay(new \DateTime('sunday this week')));
$form = $client->getCrawler()->filter('form[name=user_contract]')->form();
@@ -580,13 +582,14 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
$user = $this->getUserByRole(User::ROLE_USER);
$calculator = (new WorkingTimeModeDay())->getCalculator($user);
$this->assertEquals(3600, $user->getWorkHoursMonday());
$this->assertEquals(7200, $user->getWorkHoursTuesday());
$this->assertEquals(10800, $user->getWorkHoursWednesday());
$this->assertEquals(16200, $user->getWorkHoursThursday());
$this->assertEquals(18720, $user->getWorkHoursFriday());
$this->assertEquals(25140, $user->getWorkHoursSaturday());
$this->assertEquals(60, $user->getWorkHoursSunday());
$this->assertEquals(3600, $calculator->getWorkHoursForDay(new \DateTime('monday this week')));
$this->assertEquals(7200, $calculator->getWorkHoursForDay(new \DateTime('tuesday this week')));
$this->assertEquals(10800, $calculator->getWorkHoursForDay(new \DateTime('wednesday this week')));
$this->assertEquals(16200, $calculator->getWorkHoursForDay(new \DateTime('thursday this week')));
$this->assertEquals(18720, $calculator->getWorkHoursForDay(new \DateTime('friday this week')));
$this->assertEquals(25140, $calculator->getWorkHoursForDay(new \DateTime('saturday this week')));
$this->assertEquals(60, $calculator->getWorkHoursForDay(new \DateTime('sunday this week')));
}
}

23
tests/Entity/UserTest.php
View File

@@ -17,6 +17,7 @@ use App\Entity\UserPreference;
use App\Export\Spreadsheet\ColumnDefinition;
use App\Export\Spreadsheet\Extractor\AnnotationExtractor;
use App\Tests\Security\TestUserEntity;
use App\WorkingTime\Mode\WorkingTimeModeDay;
use Doctrine\Common\Collections\ArrayCollection;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Security\Core\User\EquatableInterface;
@@ -74,13 +75,6 @@ class UserTest extends TestCase
$user->setAccountNumber('A-058375');
self::assertEquals('A-058375', $user->getAccountNumber());
self::assertEquals(0, $user->getWorkHoursMonday());
self::assertEquals(0, $user->getWorkHoursTuesday());
self::assertEquals(0, $user->getWorkHoursWednesday());
self::assertEquals(0, $user->getWorkHoursThursday());
self::assertEquals(0, $user->getWorkHoursFriday());
self::assertEquals(0, $user->getWorkHoursSaturday());
self::assertEquals(0, $user->getWorkHoursSunday());
self::assertEquals(0, $user->getHolidaysPerYear());
self::assertFalse($user->hasWorkHourConfiguration());
self::assertNull($user->getPublicHolidayGroup());
@@ -88,10 +82,23 @@ class UserTest extends TestCase
self::assertNull($user->getSupervisor());
}
/**
* @deprecated
* @group legacy
*/
public function testWorkContract(): void
{
$user = new User();
self::assertEquals(0, $user->getWorkHoursMonday());
self::assertEquals(0, $user->getWorkHoursTuesday());
self::assertEquals(0, $user->getWorkHoursWednesday());
self::assertEquals(0, $user->getWorkHoursThursday());
self::assertEquals(0, $user->getWorkHoursFriday());
self::assertEquals(0, $user->getWorkHoursSaturday());
self::assertEquals(0, $user->getWorkHoursSunday());
self::assertFalse($user->hasWorkHourConfiguration());
$monday = new \DateTime('2023-05-08 12:00:00', new \DateTimeZone('Europe/Berlin'));
$tuesday = new \DateTime('2023-05-09 12:00:00', new \DateTimeZone('Europe/Berlin'));
$wednesday = new \DateTime('2023-05-10 12:00:00', new \DateTimeZone('Europe/Berlin'));
@@ -108,6 +115,8 @@ class UserTest extends TestCase
self::assertFalse($user->isWorkDay($saturday));
self::assertFalse($user->isWorkDay($sunday));
$user->setWorkContractMode(WorkingTimeModeDay::ID);
$user->setWorkHoursMonday(7200);
self::assertTrue($user->hasWorkHourConfiguration());
$user->setWorkHoursTuesday(7300);

58
tests/WorkingTime/Calculator/WorkingTimeCalculatorDayTest.php Normal file
View File

@@ -0,0 +1,58 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\WorkingTime\Calculator;
use App\Entity\User;
use App\WorkingTime\Calculator\WorkingTimeCalculatorDay;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\WorkingTime\Calculator\WorkingTimeCalculatorDay
*/
class WorkingTimeCalculatorDayTest extends TestCase
{
public function testDefaults(): void
{
$monday = new \DateTimeImmutable('monday last week 12:00:00');
$tuesday = $monday->modify('+1 day');
$wednesday = $tuesday->modify('+1 day');
$thursday = $wednesday->modify('+1 day');
$friday = $thursday->modify('+1 day');
$saturday = $friday->modify('+1 day');
$sunday = $saturday->modify('+1 day');
$user = new User();
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_MONDAY, 0);
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_TUESDAY, 3600);
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_WEDNESDAY, 0);
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_THURSDAY, 7200);
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_FRIDAY, 0);
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_SATURDAY, 1800);
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_SUNDAY, 9000);
$sut = new WorkingTimeCalculatorDay($user);
self::assertFalse($sut->isWorkDay($monday));
self::assertTrue($sut->isWorkDay($tuesday));
self::assertFalse($sut->isWorkDay($wednesday));
self::assertTrue($sut->isWorkDay($thursday));
self::assertFalse($sut->isWorkDay($friday));
self::assertTrue($sut->isWorkDay($saturday));
self::assertTrue($sut->isWorkDay($sunday));
self::assertEquals(0, $sut->getWorkHoursForDay($monday));
self::assertEquals(3600, $sut->getWorkHoursForDay($tuesday));
self::assertEquals(0, $sut->getWorkHoursForDay($wednesday));
self::assertEquals(7200, $sut->getWorkHoursForDay($thursday));
self::assertEquals(0, $sut->getWorkHoursForDay($friday));
self::assertEquals(1800, $sut->getWorkHoursForDay($saturday));
self::assertEquals(9000, $sut->getWorkHoursForDay($sunday));
}
}

27
tests/WorkingTime/Calculator/WorkingTimeCalculatorNoneTest.php Normal file
View File

@@ -0,0 +1,27 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\WorkingTime\Calculator;
use App\WorkingTime\Calculator\WorkingTimeCalculatorNone;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\WorkingTime\Calculator\WorkingTimeCalculatorNone
*/
class WorkingTimeCalculatorNoneTest extends TestCase
{
public function testDefaults(): void
{
$date = new \DateTime();
$sut = new WorkingTimeCalculatorNone();
self::assertTrue($sut->isWorkDay($date));
self::assertEquals(0, $sut->getWorkHoursForDay($date));
}
}

34
tests/WorkingTime/Mode/WorkingTimeModeDayTest.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\WorkingTime\Mode;
use App\Entity\User;
use App\WorkingTime\Calculator\WorkingTimeCalculatorDay;
use App\WorkingTime\Mode\WorkingTimeModeDay;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\WorkingTime\Mode\WorkingTimeModeDay
*/
class WorkingTimeModeDayTest extends TestCase
{
public function testDefaults(): void
{
$user = new User();
$user->setWorkContractMode('day');
$sut = new WorkingTimeModeDay();
$this->assertEquals('day', $sut->getId());
$this->assertEquals(10, $sut->getOrder());
$this->assertEquals('hours_per_day', $sut->getName());
$this->assertInstanceOf(WorkingTimeCalculatorDay::class, $sut->getCalculator($user));
$fields = $sut->getFormFields();
$this->assertCount(7, $fields);
}
}

46
tests/WorkingTime/Mode/WorkingTimeModeFactoryTest.php Normal file
View File

@@ -0,0 +1,46 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\WorkingTime\Mode;
use App\Entity\User;
use App\WorkingTime\Mode\WorkingTimeModeDay;
use App\WorkingTime\Mode\WorkingTimeModeFactory;
use App\WorkingTime\Mode\WorkingTimeModeNone;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\WorkingTime\Mode\WorkingTimeModeFactory
*/
class WorkingTimeModeFactoryTest extends TestCase
{
public function testDefaults(): void
{
$none = new WorkingTimeModeNone();
$day = new WorkingTimeModeDay();
$modes = [$none, $day];
$sut = new WorkingTimeModeFactory($modes);
$this->assertEquals($modes, $sut->getAll());
$this->assertSame($none, $sut->getMode('none'));
$this->assertSame($day, $sut->getMode('day'));
$user = new User();
$user->setWorkContractMode('day');
$this->assertSame($day, $sut->getModeForUser($user));
}
public function testException(): void
{
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Unknown working contract mode: foo');
$sut = new WorkingTimeModeFactory([]);
$sut->getMode('foo');
}
}

30
tests/WorkingTime/Mode/WorkingTimeModeNoneTest.php Normal file
View File

@@ -0,0 +1,30 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\WorkingTime\Mode;
use App\Entity\User;
use App\WorkingTime\Calculator\WorkingTimeCalculatorNone;
use App\WorkingTime\Mode\WorkingTimeModeNone;
use PHPUnit\Framework\TestCase;
/**
* @covers \App\WorkingTime\Mode\WorkingTimeModeNone
*/
class WorkingTimeModeNoneTest extends TestCase
{
public function testDefaults(): void
{
$sut = new WorkingTimeModeNone();
$this->assertEquals('none', $sut->getId());
$this->assertEquals(0, $sut->getOrder());
$this->assertEquals('', $sut->getName());
$this->assertInstanceOf(WorkingTimeCalculatorNone::class, $sut->getCalculator(new User()));
}
}