Merge pull request #905 from edx/diana/order-criterion

Order assessment parts by criteria.

openassessment/data.py

@@ -388,7 +388,7 @@ class OraAggregateData(object):
         returned_string = u""
         for assessment in assessments:
             returned_string += u"Assessment #{}\n".format(assessment.id)
-            for part in assessment.parts.all():
+            for part in assessment.parts.order_by('criterion__order_num'):
                 returned_string += u"-- {}".format(part.criterion.label)
                 if part.option is not None and part.option.label is not None:
                     option_label = part.option.label

openassessment/tests/factories.py

@@ -31,7 +31,7 @@ class CriterionFactory(DjangoModelFactory):
     name = factory.Sequence(lambda n: 'criterion_{}'.format(n))  # pylint: disable=unnecessary-lambda
     label = factory.Sequence(lambda n: 'label_{}'.format(n))  # pylint: disable=unnecessary-lambda
 
-    order_num = 0
+    order_num = factory.Sequence(lambda n: n)
 
     prompt = 'This is a fake prompt.'
 
@@ -43,7 +43,7 @@ class CriterionOptionFactory(DjangoModelFactory):
 
     criterion = factory.SubFactory(CriterionFactory)
 
-    order_num = 0
+    order_num = factory.Sequence(lambda n: n)
 
     points = 4
 

openassessment/tests/test_data.py

@@ -456,17 +456,17 @@ class TestOraAggregateDataIntegration(TransactionCacheResetTest):
                 scorer=self.assessment['scorer_id'],
                 feedback=self.assessment['feedback']
             ),
-            u"Assessment #{id}\n-- {label}: {option_label} ({points})\n-- feedback: {feedback}\n".format(
+            u"Assessment #{id}\n-- {label}: {option_label} ({points})\n".format(
                 id=self.assessment['id'],
+                label=self.assessment['parts'][1]['criterion']['label'],
+                option_label=self.assessment['parts'][1]['criterion']['options'][0]['label'],
+                points=self.assessment['parts'][1]['criterion']['options'][0]['points'],
+            ) +
+            u"-- {label}: {option_label} ({points})\n-- feedback: {feedback}\n".format(
                 label=self.assessment['parts'][0]['criterion']['label'],
                 option_label=self.assessment['parts'][0]['criterion']['options'][1]['label'],
                 points=self.assessment['parts'][0]['criterion']['options'][1]['points'],
                 feedback=self.assessment['parts'][0]['feedback'],
-            ) +
-            u"-- {label}: {option_label} ({points})\n".format(
-                label=self.assessment['parts'][1]['criterion']['label'],
-                option_label=self.assessment['parts'][1]['criterion']['options'][0]['label'],
-                points=self.assessment['parts'][1]['criterion']['options'][0]['points'],
             ),
             self.score['created_at'],
             self.score['points_earned'],