diff --git a/project_report/report/project_revenue_custom_report3.py b/project_report/report/project_revenue_custom_report3.py index 6e622ef..a4bd4ef 100644 --- a/project_report/report/project_revenue_custom_report3.py +++ b/project_report/report/project_revenue_custom_report3.py @@ -232,8 +232,10 @@ data1_sub as ( ), data2 as ( SELECT - coalesce(min(pro_data.pro_sdate), min(AAL.start_datetime::date)) as start_date, - coalesce(max(pro_data.pro_edate), max(AAL.end_datetime::date)) as end_date, + --coalesce(min(pro_data.pro_sdate), min(AAL.start_datetime::date)) as start_date, + --coalesce(max(pro_data.pro_edate), max(AAL.end_datetime::date)) as end_date, + null::date as start_date, + null::date as end_date, pro_data.pproject_id as project_id, pro_data.project_active, pro_data.project_type, @@ -331,8 +333,10 @@ SELECT ), data2_sub_project as ( SELECT - min(sub_pro_data.pro_sdate) as start_date, - max(sub_pro_data.pro_edate)as end_date, + --min(sub_pro_data.pro_sdate) as start_date, + --max(sub_pro_data.pro_edate)as end_date, + null::date as start_date, + null::date as end_date, sub_pro_data.parent_project as project_id, sub_pro_data.project_active, sub_pro_data.project_type, @@ -428,8 +432,10 @@ SELECT ), data3 as ( SELECT - coalesce(min(pro_data.pro_sdate), min(AAL.start_datetime::date)) as start_date, - coalesce(max(pro_data.pro_edate), max(AAL.end_datetime::date)) as end_date, + --coalesce(min(pro_data.pro_sdate), min(AAL.start_datetime::date)) as start_date, + --coalesce(max(pro_data.pro_edate), max(AAL.end_datetime::date)) as end_date, + null::date as start_date, + null::date as end_date, pro_data.pproject_id as project_id, pro_data.project_active, pro_data.project_type, @@ -473,8 +479,8 @@ SELECT pro_data.expenses_amt UNION SELECT - null as start_date, - null as end_date, + null::date as start_date, + null::date as end_date, cons_data1.project_id, pro_data.project_active, pro_data.project_type, @@ -578,8 +584,10 @@ SELECT ), data3_sub_project as ( SELECT - min(sub_pro_data.pro_sdate) as start_date, - max(sub_pro_data.pro_edate) as end_date, + --min(sub_pro_data.pro_sdate) as start_date, + --max(sub_pro_data.pro_edate) as end_date, + null::date as start_date, + null::date as end_date, --sub_pro_data.parent_project as project_id, sub_pro_data.pproject_id as project_id, sub_pro_data.project_active, @@ -623,8 +631,8 @@ SELECT sub_pro_data.expenses_amt UNION SELECT - null as start_date, - null as end_date, + null::date as start_date, + null::date as end_date, sub_pro_data.pproject_id as project_id, sub_pro_data.project_active, sub_pro_data.project_type,