Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
4953cf30
Commit
4953cf30
authored
Aug 09, 2017
by
Tyler Hallada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Comment out actual override and log instead
parent
410cc166
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
15 deletions
+31
-15
lms/djangoapps/grades/models.py
+21
-8
lms/templates/courseware/progress.html
+10
-7
No files found.
lms/djangoapps/grades/models.py
View file @
4953cf30
...
...
@@ -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
...
...
lms/templates/courseware/progress.html
View file @
4953cf30
...
...
@@ -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"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment