New Grader screenshots and instructions

.gitignore

@@ -10,3 +10,4 @@ cli.log
 .error_schema.log
 sphinx_settings.json
 /logs
+generated-assets

pretext/Assignments/assembleAssignment.ptx

@@ -104,6 +104,7 @@
         alt="Choose Exercises" />
     </figure>
 
+   <p>You can use the "All Exercises" toggle at the top to switch to just the "Book Exercises" to filter by just exercises that appear in the book. There are also exercises contributed by the teacher community. </p>
    <p>Scroll to the chapter and subchapters that you want and click on the triangles next to them to expand them. 
    When you see the exercises, you can click to choose them or click the eye to preview them before choosing. 
    Exercises can be from the ebook that you are using, written by its author, or contributed by the community. 
@@ -128,8 +129,8 @@
     <p>
       <ul>
       <li>
-          <p>Autograde: options here are % correct, All or nothing, Interaction, or manual. If the exercise has unit test autograding code,
-          it will be set to "% correct". If it does not have autograding, it will be set to manual, where you will need to grade it.</p>
+          <p>Autograde: options here are Pct Correct, All or nothing, Interaction, or manual. If the exercise has unit test autograding code,
+          it will be set to "Pct Correct". If it does not have autograding, it can be set to Interaction only where just interacting with it gives the points or manual, where you will need to grade it.</p>
         </li>
         <li>
           <p>Which to Grade: Best Answer, first answer or last answer</p>
@@ -154,13 +155,27 @@
         alt="Search Exercises" />
         </figure>
 
-<p>When you are done adding exercises, click on the back arrow by the assignment name or on the Assignment Builder button at the top to return to the main assignment list page. By default, the new assignment will not be visible to students. </p>
+<p>Make sure you do not accept all the exercises in a lesson without toggling for "Book exercises" because there may be many community-added ones that may or may not work! When you are done adding exercises, click on the back arrow by the assignment name or on the Assignment Builder button at the top to return to the main assignment list page. By default, the new assignment will not be visible to students. </p>
        <warning>
             <title>Make it Visible</title>
             <p>Please make sure that you slide the visibility toggle of an assignment in the assignments list to visible when you want your students to see it. If you forget to toggle this to visible, then the assignment will not show up in the list that your students can see on the assignment page.</p>
           </warning>
   </subsection>
 
+  <subsection xml:id="autograding">
+    <title>Auto Grading</title>
+    <p>For exercises in an assignment to be autograded, the assignment must be visible and 
+      completed beforethe deadline while the students are working on it, and the exercises must be 
+      the type of exercises that support autograding. For example, the book active code exercises 
+      in the ebooks CSAwesome and CSAwesome2 all have unit tests 
+      that support autograding, but the community-contributed exercises and exercises from other 
+      books might not have unit tests. When you add an active code exercise to an assignment, you can 
+      tell if it has autograding tests if it comes up as "Pct Correct" in the Autograde colum and 
+      presents the autograding test results when run. Otherwise, it can be added as "interaction" 
+      only without grading for correctness or for "manual" grading. Short answer questions can be 
+      autograded for interaction, but require manual grading for content. </p>
+
+  </subsection>
   <subsection xml:id="subsec-accommodations">
     <title>Accommodations</title>
     <introduction>

pretext/Assignments/copyAssignment.ptx

@@ -3,7 +3,16 @@
   <title>Copying Assignments</title>
   <subsection>
     <title>Copying from your previous courses</title>
-    <p>You may have multiple sections where you want to share assignments, or you may simply want to copy your assignments from the last time you taught a course to your current course.  Choose "Copy Assignment" from the Instructor Dashboard under the "Assignments &amp; Grading" menu. Before copying assignments, it is a good idea to make sure that the course settings has the correct start date in the "Course Settings" in the "Course Administration" menu of the Instructor Dashboard so that the due dates are adjusted properly.</p>
+    <p>You may have multiple sections where you want to share assignments, or you may simply want to copy your assignments from the last time you taught a course to your current course or
+      you may want to copy assignments provided by a base course.
+      There is a new Import button at the top right of the screen available in the Assignment Builder in the Instructor Dashboard. You can select whether to restrict the list of courses to "Only for this book" or "Only for courses I teach" with the toggles at the top. Open the drop down next to a course name to choose specific assignments or all.
+      </p>
+      <figure align="center" xml:id="import_assign_fig">
+      <caption>Import assignments.</caption>
+      <image source="Figures/import_assignments.png" width="100%" alt="Import Assignments"/>
+    </figure>
+
+      <p>Or you can choose "Copy Assignment" from the Instructor Dashboard under the "Assignments &amp; Grading" menu. Before copying assignments, it is a good idea to make sure that the course settings has the correct start date in the "Course Settings" in the "Course Administration" menu of the Instructor Dashboard so that the due dates are adjusted properly.</p>
     <figure align="center" xml:id="copy_assign_fig">
       <caption>Copying an assignment.</caption>
       <image source="Figures/copyAssignmentMenu.png" width="100%" alt="Copy Assignments"/>
@@ -25,8 +34,7 @@
 
   <subsection>
     <title>Copying from a different Instructor</title>
-    <p>Help, this is my first time teaching this class and I want to copy assignments from another instructor.  This is very possible if the instructor is still available.  You simply need to enroll in their course and have them make you a TA.  Then you will be able to copy the assignments from their course to yours.</p>
-    <p>If the previous instructor is not available then we can still probably make it happen, but you are going to have to go out of your way to prove that your request is legit.  Sorry, we cannot just take your word for it over email.  A link to your faculty page, that verifies your email as a legitimate instructor at the same institution of the instructor of the course you want to copy.  We would love to just trust everyone, but data privacy laws are strict and we have to to treat data privacy very carefully.  Thanks for understanding.</p>
+    <p>You can now ask the other instructor to go to Course Settings and share their assignments with you, which you can then Import through the Assignment Builder.</p>
   </subsection>
 
 

pretext/Assignments/gradeAssignment.ptx

@@ -1,57 +1,94 @@
 <?xml version="1.0"?>
 <section xml:id="instructor-interface_grading">
   <title>Grading</title>
-  <subsection xml:id="grading_intro">
-  <title>Introduction</title>
-  <video xml:id="ArghLTeeSvc" youtube="ArghLTeeSvc" width="auto"/>
-  <p>To grade student performance, go back to the instructor's interface and click on the grading tab. You'll see something like this.</p>
-  <image source="Figures/grading_tab.png" width="50%"/>
-  <p>Typically, you will select an assignment from the first dropdown.  This will show you summary of the elements that are automatically graded.  The other option is Chapter and you can use this to drill in on a chapter and look at a students work on any problem in the textbook regardless of whether it was part of an assignment.</p>
-  <image source="Figures/assignment_selected.png" width="50%"/>
-  <p>From here you can also select a question or questions as well as a student or students to manually grade a problem.  You can also use this to view a students answer to an automatically graded problem if they have a question about their score.</p>
-  <image source="Figures/manual_grading.png" width="50%"/>
-  <p>You will see the last version of code that the student ran prior to the assignment deadline. Click run to execute it. Drag the little scrubber across the timeline next to the Run button to see other versions of the code that the student ran.</p>
-  <p>You can assign a number grade (number of points) and, optionally, leave a comment.  As you tab out of the grade box you will see it turn green to indicate that the grade has been updated in the database. Similarly if you leave a comment it will automatically update the database with the comment for the student.</p>
-  <p>If you prefer to work on one question at a time there is a save and next button that will automatically move on the next item to grade.</p>
-  </subsection>
-  <subsection xml:id="instructor-interface_autograde">
-    <title>Autograde</title>
-    <p>Some questions have been configured for auto-grading, in particular coding problems with unit tests and some multiple choice problems. If you click on the Autograde button on the left side, the autograder will run. It will pop up an alert box to give you a diagnostic about how many question-student pairs were autograded.</p>
-    <p>Some things to note about the autograder:</p>
+
+  <subsection>
+    <title>Grade Book</title>
+
+
+  <p>To see the Grade Book, go to the Instructor Dashboard and click on Grade Book. </p>
+   <figure
+      xml:id="gradebook">
+      <caption>Gradebook</caption>
+      <image source="Figures/gradebook.png" width="100%" />
+    </figure>
+
+    <p>The gradebook allows filtering by students or assignments. If you click on a student's grade, you can drill down to see their performance on each exercise and override the grade total. You can click on each exercise to open them in the grader.</p>
+
+     <figure
+      xml:id="gradebook_drilldown">
+      <caption>Gradebook Drill Down on Assignment Score</caption>
+      <image source="Figures/gradebook_drilldown.png" width="100%" />
+    </figure>
+
+<p>Many assignments can be automatically graded, with the grades automatically appearing in the 
+  gradebook. For exercises in an assignment to be autograded, the assignment must be visible and 
+  completed before the deadline, and the exercises must be the type of exercises 
+  that support autograding. For example, the book active code exercises in the ebooks CSAwesome and 
+  CSAwesome2 all have unit tests that support autograding, but the community-contributed exercises 
+  and exercises from other books might not have unit tests. When you add an active code exercise to 
+  an assignment, you can tell if it has autograding tests if it comes up as "Pct Correct" in the 
+  Autograde colum and presents the autograding test results when run. Otherwise, it can be added as 
+  "interaction" only without grading for correctness or for "manual" grading. Short answer 
+  questions can be autograded for interaction, but require manual grading for content. </p>
+
+  <p>For assignments that are not autograded, you can manually grade the students' work. You can also manually grade any assignment, even if it is autograded, to override the automatic grading or for late work after the deadline.</p>
+
+</subsection>
+<subsection>
+    <title>Grader</title>
+  <p>To grade or examine student work, click on the Grader button in the Instructor's Dashboard.
+    You will see your assignments in the Cards View. You can switch to the Table View by clicking on the Table View button at the top right, and then you can search for an assignment by name or description. You can also sort the assignments by clicking on the column headers.
+
+  </p>
+  <figure
+      xml:id="grader1">
+      <caption>Grader: Choose an Assignment</caption>
+      <image source="Figures/grader1.png" width="100%" />
+    </figure>
+
+  <p>Click on an assignment to view the problems in the assignment in Cards or Table view. In this 
+    view, there are options to select all of the problems and Regrade all and to release the grades 
+    to the students.</p>
+
+  <figure xml:id="grader2">
+      <caption>Grader: Choose a Problem</caption>
+      <image source="Figures/grader2.png" width="100%" />
+    </figure>
+
+  <p>From here, you can also select an exercise to view student solutions and to manually grade 
+    them. In the manual grading view, you can see the students' solutions, override autograded 
+    scores, and provide comments.</p>
+
+    <figure xml:id="manual-grading">
+      <caption>Grader: Manual Grading</caption>
+      <image source="Figures/manual_grading.png" width="100%" />
+    </figure>
+
+  <p>
+    In active code exercises, this view will show the last version of code that the student ran prior to the assignment deadline. 
+    Click run to execute it. Drag the little scrubber across the timeline next to the Run button to 
+    see other versions of the code that the student ran.</p>
+
+  <p>
+    You can assign or change the grades next to "Points" in the rightmost panel, and, optionally, 
+    leave a comment. If you erase the "autograded" comment, it will no longer be autograded on regrades. Once you have manually graded the assignment or released grades, they will no longer 
+    be autograded. You will need to run the grader again for late work.
+  </p>
+
+   <p>When you are satisfied that the grades have been calculated correctly, click on the toggle 
+    "Grades Hidden" button at the top right of the assignment view showing all the exercises in an 
+    assignment in the Grader, to switch it to Released. This makes them visible to students. </p>
+
     <p>
-      <ul>
-        <li>
-          <p>If a question is selected, the autograder will run only for that question.</p>
-        </li>
-        <li>
-          <p>If a student is also selected, the autograder will run for only that question-student combination.</p>
-        </li>
-        <li>
-          <p>To run the autograder for all the questions and students for a particular assignment, refresh the page, select the assignment, and click the autograde button before selecting a question or student.</p>
-        </li>
-        <li>
-          <p>You can manually override the grade assigned by the autograder using the grading form on the right side. Be sure to change the comment as well.</p>
-        </li>
-        <li>
-          <p>If you rerun the autograder, it will not run on any student-question pair where you have changed the comment.</p>
-        </li>
-      </ul>
-    </p>
-  </subsection>
-  <subsection xml:id="instructor-interface_calculate-totals">
-    <title>Calculate Totals</title>
-    <p>Once you have graded all the questions on an assignment, click the Caclulate Totals button to compute the total scores for the whole assignment, or to recalculate them after updating a grade. Again, an alert box will pop up to provide diagnostics about the min and max scores that were calculated.</p>
-    <image source="Figures/calculate_totals.png" width="50%"/>
-  </subsection>
-  <subsection xml:id="instructor-interface_release-grades">
-    <title>Release Grades</title>
-    <p>When you are satisfied that the grade totals have been calculated correctly, click on the Release Grades button at the bottom left. This makes them visible to students. If you make any subsequent changes to grades, you will need to click Calculate Totals again, but you will not need to click on Release Grades again: once released, they stay released.</p>
-  </subsection>
-  <subsection xml:id="instructor-interface_how-a-student-sees-grades-and-comments">
-    <title>How a Student Sees Grades and Comments</title>
-    <p>When viewing an assignment, a student can click on the <q>Show Feedback</q> button to see a score and any instructor comments.</p>
-    <image source="Figures/studentFeedback.JPG" width="50%"/>
-    <p>In addition the user menu allows the student to see a summary of their progress.</p>
-    <image source="Figures/student_progress.png" width="50%"/>
+    Students will see their grades and comments when they view their assignment. They will see your comments above each exercise in the assignment. They can also choose Progress from 
+    the user icon menu to see a summary of their grades on all assignments. 
+  </p>
+
+  <p>If you prefer to start grading by student and drill down instead of starting with the 
+    assignments, start with the Gradebook interface and click on a student's score in an assignment 
+    to see a breakdown, and click on a specific problem to view the student's solution in the Grader.</p>
+
   </subsection>
+
 </section>

pretext/Assignments/instructorAssignments.ptx

@@ -59,23 +59,5 @@
     <p>If you decide you don't want to use LTI you can remove that message and display the student assignments as usual by deleting the LTI keys you created when you set up LTI.</p>
   </paragraphs>
 
-  <paragraphs>
-    <title>Assignment Status</title>
-    <p>
-      The choose assignment page shows the status of the assignment. Students are encouraged to use this to keep themselves organized. They can mark an assignment as <term>in progress</term> or <term>submitted</term> But marking an assignment as submitted is <em>advisory</em> only. They can continue to work on the assignment and Runestone will continue to record what they do. When you grade the assignment you have the flexibility to decide what to grade and how to grade it. You can enforce your deadlines, or relax your deadlines. You can grade your students best response, their last response or their first.</p>
-    <p>The image below shows the choose assignment page. The student can see that two assignments have been graded and one assignment is "in progress." This makes it easier for students to know where they are it with each homework assignment, but to repeat has no actual bearing on grading.
-    </p>
-
-    <image source="Figures/chooseAssignmentStatus.png" alt="Choose assignment with status" />
 
-    <p>While Runestone is not (yet) smart enough to automatically mark a students assignment in progress, the student can set toggle through the status values by clicking the button at the bottom of the assignment page.</p>
-    <image source="Figures/changeStatus.png" alt="change status" />
-    <p>The values for the status will toggle through the following options:
-    <ul>
-      <li>Not Started</li>
-      <li>In Progress</li>
-      <li>Complete</li>
-    </ul>
-    </p>
-  </paragraphs>
 </section>

pretext/Assignments/toctree.ptx

@@ -7,5 +7,5 @@
     <xi:include href='./copyAssignment.ptx' />
     <xi:include href='./examsAndQuizzes.ptx' />
     <xi:include href='./gradeAssignment.ptx' />
-    <xi:include href='./practice.ptx' />
+ <!--   <xi:include href='./practice.ptx' /> -->
 </chapter>

pretext/Registration/add_instructor.ptx

@@ -5,12 +5,13 @@
 
 <ol>
 <li>Make sure that your co-instructor has registered for your course as a student.</li>
-<li><p>Go to the instructor page and select the Add TA tab as shown below</p>
+<li><p>From the user icon at the top right of the page, choose the Instructor Dashboard. 
+    Open the "Course Administration" section, and click on "Manage Teaching Assistants". </p>
 <image source="Figures/add_instructor.png" description="Add a TA or instructor" />
 </li>
-<li>Select the co-instructor or TA from the list of students on the right then click the + button below the list.  You should see the name appear in the list of instructors on the left.</li>
+<li>Select the co-instructor or TA from the list of students on the right then click the Add button below the list.  You should see the name appear in the list of instructors on the left.</li>
 </ol>
 
-<p>To "demote" a co-instructor or TA back to a student just select them in the list of instructors on the left and click the - button below the box.</p>
+<p>To "demote" a co-instructor or TA back to a student just select them in the list of instructors on the left and click the Remove button below the box.</p>
 </p>
 </section>