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

Hiding overall grades for a sequential when problem scores are hidden

Browse Source
This commit is contained in:
Jolyon Bloomfield
2019-03-28 23:07:00 -07:00
parent 63f799ff8f
commit 963ec44826
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lms/djangoapps/courseware/tests/test_views.py
View File

@@ -1995,34 +1995,48 @@ class ProgressPageShowCorrectnessTests(ProgressPageBaseTests):
Ensures that grades and scores are shown or not shown on the progress page as required.
"""
expected_score = "<dd>{score}/{max_score}</dd>".format(score=score, max_score=max_score)
expected_score = u"<dd>{score}/{max_score}</dd>".format(score=score, max_score=max_score)
percent = score / float(max_score)
# Test individual problem scores
if show_grades:
# If grades are shown, we should be able to see the current problem scores.
self.assertIn(expected_score, response.content)
self.assertIn(expected_score, response.content.decode("utf-8"))
if graded:
expected_summary_text = "Problem Scores:"
expected_summary_text = u"Problem Scores:"
else:
expected_summary_text = "Practice Scores:"
expected_summary_text = u"Practice Scores:"
else:
# If grades are hidden, we should not be able to see the current problem scores.
self.assertNotIn(expected_score, response.content)
self.assertNotIn(expected_score, response.content.decode("utf-8"))
if graded:
expected_summary_text = "Problem scores are hidden"
expected_summary_text = u"Problem scores are hidden"
else:
expected_summary_text = "Practice scores are hidden"
expected_summary_text = u"Practice scores are hidden"
if show_correctness == ShowCorrectness.PAST_DUE and due_date:
expected_summary_text += ' until the due date.'
expected_summary_text += u' until the due date.'
else:
expected_summary_text += '.'
expected_summary_text += u'.'
# Ensure that expected text is present
self.assertIn(expected_summary_text, response.content)
self.assertIn(expected_summary_text, response.content.decode("utf-8"))
# Test overall sequential score
if graded and max_score > 0:
percentageString = "{0:.0%}".format(percent) if max_score > 0 else ""
template = u'<span> ({0:.3n}/{1:.3n}) {2}</span>'
expected_grade_summary = template.format(float(score),
float(max_score),
percentageString)
if show_grades:
self.assertIn(expected_grade_summary, response.content.decode("utf-8"))
else:
self.assertNotIn(expected_grade_summary, response.content.decode("utf-8"))
@ddt.data(
('', None, False),

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

@@ -177,13 +177,13 @@ username = get_enterprise_learner_generic_name(request) or student.username
<h4 class="hd hd-4">
<a href="${reverse('courseware_section', kwargs=dict(course_id=text_type(course.id), chapter=chapter['url_name'], section=section.url_name))}">
${ section.display_name}
%if total > 0 or earned > 0:
%if (total > 0 or earned > 0) and section.show_grades(staff_access):
<span class="sr">
${_("{earned} of {total} possible points").format(earned='{:.3n}'.format(float(earned)), total='{:.3n}'.format(float(total)))}
</span>
%endif
</a>
%if total > 0 or earned > 0:
%if (total > 0 or earned > 0) and section.show_grades(staff_access):
<span> ${"({0:.3n}/{1:.3n}) {2}".format( float(earned), float(total), percentageString )}</span>
%endif
</h4>