Merge remote-tracking branch 'origin/master' into ai-grading

Conflicts:
	apps/openassessment/xblock/staff_info_mixin.py

apps/openassessment/assessment/api/peer.py

@@ -163,7 +163,7 @@ def create_assessment(
         try:
             option_ids = rubric.options_ids(options_selected)
         except InvalidOptionSelection as ex:
-            msg = _("Selected options do not match the rubric: {error}").format(error=ex.message)
+            msg = _("Selected options do not match the rubric: {error}").format(error=ex)
             raise PeerAssessmentRequestError(msg)
 
         scorer_workflow = PeerWorkflow.objects.get(submission_uuid=scorer_submission_uuid)
@@ -192,7 +192,12 @@ def create_assessment(
         peer_serializer = AssessmentSerializer(data=peer_assessment)
 
         if not peer_serializer.is_valid():
-            raise PeerAssessmentRequestError(peer_serializer.errors)
+            msg = (
+                u"An error occurred while serializing "
+                u"the peer assessment associated with "
+                u"the scorer's submission UUID {}."
+            ).format(scorer_submission_uuid)
+            raise PeerAssessmentRequestError(msg)
 
         assessment = peer_serializer.save()
 
@@ -567,8 +572,7 @@ def create_peer_workflow(submission_uuid):
         submission_uuid (str): The submission associated with this workflow.
 
     Returns:
-        Workflow (PeerWorkflow): A PeerWorkflow item created based on the given
-            student item and submission.
+        None
 
     Raises:
         SubmissionError: There was an error retrieving the submission.
@@ -587,8 +591,11 @@ def create_peer_workflow(submission_uuid):
             item_id=submission['student_item']['item_id'],
             submission_uuid=submission_uuid
         )
+        workflow.save()
     except IntegrityError:
-        workflow = PeerWorkflow.objects.get(submission_uuid=submission_uuid)
+        # If we get an integrity error, it means someone else has already
+        # created a workflow for this submission, so we don't need to do anything.
+        pass
     except DatabaseError:
         error_message = _(
             u"An internal error occurred while creating a new peer "
@@ -597,8 +604,6 @@ def create_peer_workflow(submission_uuid):
         )
         logger.exception(error_message)
         raise PeerAssessmentInternalError(error_message)
-    workflow.save()
-    return workflow
 
 
 def create_peer_workflow_item(scorer_submission_uuid, submission_uuid):

apps/openassessment/assessment/api/student_training.py

@@ -322,7 +322,7 @@ def get_training_example(submission_uuid, rubric, examples):
         logger.exception(
             "Could not deserialize training examples for submission UUID {}".format(submission_uuid)
         )
-        raise StudentTrainingRequestError(ex.message)
+        raise StudentTrainingRequestError(ex)
     except sub_api.SubmissionNotFoundError as ex:
         msg = _(u"Could not retrieve the submission with UUID {}").format(submission_uuid)
         logger.exception(msg)

apps/openassessment/assessment/errors/peer.py

 """
 Errors for the peer assessment.
 """
-import copy
 
 
 class PeerAssessmentError(Exception):
@@ -21,10 +20,7 @@ class PeerAssessmentRequestError(PeerAssessmentError):
     information which does not allow the request to be processed.
 
     """
-
-    def __init__(self, field_errors):
-        super(PeerAssessmentRequestError, self).__init__(repr(field_errors))
-        self.field_errors = copy.deepcopy(field_errors)
+    pass
 
 
 class PeerAssessmentWorkflowError(PeerAssessmentError):

apps/openassessment/assessment/test/test_peer.py

@@ -358,11 +358,11 @@ class TestPeerApi(CacheResetTest):
         self.assertNotEqual(pwis[0].started_at, yesterday)
 
     def test_peer_workflow_integrity_error(self):
-        tim_sub, tim = self._create_student_and_submission("Tim", "Tim's answer")
+        tim_sub, __ = self._create_student_and_submission("Tim", "Tim's answer")
         with patch.object(PeerWorkflow.objects, "get_or_create") as mock_peer:
             mock_peer.side_effect = IntegrityError("Oh no!")
-            workflow = peer_api.create_peer_workflow(tim_sub["uuid"])
-            self.assertEquals(tim_sub["uuid"], workflow.submission_uuid)
+            # This should not raise an exception
+            peer_api.create_peer_workflow(tim_sub["uuid"])
 
     @raises(peer_api.PeerAssessmentWorkflowError)
     def test_no_submission_found_closing_assessment(self):

apps/openassessment/xblock/peer_assessment_mixin.py

@@ -77,9 +77,9 @@ class PeerAssessmentMixin(object):
 
                 # Emit analytics event...
                 self._publish_peer_assessment_event(assessment)
-            except PeerAssessmentRequestError as ex:
-                return {'success': False, 'msg': ex.message}
-            except PeerAssessmentInternalError as ex:
+            except PeerAssessmentRequestError:
+                return {'success': False, 'msg': _(u"Your peer assessment could not be submitted.")}
+            except PeerAssessmentInternalError:
                 msg = _("Internal error occurred while creating the assessment")
                 logger.exception(msg)
                 return {'success': False, 'msg': msg}

apps/openassessment/xblock/self_assessment_mixin.py

@@ -139,10 +139,10 @@ class SelfAssessmentMixin(object):
             # After we've created the self-assessment, we need to update the workflow.
             self.update_workflow_status()
         except self_api.SelfAssessmentRequestError as ex:
-            msg = _(u"Could not create self assessment: {error}").format(error=ex.message)
+            msg = _(u"Could not create self assessment: {error}").format(error=ex)
             return {'success': False, 'msg': msg}
         except workflow_api.AssessmentWorkflowError as ex:
-            msg = _(u"Could not update workflow: {error}").format(error=ex.message)
+            msg = _(u"Could not update workflow: {error}").format(error=ex)
             return {'success': False, 'msg': msg}
         else:
             return {'success': True, 'msg': u""}

apps/openassessment/xblock/staff_info_mixin.py

@@ -55,7 +55,7 @@ class StaffInfoMixin(object):
         # We need to display the new-style locations in the course staff
         # info, even if we're using old-style locations internally,
         # so course staff can use the locations to delete student state.
-        context['item_id'] = unicode(self.scope_ids.usage_id)
+        context['item_id'] = self.get_student_item_dict()["item_id"]
 
         # Include release/due dates for each step in the problem
         context['step_dates'] = list()

apps/openassessment/xblock/student_training_mixin.py

@@ -161,7 +161,7 @@ class StudentTrainingMixin(object):
         except (student_training.StudentTrainingRequestError, student_training.StudentTrainingInternalError) as ex:
             return {
                 'success': False,
-                'msg': _(u"Your scores could not be checked: {error}.").format(error=ex.message)
+                'msg': _(u"Your scores could not be checked: {error}.").format(error=ex)
             }
         except:
             return {

apps/openassessment/xblock/studio_mixin.py

@@ -56,10 +56,10 @@ class StudioMixin(object):
                 update_from_xml_str(self, data['xml'], validator=validator(self))
 
             except ValidationError as ex:
-                return {'success': False, 'msg': _('Validation error: {error}').format(error=ex.message)}
+                return {'success': False, 'msg': _('Validation error: {error}').format(error=ex)}
 
             except UpdateFromXmlError as ex:
-                return {'success': False, 'msg': _('An error occurred while saving: {error}').format(error=ex.message)}
+                return {'success': False, 'msg': _('An error occurred while saving: {error}').format(error=ex)}
 
             else:
                 return {'success': True, 'msg': _('Successfully updated OpenAssessment XBlock')}
@@ -87,7 +87,7 @@ class StudioMixin(object):
         # We do not expect `serialize_content` to raise an exception,
         # but if it does, handle it gracefully.
         except Exception as ex:
-            msg = _('An unexpected error occurred while loading the problem: {error}').format(error=ex.message)
+            msg = _('An unexpected error occurred while loading the problem: {error}').format(error=ex)
             logger.error(msg)
             return {'success': False, 'msg': msg, 'xml': u''}
         else:

apps/openassessment/xblock/validation.py

@@ -212,7 +212,7 @@ def validate_dates(start, end, date_ranges):
     try:
         resolve_dates(start, end, date_ranges)
     except (DateValidationError, InvalidDateFormat) as ex:
-        return (False, ex.message)
+        return (False, unicode(ex))
     else:
         return (True, u'')
 

docs/config.ini

+# below are the server-wide settings for documentation
+[help_settings]
+url_base = http://edx.readthedocs.org/projects/edx-partner-course-staff
+version = latest
+
+
+# below are the pdf settings for the pdf file
+[pdf_settings]
+pdf_base = https://media.readthedocs.org/pdf/edx-partner-course-staff
+pdf_file = edx-partner-course-staff.pdf
+
+
+# below are the sub-paths to the documentation for the various pages
+# NOTE: If any of these page settings change, then their corresponding test should be updated
+#       in edx-platform/cms/djangoapps/contentstore/features/help.feature
+[pages]
+default = index.html
+home = getting_started/get_started.html
+outline = creating_content/organizing_course.html
+subsection = creating_content/organizing_course.html#subsections
+unit = creating_content/organizing_course.html#units
+updates = creating_content/handouts_updates.html
+pages = creating_content/pages.html
+files = creating_content/course_files.html
+textbooks = creating_content/textbooks.html
+schedule = building_course/setting_up_student_view.html
+grading = building_course/establish_grading_policy.html
+team = building_course/creating_new_course.html#add-course-team-members
+advanced = index.html
+checklist = building_course/creating_new_course.html#use-the-course-checklist
+import = building_course/export_import_course.html#import-a-course
+export = building_course/export_import_course.html#export-a-course
+
+# below are the language directory names for the different locales
+[locales]
+default = en
+en = en
+en_us = en
\ No newline at end of file

docs/en_us/course_authors/Makefile

+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+Q_FLAG        = 
+
+ifeq ($(quiet), true)
+Q_FLAG = -Q
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = $(Q_FLAG) -d $(BUILDDIR)/doctrees -c source $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/getting_started.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/getting_started.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/getting_started"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/getting_started"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."

docs/en_us/course_authors/source/Access_PA_Info.rst

+.. _Accessing PA Information:
+
+########################################################
+Accessing Assignment Step Status and Student Information
+########################################################
+
+.. _PA Access Status of Problem Steps:
+
+******************************
+Access Status of Problem Steps
+******************************
+
+After your problem has opened, you can check the current number of students who are in each step--that is, how many students have submitted responses, have completed peer and self assessments, are waiting to assess responses or receive grades, or have finished the problem entirely. 
+
+To find this information, open the problem in the LMS, scroll to the bottom of the problem, and then click the black **Course Staff Information** banner.
+
+.. image:: /Images/PA_CourseStaffInfo_Collapsed.png
+   :alt: The Course Staff Information banner at the bottom of the peer assessment
+
+**Course Staff Information** expands, and you can see the number of students who are actively in each step of the problem.
+
+.. image:: /Images/PA_CourseStaffInfo_Expanded.png
+   :alt: The Course Staff Information box expanded, showing problem status
+
+.. _Access Student Information:
+
+******************************
+Access Student Information
+******************************
+
+You can access information about an individual student's performance on a peer assessment assignment, including:
+
+* The student's response. 
+* The peer assessments that other students performed on the student's response, including feedback on individual criteria and on the overall response.
+* The peer assessments that the student performed on other students' responses, including feedback on individual criteria and on the overall responses.
+* The student's self assessment.
+
+In the following example, you can see the student's response. The response received one peer assessment, and the student completed one peer assessment on another student's response. The student also completed a self assessment.
+
+.. image:: /Images/PA_SpecificStudent.png
+   :width: 600
+   :alt: Report showing information about a student's response
+
+Accessing information about a specific student has two steps:
+
+#. Determine the student's anonymized ID.
+#. Access information for that student.
+
+=======================================
+Determine the Student's Anonymized ID
+=======================================
+
+To determine a student's anonymized ID for the course, you'll download two .csv spreadsheets from the Instructor Dashboard.
+
+#. In the LMS, click the **Instructor** tab.
+#. On the Instructor Dashboard, click **Data Download**.
+#. On the **Data Download** page, locate the **Data Download** section, and then click the **Download profile information as a CSV** button. A spreadsheet named **enrolled_profiles.csv** automatically downloads.
+#. In the **Data Download** section, click the **Get Student Anonymized IDs CSV** button. A spreadsheet named **<course name>-anon-ids.csv** automatically downloads.
+#. Open both spreadsheets.
+#. In the **enrolled_profiles.csv** spreadsheet, locate the student that you want by username, name, or e-mail address. Make a note of the line number for that student. In the following example, Amy Dorrit is listed on line 7.
+
+   .. image:: /Images/PA_enrolled_profiles.png
+      :width: 800
+      :alt: Spreadsheet listing enrolled students
+
+7. In the **<course name>-anon-ids.csv** spreadsheet, locate the line number that you noted in step 6, and then go to column C, "Course Specific Anonymized user ID", for that line. The value in column C is the student's anonymized user ID for the course. In the following example, the anonymized user ID for Amy Dorrit, line 7, is 9gsbl24689gsdhklh1478192741hjklf.
+
+   .. image:: /Images/PA_anon_ids.png
+      :width: 500
+      :alt: Spreadsheet listing students' anonymous user IDs
+
+=======================================
+Access the Student's Information
+=======================================
+
+#. In the LMS, go to the peer assessment assignment that you want to see.
+#. Scroll to the bottom of the problem, and then click the black **Course Staff Information** banner.
+#. Scroll down to the **Get Student Info** box, enter the student's anonymized user ID in the box, and then click **Submit**.
+
+The student's information appears below the **Get Student Info** box.
+

docs/en_us/course_authors/source/PeerAssessment_Students.rst

+.. _PA for Students:
+
+#############################
+Peer Assessments for Students
+#############################
+
+You may want to let your students know what to expect when they complete peer assessments. This guide walks students through each step of the process.
+
+********************
+Student Instructions
+********************
+
+Peer assessment problems have several steps--you'll submit a response, then assess (grade) peer responses, and then assess your own response.  When you come to a peer assessment problem in the course, you'll see the question and a response field, followed by grayed-out steps that show you what you'll do next.
+
+.. image:: /Images/PA_AsmtWithResponse_Students.png
+   :alt: Peer assessment example with question, response field, and assessment types and status labeled
+   :width: 550
+
+Here, we'll walk you through the process of performing a peer assessment:
+
+#. Submit your response to a question.
+#. Assess, or grade, responses that other students have submitted.
+#. Assess your own response to the question.
+#. Receive your score and provide feedback on the peer assessment.
+
+At any time during the assessment, you can see your status at the bottom of the page under **Your Grade**. A message tells you the steps that you still have to perform before you can receive your grade. For example, you may see the following message:
+
+	Not Completed
+
+	You have not completed the Peer Assessment step and Self Assessment step of this problem.
+
+
+Submit Your Response
+********************
+
+Read the question carefully. Some instructors include important information in the question, such as how long your response must be or specific topics your response must cover.
+
+.. note:: Your response must contain fewer than 10,000 words (approximately the equivalent of 20 pages of 8.5x11 paper, with text single-spaced).
+
+After you compose a response, type it into the response field under **Your Response**, and then click **Submit your response and move to the next step**. If you can't finish your response all at once, you can click **Save Your Progress** to save a draft of your response, and then come back and submit it later.
+
+After you submit your response, if no other students have submitted responses yet, you'll see the following message:
+
+	**Waiting for Peer Responses**
+
+	**All submitted peer responses have been assessed. Check back later to see if more students have submitted responses. You'll receive your grade after you complete the peer assessment and self assessment steps, and after your peers have assessed your response.**
+
+If other students have already submitted responses, the peer assessment step starts immediately after you submit your response. However, you don't have to start grading right away. If you want to stop working and come back later, just refresh or reopen your browser when you come back. New peer responses will be available for you to grade.
+
+Note that you can view your response at any time after you submit it. To do this, click the **Your Response** heading to expand the response field.
+
+.. image:: /Images/PA_S_ReviewResponse.png
+   :alt: Image of the Response field collapsed and then expanded
+   :width: 550
+
+
+Assess Peer Responses
+**********************
+
+When peer assessment starts, you'll see the original question followed by another student's response and a rubric. Above the rubric you can also see how many responses you'll assess, how many you've already assessed, and the amount of time you can expect to spend on each assessment. Below the rubric is a field where you can provide comments about the student's response.
+
+The rubric contains *criteria*, each of which has several *options*. Read the student's response and the rubric carefully, and then select the option that you think best reflects the student's response.
+
+.. image:: /Images/PA_LMS-PARubric.png
+   :alt: Image of the question, response, and rubric
+   :width: 550
+
+When you've selected options in the rubric, provide additional comments about the response in the field below the rubric. When you're done, click **Submit your assessment and move to response #<number>**.
+
+.. note:: Some assessments may have an additional **Comments** field for one or more of the assessment's individual criteria. You can enter up to 300 characters in these fields. In the following image, the first of the criteria has a separate **Comments** field, but the second does not.
+
+    .. image:: /Images/PA_Students_CommentBoxes.png
+       :alt: Rubric with call-outs for comment boxes
+       :width: 500
+
+When you submit your assessment of the first student's response, another response opens for you. Assess this response in the same way that you assessed the first response, and then submit your assessment. You'll repeat these steps until you've assessed the required number of responses. The number in the upper-right corner of the rubric updates as you assess each response.
+
+
+Assess Your Response
+********************
+
+When you've completed enough peer assessments, your self assessment opens. You'll see your response along with the same rubric that you used in the peer assessment step. Assess your response, and then click **Submit Your Assessment**.
+
+
+Receive Your Score and Provide Feedback
+****************************************
+
+After you submit your self assessment, if other students are still assessing your response, you'll see the following message under the **Assess Your Response** step.
+
+	**Your Grade: Waiting for Peer Assessment**
+
+	**Your response is still undergoing peer assessment. After your peers have assessed your response, you'll see their feedback and receive your final grade.**
+
+If you see this message, keep checking back periodically until peer assessment is complete.
+
+When peer assessment is complete, you can see the scores you received from all of your peers, as well as your self assessment. You can also see any additional comments that your peers have provided.
+
+.. image:: /Images/PA_AllScores.png
+   :alt: A student's response with peer and self assessment scores
+   :width: 550
+
+If you want to, you can provide feedback on the scores that you received under **Provide Feedback on Peer Assessments**.
+
+Assess Additional Peer Responses (optional)
+*******************************************
+
+If you've assessed the required number of peer responses and completed your self assessment, you can assess additional peer responses. To do this, click the **Assess Peers** heading. If any responses remain to be assessed, a new response opens.
+
+***********************
+Peer Assessment Scoring
+***********************
+
+Peer assessments are scored by criteria. An individual criterion's score is the median of the scores that each peer assessor gave that criterion. For example, if the Ideas criterion in a peer assessment receives a 10 from one student, a 7 from a second student, and an 8 from a third student, the Ideas criterion's score is 8.
+
+A student's final score for a peer assessment is the sum of the median scores for each individual criterion. 
+
+For example, a response may receive the following scores from peer assessors:
+
+.. list-table::
+   :widths: 25 10 10 10 10
+   :stub-columns: 1
+   :header-rows: 1
+
+   * - Criterion Name
+     - Peer 1
+     - Peer 2
+     - Peer 3
+     - Median
+   * - Ideas (out of 10)
+     - 10
+     - 7
+     - 8
+     - **8**
+   * - Content (out of 10)
+     - 7
+     - 9
+     - 8
+     - **8**
+   * - Grammar (out of 5)
+     - 4
+     - 4
+     - 5
+     - **4**
+
+To calculate the final score, the system adds the median scores for each criterion:
+
+  **Ideas median (8/10) + Content median (8/10) + Grammar median (4/5) = final score (20/25)**
+
+Note, again, that final scores are calculated by criteria, not by individual assessor. Thus the response's score is not the median of the scores that each individual peer assessor gave the response.

docs/en_us/course_authors/source/conf.py

+# -*- coding: utf-8 -*-
+#
+
+import sys, os
+
+# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+if not on_rtd:  # only import and set the theme if we're building docs locally
+    import sphinx_rtd_theme
+    html_theme = 'sphinx_rtd_theme'
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+
+
+
+
+
+
+
+sys.path.append(os.path.abspath('../../../'))
+sys.path.append(os.path.abspath('../../'))
+
+#from docs.shared.conf import *
+
+sys.path.insert(0, os.path.abspath('.'))
+
+master_doc = 'index'
+
+# Add any paths that contain templates here, relative to this directory.
+#templates_path.append('source/_templates')
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+#html_static_path.append('source/_static')
+
+
+# General information about the project.
+project = u'Creating a Peer Assessment'
+copyright = u'2014, edX'
+
+# The short X.Y version.
+version = ''
+# The full version, including alpha/beta/rc tags.
+release = ''

docs/en_us/course_authors/source/index.rst

+.. Getting_Started documentation master file, created by
+   sphinx-quickstart on Tue Apr 16 11:19:12 2013.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+
+Creating Peer Assessments
+========================================
+
+.. toctree::
+   :numbered:
+   :maxdepth: 2
+
+   PeerAssessment
+   PeerAssessment_Students
+   Access_PA_Info
\ No newline at end of file

docs/en_us/course_authors/source/read_me.rst

+*******
+Read Me
+*******
+
+The edX *Building a Course with edX Studio* documentation is created
+using RST_ files and Sphinx_. You, the user community, can help update and revise
+this documentation project on GitHub::
+
+  https://github.com/edx/edx-platform/tree/master/docs/course_authors/source
+
+To suggest a revision, fork the project, make changes in your fork, and submit
+a pull request back to the original project: this is known as the `GitHub Flow`_.
+All pull requests need approval from edX. For more information, contact edX at docs@edx.org.
+
+.. _Sphinx: http://sphinx-doc.org/
+.. _LaTeX: http://www.latex-project.org/
+.. _`GitHub Flow`: https://github.com/blog/1557-github-flow-in-the-browser
+.. _RST: http://docutils.sourceforge.net/rst.html
\ No newline at end of file

docs/shared/requirements.txt

+# Read the docs requirements file
+# ----------------------------------------
+# Installing modules with C dependencies on RTD can be tricky, and pip doesn't
+# have an 'ignore-errors' option, so all requirements fail. Here we keep the
+# maximal list of modules that still works.
+#
+beautifulsoup4==4.1.3
+beautifulsoup==3.2.1
+boto==2.6.0
+celery==3.0.19
+distribute>=0.6.28, <0.7
+django-celery==3.0.17
+django-countries==1.5
+django-filter==0.6.0
+django-followit==0.0.3
+django-keyedcache==1.4-6
+django-kombu==0.9.4
+django-mako==0.1.5pre
+django-masquerade==0.1.6
+django-mptt==0.5.5
+django-openid-auth==0.4
+django-robots==0.9.1
+django-sekizai==0.6.1
+django-ses==0.4.1
+django-storages==1.1.5
+django-threaded-multihost==1.4-1
+django-method-override==0.1.0
+djangorestframework==2.3.5
+django==1.4.5
+feedparser==5.1.3
+fs==0.4.0
+GitPython==0.3.2.RC1
+glob2==0.3
+lxml==3.0.1
+mako==0.7.3
+Markdown==2.2.1
+mock==1.0.1
+networkx==1.7
+nltk==2.0.4
+oauthlib==0.5.1
+paramiko==1.9.0
+path.py==3.0.1
+Pillow==1.7.8
+pip>=1.3
+polib==1.0.3
+pycrypto>=2.6
+pygments==1.5
+pymongo==2.4.1
+python-memcached==1.48
+python-openid==2.2.5
+pytz==2012h
+PyYAML==3.10
+requests==1.2.3
+Shapely==1.2.16
+sorl-thumbnail==11.12
+South==0.7.6
+sympy==0.7.1
+xmltodict==0.4.1
+
+# Metrics gathering and monitoring
+dogapi==1.2.1
+dogstatsd-python==0.2.1
+newrelic==1.13.1.31
+
+# Used for Internationalization and localization
+Babel==1.3
+transifex-client==0.9.1
+
+
+-e common/lib/calc
+-e common/lib/capa
+-e common/lib/chem
+-e common/lib/sandbox-packages
+-e common/lib/symmath
+-e common/lib/xmodule
+-e .
+
+-e git+https://github.com/edx/XBlock.git@b697bebd45deebd0f868613fab6722a0460ca0c1#egg=XBlock