Commit Graph

23 Commits

Author SHA1 Message Date
Michael Nomitch b4840c75cc DA - grade calculation works on backend
fixes CNVS-13715

test plan:
  - create a student who is in one group and not another
  - create an assignment only visible to each group
  - grade the student for both assignments
  - turn DA on
    - as the student and teacher, go to the student grades page
      - both of the assignments should be visible
      - final grade should be correct (factoring in both)
        * final grade = ungraded assignments count too
    - delete one of the grades and return
      - only one of the assignments should be visible
      - final grade should be correct (using just one assignment)
  - turn DA off
    - as the student and teacher, go to the student grades page
      - both assignments are visible
      - final grade should factor in both assignments
  - with DA on and off, ensure that the following work:
    - drop rules
    - never drop rules
    - assignment stats (mean median etc)
    - what if scores

Change-Id: I727aff943b14c91089ccffa6d3b63ba026abbeec
Reviewed-on: https://gerrit.instructure.com/36762
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cameron Sutter <csutter@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Mike Nomitch <mnomitch@instructure.com>
2014-07-17 21:27:59 +00:00
Michael Nomitch 9c8c42b952 DA - assignment indices
fixes CNVS-13708

test plan:
  - create a student who is in one section and not another
  - create an assignment only visible to each section
    (1 section => 1 assignment)
  - grade the student for both assignments
  - turn DA on
    - as the student, go to the assignment index page
      - both assignments should be visible initially
      - delete the grades for both assignments and return
        - only the overridden assignment should be visible
      - only one of the assignments should be visible
    - as the student, go to the grades page
      - only the overridden assignment should be visible
      - regrade the assignment whose grade you had deleted
        - both assignments should be visible now
      - (fyi: final grade wont be correct)
  - turn DA off
    - as the student, go to the assignment index page
      - both assignments are visible
    - as the student, go to the grades page
      - both assignments are visible
      - final grade should factor in both assignments

Change-Id: I32e3fea4d6fd3db9a512e0d170779b48418f90cf
Reviewed-on: https://gerrit.instructure.com/36728
Reviewed-by: Liz Abinante <labinante@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Mike Nomitch <mnomitch@instructure.com>
2014-07-17 18:23:25 +00:00
Nick Cloward e9595976c1 clean up permission calls for grants_rights?
refs: CNVS-11425

Change-Id: Ia0145e4b4d1da9e0f83a1845647ce203b3586057
Reviewed-on: https://gerrit.instructure.com/34280
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-06-19 18:10:30 +00:00
Tyler Pickett 8eb1df7040 update student grade listing icons for submissions
fixes CNVS-12336

Test Plan:

- As a teacher create a course with an assignment of each online
  submission type
- Log in as a student and submit each assignment
- Select the student grade book
  - The icons should be updated to match the style guide
- As a teacher grade some of the assignments
- As the student refresh the grades page (this requires a server
  restart if done locally because of CNVS-12995)
  - The grades should still be displayed correctly (we're checking
    this because there were significant refactors of this display)

Change-Id: I7aa61643eae86a98b735a18414d9f3a58eddde62
Reviewed-on: https://gerrit.instructure.com/34817
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Reviewed-by: Liz Abinante <labinante@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
2014-05-20 21:26:02 +00:00
Cameron Sutter 78a7d26d91 remove :includes => :quiz_submission
fixes CNVS-9933

test plan:
 - basic regression on the following:
   - teacher activity pages
   - gradebook pages
   - grades page
   - gradebook upload
   - changing due dates on assignments
   - submissions api
   - assignments api
 - sorry

Change-Id: I7bb4c32a74b159565772da8ee1d5a43e27369ca0
Reviewed-on: https://gerrit.instructure.com/30367
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-03-01 01:46:22 +00:00
James Williams ee5a0c29f0 fix grade_summary_presenter for rails 3
Change-Id: Ie3cbe5a8b89aec8b2d5fa6eb889aea4971bd1299
Reviewed-on: https://gerrit.instructure.com/31008
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-28 14:57:02 +00:00
Michael Nomitch 36de188de0 remove test student scores from assignment data
fixes CNVS-10570
fixes CNVS-11104

test plan:
  - as a teacher enter in scores for students and a test student
  - make test student grade the hightest (not tied)
    - on the grades page, in assingment stats, the test student score shouldnt show up
  - make test student grade the lowest (not tied)
    - on the grades page, in assingment stats, the test student score shouldnt show up
  - on the grades page, test student score shouldnt change the average

Change-Id: I9916a999cf7db4872b09d03e8e14883503025d96
Reviewed-on: https://gerrit.instructure.com/29091
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Matthew Irish <mirish@instructure.com>
Reviewed-by: Cameron Sutter <csutter@instructure.com>
Product-Review: Mike Nomitch <mnomitch@instructure.com>
2014-02-14 18:09:27 +00:00
James Williams 36a815448b update relative_id_for to switchman style
Change-Id: I0bc5b04d6210c90aa607e23714e7e78a2964e8ff
Reviewed-on: https://gerrit.instructure.com/29517
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2014-02-04 14:14:20 +00:00
Cameron Sutter 669ba4ffe9 ensure id is valid in grade summary page
fixes CNVS-1869

test plan:
 - as a teacher, go to a student's grade summary page
 - in the url, replace the student's id with 'banana' or 'lqw'
   (e.g. /courses/1/grades/banana)
 - you should get a Page Not Found error page
 - navigate to /courses/:id/grades and the page should
   redirect you to gradebook

Change-Id: Ic7d2b3de463615957a8d4178544ab19b7e651f60
Reviewed-on: https://gerrit.instructure.com/29215
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-01-30 21:05:23 +00:00
Simon Williams 2de3d1aad4 remove :order on assignment stats queries
fixes CNVS-10564

test plan:
- basic regression test of the student course grades page.  basically it should
  load and the avg/min/max graphs should still work.

Change-Id: I3eb3b60b4b2f0165497d8ecc5512712133cc9803
Reviewed-on: https://gerrit.instructure.com/28720
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-01-16 23:26:01 +00:00
Simon Williams c99bb855f0 ignore scores for unpublished assignments
fixes CNVS-10244

test plan:
- create a new course with a teacher and student
- create two assignments, and publish them
- grade them both
- unpublish one of them
- look at all the places you can see grades, and make sure they all
  consistently show only the grades for the published assignment (the
  unpublished assignment should be completely ignored)
  * GB2 with and without 'treat ungraded as 0'
  * GB1 with and without 'incluce ungraded'
  * GB csv download
  * student grades summary page with and without what-if scores
  * /grades page as a student and as a teacher

Change-Id: I32aca28fe377e59cb2e0c6278b59eb74c87c73b4
Reviewed-on: https://gerrit.instructure.com/28047
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2014-01-08 18:05:04 +00:00
Cameron Matheson e0ae3b9dc4 fix grades summary page for mysql
Test plan:
  The grades summary page should still work

Change-Id: I5cb3a32c76d7d81a70f50782ec4634c8a347e90e
Reviewed-on: https://gerrit.instructure.com/28085
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2014-01-03 22:33:05 +00:00
Michael Nomitch fb6bd60508 filters unpublished assignments out of student grades page
fixes CNVS-9948

calls for active_published_assignments thru assignment group
rather than just active_assignments

test plan:
add multiple unpublished assignments as a teacher
as a student go to the grades page
unpublished assignments should not be visible

Change-Id: I0d1d1d8f46b9a3447a134b8bd8f40627a0bfb370
Reviewed-on: https://gerrit.instructure.com/27339
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
2013-12-18 21:46:58 +00:00
Simon Williams 0fb36b61bf don't error on submissions without cached assignment
fixes CNVS-9557

test plan:
- create an assignment, and give a student a grade
- change the assignment to 'not graded'
- go to the students grade page
- it should work

Change-Id: I364e28169d302976fa64745152dc642d5fbe48e2
Reviewed-on: https://gerrit.instructure.com/26394
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>
2013-11-16 19:06:03 +00:00
Cameron Matheson 49f7746e46 grade summary: only load submissions for active assignments
fixes CNVS-9309

Test plan:
  * make an assignment
  * submit homework for that assignment as a student (or give the
    student a grade on it)
  * delete the assignment
  * go the grade summary page for that student (as the student)
  * you should see grades instead of an error page

Change-Id: I4e51b0cf35b42c18d9ca662c7aa95589a120e8b1
Reviewed-on: https://gerrit.instructure.com/26004
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
2013-11-07 00:08:45 +00:00
Cameron Matheson 0bd7b6a57b grades_summary: eliminate many comment/attachment/rubric queries
refs CNVS-8940

Test plan:
  see plan for I2f989c0b0dba9a17c904ba516154adb18ceaaad5

Change-Id: Ia71651062d1327ab2285dc4082a49bb21fba1315
Reviewed-on: https://gerrit.instructure.com/25580
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2013-10-25 22:09:45 +00:00
Cameron Matheson 26e50b0f11 faster grades summary page
fixes CNVS-8940

Test plan:
  * load the grades page as a student
  * everything should work
  * repeat as a teacher visiting the student grades page

Change-Id: I2f989c0b0dba9a17c904ba516154adb18ceaaad5
Reviewed-on: https://gerrit.instructure.com/25421
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2013-10-25 22:09:33 +00:00
Cody Cutrer d935ab98b1 deprecate Setting.get_cached
now that we have SIGHUP, we were changing everything to it anyway,
so just let caching in-proc be the default

Change-Id: Id1b44722522ac9693b17695da7107c99a359d5ac
Reviewed-on: https://gerrit.instructure.com/25020
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2013-10-10 00:42:52 +00:00
Cody Cutrer a8596e9b68 cache some settings
we can SIGHUP if we ever change them

Change-Id: I0e7d0fa63ce0e368e890eb7ea8d5e657fa3820a1
Reviewed-on: https://gerrit.instructure.com/23729
Reviewed-by: Zach Wily <zach@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Tested-by: Cody Cutrer <cody@instructure.com>
2013-08-26 17:54:56 +00:00
Brian Palmer 1fc9d0fdd5 optionally disable grade distributions in courses with many submissions
Change-Id: I0c02f58ff66d6ef647fd0f1a708b50c5b4ed123f
Reviewed-on: https://gerrit.instructure.com/19921
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-04-23 02:41:29 +00:00
Brian Palmer 9627e04619 exclude quiz submissions when loading submissions
Change-Id: I9c541f78a0a5cfc71c0efacbda79379a819700df
Reviewed-on: https://gerrit.instructure.com/19846
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
QA-Review: Brian Palmer <brianp@instructure.com>
2013-04-20 15:48:44 +00:00
Cody Cutrer 6ff362720e arel-ify views and presenters
refs CNVS-4706

Change-Id: I49ef0a651d68de26bb0522d942bec499c300cec1
Reviewed-on: https://gerrit.instructure.com/18701
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-03-22 20:23:10 +00:00
Ethan Vizitei 80c2b2d031 cleanup and sharding fixes in grade_summary
Simple "with_each_shard" fix for the
actual enrollment loading code.

I also pushed the data transformations down into
a presenter since there were so many
instance variables, and added some focused
specs around the presenter. (and updated
the view to reference all collections
from the presenter, memoizing to ensure
nothing gets transformed more than once)

Finally, to make the grade book summary work,
had to branch off of Jacob's fix for foreign
keys across shards and make use of
'relative_id_for' in the gradebooks_controller

fixes CNVS-2201

TEST PLAN:
1) login as a user who has enrollments
in 2 courses on different shards.

2) navigate to "/grades"

3) you should see all your courses, not just
the ones on your current shard.

Change-Id: I385bd94cce71bf2aee03b1ae7679157c08910924
Reviewed-on: https://gerrit.instructure.com/17667
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Jacob Fugal <jacob@instructure.com>
2013-03-07 15:44:20 -07:00