From 6a9157e409a65e52eb856db071a609b31945d81a Mon Sep 17 00:00:00 2001
From: Waheed Ahmed <waheed.ahmed@arbisoft.com>
Date: Tue, 5 Apr 2016 11:53:02 +0500
Subject: [PATCH] Fixed progress page grade requirements text. ECOM-3127
---
lms/djangoapps/courseware/tests/test_credit_requirements.py | 4 ++--
lms/templates/courseware/progress.html | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/lms/djangoapps/courseware/tests/test_credit_requirements.py b/lms/djangoapps/courseware/tests/test_credit_requirements.py
index fc2fd5b..a0bcff6 100644
--- a/lms/djangoapps/courseware/tests/test_credit_requirements.py
+++ b/lms/djangoapps/courseware/tests/test_credit_requirements.py
@@ -119,8 +119,8 @@ class ProgressPageCreditRequirementsTest(SharedModuleStoreTestCase):
response,
"{}, you have met the requirements for credit in this course.".format(self.USER_FULL_NAME)
)
- self.assertContains(response, "Completed {date}".format(date=self._now_formatted_date()))
- self.assertContains(response, "95%")
+ self.assertContains(response, "Completed by {date}".format(date=self._now_formatted_date()))
+ self.assertNotContains(response, "95%")
def test_credit_requirements_not_eligible(self):
# Mark the user as having failed both requirements
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index c520ea2..8d765a3 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -139,11 +139,7 @@ from django.utils.http import urlquote_plus
<span>${_("Verification Declined" )}</span>
%elif requirement['status'] == 'satisfied':
<i class="fa fa-check" aria-hidden="true"></i>
- % if requirement['namespace'] == 'grade' and 'final_grade' in requirement['reason']:
- <span>${int(requirement['reason']['final_grade'] * 100) | h}%</span>
- % else:
- <span>${_("Completed")} ${get_time_display(requirement['status_date'], DEFAULT_SHORT_DATE_FORMAT, settings.TIME_ZONE)}</span>
- % endif
+ <span>${_("Completed by")} ${get_time_display(requirement['status_date'], DEFAULT_SHORT_DATE_FORMAT, settings.TIME_ZONE)}</span>
%endif
%else:
<span class="not-achieve">${_("Upcoming")}</span>
--
libgit2 0.26.0