canvas-lms/lib/grade_calculator.rb

845 lines
32 KiB
Ruby
Raw Normal View History

2011-02-01 09:57:29 +08:00
#
# Copyright (C) 2011 - present Instructure, Inc.
2011-02-01 09:57:29 +08:00
#
# This file is part of Canvas.
#
# Canvas is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
# Software Foundation, version 3 of the License.
#
# Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
# details.
#
# You should have received a copy of the GNU Affero General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
class GradeCalculator
attr_accessor :assignments, :groups
def initialize(user_ids, course, opts = {})
update grading period scores when student is graded When a student is graded, the score for their grading period will now be updated in addition to their total course score. Previously, when a student was graded, their grading period score was not updated. closes CNVS-26709 test plan: 1) In a course with multiple grading periods enabled and grading periods set up, grade students for assignments that fall in grading periods and make sure the scores get updated for the grading period and for the course total. * To make sure the scores get updated for the grading period, open a rails console and find the grading period scores (we'll assume the student's enrollment ID is 5, and the ID of the grading period that the assignment falls in is 8). $ Enrollment.find(5).scores.where(grading_period_id: 8) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. * To make sure the scores get updated for the course total, open a rails console and find the course total scores (we'll assume the student's enrollment ID is 5). $ Enrollment.find(5).scores.where(grading_period_id: nil) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. Edge case: make sure that grading period scores continue to get updated even if MGP is turned off. To verify this, turn off MGP in a course that originally had MGP turned on. Then, grade students in assignments that fell in a grading period when MGP was enabled. After grading, the grading period scores should be updated. Change-Id: I29e4e22a0b73d1062a93c6ad420d876c2f5d040a Reviewed-on: https://gerrit.instructure.com/98603 Reviewed-by: Jeremy Neander <jneander@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins QA-Review: Anju Reddy <areddy@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-30 05:05:07 +08:00
opts = opts.reverse_merge(
ignore_muted: true,
update_all_grading_period_scores: true,
update_course_score: true,
only_update_course_gp_metadata: false
update grading period scores when student is graded When a student is graded, the score for their grading period will now be updated in addition to their total course score. Previously, when a student was graded, their grading period score was not updated. closes CNVS-26709 test plan: 1) In a course with multiple grading periods enabled and grading periods set up, grade students for assignments that fall in grading periods and make sure the scores get updated for the grading period and for the course total. * To make sure the scores get updated for the grading period, open a rails console and find the grading period scores (we'll assume the student's enrollment ID is 5, and the ID of the grading period that the assignment falls in is 8). $ Enrollment.find(5).scores.where(grading_period_id: 8) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. * To make sure the scores get updated for the course total, open a rails console and find the course total scores (we'll assume the student's enrollment ID is 5). $ Enrollment.find(5).scores.where(grading_period_id: nil) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. Edge case: make sure that grading period scores continue to get updated even if MGP is turned off. To verify this, turn off MGP in a course that originally had MGP turned on. Then, grade students in assignments that fell in a grading period when MGP was enabled. After grading, the grading period scores should be updated. Change-Id: I29e4e22a0b73d1062a93c6ad420d876c2f5d040a Reviewed-on: https://gerrit.instructure.com/98603 Reviewed-by: Jeremy Neander <jneander@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins QA-Review: Anju Reddy <areddy@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-30 05:05:07 +08:00
)
Rails.logger.info("GRADES: calc args: user_ids=#{user_ids.inspect}")
Rails.logger.info("GRADES: calc args: course=#{course.inspect}")
Rails.logger.info("GRADES: calc args: opts=#{opts.inspect}")
@course = course.is_a?(Course) ? course : Course.find(course)
@groups = opts[:groups] || @course.assignment_groups.active.to_a
@grading_period = opts[:grading_period]
update grading period scores when student is graded When a student is graded, the score for their grading period will now be updated in addition to their total course score. Previously, when a student was graded, their grading period score was not updated. closes CNVS-26709 test plan: 1) In a course with multiple grading periods enabled and grading periods set up, grade students for assignments that fall in grading periods and make sure the scores get updated for the grading period and for the course total. * To make sure the scores get updated for the grading period, open a rails console and find the grading period scores (we'll assume the student's enrollment ID is 5, and the ID of the grading period that the assignment falls in is 8). $ Enrollment.find(5).scores.where(grading_period_id: 8) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. * To make sure the scores get updated for the course total, open a rails console and find the course total scores (we'll assume the student's enrollment ID is 5). $ Enrollment.find(5).scores.where(grading_period_id: nil) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. Edge case: make sure that grading period scores continue to get updated even if MGP is turned off. To verify this, turn off MGP in a course that originally had MGP turned on. Then, grade students in assignments that fell in a grading period when MGP was enabled. After grading, the grading period scores should be updated. Change-Id: I29e4e22a0b73d1062a93c6ad420d876c2f5d040a Reviewed-on: https://gerrit.instructure.com/98603 Reviewed-by: Jeremy Neander <jneander@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins QA-Review: Anju Reddy <areddy@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-30 05:05:07 +08:00
# if we're updating an overall course score (no grading period specified), we
# want to first update all grading period scores for the users
@update_all_grading_period_scores = @grading_period.nil? && opts[:update_all_grading_period_scores]
# if we're updating a grading period score, we also need to update the
# overall course score
@update_course_score = @grading_period.present? && opts[:update_course_score]
@assignments = opts[:assignments] || @course.assignments.published.gradeable.to_a
@user_ids = Array(user_ids).map { |id| Shard.relative_id_for(id, Shard.current, @course.shard) }
@current_updates = {}
@final_updates = {}
@dropped_updates = {}
2017-08-17 21:47:36 +08:00
@current_groups = {}
@final_groups = {}
# The developers of the future, I leave you this gift:
# If you add a new options here, make sure you also update the
# opts in the compute_branch method
@ignore_muted = opts[:ignore_muted]
@effective_due_dates = opts[:effective_due_dates]
@enrollments = opts[:enrollments]
@periods = opts[:periods]
@submissions = opts[:submissions]
@only_update_course_gp_metadata = opts[:only_update_course_gp_metadata]
2011-02-01 09:57:29 +08:00
end
# recomputes the scores and saves them to each user's Enrollment
update grading period scores when student is graded When a student is graded, the score for their grading period will now be updated in addition to their total course score. Previously, when a student was graded, their grading period score was not updated. closes CNVS-26709 test plan: 1) In a course with multiple grading periods enabled and grading periods set up, grade students for assignments that fall in grading periods and make sure the scores get updated for the grading period and for the course total. * To make sure the scores get updated for the grading period, open a rails console and find the grading period scores (we'll assume the student's enrollment ID is 5, and the ID of the grading period that the assignment falls in is 8). $ Enrollment.find(5).scores.where(grading_period_id: 8) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. * To make sure the scores get updated for the course total, open a rails console and find the course total scores (we'll assume the student's enrollment ID is 5). $ Enrollment.find(5).scores.where(grading_period_id: nil) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. Edge case: make sure that grading period scores continue to get updated even if MGP is turned off. To verify this, turn off MGP in a course that originally had MGP turned on. Then, grade students in assignments that fell in a grading period when MGP was enabled. After grading, the grading period scores should be updated. Change-Id: I29e4e22a0b73d1062a93c6ad420d876c2f5d040a Reviewed-on: https://gerrit.instructure.com/98603 Reviewed-by: Jeremy Neander <jneander@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins QA-Review: Anju Reddy <areddy@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-30 05:05:07 +08:00
def self.recompute_final_score(user_ids, course_id, compute_score_opts = {})
user_ids = Array(user_ids).uniq.map(&:to_i)
return if user_ids.empty?
course = course_id.is_a?(Course) ? course_id : Course.active.where(id: course_id).take
return unless course
assignments = compute_score_opts[:assignments] || course.assignments.published.gradeable.to_a
groups = compute_score_opts[:groups] || course.assignment_groups.active.to_a
periods = compute_score_opts[:periods] || GradingPeriod.for(course)
grading_period_id = compute_score_opts.delete(:grading_period_id)
grading_period = periods.find_by(id: grading_period_id) if grading_period_id
opts = compute_score_opts.reverse_merge(
grading_period: grading_period,
assignments: assignments,
groups: groups,
periods: periods
update grading period scores when student is graded When a student is graded, the score for their grading period will now be updated in addition to their total course score. Previously, when a student was graded, their grading period score was not updated. closes CNVS-26709 test plan: 1) In a course with multiple grading periods enabled and grading periods set up, grade students for assignments that fall in grading periods and make sure the scores get updated for the grading period and for the course total. * To make sure the scores get updated for the grading period, open a rails console and find the grading period scores (we'll assume the student's enrollment ID is 5, and the ID of the grading period that the assignment falls in is 8). $ Enrollment.find(5).scores.where(grading_period_id: 8) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. * To make sure the scores get updated for the course total, open a rails console and find the course total scores (we'll assume the student's enrollment ID is 5). $ Enrollment.find(5).scores.where(grading_period_id: nil) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. Edge case: make sure that grading period scores continue to get updated even if MGP is turned off. To verify this, turn off MGP in a course that originally had MGP turned on. Then, grade students in assignments that fell in a grading period when MGP was enabled. After grading, the grading period scores should be updated. Change-Id: I29e4e22a0b73d1062a93c6ad420d876c2f5d040a Reviewed-on: https://gerrit.instructure.com/98603 Reviewed-by: Jeremy Neander <jneander@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins QA-Review: Anju Reddy <areddy@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-30 05:05:07 +08:00
)
user_ids.in_groups_of(1000, false) do |user_ids_group|
GradeCalculator.new(user_ids_group, course, opts).compute_and_save_scores
end
2011-02-01 09:57:29 +08:00
end
def submissions
@submissions ||= @course.submissions.
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
except(:order, :select).
for_user(@user_ids).
where(assignment_id: @assignments).
select("submissions.id, user_id, assignment_id, score, excused, submissions.workflow_state")
end
def compute_scores
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
scores_and_group_sums = []
@user_ids.each_slice(100) do |batched_ids|
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
scores_and_group_sums_batch = compute_scores_and_group_sums_for_batch(batched_ids)
scores_and_group_sums.concat(scores_and_group_sums_batch)
2011-02-01 09:57:29 +08:00
end
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
scores_and_group_sums
end
def compute_and_save_scores
calculate_grading_period_scores if @update_all_grading_period_scores
compute_scores
save_scores
invalidate_caches
# The next line looks weird, but it is intended behaviour. Its
# saying "if we're on the branch not calculating muted scores, run
# the branch that does."
calculate_muted_scores if @ignore_muted
update grading period scores when student is graded When a student is graded, the score for their grading period will now be updated in addition to their total course score. Previously, when a student was graded, their grading period score was not updated. closes CNVS-26709 test plan: 1) In a course with multiple grading periods enabled and grading periods set up, grade students for assignments that fall in grading periods and make sure the scores get updated for the grading period and for the course total. * To make sure the scores get updated for the grading period, open a rails console and find the grading period scores (we'll assume the student's enrollment ID is 5, and the ID of the grading period that the assignment falls in is 8). $ Enrollment.find(5).scores.where(grading_period_id: 8) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. * To make sure the scores get updated for the course total, open a rails console and find the course total scores (we'll assume the student's enrollment ID is 5). $ Enrollment.find(5).scores.where(grading_period_id: nil) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. Edge case: make sure that grading period scores continue to get updated even if MGP is turned off. To verify this, turn off MGP in a course that originally had MGP turned on. Then, grade students in assignments that fell in a grading period when MGP was enabled. After grading, the grading period scores should be updated. Change-Id: I29e4e22a0b73d1062a93c6ad420d876c2f5d040a Reviewed-on: https://gerrit.instructure.com/98603 Reviewed-by: Jeremy Neander <jneander@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins QA-Review: Anju Reddy <areddy@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-30 05:05:07 +08:00
calculate_course_score if @update_course_score
end
private
def effective_due_dates
@effective_due_dates ||= EffectiveDueDates.for_course(@course, @assignments).filter_students_to(@user_ids)
end
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
def compute_scores_and_group_sums_for_batch(user_ids)
user_ids.map do |user_id|
next unless enrollments_by_user[user_id].first
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
group_sums = compute_group_sums_for_user(user_id)
scores = compute_scores_for_user(user_id, group_sums)
2017-08-17 21:47:36 +08:00
update_changes_hash_for_user(user_id, scores, group_sums)
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
{
current: scores[:current],
current_groups: group_sums[:current].index_by { |group| group[:id] },
final: scores[:final],
final_groups: group_sums[:final].index_by { |group| group[:id] }
}
end.compact
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
end
def assignment_visible_to_student?(assignment_id, user_id)
effective_due_dates.find_effective_due_date(user_id, assignment_id).key?(:due_at)
end
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
def compute_group_sums_for_user(user_id)
user_submissions = submissions_by_user.fetch(user_id, []).select do |submission|
assignment_visible_to_student?(submission.assignment_id, user_id)
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
end
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
{
current: create_group_sums(user_submissions, user_id, ignore_ungraded: true),
final: create_group_sums(user_submissions, user_id, ignore_ungraded: false)
}
end
def compute_scores_for_user(user_id, group_sums)
if compute_course_scores_from_weighted_grading_periods?
scores = calculate_total_from_weighted_grading_periods(user_id)
else
scores = {
current: calculate_total_from_group_scores(group_sums[:current]),
final: calculate_total_from_group_scores(group_sums[:final])
}
end
Rails.logger.info "GRADES: calculated: #{scores.inspect}"
scores
end
2017-08-17 21:47:36 +08:00
def update_changes_hash_for_user(user_id, scores, group_sums)
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
@current_updates[user_id] = scores[:current][:grade]
@final_updates[user_id] = scores[:final][:grade]
2017-08-17 21:47:36 +08:00
@current_groups[user_id] = group_sums[:current]
@final_groups[user_id] = group_sums[:final]
@dropped_updates[user_id] = {
current: {dropped: scores[:current][:dropped]},
final: {dropped: scores[:final][:dropped]}
}
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
end
def grading_period_scores(enrollment_id)
@grading_period_scores ||= Score.active.where(
enrollment: enrollments.map(&:id),
grading_period: grading_periods_for_course.map(&:id)
).group_by(&:enrollment_id)
@grading_period_scores[enrollment_id] || []
end
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
def calculate_total_from_weighted_grading_periods(user_id)
enrollment = enrollments_by_user[user_id].first
grading_period_scores = grading_period_scores(enrollment.id)
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
scores = apply_grading_period_weights_to_scores(grading_period_scores)
scale_and_round_scores(scores, grading_period_scores)
end
def apply_grading_period_weights_to_scores(grading_period_scores)
grading_period_scores.each_with_object(
{ current: { full_weight: 0.0, grade: 0.0 }, final: { full_weight: 0.0, grade: 0.0 } }
) do |score, scores|
weight = grading_period_weights[score.grading_period_id] || 0.0
scores[:final][:full_weight] += weight
scores[:current][:full_weight] += weight if score.current_score
scores[:current][:grade] += (score.current_score || 0.0) * (weight / 100.0)
scores[:final][:grade] += (score.final_score || 0.0) * (weight / 100.0)
end
end
def scale_and_round_scores(scores, grading_period_scores)
[:current, :final].each_with_object({ current: {}, final: {} }) do |score_type, adjusted_scores|
score = scores[score_type][:grade]
full_weight = scores[score_type][:full_weight]
score = scale_score_up(score, full_weight) if full_weight < 100
if score == 0.0 && score_type == :current && grading_period_scores.none?(&:current_score)
score = nil
end
adjusted_scores[score_type][:grade] = score ? score.round(2) : score
end
end
def scale_score_up(score, weight)
return 0.0 if weight.zero?
(score * 100.0) / weight
end
def compute_course_scores_from_weighted_grading_periods?
return @compute_from_weighted_periods if @compute_from_weighted_periods.present?
Get rid of multiple_grading_periods feature flag Fixes CNVS-27109 Test plan: Regression test everything related to multiple grading periods. In particular, make sure: * there is no mention of the multiple grading periods feature flag on the account or course features pages * make sure grading periods UI always shows up on the account grading standards page * make sure the grading periods UI only shows on the course grading standards page if legacy course grading periods exist for that course (see below) * grading period dropdowns only show up everywhere else if there are grading periods to show. Otherwise, it should behave as if MGP is "disabled" * Grade calculation should work as expected with and without grading periods To create legacy course grading periods, you have to use rails console: 1. Find your course: course = Course.find(<id>) 2. Create a grading period group: group = course.grading_period_groups.create!(title: "2017") 2. Create a grading period: group.grading_periods.create!( weight: 1, title: 'Fall', start_date: 5.days.ago, end_date: 10.days.from_now ) Here's the list of known places grading periods can be seen in the UI: Instructor Assignments page (https://community.canvaslms.com/docs/DOC-2615) Student Assignments page (https://community.canvaslms.com/docs/DOC-3123) Gradebook (https://community.canvaslms.com/docs/DOC-2785) Gradebook Individual View (https://community.canvaslms.com/docs/DOC-2788) Course Settings grading schemes page (https://community.canvaslms.com/docs/DOC-4042) Student Grades page (https://community.canvaslms.com/docs/DOC-1291) Dashboard global Grades page (https://community.canvaslms.com/docs/DOC-5464) Change-Id: Iefac4b08120bd1699d4ed98bcb418089eec9b3b8 Reviewed-on: https://gerrit.instructure.com/99744 Reviewed-by: Spencer Olson <solson@instructure.com> Tested-by: Jenkins QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-17 09:18:24 +08:00
if @grading_period || grading_periods_for_course.empty?
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
@compute_from_weighted_periods = false
else
@compute_from_weighted_periods = grading_periods_for_course.first.grading_period_group.weighted?
end
end
def grading_periods_for_course
@periods ||= GradingPeriod.for(@course)
end
def grading_period_weights
@grading_period_weights ||= grading_periods_for_course.each_with_object({}) do |period, weights|
weights[period.id] = period.weight
end
end
def submissions_by_user
@submissions_by_user ||= submissions.group_by {|s| Shard.relative_id_for(s.user_id, Shard.current, @course.shard) }
end
def compute_branch(opts = {})
opts = opts.reverse_merge(
groups: @groups,
grading_period: @grading_period,
update_all_grading_period_scores: false,
update_course_score: false,
assignments: @assignments,
ignore_muted: @ignore_muted,
periods: grading_periods_for_course,
effective_due_dates: effective_due_dates,
enrollments: enrollments,
submissions: submissions,
only_update_course_gp_metadata: @only_update_course_gp_metadata
)
GradeCalculator.new(@user_ids, @course, opts).compute_and_save_scores
end
def calculate_muted_scores
# re-run this calculator, except include muted assignments
compute_branch(ignore_muted: false)
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
end
update grading period scores when student is graded When a student is graded, the score for their grading period will now be updated in addition to their total course score. Previously, when a student was graded, their grading period score was not updated. closes CNVS-26709 test plan: 1) In a course with multiple grading periods enabled and grading periods set up, grade students for assignments that fall in grading periods and make sure the scores get updated for the grading period and for the course total. * To make sure the scores get updated for the grading period, open a rails console and find the grading period scores (we'll assume the student's enrollment ID is 5, and the ID of the grading period that the assignment falls in is 8). $ Enrollment.find(5).scores.where(grading_period_id: 8) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. * To make sure the scores get updated for the course total, open a rails console and find the course total scores (we'll assume the student's enrollment ID is 5). $ Enrollment.find(5).scores.where(grading_period_id: nil) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. Edge case: make sure that grading period scores continue to get updated even if MGP is turned off. To verify this, turn off MGP in a course that originally had MGP turned on. Then, grade students in assignments that fell in a grading period when MGP was enabled. After grading, the grading period scores should be updated. Change-Id: I29e4e22a0b73d1062a93c6ad420d876c2f5d040a Reviewed-on: https://gerrit.instructure.com/98603 Reviewed-by: Jeremy Neander <jneander@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins QA-Review: Anju Reddy <areddy@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-30 05:05:07 +08:00
def calculate_grading_period_scores
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
grading_periods_for_course.each do |grading_period|
# update this grading period score
compute_branch(grading_period: grading_period)
update grading period scores when student is graded When a student is graded, the score for their grading period will now be updated in addition to their total course score. Previously, when a student was graded, their grading period score was not updated. closes CNVS-26709 test plan: 1) In a course with multiple grading periods enabled and grading periods set up, grade students for assignments that fall in grading periods and make sure the scores get updated for the grading period and for the course total. * To make sure the scores get updated for the grading period, open a rails console and find the grading period scores (we'll assume the student's enrollment ID is 5, and the ID of the grading period that the assignment falls in is 8). $ Enrollment.find(5).scores.where(grading_period_id: 8) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. * To make sure the scores get updated for the course total, open a rails console and find the course total scores (we'll assume the student's enrollment ID is 5). $ Enrollment.find(5).scores.where(grading_period_id: nil) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. Edge case: make sure that grading period scores continue to get updated even if MGP is turned off. To verify this, turn off MGP in a course that originally had MGP turned on. Then, grade students in assignments that fell in a grading period when MGP was enabled. After grading, the grading period scores should be updated. Change-Id: I29e4e22a0b73d1062a93c6ad420d876c2f5d040a Reviewed-on: https://gerrit.instructure.com/98603 Reviewed-by: Jeremy Neander <jneander@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins QA-Review: Anju Reddy <areddy@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-30 05:05:07 +08:00
end
Recalculate old grading period score when assignment moves Fixes CNVS-35341 Test plan: A. select or create 1. an account with grading periods enabled 2. an enrollment term for the course 3. a grading period set for the enrollment term with grading period weighting disabled with two grading periods ('GP1' and 'GP2') 4. a course with assignment group weighting enabled 5. a teacher for the course 6. a student enrolled in the course 7. an assignment group 'AG1' a. with a weight of 60 b. with an assignment 'A1' i. due in GP1 ii. worth 10 points c. with an assignment 'A2' i. due in GP1 ii. worth 10 points 8. an assignment group 'AG2' a. with a weight of 20 b. with an assignment 'A3' i. due in GP2 ii. worth 20 points 9. an assignment group 'AG3' a. with a weight of 20 b. with an assignment 'A4' i. due in GP2 ii. worth 40 points B. set scores 1. score A1 with 5 points 2. score A2 with 10 points 3. score A3 with 12 points 4. score A4 with 16 points a. assignment group weighting should be enabled b. enable grading period weighting c. set 'GP1' weight to 30% d. set 'GP2' weight to 70% e. set 'A2' due date before 'GP1' f. confirm total grade of 50 % Masquerade as the student and view the global grades page (/grades). You should see 50% for the total grade on all grading periods. Change-Id: Ic6ac67abd83e2cd6aa413472493fb1bfa3b041fc Reviewed-on: https://gerrit.instructure.com/104200 Reviewed-by: Spencer Olson <solson@instructure.com> Tested-by: Jenkins Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Neil Gupta <ngupta@instructure.com>
2017-03-07 06:57:02 +08:00
# delete any grading period scores that are no longer relevant
grading_period_ids = grading_periods_for_course.empty? ? nil : grading_periods_for_course.map(&:id)
@course.shard.activate do
Score.active.joins(:enrollment).
where(enrollments: {user_id: @user_ids, course_id: @course.id}).
where.not(grading_period_id: grading_period_ids).
update_all(workflow_state: :deleted)
end
update grading period scores when student is graded When a student is graded, the score for their grading period will now be updated in addition to their total course score. Previously, when a student was graded, their grading period score was not updated. closes CNVS-26709 test plan: 1) In a course with multiple grading periods enabled and grading periods set up, grade students for assignments that fall in grading periods and make sure the scores get updated for the grading period and for the course total. * To make sure the scores get updated for the grading period, open a rails console and find the grading period scores (we'll assume the student's enrollment ID is 5, and the ID of the grading period that the assignment falls in is 8). $ Enrollment.find(5).scores.where(grading_period_id: 8) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. * To make sure the scores get updated for the course total, open a rails console and find the course total scores (we'll assume the student's enrollment ID is 5). $ Enrollment.find(5).scores.where(grading_period_id: nil) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. Edge case: make sure that grading period scores continue to get updated even if MGP is turned off. To verify this, turn off MGP in a course that originally had MGP turned on. Then, grade students in assignments that fell in a grading period when MGP was enabled. After grading, the grading period scores should be updated. Change-Id: I29e4e22a0b73d1062a93c6ad420d876c2f5d040a Reviewed-on: https://gerrit.instructure.com/98603 Reviewed-by: Jeremy Neander <jneander@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins QA-Review: Anju Reddy <areddy@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-30 05:05:07 +08:00
end
def calculate_course_score
# update the overall course score now that we've finished
# updating the grading period score
compute_branch(grading_period: nil)
update grading period scores when student is graded When a student is graded, the score for their grading period will now be updated in addition to their total course score. Previously, when a student was graded, their grading period score was not updated. closes CNVS-26709 test plan: 1) In a course with multiple grading periods enabled and grading periods set up, grade students for assignments that fall in grading periods and make sure the scores get updated for the grading period and for the course total. * To make sure the scores get updated for the grading period, open a rails console and find the grading period scores (we'll assume the student's enrollment ID is 5, and the ID of the grading period that the assignment falls in is 8). $ Enrollment.find(5).scores.where(grading_period_id: 8) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. * To make sure the scores get updated for the course total, open a rails console and find the course total scores (we'll assume the student's enrollment ID is 5). $ Enrollment.find(5).scores.where(grading_period_id: nil) Then, give a different grade to the student for the assignment that falls in the grading period and run the command above again. You should see that the current_score and final_score have changed. Edge case: make sure that grading period scores continue to get updated even if MGP is turned off. To verify this, turn off MGP in a course that originally had MGP turned on. Then, grade students in assignments that fell in a grading period when MGP was enabled. After grading, the grading period scores should be updated. Change-Id: I29e4e22a0b73d1062a93c6ad420d876c2f5d040a Reviewed-on: https://gerrit.instructure.com/98603 Reviewed-by: Jeremy Neander <jneander@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins QA-Review: Anju Reddy <areddy@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2016-12-30 05:05:07 +08:00
end
def enrollments
@enrollments ||= Enrollment.shard(@course.shard).active.
where(user_id: @user_ids, course_id: @course.id).
select(:id, :user_id, :workflow_state)
end
def joined_enrollment_ids
# use local_id because we'll exec the query on the enrollment's shard
@joined_enrollment_ids ||= enrollments.map(&:local_id).join(',')
end
def enrollments_by_user
@enrollments_by_user ||= begin
hsh = enrollments.group_by {|e| Shard.relative_id_for(e.user_id, Shard.current, @course.shard) }
hsh.default = []
hsh
end
end
def number_or_null(score)
# GradeCalculator sometimes divides by 0 somewhere,
# resulting in NaN. Treat that as null here
score = nil if score.try(:nan?)
2017-08-17 21:47:36 +08:00
score || 'NULL::float'
end
def group_score_rows
2017-08-17 21:47:36 +08:00
enrollments_by_user.keys.map do |user_id|
current = @current_groups[user_id].pluck(:global_id, :grade).to_h
final = @final_groups[user_id].pluck(:global_id, :grade).to_h
@groups.map do |group|
agid = group.global_id
enrollments_by_user[user_id].map do |enrollment|
"(#{enrollment.id}, #{group.id}, #{number_or_null(current[agid])}, #{number_or_null(final[agid])})"
end
end
end.flatten
end
def group_dropped_rows
enrollments_by_user.keys.map do |user_id|
current = @current_groups[user_id].pluck(:global_id, :dropped).to_h
final = @final_groups[user_id].pluck(:global_id, :dropped).to_h
@groups.map do |group|
agid = group.global_id
hsh = {
current: {dropped: current[agid]},
final: {dropped: final[agid]}
}
enrollments_by_user[user_id].map do |enrollment|
"(#{enrollment.id}, #{group.id}, '#{hsh.to_json}')"
end
end
end.flatten
end
2017-08-17 21:47:36 +08:00
def updated_at
@updated_at ||= Score.connection.quote(Time.now.utc)
end
def current_score_column
@ignore_muted ? 'current_score' : 'unposted_current_score'
end
def final_score_column
@ignore_muted ? 'final_score' : 'unposted_final_score'
end
def save_scores
return if @current_updates.empty? && @final_updates.empty?
return if joined_enrollment_ids.blank?
return if @grading_period && @grading_period.deleted?
@course.touch
2017-08-17 21:47:36 +08:00
save_scores_in_transaction
end
def save_scores_in_transaction
Score.transaction do
@course.shard.activate do
2017-08-17 21:47:36 +08:00
save_course_and_grading_period_scores
save_course_and_grading_period_metadata
score_rows = group_score_rows
if @grading_period.nil? && score_rows.any?
dropped_rows = group_dropped_rows
save_assignment_group_scores(score_rows.join(','), dropped_rows.join(','))
2017-08-17 21:47:36 +08:00
end
end
end
2011-02-01 09:57:29 +08:00
end
2017-08-17 21:47:36 +08:00
def save_course_and_grading_period_scores
return if @only_update_course_gp_metadata
2017-08-17 21:47:36 +08:00
# Construct upsert statement to update existing Scores or create them if needed,
# for course and grading period Scores.
Score.connection.execute("
UPDATE #{Score.quoted_table_name}
SET
#{current_score_column} = CASE enrollment_id
2017-08-17 21:47:36 +08:00
#{@current_updates.map do |user_id, score|
enrollments_by_user[user_id].map do |enrollment|
"WHEN #{enrollment.id} THEN #{number_or_null(score)}"
end.join(' ')
end.join(' ')}
ELSE #{current_score_column}
2017-08-17 21:47:36 +08:00
END,
#{final_score_column} = CASE enrollment_id
2017-08-17 21:47:36 +08:00
#{@final_updates.map do |user_id, score|
enrollments_by_user[user_id].map do |enrollment|
"WHEN #{enrollment.id} THEN #{number_or_null(score)}"
end.join(' ')
end.join(' ')}
ELSE #{final_score_column}
2017-08-17 21:47:36 +08:00
END,
updated_at = #{updated_at},
-- if workflow_state was previously deleted for some reason, update it to active
workflow_state = COALESCE(NULLIF(workflow_state, 'deleted'), 'active')
WHERE
enrollment_id IN (#{joined_enrollment_ids}) AND
assignment_group_id IS NULL AND
#{@grading_period ? "grading_period_id = #{@grading_period.id}" : 'course_score IS TRUE'};
2017-08-17 21:47:36 +08:00
INSERT INTO #{Score.quoted_table_name}
(enrollment_id, grading_period_id, #{current_score_column}, #{final_score_column}, course_score, created_at, updated_at)
2017-08-17 21:47:36 +08:00
SELECT
enrollments.id as enrollment_id,
#{@grading_period.try(:id) || 'NULL'} as grading_period_id,
CASE enrollments.id
#{@current_updates.map do |user_id, score|
enrollments_by_user[user_id].map do |enrollment|
"WHEN #{enrollment.id} THEN #{number_or_null(score)}"
end.join(' ')
end.join(' ')}
ELSE NULL
END :: float AS #{current_score_column},
2017-08-17 21:47:36 +08:00
CASE enrollments.id
#{@final_updates.map do |user_id, score|
enrollments_by_user[user_id].map do |enrollment|
"WHEN #{enrollment.id} THEN #{number_or_null(score)}"
end.join(' ')
end.join(' ')}
ELSE NULL
END :: float AS #{final_score_column},
2017-08-17 21:47:36 +08:00
#{@grading_period ? 'FALSE' : 'TRUE'} AS course_score,
#{updated_at} as created_at,
#{updated_at} as updated_at
FROM #{Enrollment.quoted_table_name} enrollments
LEFT OUTER JOIN #{Score.quoted_table_name} scores on
scores.enrollment_id = enrollments.id AND
scores.assignment_group_id IS NULL AND
#{@grading_period ? "scores.grading_period_id = #{@grading_period.id}" : 'scores.course_score IS TRUE'}
2017-08-17 21:47:36 +08:00
WHERE
enrollments.id IN (#{joined_enrollment_ids}) AND
scores.id IS NULL;
")
end
def save_course_and_grading_period_metadata
# We only save score metadata for posted grades. This means, if we're
# calculating unposted grades (which means @ignore_muted is false),
# we don't want to update the score metadata. TODO: start storing the
# score metadata for unposted grades.
return unless @ignore_muted
ScoreMetadata.connection.execute("
UPDATE #{ScoreMetadata.quoted_table_name} metadata
SET
calculation_details = CASE enrollments.user_id
#{@dropped_updates.map do |user_id, dropped|
"WHEN #{user_id} THEN cast('#{dropped.to_json}' as json)"
end.join(' ')}
ELSE calculation_details
END,
updated_at = #{updated_at}
FROM #{Score.quoted_table_name} scores
INNER JOIN #{Enrollment.quoted_table_name} enrollments ON
enrollments.id = scores.enrollment_id
WHERE
scores.enrollment_id IN (#{joined_enrollment_ids}) AND
scores.assignment_group_id IS NULL AND
#{@grading_period ? "scores.grading_period_id = #{@grading_period.id}" : 'scores.course_score IS TRUE'} AND
metadata.score_id = scores.id;
INSERT INTO #{ScoreMetadata.quoted_table_name}
(score_id, calculation_details, created_at, updated_at)
SELECT
scores.id AS score_id,
CASE enrollments.user_id
#{@dropped_updates.map do |user_id, dropped|
"WHEN #{user_id} THEN cast('#{dropped.to_json}' as json)"
end.join(' ')}
ELSE NULL
END AS calculation_details,
#{updated_at} AS created_at,
#{updated_at} AS updated_at
FROM #{Score.quoted_table_name} scores
INNER JOIN #{Enrollment.quoted_table_name} enrollments ON
enrollments.id = scores.enrollment_id
LEFT OUTER JOIN #{ScoreMetadata.quoted_table_name} metadata ON
metadata.score_id = scores.id
WHERE
scores.enrollment_id IN (#{joined_enrollment_ids}) AND
scores.assignment_group_id IS NULL AND
#{@grading_period ? "scores.grading_period_id = #{@grading_period.id}" : 'scores.course_score IS TRUE'} AND
metadata.id IS NULL;
")
2017-08-17 21:47:36 +08:00
end
def save_assignment_group_scores(score_values, dropped_values)
2017-08-17 21:47:36 +08:00
# Construct upsert statement to update existing Scores or create them if needed,
# for assignment group Scores.
Score.connection.execute("
UPDATE #{Score.quoted_table_name} scores
SET
#{current_score_column} = val.current_score,
#{final_score_column} = val.final_score,
2017-08-17 21:47:36 +08:00
updated_at = #{updated_at},
workflow_state = COALESCE(NULLIF(workflow_state, 'deleted'), 'active')
FROM (VALUES #{score_values}) val
2017-08-17 21:47:36 +08:00
(enrollment_id, assignment_group_id, current_score, final_score)
WHERE val.enrollment_id = scores.enrollment_id AND
val.assignment_group_id = scores.assignment_group_id;
INSERT INTO #{Score.quoted_table_name}
(enrollment_id, assignment_group_id, #{current_score_column}, #{final_score_column},
2017-08-17 21:47:36 +08:00
course_score, created_at, updated_at)
SELECT
val.enrollment_id AS enrollment_id,
val.assignment_group_id as assignment_group_id,
val.current_score AS #{current_score_column},
val.final_score AS #{final_score_column},
2017-08-17 21:47:36 +08:00
FALSE AS course_score,
#{updated_at} AS created_at,
#{updated_at} AS updated_at
FROM (VALUES #{score_values}) val
2017-08-17 21:47:36 +08:00
(enrollment_id, assignment_group_id, current_score, final_score)
LEFT OUTER JOIN #{Score.quoted_table_name} sc ON
sc.enrollment_id = val.enrollment_id AND
sc.assignment_group_id = val.assignment_group_id
WHERE
sc.id IS NULL;
")
# We only save score metadata for posted grades. This means, if we're
# calculating unposted grades (which means @ignore_muted is false),
# we don't want to update the score metadata. TODO: start storing the
# score metadata for unposted grades.
if @ignore_muted
ScoreMetadata.connection.execute("
UPDATE #{ScoreMetadata.quoted_table_name} md
SET
calculation_details = CAST(val.calculation_details as json),
updated_at = #{updated_at}
FROM (VALUES #{dropped_values}) val
(enrollment_id, assignment_group_id, calculation_details)
INNER JOIN #{Score.quoted_table_name} scores ON
scores.enrollment_id = val.enrollment_id AND
scores.assignment_group_id = val.assignment_group_id
WHERE
scores.id = md.score_id;
INSERT INTO #{ScoreMetadata.quoted_table_name}
(score_id, calculation_details, created_at, updated_at)
SELECT
scores.id AS score_id,
CAST(val.calculation_details as json) AS calculation_details,
#{updated_at} AS created_at,
#{updated_at} AS updated_at
FROM (VALUES #{dropped_values}) val
(enrollment_id, assignment_group_id, calculation_details)
LEFT OUTER JOIN #{Score.quoted_table_name} scores ON
scores.enrollment_id = val.enrollment_id AND
scores.assignment_group_id = val.assignment_group_id
LEFT OUTER JOIN #{ScoreMetadata.quoted_table_name} metadata ON
metadata.score_id = scores.id
WHERE
metadata.id IS NULL;
")
end
2017-08-17 21:47:36 +08:00
end
# returns information about assignments groups in the form:
# [
# {
# :id => 1
# :score => 5,
# :possible => 7,
# :grade => 71.42,
# :weight => 50},
# ...]
# each group
back-end grade calculator supports grading period weighting closes CNVS-34105 test plan: - Setup - 1. At the account-level, create a new grading period set that uses weighted grading periods. Attach the default enrollment term to this set. 2. Create a grading period (GP1) that runs from January 1, 2017 to June 30, 2017. Give it a weight of 75%. 3. Create a grading period (GP2) that runs from July 1, 2017 to December 31, 2017. Give it a weight of 25%. 4. Create a course that belongs to the default enrollment term from step 1. Enroll one student in the course. Make sure that student is enrolled in at least one other course. 5. In the course settings, enable Multiple Grading Periods and enable Display ‘All Grading Period’ Totals. 6. In the course, create an assignment (Assignment in GP1) that is worth 10 points and due for everyone on March 15, 2017. 7. In the course, create an assignment (Assignment in GP2) that is worth 10 points and due for everyone on September 15, 2017. 8. Go to the gradebook and give the student 5/10 on Assignment in GP1 and 10/10 on Assignment in GP2. Ignore the totals that show up in the gradebook. - Grade Verification - 1. Sign in as the student and go to the /grades page. 2. Verify the grade for GP1 is 50%. 3. Verify the grade for GP2 is 100%. 4. Verify the grade for ‘All Grading Periods’ is 62.5%. 5. Sign in as the account admin. Change the weight for GP1 to 20% and change the weight for GP2 to 40%. 6. Sign in as the student and go to the /grades page. 7. Verify the grade for GP1 is 50%. 8. Verify the grade for GP2 is 100%. 9. Verify the grade for ‘All Grading Periods’ is 83.33%. 10. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 100%. 11. Sign in as the student and go to the /grades page. 12. Verify the grade for GP1 is 50%. 13. Verify the grade for GP2 is 100%. 14. Verify the grade for ‘All Grading Periods’ is 150%. 15. Sign in as the account admin. Change the weight for GP1 to 100% and change the weight for GP2 to 0%. 16. Sign in as the student and go to the /grades page. 17. Verify the grade for GP1 is 50%. 18. Verify the grade for GP2 is 100%. 19. Verify the grade for ‘All Grading Periods’ is 50%. 20. Sign in as the account admin. Change the weight for GP1 to 0% and change the weight for GP2 to 0%. 21. Sign in as the student and go to the /grades page. 22. Verify the grade for GP1 is 50%. 23. Verify the grade for GP2 is 100%. 24. Verify the grade for ‘All Grading Periods’ is 0%. 25. Sign in as the account admin. Uncheck the box on the grading period set for ‘weighting’. 26. Sign in as the student and go to the /grades page. 27. Verify the grade for GP1 is 50%. 28. Verify the grade for GP2 is 100%. 29. Verify the grade for ‘All Grading Periods’ is 75%. Change-Id: Iac23e92986f371b13de2d5e0524d6bed8a277bc4 Reviewed-on: https://gerrit.instructure.com/99040 Reviewed-by: Derek Bender <djbender@instructure.com> Tested-by: Jenkins Reviewed-by: Jeremy Neander <jneander@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Keith T. Garner <kgarner@instructure.com>
2017-01-04 03:59:14 +08:00
def create_group_sums(submissions, user_id, ignore_ungraded: true)
visible_assignments = @assignments.select { |assignment| assignment_visible_to_student?(assignment.id, user_id) }
feature flag for 'All Grading Periods' totals Add grading period dropdowns on the 'grades' page, and add a "Display Totals for 'All Grading Periods'" feature flag. By default, the feature will be turned 'off'. When the feature is 'off': - Totals will not display in the gradebook or the 'student grades' page when the 'All Grading Periods' option is selected. - The grading period dropdowns on the 'grades' page will not have an 'All Grading Periods' option. When the feature is 'on': - Totals will display in the gradebook and the 'student grades' page when the 'All Grading Periods' option is selected. - The grading period dropdowns on the 'grades' page will have an 'All Grading Periods' option. closes CNVS-23995 test plan: 1) as a teacher, enable the 'multiple grading periods' feature (do not enable the 'display totals for all grading periods' feature yet). a) verify the gradebook does not show totals when the 'All Grading Periods' option is selected. b) verify the 'student grades page' (courses/4/grades/9#tab-assignments) does not show totals, and the calculation of 'what-if' grades is disabled when the 'All Grading Periods' option is selected. c) turn on the 'display totals for all grading periods' feature. repeat steps a & b and verify that the totals now show up (and you can calculate what-if grades on the student grades page when 'All Grading Periods is selected') 2) sign in as a student that is enrolled in 3 courses: 1 course with MGP disabled, 1 course with MGP enabled and 'display all grading periods totals' (DAGPT) disabled, and 1 course with MGP enabled and DAGPT enabled. go the the 'grades' page (/grades). a) verify there is a grading period dropdown next to the totals for courses that have MGP enabled. verify there is not a grading period dropdown next to the total for the course with MGP disabled. b) verify that the current grading period is selected by default, if one exists. if a current grading period does not exist, then: - the dropdown next to the total for the course with DAGPT disabled should show 'Select a grading period' and the total grade should show as '--'. - the dropdown next to the total for the course with DAGPT enabled should show 'All Grading Periods' and the total grade should be displayed. c) verify clicking a grading period in the dropdown changes the total, and shows the correct total for that grading period. 3) repeat steps 2a-c, but sign in as an observer that is observing at least 3 students in 3 different courses(1 course with MGP disabled, 1 with MGP enabled and DAGPT disabled, and 1 course with MGP enabled + DAGPT enabled). 4) verify that the grading period dropdowns that were added are accessible. Note: The 'grades' page (/grades) will _always_ display the total for 'All Grading Periods' when signed in as a teacher. We are aware of this existing bug and we're working on a solution. Change-Id: If501b47aa57121d17d4e6629d1dcdbc8676971a2 Reviewed-on: https://gerrit.instructure.com/65847 Tested-by: Jenkins Reviewed-by: Strand McCutchen <smccutchen@instructure.com> Reviewed-by: Dylan Ross <dross@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> QA-Review: Jason Carter <jcarter@instructure.com> Product-Review: Spencer Olson <solson@instructure.com>
2015-10-14 03:20:03 +08:00
if @grading_period
visible_assignments.select! do |assignment|
effective_due_dates.grading_period_id_for(
student_id: user_id,
assignment_id: assignment.id
) == Shard.relative_id_for(@grading_period.id, Shard.current, @course.shard)
end
feature flag for 'All Grading Periods' totals Add grading period dropdowns on the 'grades' page, and add a "Display Totals for 'All Grading Periods'" feature flag. By default, the feature will be turned 'off'. When the feature is 'off': - Totals will not display in the gradebook or the 'student grades' page when the 'All Grading Periods' option is selected. - The grading period dropdowns on the 'grades' page will not have an 'All Grading Periods' option. When the feature is 'on': - Totals will display in the gradebook and the 'student grades' page when the 'All Grading Periods' option is selected. - The grading period dropdowns on the 'grades' page will have an 'All Grading Periods' option. closes CNVS-23995 test plan: 1) as a teacher, enable the 'multiple grading periods' feature (do not enable the 'display totals for all grading periods' feature yet). a) verify the gradebook does not show totals when the 'All Grading Periods' option is selected. b) verify the 'student grades page' (courses/4/grades/9#tab-assignments) does not show totals, and the calculation of 'what-if' grades is disabled when the 'All Grading Periods' option is selected. c) turn on the 'display totals for all grading periods' feature. repeat steps a & b and verify that the totals now show up (and you can calculate what-if grades on the student grades page when 'All Grading Periods is selected') 2) sign in as a student that is enrolled in 3 courses: 1 course with MGP disabled, 1 course with MGP enabled and 'display all grading periods totals' (DAGPT) disabled, and 1 course with MGP enabled and DAGPT enabled. go the the 'grades' page (/grades). a) verify there is a grading period dropdown next to the totals for courses that have MGP enabled. verify there is not a grading period dropdown next to the total for the course with MGP disabled. b) verify that the current grading period is selected by default, if one exists. if a current grading period does not exist, then: - the dropdown next to the total for the course with DAGPT disabled should show 'Select a grading period' and the total grade should show as '--'. - the dropdown next to the total for the course with DAGPT enabled should show 'All Grading Periods' and the total grade should be displayed. c) verify clicking a grading period in the dropdown changes the total, and shows the correct total for that grading period. 3) repeat steps 2a-c, but sign in as an observer that is observing at least 3 students in 3 different courses(1 course with MGP disabled, 1 with MGP enabled and DAGPT disabled, and 1 course with MGP enabled + DAGPT enabled). 4) verify that the grading period dropdowns that were added are accessible. Note: The 'grades' page (/grades) will _always_ display the total for 'All Grading Periods' when signed in as a teacher. We are aware of this existing bug and we're working on a solution. Change-Id: If501b47aa57121d17d4e6629d1dcdbc8676971a2 Reviewed-on: https://gerrit.instructure.com/65847 Tested-by: Jenkins Reviewed-by: Strand McCutchen <smccutchen@instructure.com> Reviewed-by: Dylan Ross <dross@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> QA-Review: Jason Carter <jcarter@instructure.com> Product-Review: Spencer Olson <solson@instructure.com>
2015-10-14 03:20:03 +08:00
end
assignments_by_group_id = visible_assignments.group_by(&:assignment_group_id)
submissions_by_assignment_id = Hash[
submissions.map { |s| [s.assignment_id, s] }
]
@groups.map do |group|
assignments = assignments_by_group_id[group.id] || []
group_submissions = assignments.map do |a|
s = submissions_by_assignment_id[a.id]
# ignore submissions for muted assignments
s = nil if @ignore_muted && a.muted?
# ignore pending_review quiz submissions
s = nil if ignore_ungraded && s.try(:pending_review?)
{
assignment: a,
submission: s,
score: s&.score,
total: a.points_possible || 0,
excused: s&.excused?,
}
end
if enrollments_by_user[user_id].all? { |e| e.workflow_state == 'completed' }
group_submissions.reject! { |s| s[:submission].nil? }
end
group_submissions.reject! { |s| s[:score].nil? } if ignore_ungraded
group_submissions.reject! { |s| s[:excused] }
add not counted towards final grade flag to assignments Teachers have requested for the ability to choose which assignments count towards the final grade. I have added a checkbox in the Assignment edit page that can be checked that says, "This assignment does not count toward the final grade." A new column has also been added to the Assignments table to track this state called "omit_from_final_grade," logic to omit such assignments in the grade calculators, as well as notification in assignment show, details, student grades pages, gradebook and SRGB that notify an assignment is not included in final grade. New state also added in assignment json. fixes CNVS-28528 Test Plan: As a Teacher: 1. Create or edit an assignment. Verify there is a checkbox to not include the assignment towards the final grade right below the grading type dropdown. (This checkbox will not show up for not_graded grading type) 2. Save the assignment. Verify there is a warning that the assignment is not counted towards final grade. As a Student: 1. Go to the assignment created above as a teacher Verify the assignment show page (courses/x/assignments/y) warns about the assignment not counting towards final grade. 2. Submit to the assignment. 3. Go to the assignment details page Verify there is a warning that the assignment is not counted towards final grade. As a Teacher: 1. Go to gradebook2 Verify there is a warning that the assignment is not counted towards final grade. 2. Grade the assignment Verify in the Total Grade column that grade for the assignment is not included in the final grade. 3. Download CSV Verify assignment is not included in final grade. 4. Verify all the above for SRGB As a Student: 1. Go to the Student Grades Page Verify a flag that assignment is not counted towards final grade. Verify the total grade shown does not include grade given for the assignment. Change-Id: I61e2d8ca02201c6e5ff4fc063432b190b6f3d60f Reviewed-on: https://gerrit.instructure.com/77201 Tested-by: Jenkins Reviewed-by: Neil Gupta <ngupta@instructure.com> Reviewed-by: Derek Bender <djbender@instructure.com> QA-Review: KC Naegle <knaegle@instructure.com> Product-Review: Christi Wruck
2016-04-12 05:56:35 +08:00
group_submissions.reject! { |s| s[:assignment].omit_from_final_grade? }
group_submissions.each { |s| s[:score] ||= 0 }
logged_submissions = group_submissions.map { |s| loggable_submission(s) }
Rails.logger.info "GRADES: calculating for assignment_group=#{group.global_id} user=#{user_id}"
Rails.logger.info "GRADES: calculating... ignore_ungraded=#{ignore_ungraded}"
Rails.logger.info "GRADES: calculating... submissions=#{logged_submissions.inspect}"
kept = drop_assignments(group_submissions, group.rules_hash)
dropped_submissions = (group_submissions - kept).map { |s| s[:submission]&.id }.compact
score, possible = kept.reduce([0, 0]) { |(s_sum,p_sum),s|
[s_sum + s[:score], p_sum + s[:total]]
}
{
2017-08-17 21:47:36 +08:00
id: group.id,
global_id: group.global_id,
score: score,
possible: possible,
weight: group.group_weight,
grade: ((score.to_f / possible * 100).round(2) if possible > 0),
dropped: dropped_submissions
}.tap { |group_grade_info|
Rails.logger.info "GRADES: calculated #{group_grade_info.inspect}"
}
2011-02-01 09:57:29 +08:00
end
end
# see comments for dropAssignments in grade_calculator.coffee
def drop_assignments(submissions, rules)
drop_lowest = rules[:drop_lowest] || 0
drop_highest = rules[:drop_highest] || 0
never_drop_ids = rules[:never_drop] || []
return submissions if drop_lowest.zero? && drop_highest.zero?
Rails.logger.info "GRADES: dropping assignments! #{rules.inspect}"
cant_drop = []
if never_drop_ids.present? || @ignore_muted
cant_drop, submissions = submissions.partition do |submission|
assignment = submission[:assignment]
(@ignore_muted && assignment.muted?) || never_drop_ids.include?(assignment.id)
end
end
# fudge the drop rules if there aren't enough submissions
return cant_drop if submissions.empty?
drop_lowest = submissions.size - 1 if drop_lowest >= submissions.size
drop_highest = 0 if drop_lowest + drop_highest >= submissions.size
keep_highest = submissions.size - drop_lowest
keep_lowest = keep_highest - drop_highest
submissions.sort! { |a,b| a[:assignment].id - b[:assignment].id }
# assignment groups that have no points possible have to be dropped
# differently (it's a simpler case, but not one that fits in with our
# usual bisection approach)
kept = (cant_drop + submissions).any? { |s| s[:total] > 0 } ?
drop_pointed(submissions, cant_drop, keep_highest, keep_lowest) :
drop_unpointed(submissions, keep_highest, keep_lowest)
(kept + cant_drop).tap do |all_kept|
loggable_kept = all_kept.map { |s| loggable_submission(s) }
Rails.logger.info "GRADES.calculating... kept=#{loggable_kept.inspect}"
end
end
def drop_unpointed(submissions, keep_highest, keep_lowest)
sorted_submissions = submissions.sort_by { |s| s[:score] }
sorted_submissions.last(keep_highest).first(keep_lowest)
end
def drop_pointed(submissions, cant_drop, n_highest, n_lowest)
max_total = (submissions + cant_drop).map { |s| s[:total] }.max
kept = keep_highest(submissions, cant_drop, n_highest, max_total)
kept = keep_lowest(kept, cant_drop, n_lowest, max_total)
end
def keep_highest(submissions, cant_drop, keep, max_total)
keep_helper(submissions, cant_drop, keep, max_total) { |*args| big_f_best(*args) }
end
def keep_lowest(submissions, cant_drop, keep, max_total)
keep_helper(submissions, cant_drop, keep, max_total) { |*args| big_f_worst(*args) }
end
# @submissions: set of droppable submissions
# @cant_drop: submissions that are not eligible for dropping
# @keep: number of submissions to keep from +submissions+
# @max_total: the highest number of points possible
# @big_f_blk: sorting block for the big_f function
# returns +keep+ +submissions+
def keep_helper(submissions, cant_drop, keep, max_total, &big_f_blk)
return submissions if submissions.size <= keep
unpointed, pointed = (submissions + cant_drop).partition { |s|
s[:total].zero?
}
grades = pointed.map { |s| s[:score].to_f / s[:total] }.sort
q_high = estimate_q_high(pointed, unpointed, grades)
q_low = grades.first
q_mid = (q_low + q_high) / 2
x, kept = big_f_blk.call(q_mid, submissions, cant_drop, keep)
threshold = 1 / (2 * keep * max_total**2)
until q_high - q_low < threshold
x < 0 ?
q_high = q_mid :
q_low = q_mid
q_mid = (q_low + q_high) / 2
# bail if we can't can't ever satisfy the threshold (floats!)
break if q_mid == q_high || q_mid == q_low
x, kept = big_f_blk.call(q_mid, submissions, cant_drop, keep)
end
kept
end
def big_f(q, submissions, cant_drop, keep, &sort_blk)
kept = submissions.map { |s|
rated_score = s[:score] - q * s[:total]
[rated_score, s]
}.sort(&sort_blk).first(keep)
q_kept = kept.reduce(0) { |sum,(rated_score,_)| sum + rated_score }
q_cant_drop = cant_drop.reduce(0) { |sum,s| sum + (s[:score] - q * s[:total]) }
[q_kept + q_cant_drop, kept.map(&:last)]
end
# we can't use the student's highest grade as an upper-bound for bisection
# when 0-points-possible assignments are present, so guess the best possible
# grade the student could have earned in that case
def estimate_q_high(pointed, unpointed, grades)
if unpointed.present?
points_possible = pointed.reduce(0) { |sum,s| sum + s[:total] }
best_pointed_score = [
points_possible, # 100%
pointed.reduce(0) { |sum,s| sum + s[:score] } # ... or extra credit
].max
unpointed_score = unpointed.reduce(0) { |sum,s| sum + s[:score] }
max_score = best_pointed_score + unpointed_score
max_score.to_f / points_possible
else
grades.last
end
end
# determines the best +keep+ assignments from submissions for the given q
# (suitable for use with drop_lowest)
def big_f_best(q, submissions, cant_drop, keep)
big_f(q, submissions, cant_drop, keep) { |(a,_),(b,_)| b <=> a }
end
# determines the worst +keep+ assignments from submissions for the given q
# (suitable for use with drop_highest)
def big_f_worst(q, submissions, cant_drop, keep)
big_f(q, submissions, cant_drop, keep) { |(a,_),(b,_)| a <=> b }
end
def gather_dropped_from_group_scores(group_sums)
dropped = group_sums.map { |sum| sum[:dropped] }
dropped.flatten!
dropped.uniq!
dropped
end
# returns grade information from all the assignment groups
def calculate_total_from_group_scores(group_sums)
dropped = gather_dropped_from_group_scores(group_sums)
2011-02-01 09:57:29 +08:00
if @course.group_weighting_scheme == 'percent'
relevant_group_sums = group_sums.reject { |gs|
gs[:possible].zero? || gs[:possible].nil?
}
final_grade = relevant_group_sums.reduce(0) { |grade,gs|
grade + (gs[:score].to_f / gs[:possible]) * gs[:weight]
}
# scale the grade up if total weights don't add up to 100%
full_weight = relevant_group_sums.reduce(0) { |w,gs| w + gs[:weight] }
if full_weight.zero?
final_grade = nil
elsif full_weight < 100
final_grade *= 100.0 / full_weight
2011-02-01 09:57:29 +08:00
end
{grade: final_grade.try(:round, 2), dropped: dropped}
2011-02-01 09:57:29 +08:00
else
total, possible = group_sums.reduce([0,0]) { |(m,n),gs|
[m + gs[:score], n + gs[:possible]]
}
if possible > 0
final_grade = (total.to_f / possible) * 100
{
grade: final_grade.round(2),
total: total.to_f,
possible: possible,
dropped: dropped
}
else
{grade: nil, total: total.to_f, dropped: dropped}
2011-02-01 09:57:29 +08:00
end
end
end
# this takes a wrapped submission (like from create_group_sums)
def loggable_submission(wrapped_submission)
{
assignment_id: wrapped_submission[:assignment].id,
score: wrapped_submission[:score],
total: wrapped_submission[:total],
}
end
# If you need to invalidate caches with associated classes, put those calls here.
def invalidate_caches
GradeSummaryPresenter.invalidate_cache(@course)
end
end