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
e4c626d3
Commit
e4c626d3
authored
Sep 29, 2016
by
Eric Fischer
Committed by
GitHub
Sep 29, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13607 from edx/release
Hotfix 2016-09-29b release to master
parents
91bae670
510b84ed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
lms/djangoapps/grades/new/course_grade.py
+1
-1
lms/djangoapps/grades/new/subsection_grade.py
+4
-4
No files found.
lms/djangoapps/grades/new/course_grade.py
View file @
e4c626d3
...
@@ -220,7 +220,7 @@ class CourseGrade(object):
...
@@ -220,7 +220,7 @@ class CourseGrade(object):
)
)
for
receiver
,
response
in
responses
:
for
receiver
,
response
in
responses
:
log
.
info
(
log
.
debug
(
'Signal fired when student grade is calculated. Receiver:
%
s. Response:
%
s'
,
'Signal fired when student grade is calculated. Receiver:
%
s. Response:
%
s'
,
receiver
,
response
receiver
,
response
)
)
...
...
lms/djangoapps/grades/new/subsection_grade.py
View file @
e4c626d3
...
@@ -73,7 +73,7 @@ class SubsectionGrade(object):
...
@@ -73,7 +73,7 @@ class SubsectionGrade(object):
self
.
_compute_block_score
(
descendant_key
,
course_structure
,
submissions_scores
,
csm_scores
)
self
.
_compute_block_score
(
descendant_key
,
course_structure
,
submissions_scores
,
csm_scores
)
self
.
all_total
,
self
.
graded_total
=
graders
.
aggregate_scores
(
self
.
scores
,
self
.
display_name
,
self
.
location
)
self
.
all_total
,
self
.
graded_total
=
graders
.
aggregate_scores
(
self
.
scores
,
self
.
display_name
,
self
.
location
)
self
.
_log_event
(
log
.
info
,
u"init_from_structure"
,
student
)
self
.
_log_event
(
log
.
debug
,
u"init_from_structure"
,
student
)
def
init_from_model
(
self
,
student
,
model
,
course_structure
,
submissions_scores
,
csm_scores
):
def
init_from_model
(
self
,
student
,
model
,
course_structure
,
submissions_scores
,
csm_scores
):
"""
"""
...
@@ -96,7 +96,7 @@ class SubsectionGrade(object):
...
@@ -96,7 +96,7 @@ class SubsectionGrade(object):
display_name
=
self
.
display_name
,
display_name
=
self
.
display_name
,
module_id
=
self
.
location
,
module_id
=
self
.
location
,
)
)
self
.
_log_event
(
log
.
info
,
u"init_from_model"
,
student
)
self
.
_log_event
(
log
.
debug
,
u"init_from_model"
,
student
)
@classmethod
@classmethod
def
bulk_create_models
(
cls
,
student
,
subsection_grades
,
course_key
):
def
bulk_create_models
(
cls
,
student
,
subsection_grades
,
course_key
):
...
@@ -218,7 +218,7 @@ class SubsectionGradeFactory(object):
...
@@ -218,7 +218,7 @@ class SubsectionGradeFactory(object):
If read_only is True, doesn't save any updates to the grades.
If read_only is True, doesn't save any updates to the grades.
"""
"""
self
.
_log_event
(
self
.
_log_event
(
log
.
info
,
u"create, read_only: {0}, subsection: {1}"
.
format
(
read_only
,
subsection
.
location
)
log
.
debug
,
u"create, read_only: {0}, subsection: {1}"
.
format
(
read_only
,
subsection
.
location
)
)
)
block_structure
=
self
.
_get_block_structure
(
block_structure
)
block_structure
=
self
.
_get_block_structure
(
block_structure
)
...
@@ -241,7 +241,7 @@ class SubsectionGradeFactory(object):
...
@@ -241,7 +241,7 @@ class SubsectionGradeFactory(object):
"""
"""
Bulk creates all the unsaved subsection_grades to this point.
Bulk creates all the unsaved subsection_grades to this point.
"""
"""
self
.
_log_event
(
log
.
info
,
u"bulk_create_unsaved"
)
self
.
_log_event
(
log
.
debug
,
u"bulk_create_unsaved"
)
with
persistence_safe_fallback
():
with
persistence_safe_fallback
():
SubsectionGrade
.
bulk_create_models
(
self
.
student
,
self
.
_unsaved_subsection_grades
,
self
.
course
.
id
)
SubsectionGrade
.
bulk_create_models
(
self
.
student
,
self
.
_unsaved_subsection_grades
,
self
.
course
.
id
)
...
...
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