Merge pull request #12036 from edx/waheed/ecom-3127-fix-grade-requirements

Fixed progress page grade requirements text.

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

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>