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

Clarify grading variables in the CourseModule

Browse Source
This commit is contained in:
Calen Pennington
2015-03-03 14:13:06 -05:00
parent de23d6defe
commit 8fbb64322b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/lib/xmodule/xmodule/course_module.py
View File

@@ -1211,23 +1211,23 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
for module_descriptor in yield_descriptor_descendents(child): for module_descriptor in yield_descriptor_descendents(child):
yield module_descriptor yield module_descriptor
for c in self.get_children(): for chapter in self.get_children():
for s in c.get_children(): for section in chapter.get_children():
if s.graded: if section.graded:
xmoduledescriptors = list(yield_descriptor_descendents(s)) xmoduledescriptors = list(yield_descriptor_descendents(section))
xmoduledescriptors.append(s) xmoduledescriptors.append(section)
# The xmoduledescriptors included here are only the ones that have scores. # The xmoduledescriptors included here are only the ones that have scores.
section_description = { section_description = {
'section_descriptor': s, 'section_descriptor': section,
'xmoduledescriptors': filter(lambda child: child.has_score, xmoduledescriptors) 'xmoduledescriptors': [child for child in xmoduledescriptors if child.has_score]
} }
section_format = s.format if s.format is not None else '' section_format = section.format if section.format is not None else ''
graded_sections[section_format] = graded_sections.get(section_format, []) + [section_description] graded_sections[section_format] = graded_sections.get(section_format, []) + [section_description]
all_descriptors.extend(xmoduledescriptors) all_descriptors.extend(xmoduledescriptors)
all_descriptors.append(s) all_descriptors.append(section)
return {'graded_sections': graded_sections, return {'graded_sections': graded_sections,
'all_descriptors': all_descriptors, } 'all_descriptors': all_descriptors, }