X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttTimeHelper.class.php;h=8142a2663c6e74425e86a735ed3b8f317c2eb87f;hb=ed499fa49d8dad66119752b4cfe213d30da2bed6;hp=baa1a144c9d65f25ab106c14386025ff1e3129bd;hpb=bf41795a3a00db3d11615fc317dd982a8cfaec0c;p=timetracker.git diff --git a/WEB-INF/lib/ttTimeHelper.class.php b/WEB-INF/lib/ttTimeHelper.class.php index baa1a144..8142a266 100644 --- a/WEB-INF/lib/ttTimeHelper.class.php +++ b/WEB-INF/lib/ttTimeHelper.class.php @@ -132,17 +132,21 @@ class ttTimeHelper { if (!isset($duration) || strlen($duration) == 0) return null; // Value is not set. Caller decides whether it is valid or not. + // We allow negative durations, similar to negative expenses (installments). + $signMultiplier = ttStartsWith($duration, '-') ? -1 : 1; + if ($signMultiplier == -1) $duration = ltrim($duration, '-'); + // 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; + return $minutes > $max ? false : $signMultiplier * $minutes; } // 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; + return $minutes > $max ? false : $signMultiplier * $minutes; } // Handle localized fractional hours. @@ -153,13 +157,13 @@ class ttTimeHelper { $duration = str_replace (',', '.', $duration); $minutes = (int)round(60 * floatval($duration)); - return $minutes > $max ? false : $minutes; + return $minutes > $max ? false : $signMultiplier * $minutes; } // 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; + return $minutes > $max ? false : $signMultiplier * $minutes; } // Everything else is not a valid duration. @@ -169,16 +173,17 @@ class ttTimeHelper { // 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; + $sign = $minutes >= 0 ? '' : '-'; + $minutes = abs($minutes); $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 $sign.$hours; - return $hours.':'.$mins; + return $sign.$hours.':'.$mins; } // toMinutes - converts a time string in format 00:00 to a number of minutes. @@ -510,6 +515,15 @@ class ttTimeHelper { global $user; $mdb2 = getConnection(); + // Delete associated files. + if ($user->isPluginEnabled('at')) { + import('ttFileHelper'); + global $err; + $fileHelper = new ttFileHelper($err); + if (!$fileHelper->deleteEntityFiles($id, 'time')) + return false; + } + $user_id = $user->getUser(); $group_id = $user->getGroup(); $org_id = $user->org_id; @@ -543,7 +557,7 @@ class ttTimeHelper { $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { $val = $res->fetchRow(); - return sec_to_time_fmt_hm($val['sm']); + return ttTimeHelper::minutesToDuration($val['sm'] / 60); } return false; } @@ -565,7 +579,7 @@ class ttTimeHelper { $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { $val = $res->fetchRow(); - return sec_to_time_fmt_hm($val['sm']); + return ttTimeHelper::minutesToDuration($val['sm'] / 60); } return false; } @@ -587,7 +601,7 @@ class ttTimeHelper { $res = $mdb2->query($sql); if (!is_a($res, 'PEAR_Error')) { $val = $res->fetchRow(); - return sec_to_time_fmt_hm($val['sm']); + return ttTimeHelper::minutesToDuration($val['sm'] / 60); } return false; } @@ -791,6 +805,7 @@ class ttTimeHelper { // getRecords - returns time records for a user for a given date. static function getRecords($user_id, $date) { + // TODO: merge getRecords and getRecordsWithFiles into one function. global $user; $mdb2 = getConnection(); @@ -805,16 +820,35 @@ class ttTimeHelper { if ($user->isPluginEnabled('cl')) $client_field = ", c.name as client"; + $include_cf_1 = $user->isPluginEnabled('cf'); + if ($include_cf_1) { + $custom_fields = new CustomFields(); + $cf_1_type = $custom_fields->fields[0]['type']; + if ($cf_1_type == CustomFields::TYPE_TEXT) { + $custom_field = ", cfl.value as cf_1"; + } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) { + $custom_field = ", cfo.value as cf_1"; + } + } + $left_joins = " left join tt_projects p on (l.project_id = p.id)". " left join tt_tasks t on (l.task_id = t.id)"; if ($user->isPluginEnabled('cl')) $left_joins .= " left join tt_clients c on (l.client_id = c.id)"; + if ($include_cf_1) { + if ($cf_1_type == CustomFields::TYPE_TEXT) + $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)"; + elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) { + $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)". + " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)"; + } + } $result = array(); $sql = "select l.id as id, TIME_FORMAT(l.start, $sql_time_format) as start,". " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,". " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,". - " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins". + " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field from tt_log l $left_joins". " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1". " order by l.start, l.id"; $res = $mdb2->query($sql); @@ -847,10 +881,29 @@ class ttTimeHelper { if ($user->isPluginEnabled('cl')) $client_field = ", c.name as client"; + $include_cf_1 = $user->isPluginEnabled('cf'); + if ($include_cf_1) { + $custom_fields = new CustomFields(); + $cf_1_type = $custom_fields->fields[0]['type']; + if ($cf_1_type == CustomFields::TYPE_TEXT) { + $custom_field = ", cfl.value as cf_1"; + } elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) { + $custom_field = ", cfo.value as cf_1"; + } + } + $left_joins = " left join tt_projects p on (l.project_id = p.id)". " left join tt_tasks t on (l.task_id = t.id)"; if ($user->isPluginEnabled('cl')) $left_joins .= " left join tt_clients c on (l.client_id = c.id)"; + if ($include_cf_1) { + if ($cf_1_type == CustomFields::TYPE_TEXT) + $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)"; + elseif ($cf_1_type == CustomFields::TYPE_DROPDOWN) { + $left_joins .= " left join tt_custom_field_log cfl on (l.id = cfl.log_id and cfl.status = 1)". + " left join tt_custom_field_options cfo on (cfl.option_id = cfo.id)"; + } + } $left_joins .= " left join (select distinct entity_id from tt_files". " where entity_type = 'time' and group_id = $group_id and org_id = $org_id and status = 1) Sub1". @@ -861,7 +914,7 @@ class ttTimeHelper { " TIME_FORMAT(sec_to_time(time_to_sec(l.start) + time_to_sec(l.duration)), $sql_time_format) as finish,". " TIME_FORMAT(l.duration, '%k:%i') as duration, p.name as project, t.name as task, l.comment,". " if(Sub1.entity_id is null, 0, 1) as has_files,". - " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field from tt_log l $left_joins". + " l.billable, l.approved, l.timesheet_id, l.invoice_id $client_field $custom_field from tt_log l $left_joins". " where l.date = '$date' and l.user_id = $user_id and l.group_id = $group_id and l.org_id = $org_id and l.status = 1". " order by l.start, l.id"; $res = $mdb2->query($sql);