diff --git a/lms/djangoapps/courseware/date_summary.py b/lms/djangoapps/courseware/date_summary.py index 49a41c3d20ea1fbae0ae17f7e27380e4125ea089..f401f96f25f6644b0049882812f06068c10e3977 100644 --- a/lms/djangoapps/courseware/date_summary.py +++ b/lms/djangoapps/courseware/date_summary.py @@ -248,7 +248,11 @@ class CourseStartDate(DateSummary): @property def date(self): - return self.course.start + if not self.course.self_paced: + return self.course.start + else: + enrollment = CourseEnrollment.get_enrollment(self.user, self.course_id) + return max(enrollment.created, self.course.start) if enrollment else self.course.start @property def date_type(self): diff --git a/lms/templates/dashboard/_dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html index 942c3b0acb53569b6e70bbf3e3b597ec6710a11c..4cc6fe6d520c8eb1f062c79839b138bf42922f92 100644 --- a/lms/templates/dashboard/_dashboard_course_listing.html +++ b/lms/templates/dashboard/_dashboard_course_listing.html @@ -108,6 +108,7 @@ from util.course import get_link_for_about_page, get_encoded_course_sharing_utm_ <span class="info-university">${course_overview.display_org_with_default} - </span> <span class="info-course-id">${course_overview.display_number_with_default}</span> <% + enrollment_date = course_overview.self_paced and enrollment and enrollment.created if course_overview.start_date_is_still_default: container_string = _("Coming Soon") course_date = None @@ -118,7 +119,7 @@ from util.course import get_link_for_about_page, get_encoded_course_sharing_utm_ course_date = course_overview.end elif course_overview.has_started(): container_string = _("Started - {date}") - course_date = course_overview.dashboard_start_display + course_date = enrollment_date or course_overview.dashboard_start_display elif course_overview.starts_within(days=5): container_string = _("Starts - {date}") course_date = course_overview.dashboard_start_display