From 1d7eae7061e3c127b26ada6cc08afbb9830ebf1a Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Mon, 1 Mar 2021 12:24:08 +0530 Subject: [PATCH] Timeline diff query updated --- project_report/report/project_timeline_report.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/project_report/report/project_timeline_report.py b/project_report/report/project_timeline_report.py index 9b052f5..d20f2a6 100755 --- a/project_report/report/project_timeline_report.py +++ b/project_report/report/project_timeline_report.py @@ -56,7 +56,8 @@ class ProjectTimelineReport(models.Model): date AS enddate, 'Budgeted' as timeline_type, pro.budgeted_hours2 as hours, - DATE_PART('day', AGE(date, date_start)) AS timeline, + (date - datestart) as timeline, + --DATE_PART('day', AGE(date, date_start)) AS timeline, pro.* FROM project_project PRO @@ -70,7 +71,8 @@ class ProjectTimelineReport(models.Model): (select max(al.end_datetime::date) from account_analytic_line as al where pro.id=al.project_id) as enddate, 'Actual' as timeline_type, sum(unit_amount) as hours, - DATE_PART('day', AGE((select max(al.end_datetime::date) from account_analytic_line as al where pro.id=al.project_id), (select min(al.start_datetime::date) from account_analytic_line as al where pro.id=al.project_id))) AS timeline, + ((select max(al.end_datetime::date) from account_analytic_line as al where pro.id=al.project_id) - (select min(al.start_datetime::date) from account_analytic_line as al where pro.id=al.project_id)) AS timeline, + --DATE_PART('day', AGE((select max(al.end_datetime::date) from account_analytic_line as al where pro.id=al.project_id), (select min(al.start_datetime::date) from account_analytic_line as al where pro.id=al.project_id))) AS timeline, pro.* FROM project_project PRO LEFT JOIN account_analytic_account AA ON PRO.analytic_account_id = AA.id