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

Comment out actual override and log instead

Browse Source
This commit is contained in:
Tyler Hallada
2017-08-09 11:19:31 -04:00
parent 410cc166e7
commit 4953cf30d9
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,14 +418,27 @@ class PersistentSubsectionGrade(DeleteGradesMixin, TimeStampedModel):
grade__course_id=usage_key.course_key,
grade__usage_key=usage_key,
)
if override.earned_all_override is not None:
params['earned_all'] = override.earned_all_override
if override.possible_all_override is not None:
params['possible_all'] = override.possible_all_override
if override.earned_graded_override is not None:
params['earned_graded'] = override.earned_graded_override
if override.possible_graded_override is not None:
params['possible_graded'] = override.possible_graded_override
# EDUCTATOR-1127: no-op and log until this behavior is verified in production
# if override.earned_all_override is not None:
# params['earned_all'] = override.earned_all_override
# if override.possible_all_override is not None:
# params['possible_all'] = override.possible_all_override
# if override.earned_graded_override is not None:
# params['earned_graded'] = override.earned_graded_override
# if override.possible_graded_override is not None:
# params['possible_graded'] = override.possible_graded_override
log.info(u"EDUCATOR-1127: Subsection grade for user {user_id} on subsection {usage_key} in course "
u"{course_key} would be overridden with params: {params}".format(
user_id=unicode(user_id),
usage_key=unicode(usage_key),
course_key=unicode(usage_key.course_key),
params=unicode({
'earned_all': override.earned_all_override,
'possible_all': override.possible_all_override,
'earned_graded': override.earned_graded_override,
'possible_graded': override.possible_graded_override
}))
)
except PersistentSubsectionGradeOverride.DoesNotExist:
pass

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

@@ -183,15 +183,18 @@ from django.utils.http import urlquote_plus
<em class="localized-datetime" data-datetime="${section.due}" data-string="${_('due {date}')}" data-timezone="${user_timezone}" data-language="${user_language}"></em>
%endif
</p>
<p class="override-notice">
<%doc>
EDUCATOR-1127: Do not display override notice until override is enabled
%if section.override is not None:
%if section.format is not None and section.format == "Exam":
${_("Exam grade has been overridden due to a failed proctoring review.")}
%else:
${_("Section grade has been overridden.")}
%endif
<p class="override-notice">
%if section.format is not None and section.format == "Exam":
${_("Exam grade has been overridden due to a failed proctoring review.")}
%else:
${_("Section grade has been overridden.")}
%endif
</p>
%endif
</p>
</%doc>
%if len(section.problem_scores.values()) > 0:
%if section.show_grades(staff_access):
<dl class="scores">