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

Release 2.39 (#5604)

Browse Source 
* prepare audit via annotation
* default calendar slot label distance of 1h
+ replace freestyle config with dropdown
* added missing return definition in callbacks
* refactor view name handling
* dispatch calendar view changes and push them into the URL to be able to reload the poage
* bump packages
* fix timezone issue in calendar sum calculation
* fixes #5618 resetRates()
* show expected daily hours in working-contract screen
This commit is contained in:
Kevin Papst
2025-08-30 11:41:17 +02:00
committed by GitHub
parent 4920ea5075
commit a4d658b821
85 changed files with 987 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/Controller/ContractControllerTest.php
View File

@@ -9,7 +9,11 @@
namespace App\Tests\Controller;
use App\DataFixtures\UserFixtures;
use App\Entity\User;
use App\Repository\UserRepository;
use App\WorkingTime\Calculator\WorkingTimeCalculatorDay;
use App\WorkingTime\Mode\WorkingTimeModeDay;
use PHPUnit\Framework\Attributes\Group;
#[Group('integration')]
@@ -31,6 +35,34 @@ class ContractControllerTest extends AbstractControllerBaseTestCase
self::assertEquals(0, $node->count());
}
public function testIndexActionWithWorkContract(): void
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
/** @var UserRepository $repository */
$repository = $this->getPrivateService(UserRepository::class);
$user = $this->loadUserFromDatabase(UserFixtures::USERNAME_USER);
$user->setWorkContractMode(WorkingTimeModeDay::ID);
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_MONDAY, '28800');
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_TUESDAY, '28800');
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_WEDNESDAY, '28800');
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_THURSDAY, '25200');
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_FRIDAY, '19800');
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_SATURDAY, '0');
$user->setPreferenceValue(WorkingTimeCalculatorDay::WORK_HOURS_SUNDAY, '0');
$repository->saveUser($user);
$this->assertAccessIsGranted($client, '/contract');
$content = $client->getResponse()->getContent();
self::assertNotFalse($content);
$node = $client->getCrawler()->filter('table#working_times_details');
self::assertEquals(1, $node->count());
self::assertStringContainsString('7:00', $content);
self::assertStringContainsString('8:00', $content);
self::assertStringContainsString('5:30', $content);
}
public function testTeamleadCanChangeUser(): void
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);