Merge pull request #18 from caseylitton/max-score-for-progess-fix

Fix progress page max_score scoring issue

.gitignore

@@ -3,3 +3,4 @@
 *.egg-info/
 *.pyc
 *.sw[op]
+coverage.xml

setup.py

@@ -45,7 +45,7 @@ def run_tests(self):
 
 setup(
     name='xblock-submit-and-compare',
-    version='0.5',
+    version='0.5.1',
     description='Submit and Compare XBlock for self assessment',
     packages=[
         'submit_and_compare',

submit_and_compare/submit_and_compare.py

@@ -272,6 +272,16 @@ def studio_view(self, context=None):
         frag.initialize_js('SubmitAndCompareXBlockInitEdit')
         return frag
 
+    def max_score(self):
+        """
+        Returns the configured number of possible points for this component.
+        Arguments:
+            None
+        Returns:
+            float: The number of possible points for this component
+        """
+        return self.weight
+
     @XBlock.json_handler
     def student_submit(self, submissions, suffix=''):
         # pylint: disable=unused-argument

submit_and_compare/tests.py

@@ -191,3 +191,11 @@ def test_submit_class_nodisplay(self):
         self.xblock.max_attempts = 5
         self.xblock.count_attempts = 6
         self.assertEquals('nodisplay', self.xblock._get_submit_class())
+
+    def test_max_score(self):
+        """
+        Tests max_score function
+        Should return the weight
+        """
+        self.xblock.weight = 4
+        self.assertEquals(self.xblock.weight, self.xblock.max_score())