Merge pull request #118 from edx/sanchez/we-need-stinkin-badges

Adding is--complete styles to some of our grading badges, and adding new...

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

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

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

+{%  extends "openassessmentblock/peer/oa_peer_assessment.html" %}
+
+{% block list_item %}
+<li id="openassessment__peer-assessment" class="openassessment__steps__step step--peer-assessment ui-toggle-visibility is--collapsed is--unavailable">
+{% endblock %}
+
+{% block title %}
+<span class="step__status">
+  <span class="ico"><i class="icon-info-sign"></i></span>
+  <span class="step__status__label">This step's status:</span>
+  <span class="step__status__value">
+  <span class="copy">Unavailable</span>
+  </span>
+</span>
+{% endblock %}
+
+{% block body %}
+{% endblock %}

apps/openassessment/templates/openassessmentblock/self/oa_self_complete.html

 {%  extends "openassessmentblock/self/oa_self_assessment.html" %}
 
 {% block list_item %}
-<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment ui-toggle-visibility is--collapsed">
+<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment ui-toggle-visibility is--collapsed is--complete">
 {% endblock %}
 
 {% block title %}

apps/openassessment/templates/openassessmentblock/self/oa_self_unavailable.html

+{%  extends "openassessmentblock/self/oa_self_assessment.html" %}
+
+{% block list_item %}
+<li id="openassessment__self-assessment" class="openassessment__steps__step step--self-assessment ui-toggle-visibility is--collapsed is--unavailable">
+{% endblock %}
+
+{% block title %}
+<span class="step__status">
+  <span class="step__status__label">This step's status:</span>
+  <span class="step__status__value">
+    <i class="ico icon-warning-sign"></i>
+    <span class="copy">Unavailable</span>
+  </span>
+</span>
+{% endblock %}
+
+{% block body %}
+{% endblock %}

apps/openassessment/xblock/peer_assessment_mixin.py

@@ -108,7 +108,7 @@ class PeerAssessmentMixin(object):
             "rubric_criteria": self.rubric_criteria,
             "estimated_time": "20 minutes"  # TODO: Need to configure this.
         }
-
+        finished = False
         assessment = self.get_assessment_module('peer-assessment')
         if assessment:
 
@@ -130,7 +130,7 @@ class PeerAssessmentMixin(object):
                 context_dict["submit_button_text"] = (
                     "Submit your assessment & move to response #{}"
                 ).format(count + 2)
-        path = 'openassessmentblock/peer/oa_peer_waiting.html'
+        path = 'openassessmentblock/peer/oa_peer_unavailable.html'
 
         if date == "due" and not problem_open:
             path = 'openassessmentblock/peer/oa_peer_closed.html'
@@ -141,6 +141,8 @@ class PeerAssessmentMixin(object):
                 context_dict["peer_submission"] = peer_sub
         elif workflow and workflow["status"] == "done":
             path = "openassessmentblock/peer/oa_peer_complete.html"
+        elif workflow and finished:
+            path = 'openassessmentblock/peer/oa_peer_waiting.html'
 
         return self.render_assessment(path, context_dict)
 

apps/openassessment/xblock/self_assessment_mixin.py

@@ -22,16 +22,12 @@ class SelfAssessmentMixin(object):
 
     @XBlock.handler
     def render_self_assessment(self, data, suffix=''):
-    # Retrieve the self-assessment, if there is one
-
-        workflow = self.get_workflow_info()
-        if workflow:
-            return self._determine_assessment_state(workflow)
-
-        return self.render_assessment('openassessmentblock/self/oa_self_closed.html')
-
-    def _determine_assessment_state(self, workflow):
         context = {}
+        path = 'openassessmentblock/self/oa_self_unavailable.html'
+        problem_open, date = self.is_open(step="self")
+        workflow = self.get_workflow_info()
+        if not workflow:
+            return self.render_assessment(path, context)
         try:
             submission, assessment = self_api.get_submission_and_assessment(
                 workflow["submission_uuid"]
@@ -49,10 +45,11 @@ class SelfAssessmentMixin(object):
                 "estimated_time": "20 minutes",  # TODO: Need to configure this.
                 "self_submission": submission,
             }
-        elif assessment:
+        elif assessment is not None:
             path = 'openassessmentblock/self/oa_self_complete.html'
-        else:
+        elif date == "due" and not problem_open:
             path = 'openassessmentblock/self/oa_self_closed.html'
+
         return self.render_assessment(path, context)
 
     @XBlock.json_handler

apps/openassessment/xblock/test/test_self.py

@@ -70,7 +70,7 @@ class TestSelfAssessment(XBlockHandlerTestCase):
     @scenario('data/self_assessment_scenario.xml')
     def test_render_self_assessment_preview(self, xblock):
         resp = self.request(xblock, 'render_self_assessment', json.dumps(dict()))
-        self.assertIn("Not Completed", resp)
+        self.assertIn("Unavailable", resp)
 
     @scenario('data/self_assessment_scenario.xml', user_id='Bob')
     def test_render_self_assessment_complete(self, xblock):
@@ -106,7 +106,7 @@ class TestSelfAssessment(XBlockHandlerTestCase):
         # Without creating a submission, render the self-assessment step
         # Expect that the step is closed
         resp = self.request(xblock, 'render_self_assessment', json.dumps(dict()))
-        self.assertIn("Not Completed", resp)
+        self.assertIn("Unavailable", resp)
 
     @scenario('data/self_assessment_scenario.xml', user_id='Bob')
     def test_render_self_assessessment_api_error(self, xblock):