merge commit

common/lib/capa/capa/inputtypes.py

@@ -746,8 +746,9 @@ class OpenEndedInput(InputTypeBase):
     tags = ['openendedinput']
 
     # pulled out for testing
-    submitted_msg = ("Submitted.  As soon as your submission is"
-                     " graded, this message will be replaced with the grader's feedback.")
+    submitted_msg = ("Feedback not yet available.  Reload to check again. "
+                     "Once the problem is graded, this message will be "
+                     "replaced with the grader's feedback")
 
     @classmethod
     def get_attributes(cls):
@@ -781,4 +782,4 @@ class OpenEndedInput(InputTypeBase):
 
 registry.register(OpenEndedInput)
 
-#-----------------------------------------------------------------------------
+#-----------------------------------------------------------------------------

common/lib/capa/capa/templates/openendedinput.html

@@ -13,15 +13,12 @@
     % elif status == 'incorrect':
       <span class="incorrect" id="status_${id}">Incorrect</span>
     % elif status == 'queued':
-      <span class="processing" id="status_${id}">Queued</span>
-      <span style="display:none;" class="xqueue" id="${id}" >${queue_len}</span>
+      <span class="grading" id="status_${id}">Submitted for grading</span>
     % endif
 
     % if hidden:
       <div style="display:none;" name="${hidden}" inputid="input_${id}" />
     % endif
-
-    <p class="debug">${status}</p>
   </div>
 
   <span id="answer_${id}"></span>

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

@@ -121,16 +121,6 @@ section.problem {
       }
     }
 
-    &.processing {
-      p.status {
-        @include inline-block();
-        background: url('../images/spinner.gif') center center no-repeat;
-        height: 20px;
-        width: 20px;
-        text-indent: -9999px;
-      }
-    }
-
     &.correct, &.ui-icon-check {
       p.status {
         @include inline-block();
@@ -266,6 +256,11 @@ section.problem {
         margin: -7px 7px 0 0;
       }
 
+      .grading {
+        text-indent: 0px;
+        margin: 0px 7px 0 0;
+      }
+
       p {
         line-height: 20px;
         text-transform: capitalize;

lms/static/coffee/src/staff_grading/staff_grading.coffee

@@ -18,7 +18,7 @@ class StaffGradingBackend
 
   mock: (cmd, data) ->
     # Return a mock response to cmd and data
-    # should take a problem id as an argument
+    # TODO: needs (optional?) arg for problem location
     if cmd == 'get_next'
       @mock_cnt++
       response =
@@ -31,7 +31,7 @@ class StaffGradingBackend
         rubric: 'A rubric! ' + @mock_cnt
         submission_id: @mock_cnt
         max_score: 2 + @mock_cnt % 3
-        ml_error_info : 'ML error info!' + @mock_cnt
+        ml_error_info : 'ML accuracy info: ' + @mock_cnt
 
     else if cmd == 'save_grade'
       console.log("eval: #{data.score} pts,  Feedback: #{data.feedback}")
@@ -44,8 +44,10 @@ class StaffGradingBackend
         response = 
             success: true
             problem_list: [
-                {problem_id: 1, problem_name: "Problem 1", num_left: 3, num_total: 5}
-                {problem_id: 2, problem_name: "Problem 2", num_left: 1, num_total: 5}
+                {location: 'i4x://MITx/3.091x/problem/open_ended_demo', \
+                    problem_name: "Problem 1", num_left: 3, num_total: 5},
+                {location: 'i4x://MITx/3.091x/problem/open_ended_demo', \
+                    problem_name: "Problem 2", num_left: 1, num_total: 5}
             ]
     else
       response =