From e910f60e08b2418fa118680ff785e5795f66e036 Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@edx.org>
Date: Thu, 15 Nov 2012 14:27:46 -0500
Subject: [PATCH] wip

---
 .../src/staff_grading/staff_grading.coffee     | 18 +++++++++++-------
 .../coffee/src/staff_grading/test_grading.html | 12 ++++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/lms/static/coffee/src/staff_grading/staff_grading.coffee b/lms/static/coffee/src/staff_grading/staff_grading.coffee
index 827f9fe56e..aded7464e7 100644
--- a/lms/static/coffee/src/staff_grading/staff_grading.coffee
+++ b/lms/static/coffee/src/staff_grading/staff_grading.coffee
@@ -22,7 +22,7 @@ class StaffGradingBackend
       response =
         success: true
         submission: 'submission! ' + @mock_cnt
-        rubric: 'A rubric!' + @mock_cnt
+        rubric: 'A rubric! ' + @mock_cnt
 
     else if cmd == 'save_grade'
       console.log("eval: #{data.score} pts,  Feedback: #{data.feedback}")
@@ -68,7 +68,8 @@ class StaffGrading
     @rubric_container = $('.rubric-container')
     @submission_wrapper = $('.submission-wrapper')
     @rubric_wrapper = $('.rubric-wrapper')
-    @button = $('.submit-button')
+    @feedback_area = $('.feedback-area')
+    @submit_button = $('.submit-button')        
     
     # model state
     @state = state_no_data
@@ -77,11 +78,12 @@ class StaffGrading
     @error_msg = ''
     @message = ''
 
-    @feedback = null
     @score = null
 
     # action handlers
-    @button.click @clicked
+    @submit_button.click @submit
+    @correct_button.click () => @score = 1
+    @incorrect_button.click () => @score = 0
 
     # render intial state
     @render_view()
@@ -91,7 +93,7 @@ class StaffGrading
 
 
   set_button_text: (text) ->
-    @button.prop('value', text)
+    @submit_button.prop('value', text)
 
   ajax_callback: (response) =>
     # always clear out errors and messages on transition.
@@ -112,7 +114,7 @@ class StaffGrading
     @backend.post('get_next', {}, @ajax_callback)
 
   submit_and_get_next: () ->
-    data = {score: '1', feedback: 'Great!'}
+    data = {score: @score, feedback: @feedback_area.val()}
     
     @backend.post('save_grade', data, @ajax_callback)
 
@@ -123,6 +125,8 @@ class StaffGrading
   data_loaded: (submission, rubric) ->
     @submission = submission
     @rubric = rubric
+    @feedback_area.val('')
+    @score = null
     @state = state_grading
 
   no_more: () ->
@@ -158,7 +162,7 @@ class StaffGrading
     @rubric_wrapper.toggle(show_grading_elements)
 
 
-  clicked: (event) =>
+  submit: (event) =>
     event.preventDefault()
     
     if @state == state_error
diff --git a/lms/static/coffee/src/staff_grading/test_grading.html b/lms/static/coffee/src/staff_grading/test_grading.html
index 8e69c90866..b417aa41d9 100644
--- a/lms/static/coffee/src/staff_grading/test_grading.html
+++ b/lms/static/coffee/src/staff_grading/test_grading.html
@@ -26,6 +26,18 @@
 <div class="rubric-container">
 </div>
 
+<div class="evaluation">
+  <textarea name="feedback" placeholder="Feedback for student..."
+            class="feedback-area" cols="70" rows="10"></textarea>
+  <p>
+  <label for="correct-radio">Correct</label>
+  <input type="radio" name="score-selection" id="correct-radio" value="1">
+
+  <label for="correct-radio">Incorrect</label>
+  <input type="radio" name="score-selection" id="incorrect-radio" value="0">
+  </p>
+</div>
+  
 </section>
 
 <div class="submission">