From af0df89f5dad606a14a20279f2abae007fccfb36 Mon Sep 17 00:00:00 2001 From: Barb Cutler Date: Thu, 8 Aug 2024 15:02:48 -0400 Subject: [PATCH] update version conflict --- _docs/grader/grader_version_conflict.md | 59 +++++++++++++++++++ _docs/grader/resolving_version_conflict.md | 15 ----- .../submission/resolving_version_conflict.md | 22 ------- .../submission/submission_version_conflict.md | 44 ++++++++++++++ navtreedata.js | 4 +- 5 files changed, 105 insertions(+), 39 deletions(-) create mode 100644 _docs/grader/grader_version_conflict.md delete mode 100644 _docs/grader/resolving_version_conflict.md delete mode 100644 _docs/student/submission/resolving_version_conflict.md create mode 100644 _docs/student/submission/submission_version_conflict.md diff --git a/_docs/grader/grader_version_conflict.md b/_docs/grader/grader_version_conflict.md new file mode 100644 index 00000000..45ddd41e --- /dev/null +++ b/_docs/grader/grader_version_conflict.md @@ -0,0 +1,59 @@ +--- +category: Grader +title: Resolving a Version Conflict +--- + +Submitty supports multiple submissions before the due date. Every +submission by the student is stored permanently and tagged with a +version number and timestamp. Automated grading runs on each +submission, and we store all submissions. Teaching staff can review +details of every submission and its autograding results. +*See also:* [Student Interface for Managing Submission Version](/student/submission/managing_versions) + +After the deadline, manual/TA grading +opens, and the TA/instructor grades the currently selected submission version. +When the grader marks / scores a rubric component, the currently selected submission version is stored in the database. +If the student makes a new submission or changes their active version +during manual grading or after manual grading has completed, +this mismatch will cause confusion and conflicts. +*See also:* [Student Interface for Submission Version Conflict](/student/submission/submission_version_conflict) + + +## Reverting a Student's Submission Version + +From the "Student Info" panel of the grading interface, the grader can +review the different submission versions and change which version is +selected for grading. + +*TODO: Insert image of the Student Info panel showing the submission version dropdown menu* + +***NOTE**: The grader should exercise caution when using this option, +either to correct a student's obvious submission version error or +apply course administration policies.* + + +## Using the "Clear Version Conflicts" Button + +Alternately, if the student was allowed by the course instructor to +make a new submission or modify which submission version is used for +grading, then the grader should review the submitted materials and +either verify that the manual grading score and comments are still +appropriate for the modified submission version OR the grader should +*regrade* the entire assignment and update the score and comments as +appropriate. + +In the grading interface, there is a "Clear Version Conflicts" button +that will update the submission version stored in the database for +each component of the rubric and resolve this issue. It can be found +through navigating to a student gradeable that has a version conflict, +opening rubric, and the button appears along the top right of the +grading rubric page. If there are comments from previous versions, red +text can be seen at the header of each component within the +gradeable. Once clicked, on that gradeable there is a blue button to +choose to save and resolve version conflicts, or a white button to +discard. The message can also be updated, then saved. When the +comments are all saved or discarded: click the "Clear Version +Conflicts" button. A message will appear asking for confirmation, +click “ok”, and the version conflict is cleared. + +![](/images/ta_grading/version_conflict.png) diff --git a/_docs/grader/resolving_version_conflict.md b/_docs/grader/resolving_version_conflict.md deleted file mode 100644 index 53d8c9c2..00000000 --- a/_docs/grader/resolving_version_conflict.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -category: Grader -title: Resolving a Version Conflict ---- - -## Overview of Issue - -Typically, this issue occurs when the student changes the active version after the TA has started grading. Submitty supports multiple submissions before the due date. Any automated grading runs on each submission, and we store all submissions. Teaching staff can review each submission's version number and autograding results. After the deadline, manual/TA grading opens, and the TA/instructor grades the current active version. By default, the student's final version is active, but they can select a different version, even after the manual grading begins. This is where the version conflict results. - - -## Using the "Clear Version Conflicts" Button - -In the grading interface, there is a "Clear Version Conflicts" button that has been provided to resolve this issue. It can be found through navigating to a student gradeable that has a version conflict, opening rubric, and the button appears along the top right of the grading rubric page. If there are comments from previous versions, red text can be seen at the header of each component within the gradeable. Once clicked, on that gradeable there is a blue button to choose to save and resolve version conflicts, or a white button to discard. The message can also be updated, then saved. When the comments are all saved or discarded: click the "Clear Version Conflicts" button. A message will appear asking for confirmation, click “ok”, and the version conflict is cleared. - -![](/images/ta_grading/version_conflict.png) diff --git a/_docs/student/submission/resolving_version_conflict.md b/_docs/student/submission/resolving_version_conflict.md deleted file mode 100644 index 219f46c8..00000000 --- a/_docs/student/submission/resolving_version_conflict.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -category: Student > Submission -title: Resolving a Version Conflict ---- - -## Overview of Issue - -When you choose to grade another version after the TA's have began/finished grading, there is a high likelihood that the version they graded is not the version that you recently submitted. This causes a Version Conflict that has to be either solved by you or the TA grading your assignment. - - -## Steps to Take to Resolve a Version Conflict - -If the Instructor species that Version Conflicts will happen, then you can ignore the next steps. - -Check the Version numbers for each rubric component. - -![](/images/student_version_conflict.png) - -If they are all the same number, then you can change your active version to that version. Check out [Managing Versions](/student/submission/managing_versions) to change submission version. - -If they are different numbers, contact an Instructor/TA to regrade the assignment if possible to get a valid grade. - diff --git a/_docs/student/submission/submission_version_conflict.md b/_docs/student/submission/submission_version_conflict.md new file mode 100644 index 00000000..9092cd45 --- /dev/null +++ b/_docs/student/submission/submission_version_conflict.md @@ -0,0 +1,44 @@ +--- +category: Student > Submission +title: Submission Version Conflict +--- + + + +Once TA grading has begun, students *should not make new submissions nor should they +[change the active version](/student/submission/managing_versions) of their submission*. +If they do one of these actions, this will be flagged in the Submitty +grading system as a *version conflict*. + +This inconsistency is a problem. Submitty will not combine the +autograding score of the currently selected version with the manual +grading score awarded by the grader to the previously selected +version. Also, Submitty uses the currently selected version to +compute the number of late days used in this assignment. + +![](/images/student_version_conflict.png) + +The comments and points awarded by the grader apply only to the +version that was active at the time of grading. If there is a +mismatch the grading feedback to the student will be highlighted in +red as shown above. The student's score for the entire assignment will +be a zero until this mismatch or conflict is resolved. + + +## How to Resolve a Version Conflict + +If you have accidentally made an extra submission to this assignment, +you should use the drop down menu to +[revert to the submission](/student/submission/managing_versions#reverting-to-an-earlier-submission) +to the version that was active when manual grading began. + +Alternatively, if your instructor has given permission for you to make +this late submission, then confirm that your desired version is +selected for grading, and then contact your instructor / grader and +ask them to update the grading as necessary. + +See also: [Grader Interface for Resolving a Version Conflict](/grader/grader_version_conflict) + + + + diff --git a/navtreedata.js b/navtreedata.js index 554f2508..0411f3a5 100644 --- a/navtreedata.js +++ b/navtreedata.js @@ -48,7 +48,7 @@ var NAVTREE = [ "Automated Testing", "/student/submission/automated_testing", null ], [ "Late Days & Extensions", "/student/submission/late_days", null ], [ "Managing Versions", "/student/submission/managing_versions", null ], - [ "Resolving Version Conflicts", "/student/submission/resolving_version_conflict", null], + [ "Submission Version Conflict", "/student/submission/submission_version_conflict", null], [ "Team Assignments", "/student/submission/team_assignments", null ] ] ], [ "Grades", "/student/grades/index", [ @@ -76,7 +76,7 @@ var NAVTREE = [ "Statistics", "/grader/rubric_grading/statistics", null ] ] ], [ "Managing Office Hours", "/grader/queue", null ], - [ "Resolving a Version Conflict", "/grader/resolving_version_conflict", null ] + [ "Grader Version Conflict", "/grader/grader_version_conflict", null ] ] ], [ "Instructor", "/instructor", [ [ "Overview", "/instructor", null ],