Commit 799571b2 by Chris Dodge

Make the message to the end user consistent across as requirement types, except…

Make the message to the end user consistent across as requirement types, except for grade requirements
parent 84e56ed8
...@@ -112,7 +112,7 @@ class ProgressPageCreditRequirementsTest(ModuleStoreTestCase): ...@@ -112,7 +112,7 @@ class ProgressPageCreditRequirementsTest(ModuleStoreTestCase):
response, response,
"{}, you have met the requirements for credit in this course.".format(self.USER_FULL_NAME) "{}, 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%") self.assertContains(response, "95%")
def test_credit_requirements_not_eligible(self): def test_credit_requirements_not_eligible(self):
......
...@@ -136,12 +136,10 @@ from django.utils.http import urlquote_plus ...@@ -136,12 +136,10 @@ from django.utils.http import urlquote_plus
<span>${_("Verification Failed" )}</span> <span>${_("Verification Failed" )}</span>
%elif requirement['status'] == 'satisfied': %elif requirement['status'] == 'satisfied':
<i class="fa fa-check"></i> <i class="fa fa-check"></i>
% if requirement['namespace'] == 'reverification': % if requirement['namespace'] == 'grade' and 'final_grade' in requirement['reason']:
<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']:
<span>${int(requirement['reason']['final_grade'] * 100)}%</span> <span>${int(requirement['reason']['final_grade'] * 100)}%</span>
% else: % else:
<span>Completed</span> <span>${_("Completed")} ${get_time_display(requirement['status_date'], DEFAULT_SHORT_DATE_FORMAT, settings.TIME_ZONE)}</span>
% endif % endif
%endif %endif
%else: %else:
......
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