Adding collapse / expand functions to the javascript. Removing the collapsed templates.

apps/openassessment/templates/openassessmentblock/peer/oa_peer_assessment_collapsed.html

-{%  extends "openassessmentblock/peer/oa_peer_assessment.html" %}
-{% block list_item %}
-    <li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment is--collapsed ui-toggle-visibility">
-{% endblock %}
-{% block body %}
-{% endblock %}

apps/openassessment/xblock/peer_assessment_mixin.py

@@ -130,7 +130,3 @@ class PeerAssessmentMixin(object):
         for assessment in self.rubric_assessments:
             if assessment["name"] == mixin_name:
                 return assessment
-
-    @XBlock.handler
-    def render_peer_assessment_collapsed(self, data, suffix=''):
-        return self.render_assessment("openassessmentblock/peer/oa_peer_assessment_collapsed.html")

apps/openassessment/xblock/self_assessment_mixin.py

@@ -18,7 +18,3 @@ class SelfAssessmentMixin(object):
     def render_self_assessment(self, data, suffix=''):
         return self.render_assessment('openassessmentblock/self/oa_self_assessment.html')
 
-    @XBlock.handler
-    def render_self_assessment_collapsed(self, data, suffix=''):
-        return self.render_assessment("openassessmentblock/self/oa_self_assessment_collapsed.html")
-

apps/openassessment/xblock/static/js/src/oa_base.js

@@ -8,6 +8,20 @@ function OpenAssessmentBlock(runtime, element) {
     /* Sample Debug Console: http://localhost:8000/submissions/Joe_Bloggs/TestCourse/u_3 */
 
     /*
+     * Utility functions
+     */
+    function collapse(element) {
+        element.removeClass("is--expanded");
+        element.addClass("is--collapsed");
+    }
+
+    function expand(element) {
+        element.addClass("is--collapsed");
+        element.removeClass("is--expanded");
+    }
+
+
+    /*
      *  Submission Functions
      */
     function render_submissions(data) {
@@ -26,6 +40,7 @@ function OpenAssessmentBlock(runtime, element) {
                             render_peer_assessment(data);
                         }
                     });
+                    collapse($('#openassessment__response', element));
                     $.ajax({
                         type: "POST",
                         url: renderSubmissionUrl,
@@ -101,19 +116,23 @@ function OpenAssessmentBlock(runtime, element) {
 
         $.ajax({
             type: "POST",
-            url: renderPeerCollapseUrl,
+            url: renderPeerUrl,
             success:  function(data) {
                 $('#openassessment__peer-assessment', element).replaceWith(data);
+                collapse($('#openassessment__peer-assessment', element));
             }
         });
 
         $.ajax({
             type: "POST",
-            url: renderSelfCollapseUrl,
+            url: renderSelfUrl,
             success:  function(data) {
                 $('#openassessment__self-assessment', element).replaceWith(data);
+                collapse($('#openassessment__self-assessment', element));
             }
         });
     });
+
+
 }
 /* END Javascript for OpenAssessmentXBlock. */

apps/openassessment/xblock/submission_mixin.py

@@ -166,7 +166,3 @@ class SubmissionMixin(object):
             path = 'openassessmentblock/response/oa_response_closed.html'
 
         return self.render_assessment(path, context_dict=context)
-
-    @XBlock.handler
-    def render_submission_collapsed(self, data, suffix=''):
-        return self.render_assessment("openassessmentblock/response/oa_response_collapsed.html")