From c3a1a70d4f3a126408ad9d107c0112a925b86487 Mon Sep 17 00:00:00 2001
From: Matt Hughes <mhughes@edx.org>
Date: Thu, 15 Aug 2019 11:53:11 -0400
Subject: [PATCH] Correct discrepancy between grade data sources for gradebook
---
lms/djangoapps/grades/rest_api/v1/gradebook_views.py | 6 +++---
requirements/edx/base.txt | 2 +-
requirements/edx/development.txt | 2 +-
requirements/edx/testing.txt | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lms/djangoapps/grades/rest_api/v1/gradebook_views.py b/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
index 50d42a2f0fe..f0c1aee0a9d 100644
--- a/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
+++ b/lms/djangoapps/grades/rest_api/v1/gradebook_views.py
@@ -559,10 +559,10 @@ class GradebookView(GradeViewMixin, PaginatedAPIView):
effective_grade_percentage=Case(
When(override__isnull=False,
then=(
- F('override__earned_all_override')
- / F('override__possible_all_override')
+ F('override__earned_graded_override')
+ / F('override__possible_graded_override')
) * 100),
- default=(F('earned_all') / F('possible_all')) * 100
+ default=(F('earned_graded') / F('possible_graded')) * 100
)
)
grade_conditions = {
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 1eeda5df395..09895340691 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -97,7 +97,7 @@ docutils==0.15.2 # via botocore
drf-yasg==1.16
edx-ace==0.1.10
edx-analytics-data-api-client==0.15.3
-edx-bulk-grades==0.5
+edx-bulk-grades==0.5.2
edx-ccx-keys==0.2.2
edx-celeryutils==0.3.0
edx-completion==2.0.0
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 0031d732464..ffed13d336d 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -121,7 +121,7 @@ docutils==0.15.2
drf-yasg==1.16
edx-ace==0.1.10
edx-analytics-data-api-client==0.15.3
-edx-bulk-grades==0.5
+edx-bulk-grades==0.5.2
edx-ccx-keys==0.2.2
edx-celeryutils==0.3.0
edx-completion==2.0.0
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 7c9d9717d94..f87554c19a3 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -117,7 +117,7 @@ docutils==0.15.2
drf-yasg==1.16
edx-ace==0.1.10
edx-analytics-data-api-client==0.15.3
-edx-bulk-grades==0.5
+edx-bulk-grades==0.5.2
edx-ccx-keys==0.2.2
edx-celeryutils==0.3.0
edx-completion==2.0.0
--
GitLab