X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/e185de998d8ed94cef7b3e2b63cc63d5c64ce6cb..d9b8a2fcd3d9886b2cf218d31eb6d37afdae368e:/WEB-INF/lib/ttTimeHelper.class.php diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php index f8eadf25..748dc726 100644 --- a/WEB-INF/lib/ttTimeHelper.class.php +++ b/WEB-INF/lib/ttTimeHelper.class.php @@ -102,53 +102,6 @@ class ttTimeHelper { return false; } - // isValidQuota validates a localized value as an hours quota string (in hours and minutes). - static function isValidQuota($value) { - - if (strlen($value) == 0 || !isset($value)) return true; - - if (preg_match('/^[0-9]{1,3}h?$/', $value )) { // 000 - 999 - return true; - } - - if (preg_match('/^[0-9]{1,3}:[0-5][0-9]$/', $value )) { // 000:00 - 999:59 - return true; - } - - global $user; - $localizedPattern = '/^([0-9]{1,3})?['.$user->decimal_mark.'][0-9]{1,4}h?$/'; - if (preg_match($localizedPattern, $value )) { // decimal values like 000.5, 999.25h, ... .. 999.9999h (or with comma) - return true; - } - - return false; - } - - // quotaToFloat converts a valid quota value to a float. - static function quotaToFloat($value) { - - if (preg_match('/^[0-9]{1,3}h?$/', $value )) { // 000 - 999 - return (float) $value; - } - - if (preg_match('/^[0-9]{1,3}:[0-5][0-9]$/', $value )) { // 000:00 - 999:59 - $minutes = ttTimeHelper::toMinutes($value); - return ($minutes / 60.0); - } - - global $user; - $localizedPattern = '/^([0-9]{1,3})?['.$user->decimal_mark.'][0-9]{1,4}h?$/'; - if (preg_match($localizedPattern, $value )) { // decimal values like 000.5, 999.25h, ... .. 999.9999h (or with comma) - // Strip optional h in the end. - $value = trim($value, 'h'); - if ($user->decimal_mark == ',') - $value = str_replace(',', '.', $value); - return (float) $value; - } - - return null; - } - // normalizeDuration - converts a valid time duration string to format 00:00. static function normalizeDuration($value, $leadingZero = true) { $time_value = $value;