From 92b7dbdc69e7b2fc177dd2ff2085df22a4d24a25 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 1 Feb 2013 08:43:55 -0500
Subject: [PATCH] Refactor rubric JS so that we don't have to keep duplicating
 this code.

---
 .../js/src/combinedopenended/display.coffee   | 29 +++++++++++++++
 .../peer_grading/peer_grading_problem.coffee  | 15 ++------
 .../src/staff_grading/staff_grading.coffee    | 37 ++++---------------
 3 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
index 594efe2f9b..c4560559c8 100644
--- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
@@ -1,3 +1,32 @@
+class @Rubric
+  constructor: () ->
+
+  # finds the scores for each rubric category
+  @get_score_list: () =>
+    # find the number of categories:
+    num_categories = $('table.rubric tr').length
+
+    score_lst = []
+    # get the score for each one
+    for i in [0..(num_categories-2)]
+      score = $("input[name='score-selection-#{i}']:checked").val()
+      score_lst.push(score)
+
+    return score_lst
+
+  @get_total_score: () ->
+    score_lst = @get_score_list()
+
+  @check_complete: () ->
+     # check to see whether or not any categories have not been scored
+    num_categories = $('table.rubric tr').length
+    # -2 because we want to skip the header
+    for i in [0..(num_categories-2)]
+      score = $("input[name='score-selection-#{i}']:checked").val()
+      if score == undefined
+        return false
+    return true
+
 class @CombinedOpenEnded
   constructor: (element) ->
     @element=element
diff --git a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee
index c4b87eb30e..525891bb03 100644
--- a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee
+++ b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee
@@ -239,7 +239,7 @@ class PeerGradingProblem
 
     score_lst = []
     # get the score for each one
-    for i in [0..(num_categories-1)]
+    for i in [0..(num_categories-2)]
       score = $("input[name='score-selection-#{i}']:checked").val()
       score_lst.push(score)
 
@@ -315,17 +315,10 @@ 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()
 
   
       
diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee
index 005a8e682e..2d3cafd3e7 100644
--- a/lms/static/coffee/src/staff_grading/staff_grading.coffee
+++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee
@@ -232,35 +232,14 @@ class @StaffGrading
 
 
   graded_callback: () =>
-    @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
-    @state = state_graded
-    @submit_button.show()
+   # show button if we have scores for all categories
+    if Rubric.check_complete()
+      @state = state_graded
+      @submit_button.show()
 
   set_button_text: (text) =>
     @action_button.attr('value', text)
 
-  # finds the scores for each rubric category
-  get_score_list: () =>
-    # find the number of categories:
-    num_categories = $('table.rubric tr').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
-
   ajax_callback: (response) =>
     # always clear out errors and messages on transition.
     @error_msg = ''
@@ -285,8 +264,8 @@ class @StaffGrading
 
   skip_and_get_next: () =>
     data =
-      score: @grade
-      rubric_scores: @get_score_list()
+      score: Rubric.get_total_score()
+      rubric_scores: Rubric.get_score_list()
       feedback: @feedback_area.val()
       submission_id: @submission_id
       location: @location
@@ -299,8 +278,8 @@ class @StaffGrading
 
   submit_and_get_next: () ->
     data =
-      score: @grade
-      rubric_scores: @get_score_list()
+      score: Rubric.get_total_score()
+      rubric_scores: Rubric.get_score_list()
       feedback: @feedback_area.val()
       submission_id: @submission_id
       location: @location