Revert peer grading problem to master version

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

@@ -179,9 +179,6 @@ class @PeerGradingProblem
     @grading_panel = $('.grading-panel')
     @content_panel = $('.content-panel')
     @grading_message = $('.grading-message')
-    @question_header = $('.question-header')
-    @question_header
-    @question_header.click @collapse_question
     @grading_message.hide()
 
     @grading_wrapper =$('.grading-wrapper')
@@ -236,23 +233,11 @@ class @PeerGradingProblem
   fetch_submission_essay: () =>
     @backend.post('get_next_submission', {location: @location}, @render_submission)
 
-  # finds the scores for each rubric category
-  get_score_list: () =>
-    # find the number of categories:
-    num_categories = $('ul.rubric-list li').length
-
-    score_lst = []
-    # get the score for each one
-    for i in [0..(num_categories-1)]
-      score = $("input[name='score-selection-#{i}']:checked").val()
-      score_lst.push(score)
-
-    return score_lst
 
   construct_data: () ->
     data =
-      rubric_scores: @get_score_list()
-      score: @grade
+      rubric_scores: Rubric.get_score_list()
+      score: Rubric.get_total_score()
       location: @location
       submission_id: @essay_id_input.val()
       submission_key: @submission_key_input.val()
@@ -283,7 +268,6 @@ class @PeerGradingProblem
        if response.calibrated and (@calibration == null or @calibration == false)
          @calibration = false
          @fetch_submission_essay()
-         @collapse_question()
       # If we were calibrating before and no longer need to,
       # show the interstitial page
        else if response.calibrated and @calibration == true
@@ -321,17 +305,11 @@ class @PeerGradingProblem
 
   # called after a grade is selected on the interface
   graded_callback: (event) =>
-    @grade = $("input[name='grade-selection']:checked").val()
-    if @grade == undefined
-      return
     # check to see whether or not any categories have not been scored
-    num_categories = $('table.rubric tr').length
-    for i in [0..(num_categories-1)]
-      score = $("input[name='score-selection-#{i}']:checked").val()
-      if score == undefined
-        return
-    # show button if we have scores for all categories
-    @show_submit_button()
+    if Rubric.check_complete()
+      # show button if we have scores for all categories
+      @show_submit_button()
+      @grade = Rubric.get_total_score()
 
 
 
@@ -405,6 +383,7 @@ class @PeerGradingProblem
   # render common information between calibration and grading
   render_submission_data: (response) =>
     @content_panel.show()
+    @error_container.hide()
 
     @submission_container.append(@make_paragraphs(response.student_response))
     @prompt_container.html(response.prompt)
@@ -452,37 +431,5 @@ class @PeerGradingProblem
     @submit_button.show()
 
   setup_score_selection: (max_score) =>
-
-    # first, get rid of all the old inputs, if any.
-    @score_selection_container.html("""
-    <h3>Overall Score</h3>
-    <p>Choose an overall score for this submission.</p>
-    """)
-
-    # Now create new labels and inputs for each possible score.
-    for score in [0..max_score]
-      id = 'score-' + score
-      label = """<label for="#{id}">#{score}</label>"""
-
-      input = """
-              <input type="radio" name="grade-selection" id="#{id}" value="#{score}"/>
-              """       # "  fix broken parsing in emacs
-      @score_selection_container.append(input + label)
-
     # And now hook up an event handler again
-    $("input[name='score-selection']").change @graded_callback
-    $("input[name='grade-selection']").change @graded_callback
-
-  collapse_question: () =>
-    @prompt_container.slideToggle()
-    @prompt_container.toggleClass('open')
-    if @question_header.text() == "(Hide)"
-      new_text = "(Show)"
-    else
-      new_text = "(Hide)"
-    @question_header.text(new_text)
-
-#mock_backend = false
-#ajax_url = $('.peer-grading').data('ajax_url')
-#backend = new PeerGradingProblemBackend(ajax_url, mock_backend)
-#$(document).ready(() -> new PeerGradingProblem(backend))
+    $("input[class='score-selection']").change @graded_callback