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

improved duration and minute selector (#2264)

Browse Source 
* do not close modal if form is dirty
* deprecated TimesheetConfiguration
* inject timezone in form types
* cleanup usage of UserDateTimeFactory
* allow to configure increment steps for minutes
* use 15 minutes step for datetimepicker in project edit form
* use rounding rules for increments in minute select for begin and end
* allow duration in multi user and admin timesheet forms
* make dropdown values configurable
This commit is contained in:
Kevin Papst
2021-01-17 14:04:13 +01:00
committed by GitHub
parent e2324b7d51
commit 8d72d114c7
95 changed files with 1381 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Mocks/RoundingServiceFactory.php
View File

@@ -9,7 +9,7 @@
namespace App\Tests\Mocks;
use App\Configuration\TimesheetConfiguration;
use App\Configuration\SystemConfiguration;
use App\Tests\Configuration\TestConfigLoader;
use App\Timesheet\Rounding\CeilRounding;
use App\Timesheet\Rounding\ClosestRounding;
@@ -35,8 +35,8 @@ class RoundingServiceFactory extends AbstractMockFactory
];
}
$configuration = new TimesheetConfiguration($loader, [
'rounding' => $rules
$configuration = new SystemConfiguration($loader, [
'timesheet' => ['rounding' => $rules]
]);
$modes = [

25
tests/Mocks/Security/UserDateTimeFactoryFactory.php
View File

@@ -1,25 +0,0 @@
<?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\Mocks\Security;
use App\Entity\User;
use App\Tests\Mocks\AbstractMockFactory;
use App\Timesheet\UserDateTimeFactory;
class UserDateTimeFactoryFactory extends AbstractMockFactory
{
public function create(?string $timezone = null): UserDateTimeFactory
{
$userFactory = new CurrentUserFactory($this->getTestCase());
$currentUser = $userFactory->create(new User(), $timezone);
return new UserDateTimeFactory($currentUser);
}
}

14
tests/Mocks/TrackingModeServiceFactory.php
View File

@@ -9,9 +9,8 @@
namespace App\Tests\Mocks;
use App\Configuration\TimesheetConfiguration;
use App\Configuration\SystemConfiguration;
use App\Tests\Configuration\TestConfigLoader;
use App\Tests\Mocks\Security\UserDateTimeFactoryFactory;
use App\Timesheet\TrackingMode\DefaultMode;
use App\Timesheet\TrackingMode\DurationFixedBeginMode;
use App\Timesheet\TrackingMode\DurationOnlyMode;
@@ -26,17 +25,16 @@ class TrackingModeServiceFactory extends AbstractMockFactory
$mode = 'default';
}
$dateTime = (new UserDateTimeFactoryFactory($this->getTestCase()))->create();
$loader = new TestConfigLoader([]);
$configuration = new TimesheetConfiguration($loader, ['mode' => $mode]);
$configuration = new SystemConfiguration($loader, ['timesheet' => ['mode' => $mode]]);
if (null === $modes) {
$modes = [
new DefaultMode($dateTime, $configuration, (new RoundingServiceFactory($this->getTestCase()))->create()),
new PunchInOutMode($dateTime),
new DurationOnlyMode($dateTime, $configuration),
new DurationFixedBeginMode($dateTime, $configuration),
new DefaultMode((new RoundingServiceFactory($this->getTestCase()))->create()),
new PunchInOutMode(),
new DurationOnlyMode($configuration),
new DurationFixedBeginMode($configuration),
];
}