// isHoliday determines if $date falls on a holiday.
static function isHoliday($date) {
+ global $user;
global $i18n;
+
+ if (!$user->show_holidays) return false;
+
// $date is expected as string in DB_DATEFORMAT.
$month = date('m', strtotime($date));
$day = date('d', strtotime($date));
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;
+ // postedDurationToMinutes - converts a value representing a duration
+ // (usually enetered in a form by a user) to an integer number of minutes.
+ //
+ // Parameters:
+ // $duration - user entered duration string. Valid strings are:
+ // 3 or 3h - means 3 hours. Note: h and m letters are not localized.
+ // 0.25 or 0.25h or .25 or .25h - means a quarter of hour.
+ // 0,25 or 0,25h or ,25 or ,25h - same as above for users with comma ad decimal mark.
+ // 1:30 - means 1 hour 30 minutes.
+ // 25m - means 25 minutes.
+ // $max - maximum number of minutes that is valid.
+ //
+ // At the moment, we have 2 variations of duration types:
+ // 1) A duration within a day, such as in a time entry.
+ // These are less or equal to 24*60 minutes.
+ //
+ // 2) A duration of a monthly quota, with max value of 31*24*60 minutes.
+ //
+ // This function is generic to be used for both types.
+ //
+ // Returns false if the value cannot be converted.
+ static function postedDurationToMinutes($duration, $max = 1440) {
+ // Handle empty value.
+ if (!isset($duration) || strlen($duration) == 0)
+ return null; // Value is not set. Caller decides whether it is valid or not.
- if (preg_match('/^[0-9]{1,3}h?$/', $value )) { // 000 - 999
- return true;
+ // Handle whole hours.
+ if (preg_match('/^\d{1,3}h?$/', $duration )) { // 0 - 999, 0h - 999h
+ $minutes = 60 * trim($duration, 'h');
+ return $minutes > $max ? false : $minutes;
}
- if (preg_match('/^[0-9]{1,3}:[0-5][0-9]$/', $value )) { // 000:00 - 999:59
- return true;
+ // Handle a normalized duration value.
+ if (preg_match('/^\d{1,3}:[0-5][0-9]$/', $duration )) { // 0:00 - 999:59
+ $time_array = explode(':', $duration);
+ $minutes = (int)@$time_array[1] + ((int)@$time_array[0]) * 60;
+ return $minutes > $max ? false : $minutes;
}
+ // Handle localized fractional hours.
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) {
+ $localizedPattern = '/^(\d{1,3})?['.$user->decimal_mark.'][0-9]{1,4}h?$/';
+ if (preg_match($localizedPattern, $duration )) { // decimal values like .5, 1.25h, ... .. 999.9999h (or with comma)
+ if ($user->decimal_mark == ',')
+ $duration = str_replace (',', '.', $duration);
- if (preg_match('/^[0-9]{1,3}h?$/', $value )) { // 000 - 999
- return (float) $value;
+ $minutes = (int)round(60 * floatval($duration));
+ return $minutes > $max ? false : $minutes;
}
- if (preg_match('/^[0-9]{1,3}:[0-5][0-9]$/', $value )) { // 000:00 - 999:59
- $minutes = ttTimeHelper::toMinutes($value);
- return ($minutes / 60.0);
+ // Handle minutes. Some users enter durations like 10m (meaning 10 minutes).
+ if (preg_match('/^\d{1,5}m$/', $duration )) { // 0m - 99999m
+ $minutes = (int) trim($duration, 'm');
+ return $minutes > $max ? false : $minutes;
}
- 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;
+ // Everything else is not a valid duration.
+ return false;
}
- // normalizeDuration - converts a valid time duration string to format 00:00.
- static function normalizeDuration($value, $leadingZero = true) {
- $time_value = $value;
+ // minutesToDuration converts an integer number of minutes into duration string.
+ // Formats returned HH:MM, HHH:MM, HH, or HHH.
+ static function minutesToDuration($minutes, $abbreviate = false) {
+ if ($minutes < 0) return false;
- // If we have a decimal format - convert to time format 00:00.
- global $user;
- if ($user->decimal_mark == ',')
- $time_value = str_replace (',', '.', $time_value);
-
- if((strpos($time_value, '.') !== false) || (strpos($time_value, 'h') !== false)) {
- $val = floatval($time_value);
- $mins = round($val * 60);
- $hours = (string)((int)($mins / 60));
- $mins = (string)($mins % 60);
- if ($leadingZero && strlen($hours) == 1)
- $hours = '0'.$hours;
- if (strlen($mins) == 1)
- $mins = '0' . $mins;
- return $hours.':'.$mins;
- }
-
- $time_a = explode(':', $time_value);
- $res = '';
-
- // 0-99
- if ((strlen($time_value) >= 1) && (strlen($time_value) <= 2) && !isset($time_a[1])) {
- $hours = $time_a[0];
- if ($leadingZero && strlen($hours) == 1)
- $hours = '0'.$hours;
- return $hours.':00';
- }
-
- // 000-2359 (2400)
- if ((strlen($time_value) >= 3) && (strlen($time_value) <= 4) && !isset($time_a[1])) {
- if (strlen($time_value)==3) $time_value = '0'.$time_value;
- $hours = substr($time_value,0,2);
- if ($leadingZero && strlen($hours) == 1)
- $hours = '0'.$hours;
- return $hours.':'.substr($time_value,2,2);
- }
-
- // 0:00-23:59 (24:00)
- if ((strlen($time_value) >= 4) && (strlen($time_value) <= 5) && isset($time_a[1])) {
- $hours = $time_a[0];
- if ($leadingZero && strlen($hours) == 1)
- $hours = '0'.$hours;
- return $hours.':'.$time_a[1];
- }
+ $hours = (string) (int)($minutes / 60);
+ $mins = (string) round(fmod($minutes, 60));
+ if (strlen($mins) == 1)
+ $mins = '0' . $mins;
+ if ($abbreviate && $mins == '00')
+ return $hours;
- return $res;
+ return $hours.':'.$mins;
}
// toMinutes - converts a time string in format 00:00 to a number of minutes.
$start = $fields['start'];
$finish = $fields['finish'];
$duration = $fields['duration'];
+ if ($duration) {
+ $minutes = ttTimeHelper::postedDurationToMinutes($duration);
+ $duration = ttTimeHelper::minutesToDuration($minutes);
+ }
$client = $fields['client'];
$project = $fields['project'];
$task = $fields['task'];
$finish = ttTimeHelper::to24HourFormat($finish);
if ('00:00' == $finish) $finish = '24:00';
}
- $duration = ttTimeHelper::normalizeDuration($duration);
if (!$timestamp) {
$timestamp = date('YmdHis'); //yyyymmddhhmmss
$start = $fields['start'];
$finish = $fields['finish'];
$duration = $fields['duration'];
+ if ($duration) {
+ $minutes = ttTimeHelper::postedDurationToMinutes($duration);
+ $duration = ttTimeHelper::minutesToDuration($minutes);
+ }
$note = $fields['note'];
$billable_part = '';
$start = ttTimeHelper::to24HourFormat($start);
$finish = ttTimeHelper::to24HourFormat($finish);
if ('00:00' == $finish) $finish = '24:00';
- $duration = ttTimeHelper::normalizeDuration($duration);
-
+
if ($start) $duration = '';
if ($duration) {
// $record_id - optional record id we may be editing, excluded from overlap set
static function overlaps($user_id, $date, $start, $finish, $record_id = null) {
// Do not bother checking if we allow overlaps.
- if (defined('ALLOW_OVERLAP') && ALLOW_OVERLAP == true)
- return false;
+ global $user;
+ if ($user->allow_overlap) return false;
$mdb2 = getConnection();