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

extract submission serializer shared code 

closes: GRADE-1312

test plan: specs pass

Change-Id: I274ae211ab55d7c0a135c609f9917df5ccc2c716
Reviewed-on: https://gerrit.instructure.com/157760
Tested-by: Jenkins
Reviewed-by: Adrian Packel <apackel@instructure.com>
Reviewed-by: Gary Mei <gmei@instructure.com>
QA-Review: Derek Bender <djbender@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
This commit is contained in:
Derek Bender 2018-07-12 11:10:50 -05:00
parent 07ac06ce05
commit e15aa37067
7 changed files with 205 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
app/controllers/submissions_base_controller.rb
View File

@ -19,6 +19,7 @@
class SubmissionsBaseController < ApplicationController
include GradebookSettingsHelpers
include Api::V1::Rubric
include Api::V1::SubmissionComment
def show
@visible_rubric_assessments = @submission.visible_rubric_assessments_for(@current_user)
@ -123,7 +124,6 @@ class SubmissionsBaseController < ApplicationController
format.html { redirect_to course_assignment_url(@context, @assignment) }
# TODO: the serialization here needs to be abstracted and shared with speed_grader.rb
comments_include = if @assignment.can_view_other_grader_comments?(@current_user)
:all_submission_comments
elsif admin_in_context
@ -140,7 +140,14 @@ class SubmissionsBaseController < ApplicationController
submissions_json = @submissions.map do |submission|
submission_json = submission.as_json(json_args)
submission_json[:submission][:submission_comments] = submission_comments_to_json(submission_json[:submission].delete(comments_include))
submission_json[:submission][:submission_comments] = anonymous_moderated_submission_comments(
assignment: @assignment,
avatars: service_enabled?(:avatars),
submissions: @submissions,
submission_comments: submission_json[:submission].delete(comments_include),
current_user: @current_user,
course: @context
)
submission_json
end
@ -177,86 +184,4 @@ class SubmissionsBaseController < ApplicationController
@context.account.resolved_outcome_proficiency&.as_json
end
end
def submission_comments_to_json(submission_comments)
@submission_comment_methods ||= avatars ? [:avatar_path] : []
@submission_comment_fields ||= %i(attachments author_id author_name cached_attachments comment
created_at draft group_comment_id id media_comment_id
media_comment_type)
visible_submission_comments(submission_comments).map do |submission_comment|
json = submission_comment.as_json(include_root: false,
methods: @submission_comment_methods,
only: @submission_comment_fields)
author_id = submission_comment.author_id.to_s
json[:publishable] = submission_comment.publishable_for?(@current_user)
if anonymous_students? && student_ids_to_anonymous_ids.key?(author_id)
json.delete(:author_id)
json.delete(:author_name)
json[:anonymous_id] = student_ids_to_anonymous_ids[author_id]
json[:avatar_path] = User.default_avatar_fallback if avatars
elsif anonymous_graders? && grader_ids_to_anonymous_ids.key?(author_id)
json.delete(:author_id)
json[:anonymous_id] = grader_ids_to_anonymous_ids[author_id]
unless author_id == @current_user.id.to_s
json[:avatar_path] = User.default_avatar_fallback if avatars
json.delete(:author_name)
end
end
json
end
end
def anonymous_students?
return @anonymous_students if defined? @anonymous_students
@anonymous_students = !@assignment.can_view_student_names?(@current_user)
end
def anonymous_graders?
return @anonymous_graders if defined? @anonymous_graders
@anonymous_graders = !@assignment.can_view_other_grader_identities?(@current_user)
end
def grader_comments_hidden?
return @grader_comments_hidden if defined? @grader_comments_hidden
@grader_comments_hidden = !@assignment.can_view_other_grader_comments?(@current_user)
end
def visible_submission_comments(submission_comments)
return submission_comments unless grader_comments_hidden?
submission_comments.reject {|submission_comment| other_grader?(submission_comment.author_id)}
end
def student_ids_to_anonymous_ids
return @student_ids_to_anonymous_ids if defined? @student_ids_to_anonymous_ids
# ensure each student has membership, even without a submission
@student_ids_to_anonymous_ids = students.each_with_object({}) {|student, map| map[student.id.to_s] = nil}
@submissions.each do |submission|
@student_ids_to_anonymous_ids[submission.user_id.to_s] = submission.anonymous_id
end
@student_ids_to_anonymous_ids
end
def students
@students ||= begin
includes = gradebook_includes(user: @current_user, course: @context)
@assignment.representatives(@current_user, includes: includes) do |rep, others|
others.each { |s| res[:context][:rep_for_student][s.id] = rep.id }
end
end
end
def grader_ids_to_anonymous_ids
@assignment.grader_ids_to_anonymous_ids
end
def other_grader?(user_id)
!student_ids_to_anonymous_ids.key?(user_id.to_s) && user_id != @current_user.id
end
def avatars
@avatars ||= service_enabled?(:avatars) && !@assignment.grade_as_group?
end
end

216
app/models/assignment/speed_grader.rb
View File

@ -19,11 +19,12 @@ class Assignment
class SpeedGrader
include GradebookSettingsHelpers
include CoursesHelper
include Api::V1::SubmissionComment
def initialize(assignment, user, avatars: false, grading_role: :grader)
def initialize(assignment, current_user, avatars: false, grading_role: :grader)
@assignment = assignment
@course = @assignment.context
@user = user
@current_user = current_user
@avatars = avatars && !@assignment.grade_as_group?
@grading_role = grading_role
account_context = @course.try(:account) || @course.try(:root_account)
@ -37,7 +38,7 @@ class Assignment
submission_type score points_deducted assignment_id submission_comments
grading_period_id excused updated_at)
submission_json_fields << (anonymous_students? ? :anonymous_id : :user_id)
submission_json_fields << (anonymous_students?(current_user: @current_user, assignment: @assignment) ? :anonymous_id : :user_id)
attachment_json_fields = %i(id comment_id content_type context_id context_type display_name
filename mime_class size submitter_id workflow_state)
@ -61,29 +62,33 @@ class Assignment
# between provisional and real comments (also in
# SubmissionComment#serialization_methods)
submission_comment_methods = []
submission_comment_methods << :avatar_path if @avatars
submission_comment_methods << :avatar_path if avatars?
res[:context][:rep_for_student] = {}
# If we're working with anonymous IDs, skip students who don't have a
# valid submission object, which means no inactive or concluded students
# even if the user has elected to show them in gradebook
student_includes = @assignment.anonymize_students? ? [] : gradebook_includes
@students = @assignment.representatives(@user, includes: student_includes) do |rep, others|
includes = @assignment.anonymize_students? ? [] : gradebook_includes(user: @current_user, course: @course)
@students = @assignment.representatives(@current_user, includes: includes) do |rep, others|
others.each { |s| res[:context][:rep_for_student][s.id] = rep.id }
end
# Ensure that any test students are sorted last
@students = @students.partition { |r| r.preferences[:fake_student] != true }.flatten
enrollments = @course.apply_enrollment_visibility(gradebook_enrollment_scope, @user, nil,
include: student_includes)
enrollments = @course.apply_enrollment_visibility(
gradebook_enrollment_scope(user: @current_user, course: @course),
@current_user,
nil,
include: includes
)
current_user_rubric_assessments = @assignment.visible_rubric_assessments_for(@user, provisional_grader: provisional_grader_or_moderator?) || []
current_user_rubric_assessments = @assignment.visible_rubric_assessments_for(@current_user, provisional_grader: provisional_grader_or_moderator?) || []
# include all the rubric assessments if a moderator
all_provisional_rubric_assessments =
@grading_role == :moderator ? @assignment.visible_rubric_assessments_for(@user, :provisional_moderator => true) : []
@grading_role == :moderator ? @assignment.visible_rubric_assessments_for(@current_user, :provisional_moderator => true) : []
ActiveRecord::Associations::Preloader.new.preload(@assignment, :moderated_grading_selections) if provisional_grader_or_moderator?
@ -93,33 +98,32 @@ class Assignment
includes << {key => {submission: {assignment: { context: :root_account }}}}
@submissions = @assignment.submissions.where(:user_id => @students).preload(*includes)
student_json_fields = anonymous_students? ? [] : %i(name id sortable_name)
student_json_fields = anonymous_students?(current_user: @current_user, assignment: @assignment) ? [] : %i(name id sortable_name)
res[:context][:students] = @students.map do |student|
json = student.as_json(include_root: false, methods: submission_comment_methods, only: student_json_fields)
json[:anonymous_id] = student_ids_to_anonymous_ids[student.id.to_s] if anonymous_students?
json[:needs_provisional_grade] = @assignment.can_be_moderated_grader?(@user) if provisional_grader_or_moderator?
if anonymous_students?(current_user: @current_user, assignment: @assignment)
anonymous_ids = student_ids_to_anonymous_ids(current_user: @current_user, assignment: @assignment, course: @course, submissions: @submissions)
json[:anonymous_id] = anonymous_ids[student.id.to_s]
end
json[:needs_provisional_grade] = @assignment.can_be_moderated_grader?(@current_user) if provisional_grader_or_moderator?
json[:rubric_assessments] = rubric_assessements_to_json(current_user_rubric_assessments.select {|assessment| assessment.user_id == student.id})
json
end
res[:context][:active_course_sections] = @assignment
.context
.sections_visible_to(
@user,
@assignment.sections_with_visibility(@user)
)
.map do |section|
section.as_json(
include_root: false,
only: [:id, :name]
)
end
res[:context][:active_course_sections] = @assignment.context.
sections_visible_to(@current_user, @assignment.sections_with_visibility(@current_user)).
map { |section| section.as_json(include_root: false, only: [:id, :name]) }
res[:context][:enrollments] = enrollments.map do |enrollment|
enrollment_json = enrollment.as_json(include_root: false, only: enrollment_json_fields)
if anonymous_students?
enrollment_json[:anonymous_id] = student_ids_to_anonymous_ids[enrollment.user_id.to_s]
if anonymous_students?(current_user: @current_user, assignment: @assignment)
enrollment_json[:anonymous_id] = student_ids_to_anonymous_ids(
current_user: @current_user,
assignment: @assignment,
course: @course,
submissions: @submissions
).fetch(enrollment.user_id.to_s)
enrollment_json.delete(:user_id)
end
enrollment_json
@ -139,11 +143,11 @@ class Assignment
Submission.bulk_load_text_entry_originality_reports(submission_histories)
provisional_grades = @assignment.provisional_grades
provisional_grades = provisional_grades.preload(:scorer) unless anonymous_graders?
provisional_grades = provisional_grades.preload(:scorer) unless anonymous_graders?(current_user: @current_user, assignment: @assignment)
if @grading_role == :provisional_grader
provisional_grades = if grader_comments_hidden?
provisional_grades.not_final.where(scorer: @user)
provisional_grades = if grader_comments_hidden?(current_user: @current_user, assignment: @assignment)
provisional_grades.not_final.where(scorer: @current_user)
else
select_fields = ::ModeratedGrading::GRADE_ATTRIBUTES_ONLY.dup.append(:submission_id)
provisional_grades.select(select_fields)
@ -177,11 +181,11 @@ class Assignment
).merge("from_enrollment_type" => enrollment_types_by_id[sub.user_id])
if provisional_grader_or_moderator?
provisional_grade = sub.provisional_grade(@user, preloaded_grades: preloaded_prov_grades)
provisional_grade = sub.provisional_grade(@current_user, preloaded_grades: preloaded_prov_grades)
json.merge! provisional_grade_to_json(provisional_grade)
end
comments = if grader_comments_hidden?
comments = if grader_comments_hidden?(current_user: @current_user, assignment: @assignment)
(provisional_grade || sub).submission_comments
else
sub.all_submission_comments
@ -190,7 +194,14 @@ class Assignment
if @assignment.grade_as_group?
comments = comments.reject { |comment| comment.group_comment_id.nil? }
end
json[:submission_comments] = submission_comments_to_json(comments)
json[:submission_comments] = anonymous_moderated_submission_comments(
assignment: @assignment,
course: @course,
current_user: @current_user,
avatars: avatars?,
submission_comments: comments,
submissions: @submissions
)
# We get the attachments this way to avoid loading the
# attachments again via the submission method that creates a
@ -202,12 +213,10 @@ class Assignment
sub_attachments = []
moderated_grading_whitelist = if provisional_grader_or_moderator?
[ sub.user, @user ].map do |u|
u.moderated_grading_ids(has_crocodoc)
end
else
sub.moderated_grading_whitelist
end
[sub.user, @current_user].map { |u| u.moderated_grading_ids(has_crocodoc) }
else
sub.moderated_grading_whitelist
end
url_opts = {
anonymous_instructor_annotations: @assignment.anonymous_instructor_annotations,
@ -216,7 +225,7 @@ class Assignment
}
if url_opts[:enable_annotations]
url_opts[:enrollment_type] = user_type(@course, @user)
url_opts[:enrollment_type] = user_type(@course, @current_user)
end
if json['submission_history'] && (@assignment.quiz.nil? || too_many)
@ -244,8 +253,8 @@ class Assignment
end
a.as_json(only: attachment_json_fields,
methods: [:view_inline_ping_url]).tap do |json|
json[:attachment][:canvadoc_url] = a.canvadoc_url(@user, url_opts)
json[:attachment][:crocodoc_url] = a.crocodoc_url(@user, url_opts)
json[:attachment][:canvadoc_url] = a.canvadoc_url(@current_user, url_opts)
json[:attachment][:crocodoc_url] = a.crocodoc_url(@current_user, url_opts)
json[:attachment][:submitted_to_crocodoc] = a.crocodoc_document.present?
json[:attachment][:hijack_crocodoc_session] = a.crocodoc_document.present? && @should_migrate_to_canvadocs
end
@ -272,7 +281,7 @@ class Assignment
if provisional_grader_or_moderator?
pgs = preloaded_prov_grades[sub.id] || []
selection = preloaded_prov_selections[sub.user.id]
unless pgs.count == 0 || (pgs.count == 1 && pgs.first.scorer_id == @user.id)
unless pgs.count == 0 || (pgs.count == 1 && pgs.first.scorer_id == @current_user.id)
json['provisional_grades'] = []
pgs.each do |pg|
current_pg_json = provisional_grade_to_json(pg).tap do |pg_json|
@ -281,8 +290,8 @@ class Assignment
pg_json[:selected] = !!(selection && selection.selected_provisional_grade_id == pg.id)
# this should really be provisional_doc_view_urls :: https://instructure.atlassian.net/browse/CNVS-38202
pg_json[:crocodoc_urls] = sub_attachments.map { |a| pg.attachment_info(@user, a) }
pg_json[:readonly] = !pg.final && (pg.scorer_id != @user.id)
pg_json[:crocodoc_urls] = sub_attachments.map { |a| pg.attachment_info(@current_user, a) }
pg_json[:readonly] = !pg.final && (pg.scorer_id != @current_user.id)
end
if pg.final
@ -310,17 +319,22 @@ class Assignment
json = assessment.as_json(methods: [:assessor_name], include_root: false)
assessor_id = json[:assessor_id]
if anonymous_graders?
if anonymous_graders?(current_user: @current_user, assignment: @assignment)
json.delete(:assessor_id)
json[:anonymous_assessor_id] = grader_ids_to_anonymous_ids[assessor_id.to_s]
json.delete(:assessor_name) unless assessor_id == @user.id
json[:anonymous_assessor_id] = @assignment.grader_ids_to_anonymous_ids[assessor_id.to_s]
json.delete(:assessor_name) unless assessor_id == @current_user.id
end
if anonymous_students?
json[:anonymous_user_id] = student_ids_to_anonymous_ids[json.delete(:user_id)]
if anonymous_students?(current_user: @current_user, assignment: @assignment)
json[:anonymous_user_id] = student_ids_to_anonymous_ids(
current_user: @current_user,
assignment: @assignment,
course: @course,
submissions: @submissions
).fetch(json.delete(:user_id).to_s)
end
if grader_comments_hidden? && other_grader?(assessor_id)
if grader_comments_hidden_or_other_grader?(assessor_id)
json['data'].each do |datum|
datum.delete(:comments)
datum.delete(:comments_html)
@ -333,97 +347,31 @@ class Assignment
def provisional_grade_to_json(provisional_grade)
provisional_grade.grade_attributes.tap do |json|
if anonymous_graders?
json[:anonymous_grader_id] = grader_ids_to_anonymous_ids[json.delete(:scorer_id).to_s]
if anonymous_graders?(current_user: @current_user, assignment: @assignment)
json[:anonymous_grader_id] = @assignment.grader_ids_to_anonymous_ids[json.delete(:scorer_id).to_s]
else
json[:scorer_name] = provisional_grade.scorer&.name
end
end
end
def submission_comments_to_json(submission_comments)
@submission_comment_methods ||= @avatars ? [:avatar_path] : []
@submission_comment_fields ||= %i(attachments author_id author_name cached_attachments comment
created_at draft group_comment_id id media_comment_id
media_comment_type)
visible_submission_comments(submission_comments).map do |submission_comment|
json = submission_comment.as_json(include_root: false,
methods: @submission_comment_methods,
only: @submission_comment_fields)
author_id = submission_comment.author_id.to_s
json[:publishable] = submission_comment.publishable_for?(@user)
if anonymous_students? && student_ids_to_anonymous_ids.key?(author_id)
json.delete(:author_id)
json.delete(:author_name)
json[:anonymous_id] = student_ids_to_anonymous_ids.fetch(author_id)
json[:avatar_path] = User.default_avatar_fallback if @avatars
elsif anonymous_graders? && (grader_ids_to_anonymous_ids.key?(author_id) || final_grader?(author_id))
json.delete(:author_id)
json[:anonymous_id] = grader_ids_to_anonymous_ids.fetch(author_id, nil)
unless author_id == @user.id.to_s
json[:avatar_path] = User.default_avatar_fallback if @avatars
if final_grader?(author_id)
json[:author_name] = I18n.t 'Moderator'
else
json.delete(:author_name)
end
end
end
json
end
end
def anonymous_students?
return @anonymous_students if defined? @anonymous_students
@anonymous_students = !@assignment.can_view_student_names?(@user)
end
def anonymous_graders?
return @anonymous_graders if defined? @anonymous_graders
@anonymous_graders = !@assignment.can_view_other_grader_identities?(@user)
end
def grader_comments_hidden?
return @grader_comments_hidden if defined? @grader_comments_hidden
@grader_comments_hidden = !@assignment.can_view_other_grader_comments?(@user)
end
def visible_submission_comments(submission_comments)
return submission_comments unless grader_comments_hidden?
submission_comments.reject {|submission_comment| other_grader?(submission_comment.author_id)}
end
def student_ids_to_anonymous_ids
return @student_ids_to_anonymous_ids if @student_ids_to_anonymous_ids
# ensure each student has membership, even without a submission
@student_ids_to_anonymous_ids = @students.each_with_object({}) {|student, map| map[student.id.to_s] = nil}
@submissions.each do |submission|
@student_ids_to_anonymous_ids[submission.user_id.to_s] = submission.anonymous_id
end
@student_ids_to_anonymous_ids
end
def grader_ids_to_anonymous_ids
@assignment.grader_ids_to_anonymous_ids
end
def final_grader?(user_id)
@assignment.final_grader_id.to_s == user_id.to_s
end
def other_grader?(user_id)
!student?(user_id) && user_id != @user.id
end
def student?(user_id)
student_ids_to_anonymous_ids.key?(user_id.to_s)
end
def provisional_grader_or_moderator?
@grading_role == :provisional_grader || @grading_role == :moderator
end
def avatars?
@avatars
end
def grader_comments_hidden_or_other_grader?(assessor_id)
grader_comments_hidden?(current_user: @current_user, assignment: @assignment) &&
other_grader?(
user_id: assessor_id,
current_user: @current_user,
course: @course,
assignment: @assignment,
submissions: @submissions
)
end
end
end

99
lib/api/v1/submission_comment.rb
View File

@ -17,7 +17,6 @@
#
module Api::V1::SubmissionComment
def submission_comment_json(submission_comment, user)
sc_hash = submission_comment.as_json(
:include_root => false,
@ -52,4 +51,102 @@ module Api::V1::SubmissionComment
def submission_comments_json(submission_comments, user)
submission_comments.map{ |submission_comment| submission_comment_json(submission_comment, user) }
end
def anonymous_moderated_submission_comments(assignment:, submissions:, submission_comments:, current_user:, course:, avatars:)
@comment_methods ||= avatars ? [:avatar_path] : []
@comment_fields ||= %i(attachments author_id author_name cached_attachments comment created_at
draft group_comment_id id media_comment_id media_comment_type)
comments = visible_submission_comments(
assignment: assignment,
current_user: current_user,
submission_comments: submission_comments,
submissions: submissions,
course: course
)
comments.map do |comment|
json = comment.as_json(include_root: false, methods: @comment_methods, only: @comment_fields)
author_id = comment.author_id.to_s
json[:publishable] = comment.publishable_for?(current_user)
if (
anonymous_students?(current_user: current_user, assignment: assignment) &&
student_ids_to_anonymous_ids(current_user: current_user, submissions: submissions, assignment: assignment, course: course).key?(author_id)
)
json.delete(:author_id)
json.delete(:author_name)
json[:anonymous_id] = student_ids_to_anonymous_ids(current_user: current_user, submissions: submissions, assignment: assignment, course: course)[author_id]
json[:avatar_path] = User.default_avatar_fallback if avatars
elsif anonymous_graders?(current_user: current_user, assignment: assignment) && assignment.grader_ids_to_anonymous_ids.key?(author_id)
json.delete(:author_id)
json[:anonymous_id] = assignment.grader_ids_to_anonymous_ids[author_id]
unless author_id == current_user.id.to_s
json[:avatar_path] = User.default_avatar_fallback if avatars
json.delete(:author_name)
end
end
json
end
end
private
def anonymous_students?(current_user:, assignment:)
return @anonymous_students if defined? @anonymous_students
@anonymous_students = !assignment.can_view_student_names?(current_user)
end
def anonymous_graders?(current_user:, assignment:)
return @anonymous_graders if defined? @anonymous_graders
@anonymous_graders = !assignment.can_view_other_grader_identities?(current_user)
end
def grader_comments_hidden?(current_user:, assignment:)
return @grader_comments_hidden if defined? @grader_comments_hidden
@grader_comments_hidden = !assignment.can_view_other_grader_comments?(current_user)
end
def visible_submission_comments(submission_comments:, submissions:, current_user:, assignment:, course:)
return submission_comments unless grader_comments_hidden?(current_user: current_user, assignment: assignment)
submission_comments.reject do |submission_comment|
other_grader?(
user_id: submission_comment.author_id,
current_user: current_user,
course: course,
assignment: assignment,
submissions: submissions
)
end
end
def student_ids_to_anonymous_ids(current_user:, assignment:, course:, submissions:)
return @student_ids_to_anonymous_ids if defined? @student_ids_to_anonymous_ids
# ensure each student has membership, even without a submission
students = students(current_user: current_user, assignment: assignment, course: course)
@student_ids_to_anonymous_ids = students.each_with_object({}) {|student, map| map[student.id.to_s] = nil}
submissions.each do |submission|
@student_ids_to_anonymous_ids[submission.user_id.to_s] = submission.anonymous_id
end
@student_ids_to_anonymous_ids
end
def students(course:, assignment:, current_user:)
@students ||= begin
includes = gradebook_includes(user: current_user, course: course)
assignment.representatives(current_user, includes: includes) do |rep, others|
others.each { |s| res[:context][:rep_for_student][s.id] = rep.id }
end
end
end
def other_grader?(user_id:, current_user:, course:, assignment:, submissions:)
anonymous_ids = student_ids_to_anonymous_ids(
current_user: current_user,
assignment: assignment,
course: course,
submissions: submissions
)
!anonymous_ids.key?(user_id.to_s) && user_id != current_user.id
end
end

8
lib/gradebook_exporter.rb
View File

@ -71,8 +71,12 @@ class GradebookExporter
end
def csv_data
enrollment_scope = @course.apply_enrollment_visibility(gradebook_enrollment_scope, @user, nil,
include: gradebook_includes).preload(:root_account, :sis_pseudonym)
enrollment_scope = @course.apply_enrollment_visibility(
gradebook_enrollment_scope(user: @user, course: @course),
@user,
nil,
include: gradebook_includes(user: @user, course: @course)
).preload(:root_account, :sis_pseudonym)
student_enrollments = enrollments_for_csv(enrollment_scope)
student_section_names = {}

14
lib/gradebook_settings_helpers.rb
View File

@ -19,7 +19,7 @@
module GradebookSettingsHelpers
private
def gradebook_includes(user: @user, course: @course)
def gradebook_includes(user:, course:)
@gradebook_includes ||= begin
course_id = course.id
gb_settings = user.preferences.fetch(:gradebook_settings, {}).fetch(course_id, {})
@ -33,10 +33,16 @@ module GradebookSettingsHelpers
end
end
def gradebook_enrollment_scope(course = @course)
def gradebook_enrollment_scope(user:, course:)
scope = course.all_accepted_student_enrollments
scope = scope.where("enrollments.workflow_state <> 'inactive'") unless gradebook_includes.include?(:inactive)
scope = scope.where("enrollments.workflow_state <> 'completed'") unless gradebook_includes.include?(:completed)
unless gradebook_includes(user: user, course: course).include?(:inactive)
scope = scope.where("enrollments.workflow_state <> 'inactive'")
end
unless gradebook_includes(user: user, course: course).include?(:completed)
scope = scope.where("enrollments.workflow_state <> 'completed'")
end
scope
end

1
spec/lib/gradebook_exporter_spec.rb
View File

@ -17,7 +17,6 @@
#
require_relative '../spec_helper'
require 'csv'
describe GradebookExporter do

1
spec/shared_examples/update_submission.rb
View File

@ -314,7 +314,6 @@ RSpec.shared_examples 'a submission update action' do |controller|
expect(@submission.provisional_grade(@teacher).submission_comments.first.comment).to eq 'provisional!'
json = JSON.parse response.body
puts json.first['submission']['submission_comments'].first
expect(json.first['submission']['submission_comments'].first['comment']).to eq 'provisional!'
end