Fix location strings, re-order checkboxes

common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py

@@ -437,14 +437,14 @@ class OpenEndedChild(object):
         error_string = ("You need to peer grade {0} more in order to make another submission.  "
         "You have graded {1}, and {2} are required.  You have made {3} successful peer grading submissions.")
         try:
-            response = self.peer_gs.get_data_for_location(location, student_id)
+            response = self.peer_gs.get_data_for_location(location_string, student_id)
             count_graded = response['count_graded']
             count_required = response['count_required']
             student_sub_count = response['student_sub_count']
             success = True
         except:
             #This is a dev_facing_error
-            log.error("Could not contact external open ended graders for location {0} and student {1}".format(location,student_id))
+            log.error("Could not contact external open ended graders for location {0} and student {1}".format(location_string,student_id))
             #This is a student_facing_error
             error_message = "Could not contact the graders.  Please notify course staff."
             return success, allowed_to_submit, error_message
@@ -457,7 +457,7 @@ class OpenEndedChild(object):
             return success, allowed_to_submit, error_message
 
     def get_eta(self):
-        response = self.controller_qs.check_for_eta(self.location.url())
+        response = self.controller_qs.check_for_eta(self.location_string)
         try:
             response = json.loads(response)
         except:

lms/templates/peer_grading/peer_grading_problem.html

@@ -43,8 +43,8 @@
           <p>Please include some written feedback as well.</p>
           <textarea name="feedback" placeholder="Feedback for student"
                     class="feedback-area" cols="70" ></textarea>
-          <p class="flag-student-container">Flag this submission for review by course staff (use if the submission contains inappropriate content): <input type="checkbox" class="flag-checkbox" value="student_is_flagged"></p>
-          <p class="answer-unknown-container">I do not know how to grade this question: <input type="checkbox" class="answer-unknown-checkbox" value="answer_is_unknown"></p>
+          <div class="flag-student-container"> <input type="checkbox" class="flag-checkbox" value="student_is_flagged"> Flag this submission for review by course staff (use if the submission contains inappropriate content) </div>
+          <div class="answer-unknown-container"> <input type="checkbox" class="answer-unknown-checkbox" value="answer_is_unknown"> I do not know how to grade this question </div>
         </div>