Make has_score to be XField insted of decriptor property.

This commit is contained in:
Александр
2013-12-03 17:48:27 +02:00
parent 2088a2159e
commit 932d13ede8
2 changed files with 7 additions and 4 deletions

View File

@@ -94,6 +94,7 @@ class LTIFields(object):
scope=Scope.settings,
values={"min": 0},
)
has_score = Boolean(help="Does this LTI module have score?", default=False, scope=Scope.settings)
class LTIModule(LTIFields, XModule):
@@ -380,7 +381,7 @@ oauth_consumer_key="", oauth_signature="frVp4JuvT1mVXlxktiAUjQ7%2F1cw%3D"'}
return params
def max_score(self):
return self.weight if self.graded else 0
return self.weight if self.has_score else None
@XBlock.handler
@@ -586,6 +587,5 @@ class LTIDescriptor(LTIFields, MetadataOnlyEditingDescriptor, EmptyDataRawDescri
"""
Descriptor for LTI Xmodule.
"""
has_score = True
module_class = LTIModule
grade_handler = module_attr('grade_handler')

View File

@@ -253,9 +253,12 @@ class LTIModuleTest(LogicTest):
self.xmodule.weight = 100.0
self.xmodule.graded = True
self.assertEqual(self.xmodule.max_score(), 100)
self.assertEqual(self.xmodule.max_score(), None)
self.xmodule.has_score = True
self.assertEqual(self.xmodule.max_score(), 100.0)
self.xmodule.graded = False
self.assertEqual(self.xmodule.max_score(), 0)
self.assertEqual(self.xmodule.max_score(), 100.0)