From b35ed34767de056ad0adef9d85060b587c1f6ce2 Mon Sep 17 00:00:00 2001 From: anuko Date: Tue, 17 Jan 2017 22:01:30 +0000 Subject: [PATCH] Fixed charts to allow display of totals for unassigned projects and tasks. --- WEB-INF/lib/ttChartHelper.class.php | 4 ++-- WEB-INF/templates/footer.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WEB-INF/lib/ttChartHelper.class.php b/WEB-INF/lib/ttChartHelper.class.php index 70bb534b..7e58ca09 100644 --- a/WEB-INF/lib/ttChartHelper.class.php +++ b/WEB-INF/lib/ttChartHelper.class.php @@ -70,12 +70,12 @@ class ttChartHelper { if (CHART_PROJECTS == $ch_type) { // Data for projects. $sql = "select p.name as name, sum(time_to_sec(l.duration)) as time from tt_log l - inner join tt_projects p on (p.id = l.project_id) + left join tt_projects p on (p.id = l.project_id) where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.project_id"; } elseif (CHART_TASKS == $ch_type) { // Data for tasks. $sql = "select t.name as name, sum(time_to_sec(l.duration)) as time from tt_log l - inner join tt_tasks t on (t.id = l.task_id) + left join tt_tasks t on (t.id = l.task_id) where l.status = 1 and l.duration > 0 and l.user_id = $user_id $q_period group by l.task_id"; } elseif (CHART_CLIENTS == $ch_type) { // Data for clients. diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index a3a82452..b2366c17 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.35.3551 | Copyright © Anuko | +  Anuko Time Tracker 1.9.35.3552 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1