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

Make the message to the end user consistent across as requirement types, except for grade requirements

Browse Source
This commit is contained in:
Chris Dodge
2015-09-29 10:23:36 -04:00
parent 84e56ed8cb
commit 799571b213
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/courseware/tests/test_credit_requirements.py
View File

@@ -112,7 +112,7 @@ class ProgressPageCreditRequirementsTest(ModuleStoreTestCase):
response,
"{}, you have met the requirements for credit in this course.".format(self.USER_FULL_NAME)
)
self.assertContains(response, "Verified on {date}".format(date=self._now_formatted_date()))
self.assertContains(response, "Completed {date}".format(date=self._now_formatted_date()))
self.assertContains(response, "95%")
def test_credit_requirements_not_eligible(self):

6
lms/templates/courseware/progress.html
View File

@@ -136,12 +136,10 @@ from django.utils.http import urlquote_plus
<span>${_("Verification Failed" )}</span>
%elif requirement['status'] == 'satisfied':
<i class="fa fa-check"></i>
% if requirement['namespace'] == 'reverification':
<span>Verified on ${get_time_display(requirement['status_date'], DEFAULT_SHORT_DATE_FORMAT, settings.TIME_ZONE)}</span>
% elif requirement['namespace'] == 'grade' and 'final_grade' in requirement['reason']:
% if requirement['namespace'] == 'grade' and 'final_grade' in requirement['reason']:
<span>${int(requirement['reason']['final_grade'] * 100)}%</span>
% else:
<span>Completed</span>
<span>${_("Completed")} ${get_time_display(requirement['status_date'], DEFAULT_SHORT_DATE_FORMAT, settings.TIME_ZONE)}</span>
% endif
%endif
%else: