From fbc896af8cadb4cbbc39b27480839d4e937a0780 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Mon, 6 Oct 2014 16:58:59 -0400
Subject: [PATCH] Sort course and enrollment pairs on dashboard
---
common/djangoapps/student/views.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 46e4e16a1b3..89dd470440b 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -477,6 +477,9 @@ def dashboard(request):
# enrollments, because it could have been a data push snafu.
course_enrollment_pairs = list(get_course_enrollment_pairs(user, course_org_filter, org_filter_out_set))
+ # sort the enrollment pairs by the enrollment date
+ course_enrollment_pairs.sort(key=lambda x: x[1].created, reverse=True)
+
# Retrieve the course modes for each course
course_modes_by_course = {
course.id: CourseMode.modes_for_course_dict(course.id)
@@ -666,10 +669,9 @@ def _get_recently_enrolled_courses(course_enrollment_pairs):
"""
seconds = DashboardConfiguration.current().recent_enrollment_time_delta
- sorted_list = sorted(course_enrollment_pairs, key=lambda created: created[1].created, reverse=True)
time_delta = (datetime.datetime.now(UTC) - datetime.timedelta(seconds=seconds))
return [
- course for course, enrollment in sorted_list
+ course for course, enrollment in course_enrollment_pairs
# If the enrollment has no created date, we are explicitly excluding the course
# from the list of recent enrollments.
if enrollment.is_active and enrollment.created > time_delta
--
GitLab