Video structure returns modules of any graded status.

analytics_dashboard/courses/presenters/__init__.py

@@ -90,6 +90,11 @@ class CourseAPIPresenterMixin(object):
         """ Module type to retrieve structure for. E.g. video, problem. """
         pass
 
+    @property
+    def module_graded_type(self):
+        """ Graded module type to review structure for. E.g. True, False, None. """
+        return None
+
     def get_cache_key(self, name):
         """ Returns sanitized key for caching. """
         return sanitize_cache_key(u'{}_{}'.format(self.course_id, name))
@@ -114,7 +119,7 @@ class CourseAPIPresenterMixin(object):
             if not found_structure:
                 structure = self._get_structure()
                 found_structure = CourseStructure.course_structure_to_sections(structure, self.module_type,
-                                                                               graded=False)
+                                                                               graded=self.module_graded_type)
                 cache.set(all_sections_key, found_structure)
 
             for section in found_structure:

analytics_dashboard/courses/presenters/performance.py

@@ -368,3 +368,14 @@ class CoursePerformancePresenter(CourseAPIPresenterMixin, BasePresenter):
     @property
     def module_type(self):
         return 'problem'
+
+    @property
+    def module_graded_type(self):
+        """
+        Get ungraded blocks.
+
+        This is a bit confusing as this presenter is used to show both graded and
+        ungraded content.  The ungraded content uses CourseAPIPresenterMixin::course_structure
+        which then gets the module grade type for filtering.
+        """
+        return False

common/course_structure.py

@@ -17,8 +17,6 @@ class CourseStructure(object):
         if block_type:
             kwargs[u'type'] = block_type
 
-        kwargs.setdefault(u'graded', False)
-
         matched = True
         for name, value in kwargs.iteritems():
             matched &= (block.get(name, None) == value)
@@ -99,10 +97,14 @@ class CourseStructure(object):
         if len(block_types) > 0:
             block_types = list(block_types)
             block_type = block_types.pop(0)
+            filter_kwargs = {
+                'block_type': block_type,
+            }
+            if graded is not None:
+                filter_kwargs['graded'] = graded
             structure_sections = CourseStructure._filter_children(blocks, section_id,
-                                                                  graded=graded,
-                                                                  block_type=block_type,
-                                                                  require_format=False)
+                                                                  require_format=False,
+                                                                  **filter_kwargs)
 
             for section in structure_sections:
                 children = CourseStructure._build_sections(blocks, section[u'id'], graded, block_types)