diff --git a/app/jsx/grading/gradingPeriod.jsx b/app/jsx/grading/gradingPeriod.jsx
index 830fdaf6c0a..9aa046cbd65 100644
--- a/app/jsx/grading/gradingPeriod.jsx
+++ b/app/jsx/grading/gradingPeriod.jsx
@@ -40,7 +40,7 @@ define([
title: nextProps.title,
startDate: nextProps.startDate,
endDate: nextProps.endDate,
- weight: nextProps.weight,
+ weight: nextProps.weight
});
},
diff --git a/app/jsx/grading/gradingPeriodCollection.jsx b/app/jsx/grading/gradingPeriodCollection.jsx
index c22a785a3d1..afb150e5d92 100644
--- a/app/jsx/grading/gradingPeriodCollection.jsx
+++ b/app/jsx/grading/gradingPeriodCollection.jsx
@@ -25,8 +25,7 @@ function(React, update, GradingPeriod, $, I18n, _, ConvertCase) {
periods: null,
readOnly: false,
disabled: false,
- saveDisabled: true,
- canChangeGradingPeriodsSetting: false
+ saveDisabled: true
};
},
@@ -41,7 +40,6 @@ function(React, update, GradingPeriod, $, I18n, _, ConvertCase) {
self.setState({
periods: self.deserializePeriods(periods),
readOnly: periods.grading_periods_read_only,
- canChangeGradingPeriodsSetting: periods.can_toggle_grading_periods,
disabled: false,
saveDisabled: _.isEmpty(periods.grading_periods)
});
@@ -200,22 +198,8 @@ function(React, update, GradingPeriod, $, I18n, _, ConvertCase) {
});
},
- renderLinkToSettingsPage: function () {
- if (this.state.canChangeGradingPeriodsSetting && this.state.periods && this.state.periods.length <= 1) {
- return (
-
- {I18n.t('You can disable this feature ')}
- {I18n.t('here.')}
- );
- }
- },
-
renderSaveButton: function () {
if (periodsAreLoaded(this.state) && !this.state.readOnly && _.all(this.state.periods, period => period.permissions.update)) {
- let buttonText = this.state.disabled ? I18n.t('Updating') : I18n.t('Save');
return (
);
@@ -257,9 +241,6 @@ function(React, update, GradingPeriod, $, I18n, _, ConvertCase) {
render: function () {
return (
-
- {this.renderLinkToSettingsPage()}
-
{this.renderGradingPeriods()}
diff --git a/app/models/course.rb b/app/models/course.rb
index 6b61c38f7c8..607f2d155bd 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -1044,10 +1044,15 @@ class Course < ActiveRecord::Base
end
end
- def recompute_student_scores(student_ids = nil, grading_period_id: nil)
+ def recompute_student_scores(student_ids = nil, grading_period_id: nil, update_all_grading_period_scores: true)
student_ids ||= self.student_ids
Rails.logger.info "GRADES: recomputing scores in course=#{global_id} students=#{student_ids.inspect}"
- GradeCalculator.recompute_final_score(student_ids, self.id, grading_period_id: grading_period_id)
+ Enrollment.recompute_final_score(
+ student_ids,
+ self.id,
+ grading_period_id: grading_period_id,
+ update_all_grading_period_scores: update_all_grading_period_scores
+ )
end
handle_asynchronously_if_production :recompute_student_scores,
:singleton => proc { |c| "recompute_student_scores:#{ c.global_id }" }
@@ -1666,7 +1671,6 @@ class Course < ActiveRecord::Base
update_all(:grade_publishing_status => 'error', :grade_publishing_message => "Timed out.")
end
-
def gradebook_to_csv_in_background(filename, user, options = {})
progress = progresses.build(tag: 'gradebook_to_csv')
progress.save!
@@ -3092,6 +3096,18 @@ class Course < ActiveRecord::Base
effective_due_dates.any_in_closed_grading_period?
end
+ # Does this course have grading periods?
+ # checks for both legacy and account-level grading period groups
+ def grading_periods?
+ return @has_grading_periods unless @has_grading_periods.nil?
+
+ @has_grading_periods = shard.activate do
+ GradingPeriodGroup.active.
+ where("id = ? or course_id = ?", enrollment_term.grading_period_group_id, id).
+ exists?
+ end
+ end
+
def quiz_lti_tool
query = { tool_id: 'Quizzes 2' }
context_external_tools.active.find_by(query) ||
diff --git a/app/models/enrollment_term.rb b/app/models/enrollment_term.rb
index d659d47509e..7a5edfa04d2 100644
--- a/app/models/enrollment_term.rb
+++ b/app/models/enrollment_term.rb
@@ -35,6 +35,7 @@ class EnrollmentTerm < ActiveRecord::Base
before_validation :verify_unique_sis_source_id
after_save :update_courses_later_if_necessary
+ after_save :recompute_course_scores, if: :grading_period_group_id_has_changed?
include StickySisFields
are_sis_sticky :name, :start_at, :end_at
@@ -64,6 +65,12 @@ class EnrollmentTerm < ActiveRecord::Base
self.courses.touch_all
end
+ def recompute_course_scores(update_all_grading_period_scores: true)
+ courses.active.each do |course|
+ course.recompute_student_scores(update_all_grading_period_scores: update_all_grading_period_scores)
+ end
+ end
+
def update_courses_and_states_later(enrollment_type=nil)
return if new_record?
@@ -186,4 +193,12 @@ class EnrollmentTerm < ActiveRecord::Base
scope :not_started, -> { where('enrollment_terms.start_at IS NOT NULL AND enrollment_terms.start_at > ?', Time.now.utc) }
scope :not_default, -> { where.not(name: EnrollmentTerm::DEFAULT_TERM_NAME)}
scope :by_name, -> { order(best_unicode_collation_key('name')) }
+
+ private
+
+ def grading_period_group_id_has_changed?
+ # migration 20111111214313_add_trust_link_for_default_account
+ # will throw an error without this check
+ respond_to?(:grading_period_group_id_changed?) && grading_period_group_id_changed?
+ end
end
diff --git a/app/models/feature_flag.rb b/app/models/feature_flag.rb
index 9579c78e970..ad55779ecee 100644
--- a/app/models/feature_flag.rb
+++ b/app/models/feature_flag.rb
@@ -53,11 +53,12 @@ class FeatureFlag < ActiveRecord::Base
def clear_cache
if self.context
self.class.connection.after_transaction_commit { MultiCache.delete(self.context.feature_flag_cache_key(feature)) }
- self.context.touch if Feature.definitions[feature].touch_context
+ self.context.touch if Feature.definitions[feature].try(:touch_context)
end
end
-private
+ private
+
def valid_state
errors.add(:state, "is not valid in context") unless %w(off on).include?(state) || context.is_a?(Account) && state == 'allowed'
end
diff --git a/app/models/grading_period.rb b/app/models/grading_period.rb
index 51fdaad544a..2d4159341dc 100644
--- a/app/models/grading_period.rb
+++ b/app/models/grading_period.rb
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2015-2016 Instructure, Inc.
+# Copyright (C) 2015 - 2016 Instructure, Inc.
#
# This file is part of Canvas.
#
@@ -23,6 +23,7 @@ class GradingPeriod < ActiveRecord::Base
has_many :scores, -> { active }
validates :title, :start_date, :end_date, :close_date, :grading_period_group_id, presence: true
+ validates :weight, numericality: true, allow_nil: true
validate :start_date_is_before_end_date
validate :close_date_is_on_or_after_end_date
validate :not_overlapping, unless: :skip_not_overlapping_validator?
@@ -30,7 +31,7 @@ class GradingPeriod < ActiveRecord::Base
before_validation :adjust_close_date_for_course_period
before_validation :ensure_close_date
- after_save :recompute_scores, if: :dates_changed?
+ after_save :recompute_scores, if: :dates_or_weight_changed?
after_destroy :destroy_grading_period_set, if: :last_remaining_legacy_period?
after_destroy :destroy_scores
@@ -151,7 +152,7 @@ class GradingPeriod < ActiveRecord::Base
def as_json_with_user_permissions(user)
as_json(
- only: [:id, :title, :start_date, :end_date, :close_date],
+ only: [:id, :title, :start_date, :end_date, :close_date, :weight],
permissions: { user: user },
methods: [:is_last, :is_closed],
).fetch(:grading_period)
@@ -230,13 +231,31 @@ class GradingPeriod < ActiveRecord::Base
courses = [grading_period_group.course]
else
term_ids = grading_period_group.enrollment_terms.pluck(:id)
- courses = Course.where(enrollment_term_id: term_ids)
+ courses = Course.active.where(enrollment_term_id: term_ids)
+ end
+
+ courses.each do |course|
+ course.recompute_student_scores(
+ # different assignments could fall in this period if time
+ # boundaries changed so we need to recalculate scores.
+ # otherwise, weight must have changed, in which case we
+ # do not need to recompute the grading period scores (we
+ # only need to recompute the overall course score)
+ grading_period_id: time_boundaries_changed? ? id : nil,
+ update_all_grading_period_scores: false
+ )
end
- # Course#recompute_student_scores is asynchronous
- courses.each { |course| course.recompute_student_scores(grading_period_id: self.id) }
end
- def dates_changed?
+ def weight_actually_changed?
+ grading_period_group.weighted && weight_changed?
+ end
+
+ def time_boundaries_changed?
start_date_changed? || end_date_changed?
end
+
+ def dates_or_weight_changed?
+ time_boundaries_changed? || weight_actually_changed?
+ end
end
diff --git a/app/models/grading_period_group.rb b/app/models/grading_period_group.rb
index d55cfe4b876..c4571708fe4 100644
--- a/app/models/grading_period_group.rb
+++ b/app/models/grading_period_group.rb
@@ -26,31 +26,28 @@ class GradingPeriodGroup < ActiveRecord::Base
validate :associated_with_course_or_root_account, if: :active?
+ after_save :recompute_course_scores, if: :weighted_changed?
after_destroy :dissociate_enrollment_terms
set_policy do
given do |user|
- multiple_grading_periods_enabled? &&
(course || root_account).grants_right?(user, :read)
end
can :read
given do |user|
root_account &&
- multiple_grading_periods_enabled? &&
root_account.associated_user?(user)
end
can :read
given do |user|
- multiple_grading_periods_enabled? &&
(course || root_account).grants_right?(user, :manage)
end
can :update and can :delete
given do |user|
root_account &&
- multiple_grading_periods_enabled? &&
root_account.grants_right?(user, :manage)
end
can :create
@@ -62,12 +59,14 @@ class GradingPeriodGroup < ActiveRecord::Base
root_account.grading_period_groups.active
end
- def multiple_grading_periods_enabled?
- multiple_grading_periods_on_course? || multiple_grading_periods_on_account?
- end
-
private
+ def recompute_course_scores
+ return course.recompute_student_scores(update_all_grading_period_scores: false) if course_id.present?
+
+ enrollment_terms.each { |term| term.recompute_course_scores(update_all_grading_period_scores: false) }
+ end
+
def associated_with_course_or_root_account
if course_id.blank? && account_id.blank?
errors.add(:course_id, t("cannot be nil when account_id is nil"))
@@ -84,17 +83,6 @@ class GradingPeriodGroup < ActiveRecord::Base
end
end
- def multiple_grading_periods_on_account?
- root_account.present? && (
- root_account.feature_enabled?(:multiple_grading_periods) ||
- root_account.feature_allowed?(:multiple_grading_periods)
- )
- end
-
- def multiple_grading_periods_on_course?
- course.present? && course.feature_enabled?(:multiple_grading_periods)
- end
-
def dissociate_enrollment_terms
enrollment_terms.update_all(grading_period_group_id: nil)
end
diff --git a/app/models/group.rb b/app/models/group.rb
index a54f4fd4fe6..dd9232a8618 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -715,6 +715,10 @@ class Group < ActiveRecord::Base
context.feature_enabled?(feature)
end
+ def grading_periods?
+ !!context.try(:grading_periods?)
+ end
+
def serialize_permissions(permissions_hash, user, session)
permissions_hash.merge(
create_discussion_topic: DiscussionTopic.context_allows_user_to_create?(self, user, session),
diff --git a/app/serializers/grading_period_set_serializer.rb b/app/serializers/grading_period_set_serializer.rb
index f8b78f84c63..caa56d201ba 100644
--- a/app/serializers/grading_period_set_serializer.rb
+++ b/app/serializers/grading_period_set_serializer.rb
@@ -4,6 +4,7 @@ class GradingPeriodSetSerializer < Canvas::APISerializer
attributes :id,
:title,
+ :weighted,
:account_id,
:course_id,
:grading_periods,
diff --git a/app/views/gradebooks/grade_summary.html.erb b/app/views/gradebooks/grade_summary.html.erb
index 081d6f0c354..9c8df37ad7f 100644
--- a/app/views/gradebooks/grade_summary.html.erb
+++ b/app/views/gradebooks/grade_summary.html.erb
@@ -54,7 +54,7 @@
- <% if multiple_grading_periods? %>
+ <% if grading_periods? %>
<%= render partial: "shared/grading_periods_selector", locals: {selected_period_id: @current_grading_period_id, grading_periods: @grading_periods, enrollment_id: @presenter.student_enrollment.id, all_grading_periods_option: true} %>
<% end %>
diff --git a/app/views/gradebooks/gradebook.html.erb b/app/views/gradebooks/gradebook.html.erb
index 0b29d21142b..e4357a93dfd 100644
--- a/app/views/gradebooks/gradebook.html.erb
+++ b/app/views/gradebooks/gradebook.html.erb
@@ -91,7 +91,7 @@
diff --git a/app/views/jst/assignments/IndexView.handlebars b/app/views/jst/assignments/IndexView.handlebars
index 3f1661e74fd..3338eecef86 100644
--- a/app/views/jst/assignments/IndexView.handlebars
+++ b/app/views/jst/assignments/IndexView.handlebars
@@ -11,7 +11,7 @@