Hides Quiz icons in gradebook/grade summary until DB is ready

The quiz icons are hidden away until the appropriate features are out to
allow for monitoring of gradebook/speedgrader edits to quiz scores which
are pending review because of their question types.

Closes CNVS-16399

Change-Id: I689f1dcc94a647a32fe619b215f6b641a8376f84
Reviewed-on: https://gerrit.instructure.com/43180
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Derek DeVries <ddevries@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Ryan Taylor <rtaylor@instructure.com>
This commit is contained in:
Ryan Taylor 2014-10-22 15:15:18 -06:00
parent 58c5499344
commit 2af63ddd94
5 changed files with 14 additions and 8 deletions

View File

@ -537,8 +537,9 @@ define [
assignment = @assignments[submission.assignment_id]
if !assignment?
@staticCellFormatter(row, col, '')
else if submission.workflow_state == 'pending_review'
(SubmissionCell[assignment.grading_type] || SubmissionCell).formatter(row, col, submission, assignment)
# reverted until Quiz Icon pending review workflow_state thing is resolved
#else if submission.workflow_state == 'pending_review'
# (SubmissionCell[assignment.grading_type] || SubmissionCell).formatter(row, col, submission, assignment)
else
if assignment.grading_type == 'points' && assignment.points_possible
SubmissionCell.out_of.formatter(row, col, submission, assignment)

View File

@ -76,7 +76,8 @@ define [
specialClasses = SubmissionCell.classesBasedOnSubmission(opts.submission, opts.assignment)
opts.classes += ' no_grade_yet ' unless opts.submission.grade && opts.submission.workflow_state != 'pending_review'
innerContents = null if opts.submission.workflow_state == 'pending_review' && !isNaN(innerContents);
# This line causes a regression, CNVS-16332, silenced until we can update the pending_review workflow_state
#innerContents = null if opts.submission.workflow_state == 'pending_review' && !isNaN(innerContents);
innerContents ?= if submission_type then SubmissionCell.submissionIcon(submission_type) else '-'
if turnitin = extractData(opts.submission)

View File

@ -63,7 +63,8 @@ module GradebooksHelper
return '-' if submission.blank?
score, grade = score_and_grade_for(submission, show_student_view)
if submission && grade && submission.workflow_state != 'pending_review'
# Squelched icon placement for pending review items, until DB dependencies are resolved
if submission && grade #&& submission.workflow_state != 'pending_review'
graded_submission_display(grade, score, submission.assignment.grading_type)
elsif submission.submission_type
ungraded_submission_display(submission.submission_type)

View File

@ -163,7 +163,8 @@
<span class="tooltip_text score_teaser">
<% if assignment.muted? %>
<%= t(:student_mute_notification, "Instructor is working on grades") %>
<% elsif submission && submission.workflow_state == 'pending_review' %>
<%-# Comment out this until it is ready for primetime with the DB additions %>
<% elsif false #submission && submission.workflow_state == 'pending_review' %>
<%= t(:grading_in_progress, "Instructor is working on grades") %>
<% elsif assignment.special_class %>
<%= t(:total, "Total") %>
@ -180,7 +181,8 @@
<span class="screenreader-only" role="link">
<%= t(:click_to_change, "Click to test a different score") unless assignment_presenter.unchangeable? %>
</span>
<% if submission && submission.workflow_state == 'pending_review' %>
<%-# Comment out this until it is ready for primetime with the DB additions %>
<% if false #submission && submission.workflow_state == 'pending_review' %>
<span class="screenreader-only"><%=t(:grading_in_progress, "Instructor is working on grades")%></span>
<% end %>
<%= student_score_display_for(submission, !can_do(@context, @current_user, :manage_grades)) %>

View File

@ -234,8 +234,9 @@ define([
var tooltip;
if ($assignment.data('muted')) {
tooltip = I18n.t('student_mute_notification', 'Instructor is working on grades');
} else if(submission_status == 'pending_review') {
tooltip = I18n.t('grading_in_progress', "Instructor is working on grades");
// Commented out until CNVS-16332 backend fixes are ready
//} else if(submission_status == 'pending_review') {
// tooltip = I18n.t('grading_in_progress', "Instructor is working on grades");
} else {
tooltip = I18n.t('click_to_change', 'Click to test a different score');
}