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

12
src/Validator/Constraints/Duration.php
View File

@@ -20,12 +20,18 @@ class Duration extends Regex
public function __construct($options = null)
{
$patterns = [
// decimal times (can be separated by comma or dot, depending on the locale)
'[0-9]{1,}',
'[0-9]{1,}[,.]{1}[0-9]{1,}',
// ASP.NET style time spans - https://momentjs.com/docs/#/durations/
'[0-9]{1,}:[0-9]{1,}:[0-9]{1,}',
'[0-9]{1,}:[0-9]{1,}',
'[0-9]{1,}[hmsHMS]{1}',
'[0-9]{1,}[hmsHMS]{1}[0-9]{1,}[hmsHMS]{1}',
'[0-9]{1,}[hmsHMS]{1}[0-9]{1,}[hmsHMS]{1}[0-9]{1,}[hmsHMS]{1}',
// https://en.wikipedia.org/wiki/ISO_8601#Time_intervals
'[0-9]{1,}[hHmMsS]{1}',
'[0-9]{1,}[hH]{1}[0-9]{1,}[mM]{1}',
'[0-9]{1,}[hHmM]{1}[0-9]{1,}[sS]{1}',
'[0-9]{1,}[mM]{1}[0-9]{1,}[sS]{1}',
'[0-9]{1,}[hH]{1}[0-9]{1,}[mM]{1}[0-9]{1,}[sS]{1}',
];
$options['pattern'] = '/^' . implode('$|^', $patterns) . '$/';