Merge pull request #825 from edx/fix/vik/staff-information

Staff information about duplicate ORA submissions

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

@@ -964,3 +964,11 @@ section.peer-grading-container{
         }
     }
 }
+
+div.staff-info{
+    background-color: #eee;
+    border-radius: 10px;
+    border-bottom: 1px solid lightgray;
+    padding: 10px;
+    margin: 10px 0px 10px 0px;
+}

common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

@@ -386,7 +386,8 @@ class CombinedOpenEndedV1Module():
             'accept_file_upload': self.accept_file_upload,
             'location': self.location,
             'legend_list': LEGEND_LIST,
-            'human_state': HUMAN_STATES.get(self.state, "Not started.")
+            'human_state': HUMAN_STATES.get(self.state, "Not started."),
+            'is_staff': self.system.user_is_staff,
         }
 
         return context

lms/djangoapps/instructor/views/api.py

@@ -807,7 +807,11 @@ def _msk_from_problem_urlname(course_id, urlname):
     if urlname.endswith(".xml"):
         urlname = urlname[:-4]
 
-    urlname = "problem/" + urlname
+    # Combined open ended problems also have state that can be deleted.  However,
+    # appending "problem" will only allow capa problems to be reset.
+    # Get around this for combinedopenended problems.
+    if "combinedopenended" not in urlname:
+        urlname = "problem/" + urlname
 
     (org, course_name, __) = course_id.split("/")
     module_state_key = "i4x://" + org + "/" + course_name + "/" + urlname

lms/templates/combinedopenended/combined_open_ended.html

@@ -56,5 +56,10 @@
         <div class="result-container">
         </div>
     </div>
+    % if is_staff:
+        <div class="staff-info">
+            Staff Warning: Please note that if you submit a duplicate of text that has already been submitted for grading, it will not show up in the staff grading view.  It will be given the same grade that the original received automatically, and will be returned within 30 minutes if the original is already graded, or when the original is graded if not.
+        </div>
+    % endif
 </section>
 

lms/templates/instructor/staff_grading.html

@@ -27,7 +27,7 @@
 <section class="problem-list-container">
   <h2>${_("Instructions")}</h2>
   <div class="instructions">
-    <p>${_("This is the list of problems that currently need to be graded in order to train the machine learning models. Each problem needs to be trained separately, and we have indicated the number of student submissions that need to be graded in order for a model to be generated. You can grade more than the minimum required number of submissions--this will improve the accuracy of machine learning, though with diminishing returns. You can see the current accuracy of machine learning while grading.")}</p>
+    <p>${_("This is the list of problems that currently need to be graded in order to train AI grading and create calibration essays for peer grading. Each problem needs to be treated separately, and we have indicated the number of student submissions that need to be graded.  You can grade more than the minimum required number of submissions--this will improve the accuracy of AI grading, though with diminishing returns. You can see the current accuracy of AI grading in the problem view.")}</p>
   </div>
 
   <h2>${_("Problem List")}</h2>
@@ -46,6 +46,9 @@
       </div>
       <div class="ml-error-info-container">
       </div>
+      <div class="checkout-warning">
+          <p>${_("Please note that when you see a submission here, it has been temporarily removed from the grading pool.  The submission will return to the grading pool after 30 minutes without any grade being submitted.  Hitting the back button will result in a 30 minute wait to be able to grade this submission again.")}</p>
+      </div>
   </div>
   <div class="prompt-information-container">
     <h3>${_('Prompt')} <a href="#" class="question-header">${_("(Hide)")}</a></h3>