Commit Graph

42 Commits

Author SHA1 Message Date
Omar Gerardo Soto-Fortuño 8750d807bd Make Traditional Gradebook cell read-only when it has sub assignments
closes VICE-4205
flag=react_discussions_post
flag=discussion_create
flag=discussion_checkpoints

Test plan:
 - Specs pass.
 - Navigate to the traditional gradebook:
     http://canvas-web.inseng.test/courses/1/gradebook
 - Verify that for checkpointed assignments (discussions),
     the cell is read-only and it can open the tray.

Change-Id: I5b6738660b7b08f81d951e038989c05667418a2f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/347660
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Samuel Lee <samuel.lee@instructure.com>
Product-Review: Sam Garza <sam.garza@instructure.com>
2024-05-17 19:15:17 +00:00
Samuel Lee e4cb8877c9 fix inactive/concluded students in section filter
fix issue where if a student has a dual enrollment and one enrollment
is completed and the other is active, when switching to the section
with the completed enrollment, the student will still show in the
gradebook even with the show concluded students filter turned off.

fixes EVAL-3901
flag=none

Test Plan:
- have a couple of students
    - one student with dual enrollment where one enrollment is active
      and the other is concluded
    - have one student fully concluded
    - have one student fully inactive
    - have a few other students that are active
- go to the gradebook with both the inactive and concluded filters
  turned off
- confirm that the fully inactive and concluded students are not
  show in the gradebook
- filter by the section where the dual enrollment student is concluded
- confirm that they do not appear in the gradebook when filter is
  applied
- filter by the section where the dual enrollment student is active
- confirm that they appear in the gradebook when filter is applied
- remove filters and go to the triple dot next to Student Name column
- turn on inactive enrollments and confirm that the fully inactive
  student appears
- turn on concluded enrollment and confirm that the fully concluded
  student appears
- filter by their respective sections and see that these students appear
- confirm that the concluded dual enrollment student shows up when
  filtering by the section that their concluded enrollment resides
- toggle off the concluded and inactive filters and confirm that the
  students are removed from the gradebook

Change-Id: I85bc21f133a9ec1184dbed8f12bc3b5d29e7fe86
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/338011
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
QA-Review: Christopher Soto <christopher.soto@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
2024-01-19 17:02:54 +00:00
Aaron Shafovaloff f7ba7f9a6a Use useQuery in ProfileTray; NavigationBadges
test plan:
  - smoke test badges on old and new nav
  - smoke test profile tray on old and new nav

flag=instui_nav

Refs FOO-3880
Refs FOO-3887
Refs FOO-3894
Refs FOO-3895

Change-Id: I1d3a669aee09dc67b04e798a23e016d26f398fd4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/331758
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Reviewed-by: Gustavo Bernardes <gustavo.bernardes@instructure.com>
2023-11-01 15:32:38 +00:00
Aaron Shafovaloff 4b56a82e24 Load help links in Help tray in new side nav
flag=instui_nav

Test plan:
  - smoke test Help tray in both old and new side nav

refs FOO-3887

Change-Id: I2e952e0d1e407b7caf0605d7d0c5f22a94d761d3
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/331732
Reviewed-by: Martin Ochoa <martin.ochoa@instructure.com>
Reviewed-by: Gustavo Bernardes <gustavo.bernardes@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2023-10-31 20:56:42 +00:00
Aaron Shafovaloff 5edb4e268a TypeScriptify some nav files
Test plan:
  - Build passes

flag=none

refs FOO-3642

Change-Id: I65a8fe14d7f401e5649086ab679e42f810f249d7
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/330953
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Reviewed-by: Gustavo Bernardes <gustavo.bernardes@instructure.com>
Reviewed-by: Martin Ochoa <martin.ochoa@instructure.com>
Reviewed-by: Ryan Norton <rnorton@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2023-10-23 19:24:12 +00:00
Aaron Shafovaloff 29ad03c5fe Harden SpeedGrader with TypeScript
Test plan:
  - Build passes

flag=none

Change-Id: Ic3ad7b7d27659741197e37169158ff4806a1dbeb
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/327246
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Derek Williams <derek.williams@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2023-09-12 16:07:52 +00:00
Samuel Lee e7e9f2aa4d add required peer review link to assignment header
add a link to the assignment header that allows the user to navigate
between assigned peer reviews

closes EVAL-3182
flag=peer_reviews_for_a2

test plan:
- Have a course with at three students
- Create an assignment with anonymous peer review disabled
- Assign the same student the other two peer reviews
- As the primary student with the two peer reviews, do not submit
  the assignment.
- Go to the non-anonymous peer review assignment page and see that
  there is a link called Required Peer Reviews on the header
- Confirm that all two students are under the Not Yet Submitted
  category when the link is clicked on and the popover is displayed
- Click on one of the students in the popover and see that it will
  navigate to the student's peer review page
- Confirm that the student whose peer review page is being viewed is
  the same student on the popover that has a grey box
- Confirm that there is a required peer review link on the page
  and the page says that you need to first submit before you
  can peer review
- As the primary student, submit the assignment and click on another
  student in the required peer review link
- Confirm that the page says the no submissions are available to review
  yet and the peer review link is shown on the page
- Go to one of the peer reviewee's account and submit the assignment
- Go back to the primary student's account and go to that assignments
  page.
- Confirm that the peer reviewee who just submitted is now in the
  Ready to Review section of the popover
- Click on the peer reviewee in the popover and submit a peer review
- Open the peer review popover again and confirm that the peer reviewee
  is now in the Completed Peer Reviews Section
- Perform the same steps with an anonymous assignment and confirm that
  the names on the popover says Anonymous with a number.
- Perform the same steps with a non-anonymous assignment with a rubric
- Create an assignment with peer reviews enabled but no peer reviews
  assigned
- Confirm that there is no required peer review link for the assignment

Change-Id: I314cb0842620cf5cf7129ec0bbe17064eb8f4dbe
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/323717
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Derek Williams <derek.williams@instructure.com>
QA-Review: Derek Williams <derek.williams@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
2023-08-16 22:46:15 +00:00
rohan.chugh 4b846f6cca add custom status colors to gradebook grid
adds functionality for custom grade statuses to traditional gradebook
grid, now showing the custom colors as the background colors for
cells with that custom status

closes EVAL-3243

flag=grading_scheme_updates
flag=custom_gradebook_statuses

test plan:
- create a custom grade status
- find a submission and set the submission's custom grade status
  to the created status above in the Rails console using this:
  sub = Submission.find(<id>)
- do the above for a submission that has no status, one that has the
  'dropped' status, and one that is ungraded and has another status
  like 'missing', and also ensure that one of these submissions
  is an even cell in the grid and one is an odd cell in the grid
  (easiest way is to just choose 2 submissions that are vertically
  adjacent, like 2 student's submissions for the same assignment)
  sub.update!(custom_grade_status_id: <custom_status_id>)
- go to the gradebook grid and find the submission
- the submission's cell should have the custom status's color as
  the background color
- the custom status color should override any previous status color
  like 'dropped' or 'missing'
- the even cell should be the normal color, and the 'odd' cell should
  be a darker version (the very first row of submissions is even)
- when clicking the cell to edit the score, the background color
  should change back to white

Change-Id: I58f5e803fd4c864630e9cefe615ee65ee44d3db8
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324011
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Spencer Olson <solson@instructure.com>
Product-Review: Sam Garza <sam.garza@instructure.com>
2023-08-01 17:19:27 +00:00
rohan.chugh 5db1c9fc20 add override final grade text box
this is an iterative commit for enhanced individual gradebook
this commit adds the override final grade text box to the student
information component and fixes some logic for the "Show Grade as
Totals on Student Grades Page" checkbox when dealing with grading
periods

refs EVAL-3291

flag=individual_gradebook_enhancements

test plan:
- Jenkins build passes

Change-Id: I28eff19b67163fb8f846833038c42cc1c45473ed
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/321519
Reviewed-by: Aaron Shafovaloff <ashafovaloff@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2023-06-28 21:08:34 +00:00
rohan.chugh b23e7d16b7 render media comments correctly on grades page
fixed issue where media comments were not rendering correctly on the
grades page in the comment tray.

fixes EVAL-3099
flag=visibility_feedback_student_grades_page

test plan:
- enable the Kaltura/Notorious plugin
- create an assignment
- make a submission for the assignment as a student
- add a media comment to the submission as a student or teacher
- go to the student grades page and click on the comment/feedback
  icon to open the comment tray
- verify that the media comment is rendered correctly with a
  media player and controls and can be watched

Change-Id: I5b6ff01e8fb40b736be32dad31cbd419ee9a20ed
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/318917
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jen Smith <jen.smith@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
QA-Review: Christopher Soto <christopher.soto@instructure.com>
Product-Review: Sam Garza <sam.garza@instructure.com>
2023-05-26 15:42:41 +00:00
Kai Bjorkman 609038eb19 set hide_in_gradebook upon quiz create/edit
Allows for 'hide_in_gradebook' to be set on the new_quiz (assignment)
object when the checkbox is selected when creating/editing the quiz.

flag=hide_zero_point_quizzes_option
closes EVAL-3050

Test Plan:
    - run migrations
    - Create a New quiz
    - Set the points possible to zero
    - select the checkbox the appears and ensure the checkbox above is
    automatically checked and disabled
    - Save the quiz and ensure there are no errors
    - Ensure you can edit the quiz normally and toggle this option on
    and off

Change-Id: Idb126fa4dcc44b037b32468aa54afb26185bd982
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/318180
Reviewed-by: Derek Williams <derek.williams@instructure.com>
Reviewed-by: Jackson Huang <jackson.huang@instructure.com>
QA-Review: Derek Williams <derek.williams@instructure.com>
Product-Review: Sam Garza <sam.garza@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2023-05-24 17:53:30 +00:00
Spencer Olson dc32f058cf stop sending submission url to gradebook
refs EVAL-2791
flag=none

The url is not needed in Gradebook, and right now we make a lot of queries
to get the url when the submission is for an external tool assignment.

Test Plan:
1. Create an external tool assignment, and submit to the assignment as
   a student (the student's submission should have a submission_type of
   "basic_lti_launch")
2. Go to the Gradebook and verify the api calls to get submissions succeed
   (/api/v1/courses/:id/students/submissions), and that the submissions in
   the response for the external tool assignment do not have an
   url attribute on them.
3. Verify Gradebook otherwise works as expected for the external tool
   assignment.

Change-Id: Ieb3ff03267c7465365149e5d86cf202a3419ceaf
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/314757
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Aaron Shafovaloff <ashafovaloff@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-04-11 14:34:05 +00:00
Aaron Shafovaloff bf0e8f1a0c Fix: Gradebook appears blank with enhanced filters
Test plan:
  - Perhaps: In the Rails console set an assignment to lack module_ids?
  - With enhanced_gradebook_filters enabled, go to Gradebook
  - The Gradebook should load

flag=enhanced_gradebook_filters

Fixes EVAL-3016

Change-Id: I18531d4eeb9ddbc1cd351c413f67a0a593adf820
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/314974
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
QA-Review: Spencer Olson <solson@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2023-04-03 20:02:01 +00:00
Aaron Shafovaloff 1de3a05341 Harden Gradebook dependencies
Removes some ts-nocheck

Test plan:
  - Existing tests pass

flag=none

Change-Id: Iaa7b53a62f11d15a61291bc9ab74f61acce64989
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/314622
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Derek Williams <derek.williams@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2023-03-30 18:46:36 +00:00
Chris Soto 31e09dab8c feedback tray for a2 showing comment attachments
previously with a2 flag, the feedback tray would not show any
attachments on comments

fixes EVAL-2840
flag=visibility_feedback_student_grades_page
flag=assignments_2_student

test plan:
- as teacher, create an assignment
- as teacher, leave multiple comments with and without different
  types of attachments
- as student, view the grades page. click on the feedback tray icon
  for the assignment. verify that the comments show up and that the
  attachments show up
- for reference, the assignments should look similar to the tray in the
  assignment page when user clicks on View Feedback button

Change-Id: Ie83bf5d4dde232ebf45b88396f2d4d6e2e923c29
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/313410
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Sam Garza <sam.garza@instructure.com>
2023-03-27 22:10:28 +00:00
Aaron Shafovaloff 2d22416f70 Improve performance of SubmissionStateMap
This commit is a prerequisite to submission filtering improvements.

Test plan:
  - Existing tests pass

flag=none

Refs EVAL-2998

Change-Id: I9044a9010f4538a1e3a750f30c297e9bf8dfe770
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/314001
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-03-23 17:49:13 +00:00
Aaron Shafovaloff e422745e42 Remove all implicit "any" in Gradebook.tsx
Test plan:
  - Existing tests pass

flag=none

Refs EVAL-2886

Change-Id: I22adac983ba3d155203394a0c0e1fcb91f8a0db1
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/313617
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2023-03-20 17:40:44 +00:00
Aaron Shafovaloff 98dedd91dd Prepare assignment data for Individual Gradebook
Pork: include packages in tsconfig

Test plan:
  - All existing (and new) tests pass

flag=none

Refs EVAL-2852

Change-Id: I2a31c1c039e1ce76bc20b251bdb706b23d614151
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/312712
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2023-03-08 20:50:13 +00:00
Aaron Shafovaloff 7129bf4cac Type-harden Gradebook
Test plan:
  - Existing tests pass

flag=none

Change-Id: I7ebe0a9a746186ac6f6912644713b5efc96301e0
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/311480
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-03-06 16:29:38 +00:00
Aaron Shafovaloff 9e445782a6 Harden speed_grader.tsx
Test plan:
  - All existing tests pass

flag=none

Change-Id: I5ecfd950a4971199b39b0994f0b0d41d5882f565
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/312210
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-03-03 17:59:48 +00:00
Aaron Shafovaloff 3744660842 Further type-harden Gradebook
Test plan:
  - Existing tests pass

flag=none

Change-Id: I8e6c4c117d1a9edbf411f70987c9f8edb5be701f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/311467
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2023-02-17 21:19:56 +00:00
Chris Soto b77369cae7 add modals when completing peer reviews
add modals when completing a peer review if the student still has other
peer reviews to complete or they have completed all peer reviews

fixes EVAL-2824
fixes EVAL-2825
flag=visibility_feedback_student_grades_page
flag=assignments_2_student

test plan:
- as teacher create a peer review assignment with 3 students in class
- have one student (A) peer review the others (B,C)
- submit for the students B,C
- submit for the student A
  - a modal should popup directing you to complete peer reviews. it
    should also inform you that you have 2 peer reviews remaining
  - clicking on the button should navigate you to a peer review for one
    of the other students
- as student A, add a comment so that peer review is done
- you should see a modal pop up letting you know that you have one peer
  review remaining.
- Click on button to go to next peer review
- as student A, add comment on 2nd peer review
- you should see another modal pop up letting you know that you have
  completed all peer reviews
- refresh page, you should see that you have already completed this peer
  review for this student
- add another comment to the peer review, you SHOULD NOT see any more
  modals popup because the student has already completed all reviews

Change-Id: Ibece2f3ec2d4fb2350b4900d7a1e08fb31e72531
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/309912
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Sam Garza <sam.garza@instructure.com>
2023-02-15 23:19:10 +00:00
Aaron Shafovaloff 419a4906e2 Specify types for convert-case and html-escape
Test plan:
  - Existing tests pass

flag=none

Change-Id: Ib4ff7609f4ca71242cef7ed91de53a5ef177112c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/310891
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Derek Williams <derek.williams@instructure.com>
QA-Review: Cameron Ray <cameron.ray@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
Build-Review: Andrea Cirulli <andrea.cirulli@instructure.com>
2023-02-14 17:48:45 +00:00
Aaron Shafovaloff 93ecd4a57d Improve types for GradebookSettingsModal
Test plan:
  - All existing tests pass

flag=none

Refs EVAL-2899

Change-Id: I3db7d21152ab4f85c3cec2ab6d5de7a10a29bf71
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/310858
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-02-10 23:48:19 +00:00
Aaron Shafovaloff 50fd556f45 Improve types for grading inputs and results
Test plan:
  - Existing tests should pass

flag=none

Refs EVAL-2886

Change-Id: I9adc05fc38f748706df3445288279f674a0dfaff
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/310609
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Derek Williams <derek.williams@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-02-08 15:13:22 +00:00
Aaron Shafovaloff 3c73dac5d3 Move Gradebook search component insertion points
Also improves TypeScript coverage of API responses

Test plan:
  - In the Gradebook, ensure that the search filters
    for both students and assignments are present
    - Verify that one can search for students and
      assignments by name/title
  - Verify this for a course with a large number of
    students and assignments
  - With enhanced Gradebook filters disabled
    - Enable a filter: Click "View", "Filters", then select
      a filter
    - Verify that the filter UI is visible in the Gradebook

flag=none

Refs EVAL-2612
Refs EVAL-2853

Change-Id: I698477062916fec51348b82935e431b8c321ed28
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/309385
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Cameron Ray <cameron.ray@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
2023-02-01 22:11:33 +00:00
Chris Soto 7745b78cc7 update peer review icons
add some extra margin to the left for the peer review icons. also
increase the size of the icons and swap out the reply icon for a proper
arrow icon. add a new icon for completed peer review state

fixes EVAL-2831
fixes EVAL-2827
flag=visibility_feedback_student_grades_page
flag=assignments_2_student

test plan:
- create a peer review assignment and assign a student to review
  another student
- as the reviewer complete one of the reviews
- as the reviewer verify that:
  - the icons are now 18x18 in size
  - the icons are lined up with the assignment title
  - the completed review should have a peer review icon with a checkmark
  - the uncompleted review should have the standard peer review icon

Change-Id: I2fbb204f0147222effe653ced33b2c76c805b875
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/310030
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Jody Sailor
2023-02-01 19:41:43 +00:00
Aaron Shafovaloff ea736ae00f Harden some TS API response types
Refs EVAL-2612

flag=none

Test plan:
  - All existing tests pass

Change-Id: I744120ad28e60751a06b5170c1e9510b198d44b7
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/309374
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-01-23 19:39:48 +00:00
Aaron Shafovaloff 0e845f5f89 Resolve last TypeScript error in Gradebook.tsx
Also: Resolve TypeScript errors from grading period set files

Test plan:
  - All existing tests pass

flag=none

Refs EVAL-2645

Change-Id: I18181636dfbbf4a8ab792bcbb7cdccd72f6ba849
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/309295
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Derek Williams <derek.williams@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-01-23 17:53:26 +00:00
Aaron Shafovaloff d8bb45511d Extract custom column data DataLoader
Test plan:
  - Enable the Notes column
  - Add a note to a student
    - Verify that the note is displayed after saving it
    - Edit the note
    - Verify that the note is updated after saving it
  - Clear the note
    - Verify that the note is cleared after saving it
  - Disable the Notes column
    - Verify that the notes column is removed from the UI
  - Re-enable the Notes column
    - Make a change to a note
    - Verify that the note is displayed after refreshing the page
  - Verify that notes column loads properly in a course with many
    students

Closes EVAL-1934

flag=none

Change-Id: I2245c08e1f4b766156febbbc791acdd7c4e4c73f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/306852
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-01-21 21:14:09 +00:00
Chris Soto e8cd7e8506 submission comment tray anonymous user names
student names for anonymous peer reviews were being displayed
in the submission comments tray. they should be be only shown as
Anonymous User

fixes EVAL-2808
flag=visibility_feedback_student_grades_page

test plan:
- as a teacher, create an assignment with anonymous peer reviews
- assign one student to review another student
- as the teacher, leave a comment on the assignment a student
- as the reviewer student, leave a comment on the reviewee student
  submission
- act as the reviewee student
- go to the assignment and leave a comment
- go to the grade summary page
- open the submission comments tray by clicking on the comment icon
- next to the comments you should see:
  - teacher's name
  - the reviewee student's name
  - Anonymous User for the reviewer student's name

Change-Id: I22a846b00648e2d1260ce402e305ae125ecfec82
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/308240
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
2023-01-17 20:49:01 +00:00
Aaron Shafovaloff 0b68b64859 Fix filter presets with ID of 1
Test plan:
  - Enable enhanced_gradebook_filters
  - Regression test filter presets by adding and removing them

Fixes EVAL-2709

flag=enhanced_gradebook_filters

Change-Id: I9337161e1b804bc8d8ad80183e2219b831c9c22e
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/305847
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2022-11-23 00:33:53 +00:00
Aaron Shafovaloff 93279d0545 Move assignent group loading to ancestor component
Test plan:
  - As a teacher:
    - Create multiple grading periods
        - Create assignments with due dates that correspond to them
        - Verify that you can filter assignments by grading periods
    - Create a student and conclude his enrollment
        - Verify in the gradebook that you can toggle
        "Show... Conlcuded enrollments"
    - Create multiple sections
        - Verify that you can filter students by section
    - Create multiple student groups
        - Verify that you can filter by student groups
    - Verify that you can filter assignments by grading period

flag=none

Refs EVAL-1934

Change-Id: Idfcdbf69162bae37da495df573f3aa07dc07030e
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/303168
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Derek Williams <derek.williams@instructure.com>
Product-Review: Deborah Kwak <deborah.kwak@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
2022-10-18 15:43:47 +00:00
Aaron Shafovaloff 402bf325c5 Moves data loading some methods to Gradebook.utils
Also:

- Reduces TypeScript errors in Gradebook
- Initializes appliedFilters before filter API call

Test plan:

- As a teacher
  - ensure Gradebook filters still load
  - open the submission tray for a submission

flag=none

Refs EVAL-2645
Refs EVAL-1934

Change-Id: I4e1beabcae316bfa45bd936300cc2e54aead822b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/303048
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Deborah Kwak <deborah.kwak@instructure.com>
2022-10-12 22:54:27 +00:00
paulo.chaves 7be5f27609 Show the feedback in comments tray
flag=assignments_2_student
flag=visibility_feedback_student_grades_page
Closes EVAL-2401

Test plan:
  - Have an assignment
  - As the student submit
  - As the teacher leave comments on the submission
  - As the student load the grades page
  - The comments icons should be visible for the assignment
  - Clicking on the comments icon should open the tray
  - With tray open, clicking on the blue comments icon takes
    the student to the submissions detail

Change-Id: I4e78500d07fb34e103d62c35b82289244506e83b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/301354
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Paulo Chaves <paulo.chaves@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Deborah Kwak <deborah.kwak@instructure.com>
2022-10-10 20:25:52 +00:00
Aaron Shafovaloff bd7da343a2 Update TypeScript declaration files
Test plan:
  - Existing tests pass

Refs EVAL-2623

flag=none

Change-Id: I8916be175a1101f57766dd3cec1de50fec5b3171
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/301300
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Reviewed-by: Eduardo Escobar <eduardo.escobar@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2022-09-19 14:42:29 +00:00
Aaron Shafovaloff d561d99581 TypeScriptify more Gradebook code
Test plan:
  - Existing tests pass

flag=none

Refs EVAL-2619

Change-Id: I8bcc43fb6aed8ce4fefc7a8354b5efca067e7e74
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/301164
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2022-09-16 18:59:41 +00:00
Chris Soto 71f049c3a8 render peer review list in student assignment view
render list of peer reviewers on assignment when
assignment contains the assessment_requests array

fixes EVAL-2435
flag=assignments_2_student
flag=peer_reviews_for_a2

test plan:
- create assignment with peer reviewers
- create assignment with anonymous peer reviewers
- assign students as peer reviewers to both
  assignments
- in student view verify that you see list of
  peer reviewers on each assignment
- verify the reviewer url matches the URL
  specified in ticket
- verify the UI looks the same as the modules
  assignment peer reviewers view

Change-Id: Idecaadd94ea8b7fa5cc46b01a59ee1d3e403f562
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/300672
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Eduardo Escobar <eduardo.escobar@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Eduardo Escobar <eduardo.escobar@instructure.com>
Product-Review: Deborah Kwak <deborah.kwak@instructure.com>
2022-09-15 15:18:14 +00:00
Aaron Shafovaloff 51101b0456 Sort student groups in filter dropdown and tray
Also: remove grading period option when solitary

Also: reduce number of TypeScript errors

Test plan:
  - Enable the enhanced_gradebook_filters flag
  - Create multiple student group sets and student groups
  - Ensure that they are alphabetically sorted in the
    filter tray and dropdown

flag=enhanced_gradebook_filters

Closes EVAL-2285

Closes EVAL-2618

Refs EVAL-2623

Change-Id: I6f2756d20aab6eba7be700f1b4704ca690a094b3
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/300800
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Product-Review: Deborah Kwak <deborah.kwak@instructure.com>
2022-09-14 20:56:44 +00:00
Aaron Shafovaloff f6f2c060a6 Reduce TypeScript errors in Gradebook
Also: some formatting and improved type checks

Test plan:
  - Existing tests pass

flag=none

Refs EVAL-2623

Change-Id: Ia8cdb837fb091d1aa81a9700522bca14a73063c0
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/300703
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Deborah Kwak <deborah.kwak@instructure.com>
2022-09-12 16:06:39 +00:00
Aaron Shafovaloff a1ad04302e Rename Gradebook .js files to .ts/.tsx
Test plan:
  - Existing tests pass

flag=none

Closes EVAL-2621

Change-Id: I428e3b94a194eba56bc84ae479f5c8ae27cc05a1
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/300685
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Product-Review: Deborah Kwak <deborah.kwak@instructure.com>
2022-09-09 22:24:52 +00:00
Aaron Shafovaloff d43130327f Identifies 0-graded submissions as graded
Also TypeScriptifies SubmissionStateMap.tsx
  and other API response objects

Test plan:
  - Turn on the enhanced_gradebook_filters flag
  - As a teacher: create four assignments
  - As a student: submit three assignments
  - As a teacher:
    - Grade the first assignment with 0 points
    - Grade the second assignment with 1 point
    - Filter by "has ungraded submissions"
    - Only the assignment with the submitted but ungraded submission
      should show

flag=enhanced_gradebook_filters

Fixes EVAL-2601

Refs EVAL-2612

Change-Id: I28c7bb9f26592536ae5fbc572061f2c529ee567b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/300400
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Eduardo Escobar <eduardo.escobar@instructure.com>
Product-Review: Deborah Kwak <deborah.kwak@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Reviewed-by: Eduardo Escobar <eduardo.escobar@instructure.com>
2022-09-08 18:08:54 +00:00