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

update messaging

Browse Source
This commit is contained in:
Matthew Piatetsky
2018-12-12 14:08:53 -05:00
committed by Matthew Piatetsky
parent b2b92308d8
commit eaa07082ed
4 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lms/djangoapps/courseware/tests/helpers.py
View File

@@ -19,7 +19,7 @@ from lms.djangoapps.courseware.date_summary import verified_upgrade_deadline_lin
from lms.djangoapps.lms_xblock.field_data import LmsFieldData
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
from openedx.core.lib.url_utils import quote_slashes
from student.models import Registration
from student.models import Registration, CourseEnrollment
from student.tests.factories import CourseEnrollmentFactory, UserFactory
from xblock.field_data import DictFieldData
from xmodule.modulestore.django import modulestore
@@ -358,12 +358,21 @@ def get_expiration_banner_text(user, course):
Get text for banner that messages user course expiration date
for different tests that depend on it.
"""
expiration_date = (now() + timedelta(weeks=4)).strftime('%b %-d')
expiration_date = (now() + timedelta(weeks=4)).strftime('%b. %-d, %Y')
upgrade_link = verified_upgrade_deadline_link(user=user, course=course)
bannerText = 'Your access to this course expires on {expiration_date}. \
<a href="{upgrade_link}">Upgrade now <span class="sr-only">to retain access past {expiration_date}.\
</span></a><span aria-hidden="true">for unlimited access.</span>'.format(
enrollment = CourseEnrollment.get_enrollment(user, course.id)
upgrade_deadline = enrollment.upgrade_deadline
if upgrade_deadline is None:
return
if now() < upgrade_deadline:
upgrade_deadline = enrollment.course_upgrade_deadline
bannerText = '<strong>Audit Access Expires {expiration_date}</strong><br>\
You lose all access to this course, including your progress, on {expiration_date}.<br>\
Upgrade by {upgrade_deadline} to get unlimited access to the course as long as it exists on the site.\
<a href="{upgrade_link}">Upgrade now<span class="sr-only"> to retain access past {expiration_date}\
</span></a>'.format(
expiration_date=expiration_date,
upgrade_link=upgrade_link
upgrade_link=upgrade_link,
upgrade_deadline=upgrade_deadline.strftime('%b. %-d, %Y')
)
return bannerText