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

35
tests/Validator/Constraints/DurationValidatorTest.php
View File

@@ -29,14 +29,18 @@ class DurationValidatorTest extends ConstraintValidatorTestCase
public function getValidData()
{
return [
['99s'],
['2h'],
['38m'],
['99s'],
['2h38m'],
['2h38s'],
['2m38s'],
['2h38m17s'],
['1h96m137s'],
[''],
['0'],
['1.2'],
['2,3'],
[null],
[0],
[11257200],
@@ -64,6 +68,7 @@ class DurationValidatorTest extends ConstraintValidatorTestCase
{
$constraint = new Duration();
$this->validator->validate($input, $constraint);
$this->validator->validate(strtoupper($input), $constraint);
$this->assertNoViolation();
}
@@ -71,7 +76,12 @@ class DurationValidatorTest extends ConstraintValidatorTestCase
{
return [
['13-13'],
['13.13'],
['2m3m'],
['2s3s'],
['2h3h'],
['2m3h'],
['2s3h'],
['2s3m'],
['3127::00'],
['3127:00:'],
[':3127:00'],
@@ -92,10 +102,27 @@ class DurationValidatorTest extends ConstraintValidatorTestCase
$this->validator->validate($input, $constraint);
$expectedFormat = \is_string($input) ? '"' . $input . '"' : $input;
$this->buildViolation('myMessage')
->setParameter('{{ value }}', '"' . $input . '"')
->setCode(Regex::REGEX_FAILED_ERROR)
->assertRaised();
}
/**
* @dataProvider getInvalidData
* @param mixed $input
*/
public function testValidationErrorUpperCase($input)
{
$input = strtoupper($input);
$constraint = new Duration([
'message' => 'myMessage',
]);
$this->validator->validate($input, $constraint);
$this->buildViolation('myMessage')
->setParameter('{{ value }}', $expectedFormat)
->setParameter('{{ value }}', '"' . $input . '"')
->setCode(Regex::REGEX_FAILED_ERROR)
->assertRaised();
}

18
tests/Validator/Constraints/TimesheetFutureTimesValidatorTest.php
View File

@@ -10,7 +10,7 @@
namespace App\Tests\Validator\Constraints;
use App\Configuration\ConfigLoaderInterface;
use App\Configuration\TimesheetConfiguration;
use App\Configuration\SystemConfiguration;
use App\Entity\Timesheet;
use App\Validator\Constraints\TimesheetFutureTimes;
use App\Validator\Constraints\TimesheetFutureTimesValidator;
@@ -31,13 +31,15 @@ class TimesheetFutureTimesValidatorTest extends ConstraintValidatorTestCase
protected function createMyValidator(bool $allowFutureTimes = false)
{
$loader = $this->createMock(ConfigLoaderInterface::class);
$config = new TimesheetConfiguration($loader, [
'rules' => [
'allow_future_times' => $allowFutureTimes,
],
'rounding' => [
'default' => [
'begin' => 1
$config = new SystemConfiguration($loader, [
'timesheet' => [
'rules' => [
'allow_future_times' => $allowFutureTimes,
],
'rounding' => [
'default' => [
'begin' => 1
]
]
]
]);

16
tests/Validator/Constraints/TimesheetLockdownValidatorTest.php
View File

@@ -10,7 +10,7 @@
namespace App\Tests\Validator\Constraints;
use App\Configuration\ConfigLoaderInterface;
use App\Configuration\TimesheetConfiguration;
use App\Configuration\SystemConfiguration;
use App\Entity\Timesheet;
use App\Validator\Constraints\TimesheetLockdown;
use App\Validator\Constraints\TimesheetLockdownValidator;
@@ -46,12 +46,14 @@ class TimesheetLockdownValidatorTest extends ConstraintValidatorTestCase
);
$loader = $this->createMock(ConfigLoaderInterface::class);
$config = new TimesheetConfiguration($loader, [
'rules' => [
'lockdown_period_start' => $start,
'lockdown_period_end' => $end,
'lockdown_grace_period' => $grace,
],
$config = new SystemConfiguration($loader, [
'timesheet' => [
'rules' => [
'lockdown_period_start' => $start,
'lockdown_period_end' => $end,
'lockdown_grace_period' => $grace,
],
]
]);
return new TimesheetLockdownValidator($auth, $config);

10
tests/Validator/Constraints/TimesheetOverlappingValidatorTest.php
View File

@@ -10,7 +10,7 @@
namespace App\Tests\Validator\Constraints;
use App\Configuration\ConfigLoaderInterface;
use App\Configuration\TimesheetConfiguration;
use App\Configuration\SystemConfiguration;
use App\Entity\Timesheet;
use App\Repository\TimesheetRepository;
use App\Validator\Constraints\TimesheetOverlapping;
@@ -32,9 +32,11 @@ class TimesheetOverlappingValidatorTest extends ConstraintValidatorTestCase
protected function createMyValidator(bool $allowOverlappingRecords = false, bool $hasRecords = true)
{
$loader = $this->createMock(ConfigLoaderInterface::class);
$config = new TimesheetConfiguration($loader, [
'rules' => [
'allow_overlapping_records' => $allowOverlappingRecords,
$config = new SystemConfiguration($loader, [
'timesheet' => [
'rules' => [
'allow_overlapping_records' => $allowOverlappingRecords,
],
],
]);
$repository = $this->createMock(TimesheetRepository::class);