Added in templates for Student Training Authoring

Included:
- HTML Templating using current problem defininition
- Styles
Not included:
- JavaScript changes
- Python test cleanup

openassessment/templates/openassessmentblock/edit/oa_edit_student_training.html

@@ -4,7 +4,7 @@
     <div class = "drag-handle action"></div>
     <div class = "openassessment_inclusion_wrapper">
         <input type="checkbox" id="include_student_training"
-                {% if assessments.student_training %} checked="true" {% endif %} >
+                {% if assessments.student_training %} checked="true" {% endif %}>
         <label for="include_student_training">{% trans "Step: Student Training" %}</label>
     </div>
     <div class = "openassessment_assessment_module_editor">
@@ -16,6 +16,7 @@
                 {% trans "Enter one or more sample responses that you've created, together with the scores you would give those responses. Be sure to format the responses and scores according to the placeholder text below." %}
             </p>
             <ol>
+                {% for example in assessments.training.examples%}
                     <li class="openassessment_training_example is-collapsible">
 
                         <div class="openassessment_training_example_header view-outline">
@@ -42,7 +43,15 @@
                                                     <select class="openassessment_training_example_criterion_option setting-input">
                                                         <option value="Not Scored">{% trans "Not Scored" %}</option>
                                                         {% for option in criterion.options %}
-                                                    <option value={{option.name}}>{{option.name}} - {{option.points}} {% trans "points" %}</option>
+                                                            <option value={{option.name}}
+                                                                {% for opt_sel in example.options_selected %}
+                                                                {% if opt_sel.criterion == criterion.name and opt_sel.option == option.name %}
+                                                                        selected
+                                                                {% endif %}
+                                                                {% endfor %}
+                                                            >
+                                                                {{option.name}} - {{option.points}} {% trans "points" %}
+                                                            </option>
                                                         {% endfor %}
                                                     </select>
                                                 </label>
@@ -51,14 +60,18 @@
                                     {% endfor %}
                                 </ol>
                             </div>
+
                             <div class="openassessment_training_example_essay_wrapper">
                                 <h2>
                                     {% trans "Response" %}
                                 </h2>
-                            <textarea class="openassessment_training_example_essay"></textarea>
+                                <textarea class="openassessment_training_example_essay">
+                                    {{example.answer}}
+                                </textarea>
                             </div>
                         </div>
                 </li>
+                {% endfor %}
             </ol>
             <div>
                 <h2 class='openassessment_add_training_example'>{% trans "Add Scored Response" %}</h2>

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

@@ -265,7 +265,7 @@
   }
 
   .openassessment_assessment_module_settings_editor{
-    padding: 5px;
+    padding: 5px 20px 5px 5px;
     margin: 10px;
     border: 1px solid $edx-gray-l3;
     border-radius: 3px;
@@ -750,6 +750,7 @@
         left: 10px;
         height: 100%;
         textarea {
+          min-height: 90px;
           height: Calc(100% - 35px);
           resize: none;
           box-sizing: border-box;
@@ -773,8 +774,11 @@
         float: right;
         .openassessment_training_example_criteria_selections {
           .comp-setting-entry {
+            .wrapper-comp-setting{
+              min-width: 100px;
+            }
             margin: 0;
-            padding: 7.5px 5px;
+            padding: 10px;
             label{
               width: 100%;
               margin-left: 0;
@@ -790,7 +794,10 @@
   }
 
   .openassessment_add_training_example {
-    :before {
+    color: #009fe6;
+  }
+
+  .openassessment_add_training_example:before {
     font-family: "FontAwesome";
     display: inline-block;
     margin-left: 5px;
@@ -798,8 +805,6 @@
     width: auto;
     height: auto;
     content: "\f067";
-    }
-    color: #009fe6;
     margin-left: 10px;
   }
 

openassessment/xblock/studio_mixin.py

@@ -85,17 +85,7 @@ class StudioMixin(object):
             'student-training'
         )
         if student_training_module:
-            student_training_module = copy.deepcopy(student_training_module)
-            try:
-                examples = xml.serialize_examples_to_xml_str(
-                    student_training_module
-                )
-                student_training_module["examples"] = examples
-                assessments['training'] = student_training_module
-            # We do not expect serialization to raise an exception, but if it does,
-            # handle it gracefully.
-            except:
-                logger.exception("An error occurred while serializing the XBlock")
+            assessments['training'] = copy.deepcopy(student_training_module)
 
         submission_due = self.submission_due if self.submission_due else ''
         submission_start = self.submission_start if self.submission_start else ''