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

Merge pull request #24016 from edx/ciduarte/AA-152

Browse Source 
AA-152: Course Start Date for PLS
This commit is contained in:
Carla Duarte
2020-05-21 08:56:33 -04:00
committed by GitHub
parent cc3d3aa4ab 8b376e271c
commit f8963fe11e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/djangoapps/courseware/date_summary.py
View File

@@ -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):

3
lms/templates/dashboard/_dashboard_course_listing.html
View File

@@ -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