From d52aa8c6ecfdf236a56088ac1a7aaebdfb59703b Mon Sep 17 00:00:00 2001
From: jaebradley <jae.b.bradley@gmail.com>
Date: Fri, 19 Jan 2018 12:13:41 -0500
Subject: [PATCH] add grade information

remove console

remove whitespace

update logic

remove console statement
---
 .../templates/learner_analytics/dashboard.html           | 2 ++
 openedx/features/learner_analytics/views.py              | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/openedx/features/learner_analytics/templates/learner_analytics/dashboard.html b/openedx/features/learner_analytics/templates/learner_analytics/dashboard.html
index 4d0192d296..272fb27e18 100644
--- a/openedx/features/learner_analytics/templates/learner_analytics/dashboard.html
+++ b/openedx/features/learner_analytics/templates/learner_analytics/dashboard.html
@@ -60,6 +60,8 @@ from openedx.features.course_experience import course_home_page_title
                     'weekly_active_users': weekly_active_users,
                     'week_streak': week_streak,
                     'profile_images': profile_image_urls,
+                    'passing_grade': passing_grade,
+                    'percent_grade': percent_grade,
                   }
                 )}
             % else:
diff --git a/openedx/features/learner_analytics/views.py b/openedx/features/learner_analytics/views.py
index de9b54e1c5..2d87c1bb22 100644
--- a/openedx/features/learner_analytics/views.py
+++ b/openedx/features/learner_analytics/views.py
@@ -92,7 +92,7 @@ class LearnerAnalyticsView(View):
         if (has_access):
             grading_policy = course.grading_policy
 
-            (grade_data, answered_percent) = self.get_grade_data(request.user, course_key, grading_policy['GRADE_CUTOFFS'])
+            (grade_data, answered_percent, percent_grade) = self.get_grade_data(request.user, course_key, grading_policy['GRADE_CUTOFFS'])
             schedule_data = self.get_assignments_with_due_date(request, course_key)
             (grade_data, schedule_data) = self.sort_grade_and_schedule_data(grade_data, schedule_data)
 
@@ -106,7 +106,9 @@ class LearnerAnalyticsView(View):
                 'weekly_active_users': self.get_weekly_course_activity_count(course_key),
                 'week_streak': self.consecutive_weeks_of_course_activity_for_user(
                     request.user.username, course_key
-                )
+                ),
+                'passing_grade': math.ceil(100 * course.lowest_passing_grade),
+                'percent_grade': math.ceil(100 * percent_grade),
             })
 
         return render_to_response('learner_analytics/dashboard.html', context)
@@ -124,6 +126,7 @@ class LearnerAnalyticsView(View):
         grades = []
         total_earned = 0
         total_possible = 0
+        # answered_percent seems to be unused and it does not take into account assignment type weightings
         answered_percent = None
         for (location, subsection_grade) in course_grade.subsection_grades.iteritems():
             if subsection_grade.format is not None:
@@ -147,7 +150,7 @@ class LearnerAnalyticsView(View):
 
         if total_possible > 0:
             answered_percent = float(total_earned) / total_possible
-        return (grades, answered_percent)
+        return (grades, answered_percent, course_grade.percent)
 
     def sort_grade_and_schedule_data(self, grade_data, schedule_data):
         """