From 7ed9a64dca4a5b682024d20c487e0c8f1e970bb5 Mon Sep 17 00:00:00 2001 From: jajjibhai008 Date: Fri, 21 Jul 2023 18:56:04 +0500 Subject: [PATCH] fix: variable name conflicts in monthly_impact_report command --- CHANGELOG.rst | 4 ++++ enterprise/__init__.py | 2 +- enterprise/management/commands/monthly_impact_report.py | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5dff8084b4..1a9f7056f5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -15,6 +15,10 @@ Change Log Unreleased ---------- +[4.0.6] +-------- +fix: variable name conflicts in monthly_impact_report command + [4.0.5] -------- feat: incorporate additional attributes to degreed v2 diff --git a/enterprise/__init__.py b/enterprise/__init__.py index 068b5309de..4de7b7d864 100644 --- a/enterprise/__init__.py +++ b/enterprise/__init__.py @@ -2,6 +2,6 @@ Your project description goes here. """ -__version__ = "4.0.5" +__version__ = "4.0.6" default_app_config = "enterprise.apps.EnterpriseConfig" diff --git a/enterprise/management/commands/monthly_impact_report.py b/enterprise/management/commands/monthly_impact_report.py index 4be9254217..eacd7dce0a 100644 --- a/enterprise/management/commands/monthly_impact_report.py +++ b/enterprise/management/commands/monthly_impact_report.py @@ -176,9 +176,9 @@ on s.id=cs.skill_id WHERE - enterprise_enrollment_created >=(SELECT two_months_ago_start_range FROM dynamic_dates) + enterprise_enrollment_created_at >=(SELECT two_months_ago_start_range FROM dynamic_dates) AND - enterprise_enrollment_created <= (SELECT two_months_ago_end_range FROM dynamic_dates) + enterprise_enrollment_created_at <= (SELECT two_months_ago_end_range FROM dynamic_dates) GROUP BY 1,2 ORDER BY @@ -493,9 +493,9 @@ on s.id=cs.skill_id WHERE - enterprise_enrollment_created >= (SELECT last_month_start_range FROM dynamic_dates) + enterprise_enrollment_created_at >= (SELECT last_month_start_range FROM dynamic_dates) AND - enterprise_enrollment_created <= (SELECT last_month_end_range FROM dynamic_dates) + enterprise_enrollment_created_at <= (SELECT last_month_end_range FROM dynamic_dates) GROUP BY 1,2 ORDER BY