Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17284 from edx/jaebradley/LEARNER-3945

Browse Source 
LEARNER-3945: Add try/catch in Learner Analytics View
This commit is contained in:
Jae Bradley
2018-01-23 15:48:06 -05:00
committed by GitHub
parent b241e56f0f 5ab2533b1e
commit 7fb4ca5ce1
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/static/js/learner_analytics_dashboard/LearnerAnalyticsDashboard.jsx
View File

@@ -94,6 +94,7 @@ export function LearnerAnalyticsDashboard(props) {
}
<h3 className="section-heading">Graded Assignments</h3>
{/* TODO: LEARNER-3854: If implementing Learner Analytics, rename to graded-assignments-wrapper. */}
<div className="graded-assessments-wrapper">
<GradeTable assignmentTypes={assignmentTypes}
grades={grades}

17
openedx/features/learner_analytics/views.py
View File

@@ -96,6 +96,17 @@ class LearnerAnalyticsView(View):
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)
# TODO: LEARNER-3854: Fix hacked defaults with real error handling if implementing Learner Analytics.
try:
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
)
except Exception as e:
logging.exception(e)
weekly_active_users = 134
week_streak = 1
context.update({
'grading_policy': grading_policy,
'assignment_grades': grade_data,
@@ -103,12 +114,10 @@ class LearnerAnalyticsView(View):
'assignment_schedule': schedule_data,
'profile_image_urls': get_profile_image_urls_for_user(request.user, request),
'discussion_info': self.get_discussion_data(request, course_key),
'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),
'weekly_active_users': weekly_active_users,
'week_streak': week_streak,
})
return render_to_response('learner_analytics/dashboard.html', context)