Merge pull request #651 from edx/usman/tnl708-multiple-prompts-xml

Adds support for multiple prompts in problems.

openassessment/assessment/api/ai_worker.py

@@ -6,6 +6,7 @@ from httplib import HTTPException
 from django.db import DatabaseError
 from dogapi import dog_stats_api
 from openassessment.assessment.models import (
+    essay_text_from_submission,
     AITrainingWorkflow, AIGradingWorkflow,
     ClassifierUploadError, ClassifierSerializeError,
     IncompleteClassifierSet, NoTrainingExamples,
@@ -197,19 +198,13 @@ def get_training_task_params(training_workflow_uuid):
         returned_examples = []
 
         for example in workflow.training_examples.all():
-            answer = example.answer
-            if isinstance(answer, dict):
-                text = answer.get('answer', '')
-            else:
-                text = answer
-
             scores = {
                 option.criterion.name: option.points
                 for option in example.options_selected.all()
             }
 
             returned_examples.append({
-                'text': text,
+                'text': essay_text_from_submission({'answer': example.answer}),
                 'scores': scores
             })
 

openassessment/assessment/api/student_training.py

@@ -127,7 +127,7 @@ def validate_training_examples(rubric, examples):
         >>> ]
         >>>
         >>> rubric = {
-        >>>     "prompt": "Write an essay!",
+        >>>     "prompts": [{"description": "Write an essay!"}],
         >>>     "criteria": [
         >>>         {
         >>>             "order_num": 0,
@@ -146,14 +146,14 @@ def validate_training_examples(rubric, examples):
         >>>
         >>> examples = [
         >>>     {
-        >>>         'answer': u'Lorem ipsum',
+        >>>         'answer': {'parts': [{'text': u'Lorem ipsum'}]},
         >>>         'options_selected': {
         >>>             'vocabulary': 'good',
         >>>             'grammar': 'excellent'
         >>>         }
         >>>     },
         >>>     {
-        >>>         'answer': u'Doler',
+        >>>         'answer': {'parts': [{'text': u'Doler'}]},
         >>>         'options_selected': {
         >>>             'vocabulary': 'good',
         >>>             'grammar': 'poor'
@@ -312,7 +312,15 @@ def get_training_example(submission_uuid, rubric, examples):
 
         >>> examples = [
         >>>     {
-        >>>         'answer': u'Doler',
+        >>>         'answer': {
+        >>>             'parts': {
+        >>>                 [
+        >>>                     {'text:' 'Answer part 1'},
+        >>>                     {'text:' 'Answer part 2'},
+        >>>                     {'text:' 'Answer part 3'}
+        >>>                 ]
+        >>>             }
+        >>>         },
         >>>         'options_selected': {
         >>>             'vocabulary': 'good',
         >>>             'grammar': 'poor'
@@ -322,9 +330,21 @@ def get_training_example(submission_uuid, rubric, examples):
         >>>
         >>> get_training_example("5443ebbbe2297b30f503736e26be84f6c7303c57", rubric, examples)
         {
-            'answer': u'Lorem ipsum',
+             'answer': {
+                 'parts': {
+                     [
+                         {'text:' 'Answer part 1'},
+                         {'text:' 'Answer part 2'},
+                         {'text:' 'Answer part 3'}
+                     ]
+                 }
+             },
             'rubric': {
-                "prompt": "Write an essay!",
+                "prompts": [
+                    {"description": "Prompt 1"},
+                    {"description": "Prompt 2"},
+                    {"description": "Prompt 3"}
+                ],
                 "criteria": [
                     {
                         "order_num": 0,

openassessment/assessment/models/ai.py

@@ -40,6 +40,35 @@ CLASSIFIERS_CACHE_IN_FILE = getattr(
 )
 
 
+def essay_text_from_submission(submission):
+    """
+    Retrieve the submission text.
+
+    Submissions are arbitrary JSON-blobs, which *should*
+    contain a single key, "answer", containing the essay
+    submission text.
+    If not, though, assume we've been given the essay text
+    directly (convenient for testing).
+    """
+    if isinstance(submission, dict):
+        if 'answer' in submission:
+            # Format used for answer in examples.
+            if isinstance(submission['answer'], unicode):
+                return submission['answer']
+            # Initially there was one prompt and submission had the structure
+            # {'answer': {'text': 'The text.'}}
+            elif 'text' in submission['answer']:
+                essay_text = submission['answer']['text']
+            # When multiple prompts were introduced the structure of submission become:
+            # {'answer': {'parts': [{'text': 'The text part 1.'}, {'text': 'The text part 2.'}]}}
+            # We concatenate these parts and let AI grader evaluate the total text.
+            else:
+                essay_text = u'\n'.join([part['text'] for part in submission['answer']['parts']])
+    else:
+        essay_text = unicode(submission)
+    return essay_text
+
+
 class IncompleteClassifierSet(Exception):
     """
     The classifier set is missing a classifier for a criterion in the rubric.
@@ -792,20 +821,10 @@ class AIGradingWorkflow(AIWorkflow):
         from openassessment.assessment.serializers import rubric_from_dict
         rubric = rubric_from_dict(rubric_dict)
 
-        # Retrieve the submission text
-        # Submissions are arbitrary JSON-blobs, which *should*
-        # contain a single key, "answer", containing the essay
-        # submission text.  If not, though, assume we've been
-        # given the essay text directly (convenient for testing).
-        if isinstance(submission, dict):
-            essay_text = submission.get('answer')
-        else:
-            essay_text = unicode(submission)
-
         # Create the workflow
         workflow = cls.objects.create(
             submission_uuid=submission_uuid,
-            essay_text=essay_text,
+            essay_text=essay_text_from_submission(submission),
             algorithm_id=algorithm_id,
             student_id=submission['student_item']['student_id'],
             item_id=submission['student_item']['item_id'],

openassessment/assessment/serializers/base.py

@@ -245,7 +245,7 @@ def rubric_from_dict(rubric_dict):
     Sample data (one criterion, two options)::
 
         {
-          "prompt": "Create a plan to deliver ora2!",
+          "prompts": [{"description": "Create a plan to deliver ora2!"}],
           "criteria": [
             {
               "order_num": 0,

openassessment/assessment/serializers/training.py

@@ -107,7 +107,11 @@ def deserialize_training_examples(examples, rubric_dict):
         >>> ]
         >>>
         >>> rubric = {
-        >>>     "prompt": "Write an essay!",
+        >>>     "prompts": [
+        >>>         {"description": "Prompt 1"}
+        >>>         {"description": "Prompt 2"}
+        >>>         {"description": "Prompt 3"}
+        >>>     ],
         >>>     "criteria": [
         >>>         {
         >>>             "order_num": 0,
@@ -126,7 +130,15 @@ def deserialize_training_examples(examples, rubric_dict):
         >>>
         >>> examples = [
         >>>     {
-        >>>         'answer': u'Lorem ipsum',
+        >>>         'answer': {
+        >>>             'parts': {
+        >>>                 [
+        >>>                     {'text:' 'Answer part 1'},
+        >>>                     {'text:' 'Answer part 2'},
+        >>>                     {'text:' 'Answer part 3'}
+        >>>                 ]
+        >>>             }
+        >>>         },
         >>>         'options_selected': {
         >>>             'vocabulary': 'good',
         >>>             'grammar': 'excellent'

openassessment/assessment/test/constants.py

@@ -10,7 +10,7 @@ STUDENT_ITEM = {
     'item_type': u'openassessment'
 }
 
-ANSWER = u'ẗëṡẗ äṅṡẅëṛ'
+ANSWER = {'text': u'ẗëṡẗ äṅṡẅëṛ'}
 
 RUBRIC_OPTIONS = [
     {
@@ -34,7 +34,7 @@ RUBRIC_OPTIONS = [
 ]
 
 RUBRIC = {
-    'prompt': u"МоъЎ-ↁіск; оѓ, ГЂэ ЩЂаlэ",
+    'prompts': [{"description": u"МоъЎ-ↁіск; оѓ, ГЂэ ЩЂаlэ"}],
     'criteria': [
         {
             "order_num": 0,

openassessment/assessment/test/data/rubric/empty_criteria.json

 {
-  "prompt": "Create a plan to deliver ora2!",
+  "prompts": [{"description": "Create a plan to deliver ora2!"}],
   "criteria": [
   ]
 }

openassessment/assessment/test/data/rubric/empty_options.json

 {
-  "prompt": "Create a plan to deliver ora2!",
+  "prompts": [{"description": "Create a plan to deliver ora2!"}],
   "criteria": [
     {
       "order_num": 0,

openassessment/assessment/test/data/rubric/missing_criteria.json

 {
-  "prompt": "Create a plan to deliver ora2!"
+  "prompts": [{"description": "Create a plan to deliver ora2!"}]
 }

openassessment/assessment/test/data/rubric/missing_options.json

 {
-  "prompt": "Create a plan to deliver ora2!",
+  "prompts": [{"description": "Create a plan to deliver ora2!"}],
   "criteria": [
     {
       "order_num": 0,

openassessment/assessment/test/data/rubric/no_points.json

 {
-  "prompt": "Create a plan to deliver ora2!",
+  "prompts": [{"description": "Create a plan to deliver ora2!"}],
   "criteria": [
     {
       "order_num": 0,

openassessment/assessment/test/data/rubric/project_plan_rubric.json

 {
-  "prompt": "Create a plan to deliver ora2!",
+  "prompts": [{"description": "Create a plan to deliver ora2!"}],
   "criteria": [
     {
       "order_num": 0,

openassessment/assessment/test/data/validate_training_examples.json

 {
     "valid": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -78,7 +78,7 @@
 
     "missing_options": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -148,7 +148,7 @@
 
     "extra_options": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -225,7 +225,7 @@
 
     "missing_and_extra_options": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -291,7 +291,7 @@
 
     "invalid_option_name": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -374,7 +374,7 @@
 
     "rubric_missing_options_list": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -397,7 +397,7 @@
 
     "rubric_missing_criteria_list": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}]
         },
         "examples": [
             {
@@ -413,7 +413,7 @@
 
     "example_missing_keys": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -478,7 +478,7 @@
 
     "feedback_only_criterion": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -518,7 +518,7 @@
 
     "feedback_only_criterion_extra_score": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -561,7 +561,7 @@
 
     "feedback_only_all_criteria": {
         "rubric": {
-            "prompt": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽",
+            "prompts": [{"description": "𝓣𝓮𝓼𝓽 𝓹𝓻𝓸𝓶𝓹𝓽"}],
             "criteria": [
                 {
                     "order_num": 1,

openassessment/assessment/test/test_ai_models.py

@@ -3,11 +3,14 @@
 Test AI Django models.
 """
 import copy
+import ddt
+from django.test import TestCase
+
 from django.test.utils import override_settings
 from openassessment.test_utils import CacheResetTest
 from openassessment.assessment.models import (
     AIClassifierSet, AIClassifier, AIGradingWorkflow, AI_CLASSIFIER_STORAGE,
-    CLASSIFIERS_CACHE_IN_MEM
+    CLASSIFIERS_CACHE_IN_MEM, essay_text_from_submission
 )
 from openassessment.assessment.serializers import rubric_from_dict
 from .constants import RUBRIC
@@ -21,6 +24,19 @@ COURSE_ID = u"†3߆ çøU®ß3"
 ITEM_ID = u"fake_item_id"
 
 
+@ddt.ddt
+class DataConversionTest(TestCase):
+
+    @ddt.data(
+        (u'Answer', u'Answer'),
+        ({'answer': {'text': u'Answer'}}, u'Answer'),
+        ({'answer': {'parts': [{'text': u'Answer 1'}, {'text': u'Answer 2'}]}}, u'Answer 1\nAnswer 2')
+    )
+    @ddt.unpack
+    def test_essay_text_from_submission(self, input, output):
+        self.assertEqual(essay_text_from_submission(input), output)
+
+
 class AIClassifierTest(CacheResetTest):
     """
     Tests for the AIClassifier model.
@@ -122,7 +138,7 @@ class AIGradingWorkflowTest(CacheResetTest):
 
         # Create a rubric with a similar structure, but different prompt
         similar_rubric_dict = copy.deepcopy(RUBRIC)
-        similar_rubric_dict['prompt'] = 'Different prompt!'
+        similar_rubric_dict['prompts'] = [{"description": 'Different prompt!'}]
         self.similar_rubric = rubric_from_dict(similar_rubric_dict)
 
     def test_assign_most_recent_classifier_set(self):

openassessment/assessment/test/test_rubric.py

@@ -161,7 +161,7 @@ class RubricHashTest(CacheResetTest):
 
         # Same structure, but different text should have the same structure hash
         altered_rubric = copy.deepcopy(RUBRIC)
-        altered_rubric['prompt'] = 'altered!'
+        altered_rubric['prompts'] = [{"description": 'altered!'}]
         for criterion in altered_rubric['criteria']:
             criterion['prompt'] = 'altered!'
             for option in criterion['options']:

openassessment/management/commands/simulate_ai_grading_error.py

@@ -45,7 +45,7 @@ class Command(BaseCommand):
     ]
 
     RUBRIC = {
-        'prompt': u"Test prompt",
+        'prompts': [{"description": u"Test prompt"}],
         'criteria': [
             {
                 "order_num": 0,
@@ -91,7 +91,7 @@ class Command(BaseCommand):
     }
 
     STUDENT_ID = u'test_student'
-    ANSWER = {'answer': 'test answer'}
+    ANSWER = {"text": 'test answer'}
 
     def handle(self, *args, **options):
         """

openassessment/templates/openassessmentblock/edit/oa_edit.html

 {% load i18n %}
 {% load tz %}
 {% spaceless %}
-<div id="openassessment-editor" class="editor-with-buttons editor-with-tabs">
+<div
+    id="openassessment-editor"
+    class="editor-with-buttons editor-with-tabs"
+    data-is-released="{{ is_released|lower }}"
+>
     <div class="openassessment_editor_content_and_tabs">
 
         <div id="openassessment_editor_header">
@@ -25,9 +29,7 @@
             </a>
         </div>
 
-        <div id="oa_prompt_editor_wrapper" class="oa_editor_content_wrapper">
-            <textarea id="openassessment_prompt_editor" maxlength="10000">{{ prompt }}</textarea>
-        </div>
+        {% include "openassessmentblock/edit/oa_edit_prompts.html"  %}
 
         {% include "openassessmentblock/edit/oa_edit_rubric.html"  %}
 

openassessment/templates/openassessmentblock/edit/oa_edit_criterion.html

 {% load i18n %}
 {% spaceless %}
 <li class="openassessment_criterion is-collapsible" data-criterion="{{ criterion_name }}">
-    <div class="openassessment_criterion_header view-outline">
+    <div class="openassessment_container_header openassessment_criterion_header view-outline">
         <a class="action expand-collapse collapse"><i class="icon-caret-down ui-toggle-expansion"></i></a>
-        <div class="openassessment_criterion_header_title_box">
-            <h6 class="openassessment_criterion_header_title">{% trans "Criterion" %}</h6>
-            <p class="openassessment_criterion_guide">{% trans "You cannot delete a criterion after the assignment has been released." %}</p>
+        <div class="openassessment_container_header_title_box openassessment_criterion_header_title_box">
+            <h6 class="openassessment_container_header_title openassessment_criterion_header_title">{% trans "Criterion" %}</h6>
+            <p class="openassessment_container_guide openassessment_criterion_guide">{% trans "You cannot delete a criterion after the assignment has been released." %}</p>
         </div>
-        <div class="openassessment_criterion_remove_button"><h2>{% trans "Remove" %}</h2></div>
+        <div class="openassessment_container_remove_button openassessment_criterion_remove_button"><h2>{% trans "Remove" %}</h2></div>
     </div>
     <div class="openassessment_criterion_body wrapper-comp-settings">
         <input type="hidden" class="openassessment_criterion_name" value="{{ criterion_name }}" />

openassessment/templates/openassessmentblock/edit/oa_edit_prompt.html

+{% load i18n %}
+{% spaceless %}
+<li class="openassessment_prompt is-collapsible" data-prompt="{{ prompt_uuid }}">
+
+    <div class="openassessment_container_header openassessment_prompt_header view-outline">
+        <a class="action expand-collapse collapse"><i class="icon-caret-down ui-toggle-expansion"></i></a>
+        <div class="openassessment_container_header_title_box openassessment_prompt_header_title_box">
+            <h6 class="openassessment_container_header_title openassessment_prompt_header_title">{% trans "Prompt" %}</h6>
+            <p class="openassessment_container_guide openassessment_prompt_guide">{% trans "You cannot delete a prompt after the assignment has been released." %}</p>
+        </div>
+        <div class="openassessment_container_remove_button openassessment_prompt_remove_button"><h2>{% trans "Remove" %}</h2></div>
+    </div>
+
+    <div class="openassessment_prompt_body wrapper-comp-settings">
+        <input type="hidden" class="openassessment_prompt_uuid" value="{{ prompt_uuid }}" />
+
+        <ul class="list-input settings-list">
+            <li class="field comp-setting-entry openassessment_prompt_description_wrapper">
+                <div class="wrapper-comp-settings">
+                    <textarea class="openassessment_prompt_description setting-input" maxlength="10000">{{ prompt_description }}</textarea>
+                </div>
+            </li>
+        </ul>
+
+    </div>
+</li>
+{% endspaceless %}

openassessment/templates/openassessmentblock/edit/oa_edit_prompts.html

+{% load i18n %}
+{% spaceless %}
+<div id="oa_prompts_editor_wrapper" class="oa_editor_content_wrapper">
+    <div id="openassessment_prompt_template" class="is--hidden">
+        {% include "openassessmentblock/edit/oa_edit_prompt.html" with prompt_uuid="" prompt_description="" %}
+    </div>
+
+    <div id="openassessment_prompts_instructions" class="openassessment_tab_instructions">
+        <p class="openassessment_description">
+            {% trans "Prompts. Replace the sample text with your own text. For more information, see the ORA documentation." %}
+        </p>
+    </div>
+
+    <ul id="openassessment_prompts_list">
+        {% for prompt in prompts %}
+            {% include "openassessmentblock/edit/oa_edit_prompt.html" with prompt_uuid=prompt.uuid prompt_description=prompt.description %}
+        {% endfor %}
+    </ul>
+
+    <div id="openassessment_prompts_add_prompt" class="openassessment_container_add_button">
+        <h6>
+            {% trans "Add Prompt" %}
+        </h6>
+    </div>
+</div>
+{% endspaceless %}

openassessment/templates/openassessmentblock/edit/oa_edit_rubric.html

@@ -9,7 +9,7 @@
         {% include "openassessmentblock/edit/oa_edit_option.html" with option_name="" option_label="" option_points=1 option_explanation="" %}
     </div>
 
-    <div id="openassessment_rubric_instructions">
+    <div id="openassessment_rubric_instructions" class="openassessment_tab_instructions">
         <p class="openassessment_description">
             {% trans "Rubrics are made up of criteria, which usually contain one or more options. Each option has a point value. This template contains two sample criteria and their options. Replace the sample text with your own text. For more information, see the ORA documentation." %}
         </p>
@@ -21,7 +21,7 @@
         {% endfor %}
     </ul>
 
-    <div id="openassessment_rubric_add_criterion">
+    <div id="openassessment_rubric_add_criterion" class="openassessment_container_add_button">
         <h6>
             {% trans "Add Criterion" %}
         </h6>

openassessment/templates/openassessmentblock/edit/oa_edit_student_training.html

@@ -33,6 +33,11 @@
         <ol id="openassessment_training_example_criterion_template" class="is--hidden">
             {% include "openassessmentblock/edit/oa_training_example_criterion.html" %}
         </ol>
+        <ol id="openassessment_training_example_part_template" class="is--hidden">
+            <li class="openassessment_training_example_essay_part">
+                <textarea maxlength="100000"></textarea>
+            </li>
+        </ol>
     </div>
 
 </li>

openassessment/templates/openassessmentblock/edit/oa_training_example.html

@@ -28,7 +28,13 @@
 
         <div class="openassessment_training_example_essay_wrapper">
             <h2>{% trans "Response" %}</h2>
-            <textarea class="openassessment_training_example_essay" maxlength="100000">{{ example.answer }}</textarea>
+            <ol class="openassessment_training_example_essay">
+                {% for part in example.answer.parts %}
+                    <li class="openassessment_training_example_essay_part">
+                        <textarea maxlength="100000">{{ part.text }}</textarea>
+                    </li>
+                {% endfor %}
+            </ol>
         </div>
     </div>
 </li>

openassessment/templates/openassessmentblock/leaderboard/oa_leaderboard_show.html

@@ -20,7 +20,7 @@
                                 {% if topscore.file %}
                                 <img class="leaderboard__score__image" alt="{% trans "The image associated with your peer's submission." %}" src="{{ topscore.file }}" />
                                 {% endif %}
-                                {{ topscore.content|linebreaks }}
+                                {% include "openassessmentblock/oa_submission_answer.html" with answer=topscore.submission.answer answer_text_label="Your peer's response to the question above:" %}
                             </div>
                         </li>
                     {% endfor %}

openassessment/templates/openassessmentblock/oa_base.html

@@ -15,18 +15,6 @@
                 {% endblock %}
             </div>
 
-            <div class="wrapper--openassessment__prompt">
-                {% if question %}
-                <article class="openassessment__prompt ui-toggle-visibility">
-                    <h2 class="openassessment__prompt__title">{% trans "The prompt for this assignment" %}</h2>
-
-                    <div class="openassessment__prompt__copy ui-toggle-visibility__content">
-                        {{ question|linebreaks }}
-                    </div>
-                </article>
-                {% endif %}
-            </div>
-
             <ol class="openassessment__steps" id="openassessment__steps">
                 {% for assessment in rubric_assessments %}
                     <li id="{{ assessment.class_id }}" class="openassessment__steps__step is--loading">

openassessment/templates/openassessmentblock/oa_submission_answer.html

+{% spaceless %}
+{% load i18n %}
+<ol class="submission__answer__display__content">
+    {% for part in answer.parts %}
+        <li class="submission__answer__part">
+            <article class="submission__answer__part__prompt">
+                <h2 class="submission__answer__part__prompt__title">{% trans "The question for this section." %}</h2>
+                <div class="submission__answer__part__prompt__value">
+                    {{ part.prompt.description|linebreaks }}
+                </div>
+            </article>
+            <div class="submission__answer__part__text">
+                <h2 class="submission__answer__part__text__title">{% trans answer_text_label %}</h2>
+                <div class="submission__answer__part__text__value">
+                    {{ part.text|linebreaks }}
+                </div>
+            </div>
+        </li>
+    {% endfor %}
+</ol>
+{% endspaceless %}

openassessment/templates/openassessmentblock/peer/oa_peer_assessment.html

@@ -66,9 +66,7 @@
                                     </h3>
                                 </header>
 
-                                <div class="peer-assessment__display__response">
-                                    {{ peer_submission.answer.text|linebreaks }}
-                                </div>
+                                {% include "openassessmentblock/oa_submission_answer.html" with answer=peer_submission.answer answer_text_label="Your peer's response to the question above:" %}
 
                                 {% if allow_file_upload and peer_file_url %}
                                 <header class="peer-assessment__display__header">

openassessment/templates/openassessmentblock/peer/oa_peer_turbo_mode.html

@@ -50,9 +50,7 @@
                                 </h3>
                             </header>
 
-                            <div class="peer-assessment__display__response">
-                                {{ peer_submission.answer.text|linebreaks }}
-                            </div>
+                            {% include "openassessmentblock/oa_submission_answer.html" with answer=peer_submission.answer answer_text_label="Your peer's response to the question above:" %}
 
                             {% if allow_file_upload and peer_file_url %}
                                 <header class="peer-assessment__display__header">

openassessment/templates/openassessmentblock/response/oa_response.html

@@ -52,15 +52,26 @@
             <div class="step__content">
                 <form id="response__submission" class="response__submission">
                     <ol class="list list--fields response__submission__content">
-                        <li class="field field--textarea submission__answer" id="submission__answer">
-                            <label class="sr" for="submission__answer__value">{% trans "Enter your response to the question." %}</label>
-                            <textarea
-                                id="submission__answer__value"
-                                placeholder=""
-                                maxlength="100000"
-                            >{{ saved_response }}</textarea>
-                            <span class="tip">{% trans "You may continue to work on your response until you submit it." %}</span>
-                        </li>
+                        {% for part in saved_response.answer.parts %}
+                            <li class="submission__answer__part">
+                                <article class="submission__answer__part__prompt ui-toggle-visibility">
+                                    <h2 class="submission__answer__part__prompt__title">{% trans "The prompt for this section." %}</h2>
+
+                                    <div class="submission__answer__part__prompt__copy ui-toggle-visibility__content">
+                                        {{ part.prompt.description|linebreaks }}
+                                    </div>
+                                </article>
+                                <div class="field field--textarea submission__answer__part__text">
+                                    <label class="sr" for="submission__answer__part__text__{{ forloop.counter }}">{% trans "Your response to the question above." %}</label>
+                                    <textarea
+                                        id="submission__answer__part__text__{{ forloop.counter }}"
+                                        class="submission__answer__part__text__value"
+                                        placeholder="Enter your response to the question above."
+                                        maxlength="100000"
+                                    >{{ part.text }}</textarea>
+                                </div>
+                            </li>
+                        {% endfor %}
                         {% if allow_file_upload %}
                         <li class="field">
                             <div id="upload__error">
@@ -86,6 +97,8 @@
                         {% endif %}
                     </ol>
 
+                    <span class="tip">{% trans "You may continue to work on your response until you submit it." %}</span>
+
                     <div class="response__submission__actions">
                         <div class="message message--inline message--error message--error-server">
                             <h3 class="message__title">{% trans "We could not save your progress" %}</h3>

openassessment/templates/openassessmentblock/response/oa_response_submitted.html

@@ -42,9 +42,7 @@
             <article class="submission__answer__display">
                 <h3 class="submission__answer__display__title">{% trans "Your Response" %}</h3>
 
-                <div class="submission__answer__display__content">
-                    {{ student_submission.answer.text|linebreaks }}
-                </div>
+                {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label="Your response to the question above:" %}
 
                 {% if allow_file_upload and file_url %}
                 <h3 class="submission__answer__display__title">{% trans "Your Image" %}</h3>

openassessment/templates/openassessmentblock/self/oa_self_assessment.html

@@ -43,9 +43,7 @@
                         <h3 class="self-assessment__display__title">{% trans "Your Response" %}</h3>
                     </header>
 
-                    <div class="self-assessment__display__response">
-                        {{ self_submission.answer.text|linebreaks }}
-                    </div>
+                    {% include "openassessmentblock/oa_submission_answer.html" with answer=self_submission.answer answer_text_label="Your response to the question above:" %}
 
                     {% if allow_file_upload and self_file_url %}
                     <header class="self-assessment__display__header">

openassessment/templates/openassessmentblock/staff_debug/student_info.html

@@ -21,7 +21,7 @@
                             Comments: {{ comments }}
                         {% endblocktrans %}
                     {% else %}
-                        {{ submission.answer.text|linebreaks }}
+                        {% include "openassessmentblock/oa_submission_answer.html" with answer=submission.answer answer_text_label="The student's response to the question above:" %}
                     {% endif %}
                 </div>
 

openassessment/templates/openassessmentblock/student_training/student_training.html

@@ -72,9 +72,8 @@
                         {% endwith %}
                     </header>
 
-                    <div class="student-training__display__response">
-                        {{ training_essay|linebreaks }}
-                    </div>
+                    {% include "openassessmentblock/oa_submission_answer.html" with answer=training_essay.answer answer_text_label="The response to the question above:" %}
+
                 </article>
 
                 <form id="student-training--001__assessment" class="student-training__assessment" method="post">

openassessment/workflow/test/test_api.py

@@ -32,6 +32,9 @@ RUBRIC_DICT = {
     ]
 }
 
+ANSWER_1 = {"text": "Shoot Hot Rod"}
+ANSWER_2 = {"text": "Ultra Magnus fumble"}
+
 ALGORITHM_ID = "Ease"
 
 ON_INIT_PARAMS = {
@@ -64,7 +67,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
         first_step = data["steps"][0] if data["steps"] else "peer"
         if "ai" in data["steps"]:
             first_step = data["steps"][1] if len(data["steps"]) > 1 else "waiting"
-        submission = sub_api.create_submission(ITEM_1, "Shoot Hot Rod")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_1)
         workflow = workflow_api.create_workflow(submission["uuid"], data["steps"], ON_INIT_PARAMS)
 
         workflow_keys = set(workflow.keys())
@@ -147,7 +150,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
         self.assertEquals("waiting", workflow['status'])
 
     def test_update_peer_workflow(self):
-        submission = sub_api.create_submission(ITEM_1, "Shoot Hot Rod")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_1)
         workflow = workflow_api.create_workflow(submission["uuid"], ["training", "peer"], ON_INIT_PARAMS)
         StudentTrainingWorkflow.create_workflow(submission_uuid=submission["uuid"])
         requirements = {
@@ -200,7 +203,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
     @patch.object(ai_api, 'assessment_is_finished')
     @patch.object(ai_api, 'get_score')
     def test_ai_score_set(self, mock_score, mock_is_finished):
-        submission = sub_api.create_submission(ITEM_1, "Ultra Magnus fumble")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_2)
         mock_is_finished.return_value = True
         score = {"points_earned": 7, "points_possible": 10}
         mock_score.return_value = score
@@ -213,7 +216,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
     @ddt.unpack
     @raises(workflow_api.AssessmentWorkflowInternalError)
     def test_create_ai_workflow_no_rubric(self, rubric, algorithm_id):
-        submission = sub_api.create_submission(ITEM_1, "Shoot Hot Rod")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_1)
         on_init_params = {
             'ai': {
                 'rubric': rubric,
@@ -226,7 +229,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
     @raises(workflow_api.AssessmentWorkflowInternalError)
     def test_ai_on_init_failures(self, mock_on_init):
         mock_on_init.side_effect = AIError("Kaboom!")
-        submission = sub_api.create_submission(ITEM_1, "Ultra Magnus fumble")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_2)
         workflow_api.create_workflow(submission["uuid"], ["ai"], ON_INIT_PARAMS)
 
     @patch.object(Submission.objects, 'get')
@@ -241,14 +244,14 @@ class TestAssessmentWorkflowApi(CacheResetTest):
     @raises(workflow_api.AssessmentWorkflowInternalError)
     def test_unexpected_workflow_errors_wrapped(self, data, mock_create):
         mock_create.side_effect = DatabaseError("Kaboom!")
-        submission = sub_api.create_submission(ITEM_1, "Ultra Magnus fumble")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_2)
         workflow_api.create_workflow(submission["uuid"], data["steps"], ON_INIT_PARAMS)
 
     @patch.object(PeerWorkflow.objects, 'get_or_create')
     @raises(workflow_api.AssessmentWorkflowInternalError)
     def test_unexpected_peer_workflow_errors_wrapped(self, mock_create):
         mock_create.side_effect = DatabaseError("Kaboom!")
-        submission = sub_api.create_submission(ITEM_1, "Ultra Magnus fumble")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_2)
         workflow_api.create_workflow(submission["uuid"], ["peer", "self"], ON_INIT_PARAMS)
 
     @patch.object(AssessmentWorkflow.objects, 'get')
@@ -256,7 +259,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
     @raises(workflow_api.AssessmentWorkflowInternalError)
     def test_unexpected_exception_wrapped(self, data, mock_create):
         mock_create.side_effect = Exception("Kaboom!")
-        submission = sub_api.create_submission(ITEM_1, "Ultra Magnus fumble")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_2)
         workflow_api.update_from_assessments(submission["uuid"], data["steps"])
 
     @ddt.file_data('data/assessments.json')
@@ -363,7 +366,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
 
     def test_cancel_the_assessment_workflow(self):
         # Create the submission and assessment workflow.
-        submission = sub_api.create_submission(ITEM_1, "Shoot Hot Rod")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_1)
         workflow = workflow_api.create_workflow(submission["uuid"], ["peer"])
 
         requirements = {
@@ -403,7 +406,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
 
     def test_cancel_the_assessment_workflow_does_not_exist(self):
         # Create the submission and assessment workflow.
-        submission = sub_api.create_submission(ITEM_1, "Shoot Hot Rod")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_1)
         workflow = workflow_api.create_workflow(submission["uuid"], ["peer"])
 
         requirements = {
@@ -432,7 +435,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
 
     def test_get_the_cancelled_workflow(self):
         # Create the submission and assessment workflow.
-        submission = sub_api.create_submission(ITEM_1, "Shoot Hot Rod")
+        submission = sub_api.create_submission(ITEM_1, ANSWER_1)
         workflow = workflow_api.create_workflow(submission["uuid"], ["peer"])
 
         requirements = {

openassessment/xblock/data_conversion.py

@@ -2,6 +2,7 @@
 Data Conversion utility methods for handling ORA2 XBlock data transformations.
 
 """
+import json
 
 
 def convert_training_examples_list_to_dict(examples_list):
@@ -19,7 +20,15 @@ def convert_training_examples_list_to_dict(examples_list):
     Example:
         >>> examples = [
         >>>     {
-        >>>         "answer": "This is my response",
+        >>>         "answer": {
+        >>>             "parts": {
+        >>>                 [
+        >>>                     {"text:" "Answer part 1"},
+        >>>                     {"text:" "Answer part 2"},
+        >>>                     {"text:" "Answer part 3"}
+        >>>                 ]
+        >>>             }
+        >>>         },
         >>>         "options_selected": [
         >>>             {
         >>>                 "criterion": "Ideas",
@@ -35,7 +44,15 @@ def convert_training_examples_list_to_dict(examples_list):
         >>> convert_training_examples_list_to_dict(examples)
         [
             {
-                'answer': 'This is my response',
+                'answer': {
+                    'parts': {
+                        [
+                            {'text:' 'Answer part 1'},
+                            {'text:' 'Answer part 2'},
+                            {'text:' 'Answer part 3'}
+                        ]
+                    }
+                 },
                 'options_selected': {
                     'Ideas': 'Fair',
                     'Content': 'Good'
@@ -56,13 +73,63 @@ def convert_training_examples_list_to_dict(examples_list):
     ]
 
 
-def create_rubric_dict(prompt, criteria):
+def update_assessments_format(assessments):
+    """
+    For each example update 'answer' to newer format.
+
+    Args:
+        assessments (list): list of assessments
+    Returns:
+        list of dict
+    """
+    for assessment in assessments:
+        if 'examples' in assessment:
+            for example in assessment['examples']:
+                if isinstance(example['answer'], unicode) or isinstance(example['answer'], str):
+                    example['answer'] = {
+                        'parts': [
+                            {'text': example['answer']}
+                        ]
+                    }
+    return assessments
+
+
+def create_prompts_list(prompt_or_serialized_prompts):
+    """
+    Construct a list of prompts.
+
+    Initially a block had a single prompt which was saved as a simple string.
+    In that case a new prompt dict is constructed from it.
+
+    Args:
+        prompt_or_serialized_prompts (unicode): A string which can either
+        be a single prompt text or json for a list of prompts.
+
+    Returns:
+        list of dict
+    """
+
+    if prompt_or_serialized_prompts is None:
+        prompt_or_serialized_prompts = ''
+
+    try:
+        prompts = json.loads(prompt_or_serialized_prompts)
+    except ValueError:
+        prompts = [
+            {
+                'description': prompt_or_serialized_prompts,
+            }
+        ]
+    return prompts
+
+
+def create_rubric_dict(prompts, criteria):
     """
     Construct a serialized rubric model in the format expected
     by the assessments app.
 
     Args:
-        prompt (unicode): The rubric prompt.
+        prompts (list of dict): The rubric prompts.
         criteria (list of dict): The serialized rubric criteria.
 
     Returns:
@@ -70,7 +137,7 @@ def create_rubric_dict(prompt, criteria):
 
     """
     return {
-        "prompt": prompt,
+        "prompts" : prompts,
         "criteria": criteria
     }
 
@@ -96,6 +163,46 @@ def clean_criterion_feedback(rubric_criteria, criterion_feedback):
     }
 
 
+def prepare_submission_for_serialization(submission_data):
+    """
+    Convert a list of answers into the right format dict for serialization.
+
+    Args:
+        submission_data (list of unicode): The answers.
+
+    Returns:
+        dict
+    """
+    return {
+        'parts': [{'text': text} for text in submission_data],
+    }
+
+
+def create_submission_dict(submission, prompts):
+    """
+    1. Convert from legacy format.
+    3. Add prompts to submission['answer']['parts'] to simplify iteration in the template.
+
+    Args:
+        submission (dict): Submission dictionary.
+        prompts (list of dict): The prompts from the problem definition.
+
+    Returns:
+        dict
+    """
+    parts = [{ 'prompt': prompt, 'text': ''} for prompt in prompts]
+
+    if 'text' in submission['answer']:
+        parts[0]['text'] = submission['answer'].pop('text')
+    else:
+        for index, part in enumerate(submission['answer'].pop('parts')):
+            parts[index]['text'] = part['text']
+
+    submission['answer']['parts'] = parts
+
+    return submission
+
+
 def make_django_template_key(key):
     """
     Django templates access dictionary items using dot notation,

openassessment/xblock/leaderboard_mixin.py

@@ -4,9 +4,12 @@ Leaderboard step in the OpenAssessment XBlock.
 from django.utils.translation import ugettext as _
 from xblock.core import XBlock
 
-from openassessment.assessment.errors import SelfAssessmentError, PeerAssessmentError
 from submissions import api as sub_api
+
+from openassessment.assessment.errors import SelfAssessmentError, PeerAssessmentError
 from openassessment.fileupload import api as file_upload_api
+from openassessment.xblock.data_conversion import create_submission_dict
+
 
 class LeaderboardMixin(object):
     """Leaderboard Mixin introduces all handlers for displaying the leaderboard
@@ -72,13 +75,16 @@ class LeaderboardMixin(object):
         for score in scores:
             if 'file_key' in score['content']:
                 score['file'] = file_upload_api.get_download_url(score['content']['file_key'])
-            if 'text' in score['content']:
-                score['content'] = score['content']['text']
+            if 'text' in score['content'] or 'parts' in score['content']:
+                submission = {'answer': score.pop('content')}
+                score['submission'] = create_submission_dict(submission, self.prompts)
             elif isinstance(score['content'], basestring):
                 pass
             # Currently, we do not handle non-text submissions.
             else:
-                score['content'] = ""
+                score['submission'] = ""
+
+            score.pop('content', None)
 
         context = { 'topscores': scores,
                     'allow_latex': self.allow_latex,

openassessment/xblock/openassessmentblock.py

 """An XBlock where students can read a question and compose their response"""
 
+import copy
 import datetime as dt
+import json
 import logging
 import pkg_resources
-import copy
 
 import pytz
 
@@ -31,7 +32,7 @@ from openassessment.workflow.errors import AssessmentWorkflowError
 from openassessment.xblock.student_training_mixin import StudentTrainingMixin
 from openassessment.xblock.validation import validator
 from openassessment.xblock.resolve_dates import resolve_dates, DISTANT_PAST, DISTANT_FUTURE
-from openassessment.xblock.data_conversion import create_rubric_dict
+from openassessment.xblock.data_conversion import create_prompts_list, create_rubric_dict, update_assessments_format
 
 
 logger = logging.getLogger(__name__)
@@ -144,7 +145,7 @@ class OpenAssessmentBlock(
     prompt = String(
         default=DEFAULT_PROMPT,
         scope=Scope.content,
-        help="A prompt to display to a student (plain text)."
+        help="The prompts to display to a student."
     )
 
     rubric_criteria = List(
@@ -283,7 +284,7 @@ class OpenAssessmentBlock(
         # All data we intend to pass to the front end.
         context_dict = {
             "title": self.title,
-            "question": self.prompt,
+            "prompts": self.prompts,
             "rubric_assessments": ui_models,
             "show_staff_debug_info": self.is_course_staff and not self.in_studio_preview,
         }
@@ -418,7 +419,7 @@ class OpenAssessmentBlock(
 
         xblock_validator = validator(block, block._, strict_post_release=False)
         xblock_validator(
-            create_rubric_dict(config['prompt'], config['rubric_criteria']),
+            create_rubric_dict(config['prompts'], config['rubric_criteria']),
             config['rubric_assessments'],
             submission_start=config['submission_start'],
             submission_due=config['submission_due'],
@@ -432,7 +433,7 @@ class OpenAssessmentBlock(
         block.submission_start = config['submission_start']
         block.submission_due = config['submission_due']
         block.title = config['title']
-        block.prompt = config['prompt']
+        block.prompts = config['prompts']
         block.allow_file_upload = config['allow_file_upload']
         block.allow_latex = config['allow_latex']
         block.leaderboard_show = config['leaderboard_show']
@@ -445,6 +446,40 @@ class OpenAssessmentBlock(
         return i18nService.ugettext
 
     @property
+    def prompts(self):
+        """
+        Return the prompts.
+
+        Initially a block had a single prompt which was saved as a simple
+        string in the prompt field. Now prompts are saved as a serialized
+        list of dicts in the same field. If prompt field contains valid json,
+        parse and return it. Otherwise, assume it is a simple string prompt
+        and return it in a list of dict.
+
+        Returns:
+            list of dict
+        """
+        return create_prompts_list(self.prompt)
+
+    @prompts.setter
+    def prompts(self, value):
+        """
+        Serialize the prompts and save to prompt field.
+
+        Args:
+            value (list of dict): The prompts to set.
+        """
+
+        if value is None:
+            self.prompt = None
+        elif len(value) == 1:
+            # For backwards compatibility. To be removed after all code
+            # is migrated to use prompts property instead of prompt field.
+            self.prompt = value[0]['description']
+        else:
+            self.prompt = json.dumps(value)
+
+    @property
     def valid_assessments(self):
         """
         Return a list of assessment dictionaries that we recognize.
@@ -456,10 +491,11 @@ class OpenAssessmentBlock(
             list
 
         """
-        return [
+        _valid_assessments = [
             asmnt for asmnt in self.rubric_assessments
             if asmnt.get('name') in VALID_ASSESSMENT_TYPES
         ]
+        return update_assessments_format(copy.deepcopy(_valid_assessments))
 
     @property
     def assessment_steps(self):

openassessment/xblock/peer_assessment_mixin.py

@@ -12,7 +12,7 @@ from openassessment.workflow.errors import AssessmentWorkflowError
 from openassessment.xblock.defaults import DEFAULT_RUBRIC_FEEDBACK_TEXT
 from .data_conversion import create_rubric_dict
 from .resolve_dates import DISTANT_FUTURE
-from .data_conversion import clean_criterion_feedback
+from .data_conversion import clean_criterion_feedback, create_submission_dict
 
 logger = logging.getLogger(__name__)
 
@@ -86,7 +86,7 @@ class PeerAssessmentMixin(object):
                     data['options_selected'],
                     clean_criterion_feedback(self.rubric_criteria_with_labels, data['criterion_feedback']),
                     data['overall_feedback'],
-                    create_rubric_dict(self.prompt, self.rubric_criteria_with_labels),
+                    create_rubric_dict(self.prompts, self.rubric_criteria_with_labels),
                     assessment_ui_model['must_be_graded_by']
                 )
 
@@ -231,7 +231,7 @@ class PeerAssessmentMixin(object):
             peer_sub = self.get_peer_submission(student_item, assessment)
             if peer_sub:
                 path = 'openassessmentblock/peer/oa_peer_turbo_mode.html'
-                context_dict["peer_submission"] = peer_sub
+                context_dict["peer_submission"] = create_submission_dict(peer_sub, self.prompts)
 
                 # Determine if file upload is supported for this XBlock.
                 context_dict["allow_file_upload"] = self.allow_file_upload
@@ -247,7 +247,7 @@ class PeerAssessmentMixin(object):
             peer_sub = self.get_peer_submission(student_item, assessment)
             if peer_sub:
                 path = 'openassessmentblock/peer/oa_peer_assessment.html'
-                context_dict["peer_submission"] = peer_sub
+                context_dict["peer_submission"] = create_submission_dict(peer_sub, self.prompts)
                 # Determine if file upload is supported for this XBlock.
                 context_dict["allow_file_upload"] = self.allow_file_upload
                 context_dict["peer_file_url"] = self.get_download_url_from_submission(peer_sub)

openassessment/xblock/schema.py

@@ -66,7 +66,11 @@ VALID_ASSESSMENT_TYPES = [
 
 # Schema definition for an update from the Studio JavaScript editor.
 EDITOR_UPDATE_SCHEMA = Schema({
-    Required('prompt'): utf8_validator,
+    Required('prompts'): [
+        Schema({
+            Required('description'): utf8_validator,
+        })
+    ],
     Required('title'): utf8_validator,
     Required('feedback_prompt'): utf8_validator,
     Required('feedback_default_text'): utf8_validator,
@@ -84,7 +88,7 @@ EDITOR_UPDATE_SCHEMA = Schema({
             'must_be_graded_by': All(int, Range(min=0)),
             'examples': [
                 Schema({
-                    Required('answer'): utf8_validator,
+                    Required('answer'): [utf8_validator],
                     Required('options_selected'): [
                         Schema({
                             Required('criterion'): utf8_validator,

openassessment/xblock/self_assessment_mixin.py

@@ -8,7 +8,7 @@ from openassessment.workflow import api as workflow_api
 from submissions import api as submission_api
 from .data_conversion import create_rubric_dict
 from .resolve_dates import DISTANT_FUTURE
-from .data_conversion import clean_criterion_feedback
+from .data_conversion import clean_criterion_feedback, create_submission_dict
 
 logger = logging.getLogger(__name__)
 
@@ -88,7 +88,7 @@ class SelfAssessmentMixin(object):
                 submission = submission_api.get_submission(self.submission_uuid)
                 context["rubric_criteria"] = self.rubric_criteria_with_labels
                 context["estimated_time"] = "20 minutes"  # TODO: Need to configure this.
-                context["self_submission"] = submission
+                context["self_submission"] = create_submission_dict(submission, self.prompts)
 
                 # Determine if file upload is supported for this XBlock.
                 context["allow_file_upload"] = self.allow_file_upload
@@ -133,7 +133,7 @@ class SelfAssessmentMixin(object):
                 data['options_selected'],
                 clean_criterion_feedback(self.rubric_criteria, data['criterion_feedback']),
                 data['overall_feedback'],
-                create_rubric_dict(self.prompt, self.rubric_criteria_with_labels)
+                create_rubric_dict(self.prompts, self.rubric_criteria_with_labels)
             )
             self.publish_assessment_event("openassessmentblock.self_assess", assessment)
 

openassessment/xblock/staff_info_mixin.py

@@ -16,7 +16,7 @@ from openassessment.workflow.errors import (
 from openassessment.assessment.errors.ai import AIError
 from openassessment.xblock.resolve_dates import DISTANT_PAST, DISTANT_FUTURE
 from openassessment.xblock.data_conversion import (
-    create_rubric_dict, convert_training_examples_list_to_dict
+    create_rubric_dict, convert_training_examples_list_to_dict, create_submission_dict
 )
 from submissions import api as submission_api
 from openassessment.assessment.api import peer as peer_api
@@ -138,7 +138,7 @@ class StaffInfoMixin(object):
         context['display_reschedule_unfinished_tasks'] = display_ai_staff_info
         if display_ai_staff_info:
             context['classifierset'] = ai_api.get_classifier_set_info(
-                create_rubric_dict(self.prompt, self.rubric_criteria_with_labels),
+                create_rubric_dict(self.prompts, self.rubric_criteria_with_labels),
                 example_based_assessment['algorithm_id'],
                 student_item['course_id'],
                 student_item['item_id']
@@ -179,7 +179,7 @@ class StaffInfoMixin(object):
             examples = assessment["examples"]
             try:
                 workflow_uuid = ai_api.train_classifiers(
-                    create_rubric_dict(self.prompt, self.rubric_criteria_with_labels),
+                    create_rubric_dict(self.prompts, self.rubric_criteria_with_labels),
                     convert_training_examples_list_to_dict(examples),
                     student_item_dict.get('course_id'),
                     student_item_dict.get('item_id'),
@@ -285,7 +285,7 @@ class StaffInfoMixin(object):
             workflow_cancellation['cancelled_by'] = self.get_username(workflow_cancellation['cancelled_by_id'])
 
         context = {
-            'submission': submission,
+            'submission': create_submission_dict(submission, self.prompts) if submission else None,
             'workflow_cancellation': workflow_cancellation,
             'peer_assessments': peer_assessments,
             'submitted_assessments': submitted_assessments,

openassessment/xblock/static/js/fixtures/templates.json

@@ -86,7 +86,12 @@
     {
         "template": "openassessmentblock/response/oa_response.html",
         "context": {
-            "saved_response": "",
+            "saved_response": {"answer":
+                {"parts": [
+                    { "text": "", "prompt": { "description": "Prompt 1" }},
+                    { "text": "", "prompt": { "description": "Prompt 2" }}
+                ]}
+            },
             "save_status": "This response has not been saved.",
             "submit_enabled": false,
             "submission_due": ""
@@ -96,7 +101,18 @@
     {
         "template": "openassessmentblock/student_training/student_training.html",
         "context": {
-            "training_essay": "My special essay.",
+            "training_essay": {
+                "answer": {
+                    "parts": [
+                        {
+                            "prompt": {
+                                "description": "Given the state of the world today, what do you think should be done to combat poverty?"
+                            },
+                            "text": "My special essay."
+                        }
+                    ]
+                }
+            },
             "training_rubric": {
                 "criteria": [
                     {
@@ -398,7 +414,7 @@
     {
         "template": "openassessmentblock/edit/oa_edit.html",
         "context": {
-            "prompt": "How much do you like waffles?",
+            "prompts": [{ "description": "How much do you like waffles?" }, { "description": "How much do you like waffles 2?" }],
             "title": "The most important of all questions.",
             "submission_start": "2014-01-02T12:15",
             "submission_due": "2014-10-01T04:53",
@@ -479,7 +495,7 @@
     {
         "template": "openassessmentblock/edit/oa_edit.html",
         "context": {
-            "prompt": "Test prompt",
+            "prompts": [{ "description": "How much do you like waffles?" }, { "description": "How much do you like waffles 2?" }],
             "title": "Test title",
             "submission_start": "2014-01-1T10:00:00",
             "submission_due": "2014-10-1T10:00:00",
@@ -523,7 +539,12 @@
                 "training": {
                     "examples": [
                         {
-                            "answer": "Test answer",
+                            "answer": {
+                                "parts": [
+                                    { "text": "Test answer 1"},
+                                    { "text": "Test answer 2"}
+                                ]
+                            },
                             "criteria": [
                                 {
                                     "name": "criterion_with_two_options",
@@ -564,7 +585,12 @@
                         }
                     ],
                     "template": {
-                        "answer": "",
+                            "answer": {
+                                "parts": [
+                                    { "text": ""},
+                                    { "text": ""}
+                                ]
+                            },
                         "criteria": [
                             {
                                 "name": "criterion_with_two_options",

openassessment/xblock/static/js/spec/lms/oa_response.js

@@ -127,23 +127,29 @@ describe("OpenAssessment.ResponseView", function() {
         view.setAutoSaveEnabled(false);
     });
 
+    it("updates and retrieves response text correctly", function() {
+        view.response(['Test response 1', 'Test response 2']);
+        expect(view.response()[0]).toBe('Test response 1');
+        expect(view.response()[1]).toBe('Test response 2');
+    });
+
     it("updates submit/save buttons and save status when response text changes", function() {
         // Response is blank --> save/submit buttons disabled
-        view.response('');
+        view.response(['', '']);
         view.handleResponseChanged();
         expect(view.submitEnabled()).toBe(false);
         expect(view.saveEnabled()).toBe(false);
         expect(view.saveStatus()).toContain('This response has not been saved.');
 
         // Response is whitespace --> save/submit buttons disabled
-        view.response('               \n      \n      ');
+        view.response(['               \n      \n      ', ' ']);
         view.handleResponseChanged();
         expect(view.submitEnabled()).toBe(false);
         expect(view.saveEnabled()).toBe(false);
         expect(view.saveStatus()).toContain('This response has not been saved.');
 
         // Response is not blank --> submit button enabled
-        view.response('Test response');
+        view.response(['Test response 1', ' ']);
         view.handleResponseChanged();
         expect(view.submitEnabled()).toBe(true);
         expect(view.saveEnabled()).toBe(true);
@@ -159,7 +165,7 @@ describe("OpenAssessment.ResponseView", function() {
         expect(view.saveStatus()).toContain('saved but not submitted');
 
         // Response is not blank --> submit button enabled
-        view.response('Test response');
+        view.response(['Test response 1', 'Test response 2']);
         view.save();
         expect(view.submitEnabled()).toBe(true);
         expect(view.saveEnabled()).toBe(false);
@@ -168,21 +174,21 @@ describe("OpenAssessment.ResponseView", function() {
 
     it("shows unsaved draft only when response text has changed", function() {
         // Save the initial response
-        view.response('Lorem ipsum');
+        view.response(['Test response 1', 'Test response 2']);
         view.save();
         expect(view.saveEnabled()).toBe(false);
         expect(view.saveStatus()).toContain('saved but not submitted');
 
         // Keep the text the same, but trigger an update
         // Should still be saved
-        view.response('Lorem ipsum');
+        view.response(['Test response 1', 'Test response 2']);
         view.handleResponseChanged();
         expect(view.saveEnabled()).toBe(false);
         expect(view.saveStatus()).toContain('saved but not submitted');
 
         // Change the text
         // This should cause it to change to unsaved draft
-        view.response('changed ');
+        view.response(['Test response 1', 'Test response 3']);
         view.handleResponseChanged();
         expect(view.saveEnabled()).toBe(true);
         expect(view.saveStatus()).toContain('This response has not been saved.');
@@ -190,16 +196,16 @@ describe("OpenAssessment.ResponseView", function() {
 
     it("sends the saved submission to the server", function() {
         spyOn(server, 'save').andCallThrough();
-        view.response('Test response');
+        view.response(['Test response 1', 'Test response 2']);
         view.save();
-        expect(server.save).toHaveBeenCalledWith('Test response');
+        expect(server.save).toHaveBeenCalledWith(['Test response 1', 'Test response 2']);
     });
 
     it("submits a response to the server", function() {
         spyOn(server, 'submit').andCallThrough();
-        view.response('Test response');
+        view.response(['Test response 1', 'Test response 2']);
         view.submit();
-        expect(server.submit).toHaveBeenCalledWith('Test response');
+        expect(server.submit).toHaveBeenCalledWith(['Test response 1', 'Test response 2']);
     });
 
     it("allows the user to cancel before submitting", function() {
@@ -208,7 +214,7 @@ describe("OpenAssessment.ResponseView", function() {
         spyOn(server, 'submit').andCallThrough();
 
         // Start a submission
-        view.response('Test response');
+        view.response(['Test response 1', 'Test response 2']);
         view.submit();
 
         // Expect that the submission was not sent to the server
@@ -222,7 +228,7 @@ describe("OpenAssessment.ResponseView", function() {
             return $.Deferred(function(defer) {}).promise();
         });
 
-        view.response('Test response');
+        view.response(['Test response 1', 'Test response 2']);
         view.submit();
         expect(view.submitEnabled()).toBe(false);
     });
@@ -235,7 +241,7 @@ describe("OpenAssessment.ResponseView", function() {
             }).promise();
         });
 
-        view.response('Test response');
+        view.response(['Test response 1', 'Test response 2']);
         view.submit();
 
         // Expect the submit button to have been re-enabled
@@ -248,7 +254,7 @@ describe("OpenAssessment.ResponseView", function() {
         spyOn(server, 'submit').andCallThrough();
 
         // Start a submission
-        view.response('Test response');
+        view.response(['Test response 1', 'Test response 2']);
         view.submit();
 
         // Expect the submit button to be re-enabled
@@ -265,7 +271,7 @@ describe("OpenAssessment.ResponseView", function() {
         spyOn(view, 'load');
         spyOn(baseView, 'loadAssessmentModules');
 
-        view.response('Test response');
+        view.response(['Test response 1', 'Test response 2']);
         view.submit();
 
         // Expect the current and next step to have been reloaded
@@ -278,7 +284,7 @@ describe("OpenAssessment.ResponseView", function() {
         expect(view.unsavedWarningEnabled()).toBe(false);
 
         // Change the text, then expect the unsaved warning to be enabled.
-        view.response('Lorem ipsum');
+        view.response(['Lorem ipsum 1', 'Lorem ipsum 2']);
         view.handleResponseChanged();
 
         // Expect the unsaved work warning to be enabled
@@ -287,7 +293,7 @@ describe("OpenAssessment.ResponseView", function() {
 
     it("disables the unsaved work warning when the user saves a response", function() {
         // Change the text, then expect the unsaved warning to be enabled.
-        view.response('Lorem ipsum');
+        view.response(['Lorem ipsum 1', 'Lorem ipsum 2']);
         view.handleResponseChanged();
         expect(view.unsavedWarningEnabled()).toBe(true);
 
@@ -298,7 +304,7 @@ describe("OpenAssessment.ResponseView", function() {
 
     it("disables the unsaved work warning when the user submits a response", function() {
         // Change the text, then expect the unsaved warning to be enabled.
-        view.response('Lorem ipsum');
+        view.response(['Lorem ipsum 1', 'Lorem ipsum 2']);
         view.handleResponseChanged();
         expect(view.unsavedWarningEnabled()).toBe(true);
 
@@ -315,7 +321,7 @@ describe("OpenAssessment.ResponseView", function() {
         expect(view.saveStatus()).toContain('not been saved');
 
         // Change the response
-        view.response('Lorem ipsum');
+        view.response(['Lorem ipsum 1', 'Lorem ipsum 2']);
         view.handleResponseChanged();
 
         // Usually autosave would be called by a timer.
@@ -357,7 +363,7 @@ describe("OpenAssessment.ResponseView", function() {
         spyOn(server, 'save').andCallFake(function() { return errorPromise; });
 
         // Change the response and save it
-        view.response('Lorem ipsum');
+        view.response(['Lorem ipsum 1', 'Lorem ipsum 2']);
         view.handleResponseChanged();
         view.save();
 
@@ -378,7 +384,7 @@ describe("OpenAssessment.ResponseView", function() {
         view.AUTO_SAVE_WAIT = 900000;
 
         // Change the response
-        view.response('Lorem ipsum');
+        view.response(['Lorem ipsum 1', 'Lorem ipsum 2']);
         view.handleResponseChanged();
 
         // Autosave

openassessment/xblock/static/js/spec/oa_server.js

@@ -30,7 +30,7 @@ describe("OpenAssessment.Server", function() {
         );
     };
 
-    var PROMPT = "Hello this is the prompt yes.";
+    var PROMPTS = [{"description": "Hello this is the prompt yes."}];
     var FEEDBACK_PROMPT = "Prompt for feedback";
     var FEEDBACK_DEFAULT_TEXT = "Default feedback response text";
 
@@ -253,7 +253,7 @@ describe("OpenAssessment.Server", function() {
     it("updates the XBlock's editor context definition", function() {
         stubAjax(true, { success: true });
         server.updateEditorContext({
-            prompt: PROMPT,
+            prompts: PROMPTS,
             feedbackPrompt: FEEDBACK_PROMPT,
             feedback_default_text: FEEDBACK_DEFAULT_TEXT,
             title: TITLE,
@@ -268,7 +268,7 @@ describe("OpenAssessment.Server", function() {
         expect($.ajax).toHaveBeenCalledWith({
             type: "POST", url: '/update_editor_context',
             data: JSON.stringify({
-                prompt: PROMPT,
+                prompts: PROMPTS,
                 feedback_prompt: FEEDBACK_PROMPT,
                 feedback_default_text: FEEDBACK_DEFAULT_TEXT,
                 title: TITLE,

openassessment/xblock/static/js/spec/studio/oa_edit.js

@@ -43,7 +43,7 @@ describe("OpenAssessment.StudioView", function() {
 
     var EXPECTED_SERVER_DATA = {
         title: "The most important of all questions.",
-        prompt: "How much do you like waffles?",
+        prompts: [{"description": "How much do you like waffles?"}, {description : 'How much do you like waffles 2?'}],
         feedbackPrompt: "",
         submissionStart: "2014-01-02T12:15",
         submissionDue: "2014-10-01T04:53",
@@ -145,7 +145,7 @@ describe("OpenAssessment.StudioView", function() {
 
         // Top-level attributes
         expect(server.receivedData.title).toEqual(EXPECTED_SERVER_DATA.title);
-        expect(server.receivedData.prompt).toEqual(EXPECTED_SERVER_DATA.prompt);
+        expect(server.receivedData.prompts).toEqual(EXPECTED_SERVER_DATA.prompts);
         expect(server.receivedData.feedbackPrompt).toEqual(EXPECTED_SERVER_DATA.feedbackPrompt);
         expect(server.receivedData.submissionStart).toEqual(EXPECTED_SERVER_DATA.submissionStart);
         expect(server.receivedData.submissionDue).toEqual(EXPECTED_SERVER_DATA.submissionDue);

openassessment/xblock/static/js/spec/studio/oa_edit_assessments.js

@@ -180,7 +180,7 @@ describe("OpenAssessment edit assessment views", function() {
             expect(view.description()).toEqual({
                 examples: [
                     {
-                        answer: 'Test answer',
+                        answer: ['Test answer 1', 'Test answer 2'],
                         options_selected: [
                             {
                                 criterion: 'criterion_with_two_options',
@@ -197,7 +197,7 @@ describe("OpenAssessment edit assessment views", function() {
             expect(view.description()).toEqual({
                 examples: [
                     {
-                        answer: 'Test answer',
+                        answer: ['Test answer 1', 'Test answer 2'],
                         options_selected: [
                             {
                                 criterion: 'criterion_with_two_options',
@@ -206,7 +206,7 @@ describe("OpenAssessment edit assessment views", function() {
                         ]
                     },
                     {
-                        answer: '',
+                        answer: ['', ''],
                         options_selected: [
                             {
                                 criterion: 'criterion_with_two_options',

openassessment/xblock/static/js/spec/studio/oa_edit_prompt.js

@@ -2,7 +2,20 @@
 Tests for OpenAssessment prompt editing view.
 **/
 
-describe("OpenAssessment.EditPromptView", function() {
+describe("OpenAssessment.EditPromptViews", function() {
+
+    // Use a stub notifier implementation that simply stores
+    // the notifications it receives.
+    var notifier = null;
+    var StubNotifier = function() {
+        this.notifications = [];
+        this.notificationFired = function(name, data) {
+            this.notifications.push({
+                name: name,
+                data: data
+            });
+        };
+    };
 
     var view = null;
 
@@ -11,14 +24,84 @@ describe("OpenAssessment.EditPromptView", function() {
         loadFixtures('oa_edit.html');
 
         // Create the view
-        var element = $("#oa_prompt_editor_wrapper").get(0);
-        view = new OpenAssessment.EditPromptView(element);
+        var element = $("#oa_prompts_editor_wrapper").get(0);
+        notifier = new StubNotifier();
+        view = new OpenAssessment.EditPromptsView(element, notifier);
+    });
+
+    it("reads prompts from the editor", function() {
+        // This assumes a particular structure of the DOM,
+        // which is set by the HTML fixture.
+        var prompts = view.promptsDefinition();
+        expect(prompts.length).toEqual(2);
+
+        expect(prompts[0]).toEqual({
+            "description": "How much do you like waffles?"
+        });
     });
 
-    it("sets and loads prompt text", function() {
-        view.promptText("");
-        expect(view.promptText()).toEqual("");
-        view.promptText("This is a test prompt!");
-        expect(view.promptText()).toEqual("This is a test prompt!");
+    it("creates new prompts", function() {
+        // Delete all existing prompts
+        // Then add new prompts (created from a client-side template)
+        $.each(view.getAllPrompts(), function() { view.removePrompt(this); });
+        view.addPrompt();
+        view.addPrompt();
+        view.addPrompt();
+
+        var prompts = view.promptsDefinition();
+        expect(prompts.length).toEqual(3);
+
+        expect(prompts[0]).toEqual({
+            description: ""
+        });
+
+        expect(prompts[1]).toEqual({
+            description: ""
+        });
+    });
+});
+
+describe("OpenAssessment.EditPromptViews after release", function() {
+
+    // Use a stub notifier implementation that simply stores
+    // the notifications it receives.
+    var notifier = null;
+    var StubNotifier = function() {
+        this.notifications = [];
+        this.notificationFired = function(name, data) {
+            this.notifications.push({
+                name: name,
+                data: data
+            });
+        };
+    };
+
+    var view = null;
+
+    beforeEach(function() {
+        // Load the DOM fixture
+        loadFixtures('oa_edit.html');
+        $("#openassessment-editor").attr('data-is-released', 'true');
+
+        // Create the view
+        var element = $("#oa_prompts_editor_wrapper").get(0);
+        notifier = new StubNotifier();
+        view = new OpenAssessment.EditPromptsView(element, notifier);
+    });
+
+    it("does not allow adding prompts", function() {
+        view.addPrompt(); // call method
+        $(view.promptsContainer.addButtonElement).click(); // click on button
+
+        var prompts = view.promptsDefinition();
+        expect(prompts.length).toEqual(2);
+    });
+
+    it("does not allow removing prompts", function() {
+        view.removePrompt(view.getAllPrompts()[0]); // call method
+        $("." + view.promptsContainer.removeButtonClass, view.element).click(); // click on buttons
+
+        var prompts = view.promptsDefinition();
+        expect(prompts.length).toEqual(2);
     });
 });

openassessment/xblock/static/js/src/lms/oa_response.js

@@ -14,7 +14,7 @@ OpenAssessment.ResponseView = function(element, server, fileUploader, baseView)
     this.server = server;
     this.fileUploader = fileUploader;
     this.baseView = baseView;
-    this.savedResponse = "";
+    this.savedResponse = [];
     this.files = null;
     this.imageType = null;
     this.lastChangeTime = Date.now();
@@ -66,7 +66,7 @@ OpenAssessment.ResponseView.prototype = {
         // Install change handler for textarea (to enable submission button)
         this.savedResponse = this.response();
         var handleChange = function(eventData) { view.handleResponseChanged(); };
-        sel.find('#submission__answer__value').on('change keyup drop paste', handleChange);
+        sel.find('.submission__answer__part__text__value').on('change keyup drop paste', handleChange);
 
         var handlePrepareUpload = function(eventData) { view.prepareUpload(eventData.target.files); };
         sel.find('input[type=file]').on('change', handlePrepareUpload);
@@ -258,33 +258,39 @@ OpenAssessment.ResponseView.prototype = {
     },
 
     /**
-    Set the response text.
-    Retrieve the response text.
+    Set the response texts.
+    Retrieve the response texts.
 
     Args:
-        text (string): If specified, the text to set for the response.
+        texts (array of strings): If specified, the texts to set for the response.
 
     Returns:
-        string: The current response text.
+        array of strings: The current response texts.
     **/
-    response: function(text) {
-        var sel = $('#submission__answer__value', this.element);
-        if (typeof text === 'undefined') {
-            return sel.val();
+    response: function(texts) {
+        var sel = $('.submission__answer__part__text__value', this.element);
+        if (typeof texts === 'undefined') {
+            return sel.map(function() {
+                return $.trim($(this).val());
+            }).get();
         } else {
-            sel.val(text);
+            sel.map(function(index, element) {
+                $(this).val(texts[index]);
+            })
         }
     },
 
     /**
-    Check whether the response text has changed since the last save.
+    Check whether the response texts have changed since the last save.
 
     Returns: boolean
     **/
     responseChanged: function() {
-        var currentResponse = $.trim(this.response());
-        var savedResponse = $.trim(this.savedResponse);
-        return savedResponse !== currentResponse;
+        var savedResponse = this.savedResponse;
+        return this.response().some(function(element, index, array) {
+                return element !== savedResponse[index];
+        });
+
     },
 
     /**
@@ -314,14 +320,16 @@ OpenAssessment.ResponseView.prototype = {
     **/
     handleResponseChanged: function() {
         // Enable the save/submit button only for non-blank responses
-        var isBlank = ($.trim(this.response()) !== '');
-        this.submitEnabled(isBlank);
+        var isNotBlank = !this.response().every(function(element, index, array) {
+                return $.trim(element) == '';
+            });
+        this.submitEnabled(isNotBlank);
 
         // Update the save button, save status, and "unsaved changes" warning
         // only if the response has changed
         if (this.responseChanged()) {
-            this.saveEnabled(isBlank);
-            this.previewEnabled(isBlank);
+            this.saveEnabled(isNotBlank);
+            this.previewEnabled(isNotBlank);
             this.saveStatus(gettext('This response has not been saved.'));
             this.unsavedWarningEnabled(true);
         }
@@ -355,8 +363,15 @@ OpenAssessment.ResponseView.prototype = {
             // ... but update the UI based on what the user may have entered
             // since hitting the save button.
             var currentResponse = view.response();
-            view.submitEnabled(currentResponse !== '');
-            if (currentResponse == savedResponse) {
+            var currentResponseIsEmpty = currentResponse.every(function(element, index, array) {
+                return element == '';
+            });
+            view.submitEnabled(!currentResponseIsEmpty);
+
+            var currentResponseEqualsSaved = currentResponse.every(function(element, index, array) {
+                return element === savedResponse[index];
+            });
+            if (currentResponseEqualsSaved) {
                 view.saveEnabled(false);
                 view.saveStatus(gettext("This response has been saved but not submitted."));
             }
@@ -388,7 +403,7 @@ OpenAssessment.ResponseView.prototype = {
             // NOTE: in JQuery >=1.8, `pipe()` is deprecated in favor of `then()`,
             // but we're using JQuery 1.7 in the LMS, so for now we're stuck with `pipe()`.
             .pipe(function() {
-                var submission = $('#submission__answer__value', view.element).val();
+                var submission = view.response();
                 baseView.toggleActionError('response', null);
 
                 // Send the submission to the server, returning the promise.

openassessment/xblock/static/js/src/oa_server.js

@@ -445,7 +445,7 @@ if (typeof OpenAssessment.Server == "undefined" || !OpenAssessment.Server) {
         updateEditorContext: function(kwargs) {
             var url = this.url('update_editor_context');
             var payload = JSON.stringify({
-                prompt: kwargs.prompt,
+                prompts: kwargs.prompts,
                 feedback_prompt: kwargs.feedbackPrompt,
                 feedback_default_text: kwargs.feedback_default_text,
                 title: kwargs.title,

openassessment/xblock/static/js/src/studio/oa_container.js

@@ -65,6 +65,7 @@ OpenAssessment.Container = function(containerItem, kwargs) {
     this.removeButtonClass = kwargs.removeButtonClass;
     this.containerItemClass = kwargs.containerItemClass;
     this.notifier = kwargs.notifier;
+    this.addRemoveEnabled = (typeof kwargs.addRemoveEnabled == 'undefined') || kwargs.addRemoveEnabled;
 
     // Since every container item should be instantiated with
     // the notifier we were given, create a helper method
@@ -83,17 +84,23 @@ OpenAssessment.Container.prototype = {
      */
     addEventListeners: function() {
         var container = this;
-        // Install a click handler for the add button
-        $(this.addButtonElement).click($.proxy(this.add, this));
-
-        // Find items already in the container and install click
-        // handlers for the delete buttons.
-        $("." + this.removeButtonClass, this.containerElement).click(
-            function(eventData) {
-                var item = container.createContainerItem(eventData.target);
-                container.remove(item);
-            }
-        );
+
+        if (this.addRemoveEnabled) {
+            // Install a click handler for the add button
+            $(this.addButtonElement).click($.proxy(this.add, this));
+
+            // Find items already in the container and install click
+            // handlers for the delete buttons.
+            $("." + this.removeButtonClass, this.containerElement).click(
+                function (eventData) {
+                    var item = container.createContainerItem(eventData.target);
+                    container.remove(item);
+                }
+            );
+        } else {
+            $(this.addButtonElement).addClass('is--disabled');
+            $("." + this.removeButtonClass, this.containerElement).addClass('is--disabled');
+        }
 
         // Initialize existing items, in case they need to install their
         // own event handlers.
@@ -122,16 +129,21 @@ OpenAssessment.Container.prototype = {
             .toggleClass(this.containerItemClass, true)
             .appendTo($(this.containerElement));
 
-        // Install a click handler for the delete button
         // Since we just added the new element to the container,
         // it should be the last one.
         var container = this;
         var containerItem = $("." + this.containerItemClass, this.containerElement).last();
-        containerItem.find('.' + this.removeButtonClass)
-            .click(function(eventData) {
-                var containerItem = container.createContainerItem(eventData.target);
-                container.remove(containerItem);
-            } );
+
+        // Install a click handler for the delete button
+        if (this.addRemoveEnabled) {
+            containerItem.find('.' + this.removeButtonClass)
+                .click(function (eventData) {
+                    var containerItem = container.createContainerItem(eventData.target);
+                    container.remove(containerItem);
+                });
+        } else {
+            containerItem.find('.' + this.removeButtonClass).addClass('is--disabled');
+        }
 
         // Initialize the item, allowing it to install event handlers.
         // Fire event handler for adding a new element

openassessment/xblock/static/js/src/studio/oa_container_item.js

@@ -65,6 +65,113 @@ OpenAssessment.ItemUtilities = {
 };
 
 /**
+The Prompt Class is used to construct and maintain references to prompts from within a prompts
+container object. Constructs a new Prompt element.
+
+Args:
+    element (OpenAssessment.Container): The container that the prompt is a member of.
+    notifier (OpenAssessment.Notifier): Used to send notifications of updates to prompts.
+
+Returns:
+    OpenAssessment.Prompt
+**/
+OpenAssessment.Prompt = function(element, notifier) {
+    this.element = element;
+    this.notifier = notifier;
+};
+
+OpenAssessment.Prompt.prototype = {
+    /**
+    Finds the values currently entered in the Prompts's fields, and returns them.
+
+    Returns:
+        object literal of the form:
+        {
+            'description': 'Write a nice long essay about anything.'
+        }
+    **/
+    getFieldValues: function () {
+        var fields = {
+            description: this.description()
+        };
+        return fields;
+    },
+
+    /**
+    Get or set the description of the prompt.
+
+    Args:
+        text (string, optional): If provided, set the description of the prompt.
+
+    Returns:
+        string
+
+    **/
+    description: function(text) {
+        var sel = $('.openassessment_prompt_description', this.element);
+        return OpenAssessment.Fields.stringField(sel, text);
+    },
+
+    addEventListeners: function() {},
+
+    /**
+    Hook into the event handler for addition of a prompt.
+
+    */
+    addHandler: function (){
+        this.notifier.notificationFired(
+            "promptAdd",
+            {
+                "index": this.element.index()
+            }
+        );
+    },
+
+    /**
+    Hook into the event handler for removal of a prompt.
+
+    */
+    removeHandler: function (){
+        this.notifier.notificationFired(
+            "promptRemove",
+            {
+                "index": this.element.index()
+            }
+        );
+    },
+
+    updateHandler: function() {},
+
+    /**
+    Mark validation errors.
+
+    Returns:
+        Boolean indicating whether the option is valid.
+
+    **/
+    validate: function() {
+        return true;
+    },
+
+    /**
+    Return a list of validation errors visible in the UI.
+    Mainly useful for testing.
+
+    Returns:
+        list of strings
+
+    **/
+    validationErrors: function() {
+        return [];
+    },
+
+    /**
+    Clear all validation errors from the UI.
+    **/
+    clearValidationErrors: function() {}
+};
+
+/**
 The RubricOption Class used to construct and maintain references to rubric options from within an options
 container object. Constructs a new RubricOption element.
 
@@ -506,7 +613,7 @@ OpenAssessment.RubricCriterion.prototype = {
 OpenAssessment.TrainingExample = function(element){
     this.element = element;
     this.criteria = $(".openassessment_training_example_criterion_option", this.element);
-    this.answer = $('.openassessment_training_example_essay', this.element).first();
+    this.answer = $('.openassessment_training_example_essay_part textarea', this.element)
 };
 
 OpenAssessment.TrainingExample.prototype = {
@@ -527,7 +634,9 @@ OpenAssessment.TrainingExample.prototype = {
         ).get();
 
         return {
-            answer: this.answer.prop('value'),
+            answer: this.answer.map(function() {
+                return $(this).prop('value');
+            }).get(),
             options_selected: optionsSelected
         };
     },

openassessment/xblock/static/js/src/studio/oa_edit.js

@@ -25,9 +25,14 @@ OpenAssessment.StudioView = function(runtime, element, server) {
     // Initialize the validation alert
     this.alert = new OpenAssessment.ValidationAlert().install();
 
+    var studentTrainingListener = new OpenAssessment.StudentTrainingListener();
+
     // Initialize the prompt tab view
-    this.promptView = new OpenAssessment.EditPromptView(
-        $("#oa_prompt_editor_wrapper", this.element).get(0)
+    this.promptsView = new OpenAssessment.EditPromptsView(
+        $("#oa_prompts_editor_wrapper", this.element).get(0),
+        new OpenAssessment.Notifier([
+            studentTrainingListener
+        ])
     );
 
     // Initialize the settings tab view
@@ -57,7 +62,7 @@ OpenAssessment.StudioView = function(runtime, element, server) {
     this.rubricView = new OpenAssessment.EditRubricView(
         $("#oa_rubric_editor_wrapper", this.element).get(0),
          new OpenAssessment.Notifier([
-            new OpenAssessment.StudentTrainingListener()
+            studentTrainingListener
         ])
     );
 
@@ -185,7 +190,7 @@ OpenAssessment.StudioView.prototype = {
 
         var view = this;
         this.server.updateEditorContext({
-            prompt: view.promptView.promptText(),
+            prompts: view.promptsView.promptsDefinition(),
             feedbackPrompt: view.rubricView.feedbackPrompt(),
             feedback_default_text: view.rubricView.feedback_default_text(),
             criteria: view.rubricView.criteriaDefinition(),
@@ -236,7 +241,8 @@ OpenAssessment.StudioView.prototype = {
     validate: function() {
         var settingsValid = this.settingsView.validate();
         var rubricValid = this.rubricView.validate();
-        return settingsValid && rubricValid;
+        var promptsValid = this.promptsView.validate();
+        return settingsValid && rubricValid && promptsValid;
     },
 
    /**
@@ -249,7 +255,9 @@ OpenAssessment.StudioView.prototype = {
     **/
     validationErrors: function() {
         return this.settingsView.validationErrors().concat(
-            this.rubricView.validationErrors()
+            this.rubricView.validationErrors().concat(
+                this.promptsView.validationErrors()
+            )
         );
     },
 
@@ -259,6 +267,7 @@ OpenAssessment.StudioView.prototype = {
     clearValidationErrors: function() {
         this.settingsView.clearValidationErrors();
         this.rubricView.clearValidationErrors();
+        this.promptsView.clearValidationErrors();
     },
 };
 

openassessment/xblock/static/js/src/studio/oa_edit_assessment.js

@@ -421,7 +421,7 @@ OpenAssessment.EditStudentTrainingView.prototype = {
     {
         examples: [
             {
-                answer: "I love pokemon",
+                answer: ("I love pokemon 1", "I love pokemon 2"),
                 options_selected: [
                     {
                         criterion: "brevity",

openassessment/xblock/static/js/src/studio/oa_edit_listeners.js

 /**
 Dynamically update student training examples based on
-changes to the rubric.
+changes to the prompts or the rubric.
 **/
 OpenAssessment.StudentTrainingListener = function() {
     this.element = $('#oa_student_training_editor');
@@ -8,6 +8,28 @@ OpenAssessment.StudentTrainingListener = function() {
 };
 
 OpenAssessment.StudentTrainingListener.prototype = {
+
+    /**
+    Add a answer part in the training examples when a prompt is added.
+     */
+    promptAdd: function(data) {
+        var view = this.element;
+        var essay_part = $("#openassessment_training_example_part_template")
+            .children().first()
+            .clone()
+            .removeAttr('id')
+            .toggleClass('is--hidden', false)
+            .appendTo(".openassessment_training_example_essay", view);
+    },
+
+    /**
+    Remove the answer part in the training examples when a prompt is removed.
+     */
+    promptRemove: function(data) {
+        var view = this.element;
+        $(".openassessment_training_example_essay li:nth-child(" + (data.index + 1) + ")", view).remove();
+    },
+
     /**
      Event handler for updating training examples when a criterion option has
      been updated.

openassessment/xblock/static/js/src/studio/oa_edit_prompt.js

-/**
-Editing interface for the rubric prompt.
-
-Args:
-    element (DOM element): The DOM element representing this view.
-
-Returns:
-    OpenAssessment.EditPromptView
-
-**/
-OpenAssessment.EditPromptView = function(element) {
-    this.element = element;
-};
-
-
-OpenAssessment.EditPromptView.prototype = {
-
-    /**
-    Get or set the text of the prompt.
-
-    Args:
-        text (string, optional): If provided, set the text of the prompt.
-
-    Returns:
-        string
-
-    **/
-    promptText: function(text) {
-        var sel = $('#openassessment_prompt_editor', this.element);
-        return OpenAssessment.Fields.stringField(sel, text);
-    },
-
-};
\ No newline at end of file

openassessment/xblock/static/js/src/studio/oa_edit_prompts.js

+/**
+Editing interface for the prompts.
+
+Args:
+    element (DOM element): The DOM element representing this view.
+
+Returns:
+    OpenAssessment.EditPromptsView
+
+**/
+OpenAssessment.EditPromptsView = function(element, notifier) {
+    this.element = element;
+    this.editorElement = $(this.element).closest("#openassessment-editor");
+    this.addRemoveEnabled = !(this.editorElement.attr('data-is-released') === 'true');
+
+    this.promptsContainer = new OpenAssessment.Container(
+        OpenAssessment.Prompt, {
+            containerElement: $("#openassessment_prompts_list", this.element).get(0),
+            templateElement: $("#openassessment_prompt_template", this.element).get(0),
+            addButtonElement: $("#openassessment_prompts_add_prompt", this.element).get(0),
+            removeButtonClass: "openassessment_prompt_remove_button",
+            containerItemClass: "openassessment_prompt",
+            notifier: notifier,
+            addRemoveEnabled: this.addRemoveEnabled
+        }
+    );
+    this.promptsContainer.addEventListeners();
+};
+
+
+OpenAssessment.EditPromptsView.prototype = {
+
+    /**
+    Construct a list of prompts definitions from the editor UI.
+
+    Returns:
+        list of prompt objects
+
+    Example usage:
+    >>> editPromptsView.promptsDefinition();
+    [
+        {
+            uuid: "cfvgbh657",
+            description: "Description",
+            order_num: 0,
+        },
+        ...
+    ]
+
+    **/
+    promptsDefinition: function() {
+        var prompts = this.promptsContainer.getItemValues();
+        return prompts;
+    },
+
+    /**
+    Add a new prompt.
+    Uses a client-side template to create the new prompt.
+    **/
+    addPrompt: function() {
+        if (this.addRemoveEnabled) {
+            this.promptsContainer.add();
+        }
+    },
+
+    /**
+    Remove a prompt.
+
+    Args:
+        item (OpenAssessment.RubricCriterion): The criterion item to remove.
+    **/
+    removePrompt: function(item) {
+        if (this.addRemoveEnabled) {
+            this.promptsContainer.remove(item);
+        }
+    },
+
+    /**
+    Retrieve all prompts.
+
+    Returns:
+        Array of OpenAssessment.Prompt objects.
+
+    **/
+    getAllPrompts: function() {
+        return this.promptsContainer.getAllItems();
+    },
+
+    /**
+    Retrieve a prompt item from the prompts.
+
+    Args:
+        index (int): The index of the prompt, starting from 0.
+
+    Returns:
+        OpenAssessment.Prompt or null
+
+    **/
+    getPromptItem: function(index) {
+        return this.promptsContainer.getItem(index);
+    },
+
+    /**
+    Mark validation errors.
+
+    Returns:
+        Boolean indicating whether the view is valid.
+
+    **/
+    validate: function() {
+        return true;
+    },
+
+   /**
+    Return a list of validation errors visible in the UI.
+    Mainly useful for testing.
+
+    Returns:
+        list of string
+
+    **/
+    validationErrors: function() {
+        var errors = [];
+        return errors;
+    },
+
+    /**
+    Clear all validation errors from the UI.
+    **/
+    clearValidationErrors: function() {}
+};
\ No newline at end of file

openassessment/xblock/static/sass/oa/utilities/_developer.scss

@@ -331,26 +331,6 @@
     -moz-transition: height 1s ease-in-out 0;
   }
 
-  #openassessment_prompt_editor {
-    width: 100%;
-    height: 100%;
-    resize: none;
-    border: none;
-    @include border-radius(4px);
-    padding: 10px;
-    font-family: $f-sans-serif;
-
-    textarea{
-      font-size: 14px;
-      border: none;
-      overflow: auto;
-      outline: none;
-      -webkit-box-shadow: none;
-      -moz-box-shadow: none;
-      box-shadow: none;
-    }
-  }
-
   #openassessment_rubric_editor {
     width: 100%;
     height: 100%;
@@ -493,66 +473,146 @@
      bottom: 0;
    }
 
-  #oa_rubric_editor_wrapper{
-
-    .wrapper-comp-settings{
-      display: block;
-    }
-
-    #openassessment_rubric_instructions{
+  .openassessment_tab_instructions {
       background-color: $edx-gray-t1;
       border-bottom: 1px solid $edx-gray-d1;
       padding: 10px;
+  }
+
+  .openassessment_container_header {
+    margin: ($baseline-v/2) ($baseline-h/4);
+    padding-bottom: $baseline-v/4;
+    border-bottom: 1px solid;
+    overflow: auto;
+    color: $edx-gray-d2;
+  }
+
+  .action.expand-collapse {
+    @include float(left);
+    .ui-toggle-expansion {
+      color: $edx-gray-d2;
+      cursor: pointer;
+    }
+    .ui-toggle-expansion:hover {
+      color: $edx-gray-d1;
+      cursor: pointer;
     }
+  }
 
-    .openassessment_criterion {
+  .openassessment_container_header_title_box {
+    @include float(left);
+    width: 80%;
+    display: inline-block;
+  }
 
-      .openassessment_criterion_remove_button{
-        @extend .openassessment_rubric_remove_button;
-      }
+  .openassessment_container_header_title {
+    text-transform: uppercase;
+    cursor: default;
+    padding-top: 2px;
+  }
 
-      .openassessment_criterion_header {
-        margin: 10px;
-        padding-bottom: 5px;
-        border-bottom: 1px solid;
-        overflow: auto;
-        color: $edx-gray-d2;
+  .openassessment_container_guide {
+    @extend %t-small;
+  }
 
-        .action.expand-collapse {
-          @include float(left);
-          .ui-toggle-expansion {
-            color: $edx-gray-d2;
-            cursor: pointer;
-          }
-          .ui-toggle-expansion:hover {
-            color: $edx-gray-d1;
-            cursor: pointer;
-          }
-        }
+  .openassessment_container_remove_button{
+    cursor: pointer;
+    h2:after{
+      font-family: FontAwesome;
+      content: "\f00d";
+      display: inline-block;
+      color: inherit;
+      margin: 0 5px;
+    }
+    h2{
+      text-transform: uppercase;
+      font-size: 80%;
+      @include float(right);
+      display: inline-block;
+      padding: 3px 8px 3px 13px;
+    }
+    @include float(right);
+  }
+  .openassessment_container_remove_button:hover{
+    background-color: $edx-gray-d2;
+    border-radius: 4px;
+    color: white;
+  }
 
-        .openassessment_criterion_header_title_box {
-            @include float(left);
-            width: 80%;
-            display: inline-block;
-        }
+  .openassessment_container_add_button {
+    h6:before{
+      font-family: "FontAwesome";
+      display: inline-block;
+      @include margin-left(5px);
+      @include margin-right(10px);
+      width: auto;
+      height: auto;
+      content: "\f067";
+    }
 
-        .openassessment_criterion_header_title {
-          @include float(left);
-          text-transform: uppercase;
-          width: 50%;
-          display: inline-block;
-          cursor: default;
-          padding-top: 2px;
-        }
+    background-color: white;
+    border: 1px solid;
+    border-radius: 4px;
+    text-align: center;
+    color: #009fe6;
+    padding: 10px;
+    margin: 15px 10px;
+  }
 
-        .openassessment_criterion_guide {
-            @extend %t-small;
-        }
+  .openassessment_container_add_button.openassessment_highlighted_field {
+    color: red;
+    border-width: 2px;
+  }
 
-        .openassessment_criterion_header_remove {
-          @extend .openassessment_rubric_remove_button;
-        }
-      }
+  .openassessment_container_add_button:hover {
+    color: white;
+    background-color: #009fe6;
+    cursor: pointer;
+  }
+
+  .openassessment_container_remove_button.is--disabled,
+  .openassessment_container_remove_button.is--disabled:hover,
+  .openassessment_container_add_button.is--disabled,
+  .openassessment_container_add_button.is--disabled:hover {
+    color: $edx-gray-l2;
+    background-color: transparent;
+    cursor: auto;
+  }
+
+  #oa_prompts_editor_wrapper {
+
+    .wrapper-comp-settings {
+      display: block;
+    }
+
+    .openassessment_prompt_description {
+      width: 100%;
+      min-height: 100px;
+      resize: none;
+      border: 1px solid #b2b2b2;
+      border-radius: 4px;
+      padding: 10px;
+      font-family: $f-sans-serif;
+      font-size: 14px;
+      overflow: auto;
+      outline: none;
+      -webkit-box-shadow: none;
+      -moz-box-shadow: none;
+      box-shadow: none;
+    }
+
+    .openassessment_prompt_description.openassessment_highlighted_field {
+      border: 2px solid red;
+    }
+  }
+
+  #oa_rubric_editor_wrapper{
+
+    .wrapper-comp-settings{
+      display: block;
+    }
+
+    .openassessment_criterion {
 
       .openassessment_criterion_add_option {
         h2:before {
@@ -653,7 +713,7 @@
       @include padding(5px, 5px, 5px, 15px);
 
       .openassessment_criterion_option_remove_button{
-        @extend .openassessment_rubric_remove_button;
+        @extend .openassessment_container_remove_button;
       }
 
       .openassessment_option_header{
@@ -670,7 +730,7 @@
         }
 
         .openassessment_option_header_remove{
-          @extend .openassessment_rubric_remove_button;
+          @extend .openassessment_container_remove_button;
         }
       }
 
@@ -767,30 +827,6 @@
       outline: 0;
     }
 
-    .openassessment_rubric_remove_button{
-      cursor: pointer;
-      h2:after{
-        font-family: FontAwesome;
-        content: "\f00d";
-        display: inline-block;
-        color: inherit;
-        margin: 0 5px;
-      }
-      h2{
-        text-transform: uppercase;
-        font-size: 80%;
-        @include float(right);
-        display: inline-block;
-        @include padding(3px, 8px, 3px, 13px);
-      }
-      @include float(right);
-    }
-    .openassessment_rubric_remove_button:hover{
-      background-color: $edx-gray-d2;
-      border-radius: 4px;
-      color: white;
-    }
-
     #openassessment_rubric_feedback_wrapper{
       padding: 0;
 
@@ -813,39 +849,6 @@
         @include float(right);
       }
     }
-
-    #openassessment_rubric_add_criterion{
-
-      h6:before{
-        font-family: "FontAwesome";
-        display: inline-block;
-        @include margin-left(5px);
-        @include margin-right(10px);
-        width: auto;
-        height: auto;
-        content: "\f067";
-      }
-
-      background-color: white;
-      border: 1px solid;
-      border-radius: 4px;
-      @include text-align(center);
-      color: #009fe6;
-
-      padding: 10px;
-      margin: 15px 10px;
-    }
-
-    #openassessment_rubric_add_criterion.openassessment_highlighted_field{
-      color: red;
-      border-width: 2px;
-    }
-
-    #openassessment_rubric_add_criterion:hover{
-      color: white;
-      background-color: #009fe6;
-      cursor: pointer;
-    }
   }
 
 
@@ -940,7 +943,7 @@
     .openassessment_training_example_body {
       @include padding(0, 15px, 15px, 15px);
       position: relative;
-      overflow: hidden;
+      overflow: scroll;
       .openassessment_training_example_essay_wrapper {
         width: 58%;
         display: inline-block;

openassessment/xblock/static/sass/oa/views/_oa-base.scss

@@ -459,26 +459,26 @@
 
 
   // --------------------
-  // problem
+  // submission
   // --------------------
   .wrapper--openassessment__prompt {
 
   }
 
-  .openassessment__prompt {
+  .submission__answer__part__prompt {
     @extend %ui-well;
     position: relative;
-    margin-bottom: $baseline-v;
+    margin: ($baseline-v/2) 0;
     border: 1px solid $color-decorative-tertiary;
     @include border-left(($baseline-h/4) solid $color-decorative-secondary);
     @include padding-left(($baseline-h*0.75));
   }
 
-  .openassessment__prompt__title {
+  .submission__answer__part__prompt__title {
     @extend %text-sr;
   }
 
-  .openassessment__prompt__copy {
+  .submission__answer__part__prompt__copy {
     @extend %copy-2;
     color: $copy-color;
 
@@ -495,6 +495,11 @@
     }
   }
 
+  div.submission__answer__part__text__value {
+    border: 1px solid $color-decorative-secondary;
+    background-color: $white-t;
+    padding: $baseline-v;
+  }
 
   // --------------------
   // response
@@ -816,9 +821,20 @@
 
   .submission__answer__display__content {
     @extend %copy-3;
-    @extend %ui-content-longanswer;
     @extend %ui-subsection-content;
-    @extend %ui-well;
+
+    padding: ($baseline-v/2) ($baseline-h/4) $baseline-v ($baseline-h/4);
+    background: $color-decorative-quaternary;
+    border-radius: ($baseline-v/10);
+    list-style: none;
+
+    .submission__answer__part {
+      margin: ($baseline-v*1.5) 0px 0px;
+
+      &:first-child {
+        margin-top: 0px;
+      }
+    }
   }
 
 

openassessment/xblock/student_training_mixin.py

@@ -7,7 +7,7 @@ from xblock.core import XBlock
 from openassessment.assessment.api import student_training
 from openassessment.workflow import api as workflow_api
 from openassessment.workflow.errors import AssessmentWorkflowError
-from openassessment.xblock.data_conversion import convert_training_examples_list_to_dict
+from openassessment.xblock.data_conversion import convert_training_examples_list_to_dict, create_submission_dict
 from .resolve_dates import DISTANT_FUTURE
 
 
@@ -124,7 +124,7 @@ class StudentTrainingMixin(object):
                 examples
             )
             if example:
-                context['training_essay'] = example['answer']
+                context['training_essay'] = create_submission_dict({'answer': example['answer']}, self.prompts)
                 context['training_rubric'] = {
                     'criteria': example['rubric']['criteria'],
                     'points_possible': example['rubric']['points_possible']

openassessment/xblock/studio_mixin.py

 """
 Studio editing view for OpenAssessment XBlock.
 """
-import pkg_resources
 import copy
 import logging
+import pkg_resources
+from uuid import uuid4
+
 from django.template import Context
 from django.template.loader import get_template
 from voluptuous import MultipleInvalid
@@ -12,7 +14,7 @@ from xblock.fields import List, Scope
 from xblock.fragment import Fragment
 from openassessment.xblock.defaults import DEFAULT_EDITOR_ASSESSMENTS_ORDER, DEFAULT_RUBRIC_FEEDBACK_TEXT
 from openassessment.xblock.validation import validator
-from openassessment.xblock.data_conversion import create_rubric_dict, make_django_template_key
+from openassessment.xblock.data_conversion import create_rubric_dict, make_django_template_key, update_assessments_format
 from openassessment.xblock.schema import EDITOR_UPDATE_SCHEMA
 from openassessment.xblock.resolve_dates import resolve_dates
 from openassessment.xblock.xml import serialize_examples_to_xml_str, parse_examples_from_xml_str
@@ -112,7 +114,7 @@ class StudioMixin(object):
             feedback_default_text = DEFAULT_RUBRIC_FEEDBACK_TEXT
 
         return {
-            'prompt': self.prompt,
+            'prompts': self.prompts,
             'title': self.title,
             'submission_due': submission_due,
             'submission_start': submission_start,
@@ -127,6 +129,7 @@ class StudioMixin(object):
                 make_django_template_key(asmnt)
                 for asmnt in editor_assessments_order
             ],
+            'is_released': self.is_released(),
         }
 
     @XBlock.json_handler
@@ -189,10 +192,14 @@ class StudioMixin(object):
                     )}
                     # This is where we default to EASE for problems which are edited in the GUI
                 assessment['algorithm_id'] = 'ease'
+            if assessment['name'] == 'student-training':
+                for example in assessment['examples']:
+                    example['answer'] = {'parts': [{'text': text} for text in example['answer']]}
+
 
         xblock_validator = validator(self, self._)
         success, msg = xblock_validator(
-            create_rubric_dict(data['prompt'], data['criteria']),
+            create_rubric_dict(data['prompts'], data['criteria']),
             data['assessments'],
             submission_start=data['submission_start'],
             submission_due=data['submission_due'],
@@ -205,7 +212,7 @@ class StudioMixin(object):
         # so we can safely modify the XBlock fields.
         self.title = data['title']
         self.display_name = data['title']
-        self.prompt = data['prompt']
+        self.prompts = data['prompts']
         self.rubric_criteria = data['criteria']
         self.rubric_assessments = data['assessments']
         self.editor_assessments_order = data['editor_assessments_order']
@@ -267,13 +274,20 @@ class StudioMixin(object):
         # could be accomplished within the template, we are opting to remove logic from the template.
         student_training_module = self.get_assessment_module('student-training')
 
-        student_training_template = {'answer': ""}
+        student_training_template = {
+            'answer': {
+                'parts': [
+                    {'text': ''} for prompt in self.prompts
+                ]
+            }
+        }
         criteria_list = copy.deepcopy(self.rubric_criteria_with_labels)
         for criterion in criteria_list:
             criterion['option_selected'] = ""
         student_training_template['criteria'] = criteria_list
 
         if student_training_module:
+            student_training_module = update_assessments_format([student_training_module])[0]
             example_list = []
             # Adds each example to a modified version of the student training module dictionary.
             for example in student_training_module['examples']:

openassessment/xblock/submission_mixin.py

+import json
 import logging
 
 from xblock.core import XBlock
@@ -9,6 +10,8 @@ from openassessment.workflow import api as workflow_api
 from openassessment.workflow.errors import AssessmentWorkflowError
 from .resolve_dates import DISTANT_FUTURE
 
+from data_conversion import create_submission_dict, prepare_submission_for_serialization
+from validation import validate_submission
 
 logger = logging.getLogger(__name__)
 
@@ -54,7 +57,15 @@ class SubmissionMixin(object):
             )
 
         status = False
-        student_sub = data['submission']
+        student_sub_data = data['submission']
+        success, msg = validate_submission(student_sub_data, self.prompts, self._)
+        if not success:
+            return (
+                False,
+                'EBADARGS',
+                msg
+            )
+
         student_item_dict = self.get_student_item_dict()
 
         # Short-circuit if no user is defined (as in Studio Preview mode)
@@ -74,7 +85,7 @@ class SubmissionMixin(object):
             try:
                 submission = self.create_submission(
                     student_item_dict,
-                    student_sub
+                    student_sub_data
                 )
             except api.SubmissionRequestError as err:
 
@@ -132,8 +143,14 @@ class SubmissionMixin(object):
             dict: Contains a bool 'success' and unicode string 'msg'.
         """
         if 'submission' in data:
+            student_sub_data = data['submission']
+            success, msg = validate_submission(student_sub_data, self.prompts, self._)
+            if not success:
+                return {'success': False, 'msg': msg}
             try:
-                self.saved_response = unicode(data['submission'])
+                self.saved_response = json.dumps(
+                    prepare_submission_for_serialization(student_sub_data)
+                )
                 self.has_saved = True
 
                 # Emit analytics event...
@@ -149,11 +166,11 @@ class SubmissionMixin(object):
         else:
             return {'success': False, 'msg': self._(u"This response was not submitted.")}
 
-    def create_submission(self, student_item_dict, student_sub):
+    def create_submission(self, student_item_dict, student_sub_data):
 
         # Store the student's response text in a JSON-encodable dict
         # so that later we can add additional response fields.
-        student_sub_dict = {'text': student_sub}
+        student_sub_dict = prepare_submission_for_serialization(student_sub_data)
 
         if self.allow_file_upload:
             student_sub_dict['file_key'] = self._get_student_item_key()
@@ -352,7 +369,21 @@ class SubmissionMixin(object):
                 context['submission_start'] = start_date
                 path = 'openassessmentblock/response/oa_response_unavailable.html'
         elif not workflow:
-            context['saved_response'] = self.saved_response
+            # For backwards compatibility. Initially, problems had only one prompt
+            # and a string answer. We convert it to the appropriate dict.
+            try:
+                json.loads(self.saved_response)
+                saved_response = {
+                    'answer': json.loads(self.saved_response),
+                }
+            except ValueError:
+                saved_response = {
+                    'answer': {
+                        'text': self.saved_response,
+                    },
+                }
+
+            context['saved_response'] = create_submission_dict(saved_response, self.prompts)
             context['save_status'] = self.save_status
             context['submit_enabled'] = self.saved_response != ''
             path = "openassessmentblock/response/oa_response.html"
@@ -372,12 +403,13 @@ class SubmissionMixin(object):
             student_submission = self.get_user_submission(
                 workflow["submission_uuid"]
             )
-            context["student_submission"] = student_submission
+            context["student_submission"] = create_submission_dict(student_submission, self.prompts)
             path = 'openassessmentblock/response/oa_response_graded.html'
         else:
-            context["student_submission"] = self.get_user_submission(
+            student_submission = self.get_user_submission(
                 workflow["submission_uuid"]
             )
+            context["student_submission"] = create_submission_dict(student_submission, self.prompts)
             path = 'openassessmentblock/response/oa_response_submitted.html'
 
         return path, context

openassessment/xblock/test/data/basic_scenario.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty? Please answer in a short essay of 200-300 words.</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>Concise</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/example_based_assessment.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>Example-based assessment</prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>Ideas</name>
             <prompt>How good are the ideas?</prompt>

openassessment/xblock/test/data/example_based_only.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>Example-based assessment</prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>Ideas</name>
             <prompt>How good are the ideas?</prompt>

openassessment/xblock/test/data/feedback_only_criterion_ai.xml

 <openassessment>
     <title>Feedback only criterion</title>
-    <prompt>Test prompt</prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Test rubric prompt</prompt>
         <criterion>
             <name>vocabulary</name>
             <prompt>How good is the vocabulary?</prompt>

openassessment/xblock/test/data/feedback_only_criterion_grade.xml

 <openassessment>
     <title>Feedback only criterion</title>
-    <prompt>Test prompt</prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Test rubric prompt</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/feedback_only_criterion_peer.xml

 <openassessment>
     <title>Feedback only criterion</title>
-    <prompt>Test prompt</prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Test rubric prompt</prompt>
         <criterion>
             <name>vocabulary</name>
             <prompt>How good is the vocabulary?</prompt>

openassessment/xblock/test/data/feedback_only_criterion_self.xml

 <openassessment>
     <title>Feedback only criterion</title>
-    <prompt>Test prompt</prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Test rubric prompt</prompt>
         <criterion>
             <name>vocabulary</name>
             <prompt>How good is the vocabulary?</prompt>

openassessment/xblock/test/data/feedback_only_criterion_student_training.xml

 <openassessment>
     <title>Feedback only criterion</title>
-    <prompt>Test prompt</prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Test rubric prompt</prompt>
         <criterion>
             <name>vocabulary</name>
             <prompt>How good is the vocabulary?</prompt>

openassessment/xblock/test/data/feedback_per_criterion.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion feedback="optional">
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/grade_incomplete_scenario.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
         <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>

openassessment/xblock/test/data/grade_scenario.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/grade_scenario_ai_only.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/grade_scenario_self_only.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/grade_waiting_scenario.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/invalid_rubric.json

 {
     "missing_feedback": {
-        "rubric": {
-            "prompt": "Test Prompt",
-            "criteria": [
-                {
-                    "order_num": 0,
-                    "name": "Test criterion",
-                    "prompt": "Test criterion prompt",
-                    "options": [
-                        {
-                            "order_num": 0,
-                            "points": 0,
-                            "name": "No",
-                            "explanation": "No explanation"
-                        }
-                    ]
-                }
-            ]
-        },
-        "prompt": "My new prompt.",
+        "criteria": [
+            {
+                "order_num": 0,
+                "name": "Test criterion",
+                "label": "Test criterion label",
+                "prompt": "Test criterion prompt",
+                "options": [
+                    {
+                        "order_num": 0,
+                        "points": 0,
+                        "name": "No",
+                        "label": "No label",
+                        "explanation": "No explanation"
+                    }
+                ]
+            }
+        ],
+        "prompts": [{"description": "My new prompt."}],
         "submission_due": "4014-02-27T09:46:28",
         "submission_start": "4014-02-10T09:46:28",
         "title": "My new title.",
@@ -36,9 +35,59 @@
                 "start": "",
                 "due": ""
             }
+        ]
+    },
+
+    "prompts_is_string": {
+        "title": "Foo",
+        "prompts": "My new prompt.",
+        "feedback_prompt": "Test Feedback Prompt",
+        "feedback_default_text": "Test default text...",
+        "submission_start": null,
+        "submission_due": null,
+        "allow_file_upload": true,
+        "leaderboard_show": true,
+        "allow_latex": false,
+        "criteria": [
+            {
+                "order_num": 0,
+                "name": "Test criterion",
+                "label": "Test criterion label",
+                "prompt": "Test criterion prompt",
+                "feedback": "optional",
+                "options": [
+                    {
+                        "order_num": 0,
+                        "points": 0,
+                        "label": "No label",
+                        "name": "No",
+                        "explanation": "No explanation"
+                    },
+                    {
+                        "order_num": 1,
+                        "points": 2,
+                        "label": "Yes label",
+                        "name": "Yes",
+                        "explanation": "Yes explanation"
+                    }
+                ]
+            }
+        ],
+        "assessments": [
+            {
+                "name": "peer-assessment",
+                "start": "2014-02-27T09:46:28",
+                "due": "2014-03-01T00:00:00",
+                "must_grade": 5,
+                "must_be_graded_by": 3
+            },
+            {
+                "name": "self-assessment",
+                "start": "2014-04-01T00:00:00",
+                "due": "2014-06-01T00:00:00"
+            }
         ],
 
-        "expected-assessment": "peer-assessment",
-        "expected-criterion-prompt": "Test criterion prompt"
+        "editor_assessments_order": ["student-training", "peer-assessment", "self-assessment"]
     }
 }

openassessment/xblock/test/data/invalid_rubrics.json

 {
     "zero_criteria": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": []
         }
     },
 
     "negative_points": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -29,7 +29,7 @@
 
     "duplicate_criteria_names": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -63,7 +63,7 @@
 
     "duplicate_option_names": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -88,9 +88,62 @@
         }
     },
 
+
+    "change_prompts_number_after_release": {
+        "rubric": {
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}, {"description": "Test Prompt 3."}],
+            "criteria": [
+                {
+                    "order_num": 0,
+                    "name": "Test criterion",
+                    "prompt": "Test criterion prompt",
+                    "options": [
+                        {
+                            "order_num": 0,
+                            "points": 0,
+                            "name": "No",
+                            "explanation": "No explanation"
+                        },
+                        {
+                            "order_num": 1,
+                            "points": 2,
+                            "name": "Yes",
+                            "explanation": "Yes explanation"
+                        }
+                    ]
+                }
+            ]
+        },
+        "current_rubric": {
+            "prompts": [{"description": "Test Prompt 3."}, {"description": "Test Prompt 4."}],
+            "criteria": [
+                {
+                    "order_num": 0,
+                    "name": "Test criterion",
+                    "prompt": "Test criterion prompt",
+                    "options": [
+                        {
+                            "order_num": 0,
+                            "points": 0,
+                            "name": "No",
+                            "explanation": "No explanation"
+                        },
+                        {
+                            "order_num": 1,
+                            "points": 2,
+                            "name": "Yes",
+                            "explanation": "Yes explanation"
+                        }
+                    ]
+                }
+            ]
+        },
+        "is_released": true
+    },
+
     "change_points_after_release": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -114,7 +167,7 @@
             ]
         },
         "current_rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -142,7 +195,7 @@
 
     "add_criteria_after_release": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -166,7 +219,7 @@
             ]
         },
         "current_rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -213,7 +266,7 @@
 
     "remove_criteria_after_release": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -256,7 +309,7 @@
             ]
         },
         "current_rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -284,7 +337,7 @@
 
     "add_options_after_release": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -308,7 +361,7 @@
             ]
         },
         "current_rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -330,7 +383,7 @@
 
     "remove_options_after_release": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -348,7 +401,7 @@
             ]
         },
         "current_rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -376,7 +429,7 @@
 
         "rename_criterion_name_after_release": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -400,7 +453,7 @@
             ]
         },
         "current_rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -428,7 +481,7 @@
 
     "rename_multiple_criteria_after_release": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -465,7 +518,7 @@
             ]
         },
         "current_rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -507,7 +560,7 @@
     "example_based_duplicate_option_points": {
         "is_example_based": true,
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -534,7 +587,7 @@
 
     "zero_options_feedback_optional": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -549,7 +602,7 @@
 
     "zero_options_feedback_disabled": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,
@@ -564,7 +617,7 @@
 
     "zero_options_no_feedback": {
         "rubric": {
-            "prompt": "Test Prompt",
+            "prompts": [{"description": "Test Prompt 1."}, {"description": "Test Prompt 2."}],
             "criteria": [
                 {
                     "order_num": 0,

openassessment/xblock/test/data/leaderboard_show.xml

 <openassessment leaderboard_show="3">
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
         <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>

openassessment/xblock/test/data/leaderboard_show_allowfiles.xml

 <openassessment leaderboard_show="3" allow_file_upload="True">
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/leaderboard_unavailable.xml

 <openassessment leaderboard_show="10">
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/over_grade_scenario.xml

 <openassessment submission_due="2014-03-05">
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/parse_assessments_xml.json

@@ -90,7 +90,11 @@
                 "due": "2014-06-01T00:00:00",
                 "examples": [
                     {
-                        "answer": "ẗëṡẗ äṅṡẅëṛ",
+                        "answer": {
+                            "parts": [
+                                {"text": "ẗëṡẗ äṅṡẅëṛ"}
+                            ]
+                        },
                         "options_selected": [
                             {
                                 "criterion": "Test criterion",
@@ -127,7 +131,11 @@
                 "due": "2014-06-01T00:00:00",
                 "examples": [
                     {
-                        "answer": "ẗëṡẗ äṅṡẅëṛ",
+                        "answer": {
+                            "parts": [
+                                {"text": "ẗëṡẗ äṅṡẅëṛ"}
+                            ]
+                        },
                         "options_selected": [
                             {
                                 "criterion": "Test criterion",
@@ -140,7 +148,11 @@
                         ]
                     },
                     {
-                        "answer": "äṅöẗḧëṛ ẗëṡẗ äṅṡẅëṛ",
+                        "answer": {
+                            "parts": [
+                                {"text": "äṅöẗḧëṛ ẗëṡẗ äṅṡẅëṛ"}
+                            ]
+                        },
                         "options_selected": [
                             {
                                 "criterion": "Another test criterion",

openassessment/xblock/test/data/parse_examples_xml.json

@@ -10,7 +10,11 @@
         ],
         "examples": [
             {
-                "answer": "ẗëṡẗ äṅṡẅëṛ",
+                "answer": {
+                    "parts": [
+                        {"text": "ẗëṡẗ äṅṡẅëṛ"}
+                    ]
+                },
                 "options_selected": [
                     {
                         "criterion": "Test criterion",
@@ -25,12 +29,18 @@
         "xml": [
             "<examples>",
             "<example>",
-            "<answer>ẗëṡẗ äṅṡẅëṛ</answer>",
+            "<answer>",
+            "<part>ẗëṡẗ äṅṡẅëṛ 1</part>",
+            "<part>ẗëṡẗ äṅṡẅëṛ 2</part>",
+            "</answer>",
             "<select criterion=\"Test criterion\" option=\"Yes\" />",
             "<select criterion=\"Another test criterion\" option=\"No\" />",
             "</example>",
             "<example>",
-            "<answer>äṅöẗḧëṛ ẗëṡẗ äṅṡẅëṛ</answer>",
+            "<answer>",
+            "<part>äṅöẗḧëṛ ẗëṡẗ äṅṡẅëṛ 1</part>",
+            "<part>äṅöẗḧëṛ ẗëṡẗ äṅṡẅëṛ 2</part>",
+            "</answer>",
             "<select criterion=\"Another test criterion\" option=\"Yes\" />",
             "<select criterion=\"Test criterion\" option=\"No\" />",
             "</example>",
@@ -38,7 +48,12 @@
         ],
         "examples": [
             {
-                "answer": "ẗëṡẗ äṅṡẅëṛ",
+                "answer": {
+                    "parts": [
+                        {"text": "ẗëṡẗ äṅṡẅëṛ 1"},
+                        {"text": "ẗëṡẗ äṅṡẅëṛ 2"}
+                    ]
+                },
                 "options_selected": [
                     {
                         "criterion": "Test criterion",
@@ -51,7 +66,12 @@
                 ]
             },
             {
-                "answer": "äṅöẗḧëṛ ẗëṡẗ äṅṡẅëṛ",
+                "answer": {
+                    "parts": [
+                        {"text": "äṅöẗḧëṛ ẗëṡẗ äṅṡẅëṛ 1"},
+                        {"text": "äṅöẗḧëṛ ẗëṡẗ äṅṡẅëṛ 2"}
+                    ]
+                },
                 "options_selected": [
                     {
                         "criterion": "Another test criterion",

openassessment/xblock/test/data/parse_prompts_xml.json

+{
+    "promptless": {
+        "xml": [
+            "<openassessment>",
+                "<rubric>",
+                "</rubric>",
+            "</openassessment>"
+        ],
+        "prompts": [{"description": ""}]
+    },
+
+    "rubric_prompt": {
+        "xml": [
+            "<openassessment>",
+                "<rubric>",
+                    "<prompt>Test prompt</prompt>",
+                "</rubric>",
+            "</openassessment>"
+        ],
+        "prompts": [{"description": "Test prompt"}]
+    },
+
+    "rubric_prompt_empty": {
+        "xml": [
+            "<openassessment>",
+                "<rubric>",
+                    "<prompt></prompt>",
+                "</rubric>",
+            "</openassessment>"
+        ],
+        "prompts": [{"description": ""}]
+    },
+
+    "rubric_prompt_unicode": {
+        "xml": [
+            "<openassessment>",
+                "<prompts>",
+                    "<prompt><description>ՇєรՇ קг๏๓קՇ</description></prompt>",
+                "</prompts>",
+                "<rubric>",
+                    "<prompt>Test prompt</prompt>",
+                "</rubric>",
+            "</openassessment>"
+        ],
+        "prompts": [{"description": "ՇєรՇ קг๏๓קՇ"}]
+    },
+
+    "prompts_one": {
+        "xml": [
+            "<openassessment>",
+                "<prompts>",
+                    "<prompt><description>Test prompt</description></prompt>",
+                "</prompts>",
+                "<rubric>",
+                "</rubric>",
+            "</openassessment>"
+        ],
+        "prompts": [{"description": "Test prompt"}]
+    },
+
+    "prompts_multiple": {
+        "xml": [
+            "<openassessment>",
+                "<prompts>",
+                    "<prompt><description>Test prompt 1</description></prompt>",
+                    "<prompt><description>Test prompt 2</description></prompt>",
+                    "<prompt><description>Test prompt 3</description></prompt>",
+                "</prompts>",
+                "<rubric>",
+                "</rubric>",
+            "</openassessment>"
+        ],
+        "prompts": [{"description": "Test prompt 1"}, {"description": "Test prompt 2"}, {"description": "Test prompt 3"}]
+    },
+
+    "prompts_empty": {
+        "xml": [
+            "<openassessment>",
+                "<prompts>",
+                    "<prompt><description></description></prompt>",
+                "</prompts>",
+                "<rubric>",
+                "</rubric>",
+            "</openassessment>"
+        ],
+        "prompts": [{"description": ""}]
+    },
+
+    "prompts_multiple_empty": {
+        "xml": [
+            "<openassessment>",
+                "<prompts>",
+                    "<prompt><description></description></prompt>",
+                    "<prompt><description></description></prompt>",
+                "</prompts>",
+                "<rubric>",
+                    "<prompt>Test prompt</prompt>",
+                "</rubric>",
+            "</openassessment>"
+        ],
+        "prompts": [{"description": ""}, {"description": ""}]
+    },
+
+    "prompts_unicode": {
+        "xml": [
+            "<openassessment>",
+                "<prompts>",
+                    "<prompt><description>ՇєรՇ קг๏๓קՇ 1</description></prompt>",
+                    "<prompt><description>ՇєรՇ קг๏๓קՇ 2</description></prompt>",
+                "</prompts>",
+                "<rubric>",
+                "</rubric>",
+            "</openassessment>"
+        ],
+        "prompts": [{"description": "ՇєรՇ קг๏๓קՇ 1"}, {"description": "ՇєรՇ קг๏๓קՇ 2"}]
+    },
+
+    "rubric_prompt_and_prompts": {
+        "xml": [
+            "<openassessment>",
+                "<prompts>",
+                    "<prompt><description>Test prompt 1</description></prompt>",
+                    "<prompt><description>Test prompt 2</description></prompt>",
+                "</prompts>",
+                "<rubric>",
+                    "<prompt>Test prompt</prompt>",
+                "</rubric>",
+            "</openassessment>"
+        ],
+        "prompts": [{"description": "Test prompt 1"}, {"description": "Test prompt 2"}]
+    }
+}

openassessment/xblock/test/data/parse_rubric_xml.json

@@ -2,7 +2,6 @@
     "simple": {
         "xml": [
             "<rubric>",
-            "<prompt>Test prompt</prompt>",
             "<criterion>",
             "<name>Test criterion</name>",
             "<prompt>Test criterion prompt</prompt>",
@@ -11,7 +10,6 @@
             "</criterion>",
             "</rubric>"
         ],
-        "prompt": "Test prompt",
         "feedbackprompt": null,
         "criteria": [
             {
@@ -43,7 +41,6 @@
     "feedback_prompt": {
         "xml": [
             "<rubric>",
-            "<prompt>Test prompt</prompt>",
             "<criterion>",
             "<name>Test criterion</name>",
             "<prompt>Test criterion prompt</prompt>",
@@ -53,7 +50,6 @@
             "<feedbackprompt>This is the feedback prompt</feedbackprompt>",
             "</rubric>"
         ],
-        "prompt": "Test prompt",
         "feedbackprompt": "This is the feedback prompt",
         "criteria": [
             {
@@ -93,7 +89,6 @@
             "</criterion>",
             "</rubric>"
         ],
-        "prompt": null,
         "feedbackprompt": null,
         "criteria": [
             {
@@ -125,7 +120,6 @@
     "empty_prompt": {
         "xml": [
             "<rubric>",
-            "<prompt></prompt>",
             "<criterion>",
             "<name>Test criterion</name>",
             "<prompt>Test criterion prompt</prompt>",
@@ -134,7 +128,6 @@
             "</criterion>",
             "</rubric>"
         ],
-        "prompt": "",
         "feedbackprompt": null,
         "criteria": [
             {
@@ -166,7 +159,6 @@
     "unicode": {
         "xml": [
             "<rubric>",
-            "<prompt>ՇєรՇ קг๏๓קՇ</prompt>",
             "<criterion>",
             "<name>𝓣𝓮𝓼𝓽 𝓬𝓻𝓲𝓽𝓮𝓻𝓲𝓸𝓷</name>",
             "<prompt>Ŧɇsŧ ȼɍɨŧɇɍɨøn ꝑɍømꝑŧ</prompt>",
@@ -175,7 +167,6 @@
             "</criterion>",
             "</rubric>"
         ],
-        "prompt": "ՇєรՇ קг๏๓קՇ",
         "feedbackprompt": null,
         "criteria": [
             {
@@ -207,7 +198,6 @@
     "multiple_criteria": {
         "xml": [
             "<rubric>",
-            "<prompt>Test prompt</prompt>",
             "<criterion>",
             "<name>Test criterion</name>",
             "<prompt>Test criterion prompt</prompt>",
@@ -221,7 +211,6 @@
             "</criterion>",
             "</rubric>"
         ],
-        "prompt": "Test prompt",
         "feedbackprompt": null,
         "criteria": [
             {
@@ -269,7 +258,6 @@
     "criterion_feedback_optional": {
         "xml": [
             "<rubric>",
-            "<prompt>Test prompt</prompt>",
             "<criterion>",
             "<name>Test criterion</name>",
             "<prompt>Test criterion prompt</prompt>",
@@ -283,7 +271,6 @@
             "</criterion>",
             "</rubric>"
         ],
-        "prompt": "Test prompt",
         "feedbackprompt": null,
         "criteria": [
             {

openassessment/xblock/test/data/peer_assessment_scenario.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/peer_closed_scenario.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/peer_future_scenario.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/peer_only_scenario.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>Concise</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/save_responses.json

 {
-   "empty": [""],
-   "unicode": ["Ѕраѓтаиѕ! ГоиіБЂт, Щэ ↁіиэ іи Нэll!"],
+   "empty": [[""], [""]],
+   "unicode": [["Ѕраѓтаиѕ! ГоиіБЂт, Щэ ↁіиэ іи Нэll!"], ["Ѕраѓтаиѕ! ГоиіБЂт, Щэ ↁіиэ іи Нэll!"]],
    "long": [
-        "Lorem ipsum dolor sit amet,",
+       [ "Lorem ipsum dolor sit amet,"],
+       [
         "consectetur adipiscing elit. Etiam luctus dapibus ante, vel luctus nibh bibendum et.",
         "Praesent in commodo quam. Morbi lobortis at felis ac mollis.",
         "Maecenas placerat nisl sed imperdiet posuere.",
@@ -50,5 +51,6 @@
         "nascetur ridiculus mus. Mauris at dapibus mauris, sed pharetra tortor.",
         "Pellentesque purus sem, congue sed elementum non, pretium in mi. Cras cursus gravida commodo.",
         "Aenean eu massa rhoncus, faucibus tortor id, sollicitudin tortor."
+       ]
    ]
 }
\ No newline at end of file

openassessment/xblock/test/data/save_scenario.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
         <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>

openassessment/xblock/test/data/self_assessment_closed.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/self_assessment_open.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/self_assessment_scenario.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>𝓒𝓸𝓷𝓬𝓲𝓼𝓮</name>
             <prompt>How concise is it?</prompt>

openassessment/xblock/test/data/self_assessment_unavailable.xml

 <openassessment>
     <title>Open Assessment Test</title>
-    <prompt>
-        Given the state of the world today, what do you think should be done to
-        combat poverty? Please answer in a short essay of 200-300 words.
-    </prompt>
+    <prompts>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat poverty?</description>
+        </prompt>
+        <prompt>
+            <description>Given the state of the world today, what do you think should be done to combat pollution?</description>
+        </prompt>
+    </prompts>
     <rubric>
-        <prompt>Read for conciseness, clarity of thought, and form.</prompt>
         <criterion>
             <name>Concise</name>
             <prompt>How concise is it?</prompt>