Display rubric to students after calibration

common/lib/xmodule/xmodule/css/combinedopenended/display.scss

@@ -122,6 +122,7 @@ div.combined-rubric-container {
 
   span.rubric-category {
     font-size: .9em;
+    font-weight: bold;
   }
   padding-bottom: 5px;
   padding-top: 10px;

common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee

@@ -443,7 +443,6 @@ class @PeerGradingProblem
     calibration_wrapper = $('.calibration-feedback-wrapper')
     calibration_wrapper.html("<p>The score you gave was: #{@grade}. The actual score is: #{response.actual_score}</p>")
 
-
     score = parseInt(@grade)
     actual_score = parseInt(response.actual_score)
 
@@ -452,6 +451,9 @@ class @PeerGradingProblem
     else
       calibration_wrapper.append("<p>You may want to review the rubric again.</p>")
 
+    if response.actual_rubric != undefined
+      calibration_wrapper.append("<div>Instructor Scored Rubric: #{response.actual_rubric}</div>")
+
     # disable score selection and submission from the grading interface
     $("input[name='score-selection']").attr('disabled', true)
     @submit_button.hide()

common/lib/xmodule/xmodule/peer_grading_module.py

@@ -15,6 +15,7 @@ from xmodule.open_ended_grading_classes.xblock_field_types import StringyFloat
 from xmodule.fields import Date
 
 from xmodule.open_ended_grading_classes.peer_grading_service import PeerGradingService, GradingServiceError, MockPeerGradingService
+from open_ended_grading_classes import combined_open_ended_rubric
 
 log = logging.getLogger(__name__)
 
@@ -394,7 +395,7 @@ class PeerGradingModule(PeerGradingFields, XModule):
         except etree.XMLSyntaxError:
             #This is a dev_facing_error
             log.exception("Cannot parse rubric string. Raw string: {0}"
-            .format(rubric))
+            .format(""))
             #This is a student_facing_error
             return {'success': False,
                     'error': 'Error displaying submission.  Please notify course staff.'}
@@ -434,12 +435,16 @@ class PeerGradingModule(PeerGradingFields, XModule):
         try:
             response = self.peer_gs.save_calibration_essay(location, grader_id, calibration_essay_id,
                                                            submission_key, score, feedback, rubric_scores)
+            log.debug("RESPONSE RESPONSE : {0}".format(response))
+            if 'actual_rubric' in response:
+                rubric_renderer = combined_open_ended_rubric.CombinedOpenEndedRubric(self.system, True)
+                response['actual_rubric'] = rubric_renderer.render_rubric(response['actual_rubric'])['html']
             return response
         except GradingServiceError:
             #This is a dev_facing_error
             log.exception(
                 "Error saving calibration grade, location: {0}, submission_id: {1}, submission_key: {2}, grader_id: {3}".format(
-                    location, submission_id, submission_key, grader_id))
+                    location, submission_key, grader_id))
             #This is a student_facing_error
             return self._err_response('There was an error saving your score.  Please notify course staff.')