X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/9af5722a81d1999243ac3a3d51d3cf3c3256d86a..87a40bf7dc910c008aa6aadf8882b070ad120c39:/WEB-INF/lib/ttChartHelper.class.php diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php index 7a4d2584..efb30c60 100644 --- a/WEB-INF/lib/ttChartHelper.class.php +++ b/WEB-INF/lib/ttChartHelper.class.php @@ -27,6 +27,7 @@ // +----------------------------------------------------------------------+ import('Period'); +import('ttTimeHelper'); // Definitions for chart types. define('CHART_PROJECTS', 1); @@ -77,7 +78,7 @@ class ttChartHelper { where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.task_id"; } elseif (CHART_CLIENTS == $chart_type) { // Data for clients. - $sql = "select coalesce(c.name, 'NULL') as name, sum(time_to_sec(l.duration)) as time from tt_log l + $sql = "select c.name as name, sum(time_to_sec(l.duration)) as time from tt_log l left join tt_clients c on (c.id = l.client_id) where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.client_id"; } @@ -97,7 +98,7 @@ class ttChartHelper { // Add a string representation of time + percentage to names. Example: "Time Tracker (1:15 - 6%)". foreach ($result as &$one_val) { $percent = round(100*$one_val['time']/$total).'%'; - $one_val['name'] .= ' ('.sec_to_time_fmt_hm($one_val['time']).' - '.$percent.')'; + $one_val['name'] .= ' ('.ttTimeHelper::minutesToDuration($one_val['time'] / 60).' - '.$percent.')'; } // Note: the remaining code here is needed to display labels on the side of the diagram.