Commit 4fc34ddd by Diana Huang

Merge pull request #5503 from edx/diana/reorder-dashboard-courses

Sort course and enrollment pairs on dashboard
parents d1b3e8e0 fbc896af
...@@ -477,6 +477,9 @@ def dashboard(request): ...@@ -477,6 +477,9 @@ def dashboard(request):
# enrollments, because it could have been a data push snafu. # 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)) 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 # Retrieve the course modes for each course
course_modes_by_course = { course_modes_by_course = {
course.id: CourseMode.modes_for_course_dict(course.id) course.id: CourseMode.modes_for_course_dict(course.id)
...@@ -666,10 +669,9 @@ def _get_recently_enrolled_courses(course_enrollment_pairs): ...@@ -666,10 +669,9 @@ def _get_recently_enrolled_courses(course_enrollment_pairs):
""" """
seconds = DashboardConfiguration.current().recent_enrollment_time_delta 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)) time_delta = (datetime.datetime.now(UTC) - datetime.timedelta(seconds=seconds))
return [ 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 # If the enrollment has no created date, we are explicitly excluding the course
# from the list of recent enrollments. # from the list of recent enrollments.
if enrollment.is_active and enrollment.created > time_delta if enrollment.is_active and enrollment.created > time_delta
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment