ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prevent default grade from being entered for quizzes 

fixes CNVS-24774
fixes CNVS-25052

Reverts "gradebook quiz icon appears when quiz receives
default grade." This reverts commit
b3dc1c72f5.

Test plan:

 - As a teacher, create a quiz with an essay question.
 - As a student, take the quiz.

for CNVS-24774
==============

 1. As the teacher, view the Gradebook as and click
    the Q for the submission.
 2. Click on another cell in gradebook.
 3. Verify that the quiz icon remains.

for CNVS-25052
==============

 1. In the Gradebook, hover over the grading cell for
    the student and the quiz, and click the comments
    icon.
 2. In the dialog box that appears, click on "More
    Details in the SpeedGrader"; this opens the
    SpeedGrader in a new tab.
 3. In SpeedGrader, manually change the score for the
    question and click on "Update Scores".
 4. Close the SpeedGrader, then close the dialog box
    in the Gradebook.
 5. Go back to the SpeedGrader and view the submission.
 6. Verify that it has the score which you previously
    gave it.

Change-Id: Ibd6ccef7daa427cbe847ef6b1d7b43580c9c2386
Reviewed-on: https://gerrit.instructure.com/70619
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Christi Wruck
This commit is contained in:
Strand McCutchen 2016-01-19 14:42:34 -08:00
parent 9ac8d71adf
commit 1de51751a3
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffeescripts/gradebook2/SubmissionCell.coffee
View File

@ -64,7 +64,6 @@ define [
$.flashError(GRADEBOOK_TRANSLATIONS.submission_update_error)
isValueChanged: () ->
return true if @submission_type? && @submission_type == "online_quiz"
@val != @$input.val()
validate: () ->
@ -151,7 +150,6 @@ define [
class SubmissionCell.out_of extends SubmissionCell
init: () ->
submission = @opts.item[@opts.column.field]
@submission_type = submission.submission_type
@$wrapper = $(@cellWrapper("""
<div class="overflow-wrapper">
<div class="grade-and-outof-wrapper">

3
app/models/assignment.rb
View File

@ -1105,9 +1105,6 @@ class Assignment < ActiveRecord::Base
submission.grade_matches_current_submission) &&
((submission.score && submission.grade) || submission.excused?)
submission.workflow_state = "graded"
if submission.quiz_submission
submission.quiz_submission.complete
end
end
submission.group = group
submission.graded_at = Time.zone.now if did_grade

7
app/models/submission.rb
View File

@ -573,12 +573,7 @@ class Submission < ActiveRecord::Base
self.quiz_submission.reload if self.quiz_submission_id
self.workflow_state = 'unsubmitted' if self.submitted? && !self.has_submission?
self.workflow_state = 'graded' if self.grade && self.score && self.grade_matches_current_submission
if self.submission_type == 'online_quiz' &&
self.quiz_submission.try(:latest_submitted_attempt).try(:pending_review?)
self.workflow_state = 'pending_review'
end
self.workflow_state = 'pending_review' if self.submission_type == 'online_quiz' && self.quiz_submission.try(:latest_submitted_attempt).try(:pending_review?)
if self.workflow_state_changed? && self.graded?
self.graded_at = Time.now
end