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

Merge pull request #19739 from edx/zhancock/progress-override

Browse Source 
Grading Overrides on Progress Page
This commit is contained in:
Zachary Hancock
2019-02-05 11:32:12 -05:00
committed by GitHub
parent 33d16d8e24 8a55435b1e
commit 945debb00f
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/djangoapps/grades/models.py
View File

@@ -654,6 +654,9 @@ class PersistentSubsectionGradeOverride(models.Model):
u"possible_graded_override: {}".format(self.possible_graded_override),
])
def get_history(self):
return PersistentSubsectionGradeOverrideHistory.get_override_history(self.id)
@classmethod
def prefetch(cls, user_id, course_key):
get_cache(cls._CACHE_NAMESPACE)[(user_id, str(course_key))] = {
@@ -777,6 +780,10 @@ class PersistentSubsectionGradeOverrideHistory(models.Model):
self.created
)
@classmethod
def get_override_history(cls, override_id):
return cls.objects.filter(override_id=override_id)
def prefetch(user, course_key):
PersistentSubsectionGradeOverride.prefetch(user.id, course_key)

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

@@ -5,6 +5,7 @@
<%!
from course_modes.models import CourseMode
from lms.djangoapps.certificates.models import CertificateStatuses
from lms.djangoapps.grades.models import PersistentSubsectionGradeOverrideHistory
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import HTML, Text
from django.urls import reverse
@@ -168,10 +169,10 @@ username = get_enterprise_learner_generic_name(request) or student.username
%for section in chapter['sections']:
<div>
<%
earned = section.all_total.earned
total = section.all_total.possible
earned = section.graded_total.earned
total = section.graded_total.possible
percentageString = "{0:.0%}".format(section.percent_graded) if earned > 0 and total > 0 else ""
percentageString = "{0:.0%}".format(section.percent_graded) if total > 0 or earned > 0 else ""
%>
<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))}">
@@ -196,7 +197,8 @@ username = get_enterprise_learner_generic_name(request) or student.username
</p>
<p class="override-notice">
%if section.override is not None:
%if section.format is not None and section.format == "Exam":
<%last_override_history = section.override.get_history().order_by('created').last()%>
%if (not last_override_history or last_override_history.feature == PersistentSubsectionGradeOverrideHistory.PROCTORING) and section.format == "Exam" and earned == 0:
${_("Suspicious activity detected during proctored exam review. Exam score 0.")}
%else:
${_("Section grade has been overridden.")}