Replace crocodoc_ids with moderated_grading_ids
Both canvadocs and crocodoc can use the ids now
refs RD-4238
Test Plan:
With a course that has one teacher, 2 TAs, and a student
- Create an assignment, check the moderated grading check box
- as the student submit the assignment
- as a TA, pull up the submission in speed grader, annotate and grade it
- as the Other TA, open the submission in speed grader
- make sure you cant see the first TAs comments
Change-Id: I886af3e21f9276866ea4be8d5de6574b32e5f122
Reviewed-on: https://gerrit.instructure.com/117360
Tested-by: Jenkins
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Derek Bender <djbender@instructure.com>
We no longer care if the doc was created with annotations required.
The new DocViewer can handle annotating :allthethings:
Fixes RD-4229
Test plan:
Submit a box doc for an assignment
enable new_annotations and supports annotations
load doc in speed grader, you should be able to annotate it
Change-Id: I5dd594d338c7b1e60e8b15ec3021dd19bb4287c1
Reviewed-on: https://gerrit.instructure.com/116846
Tested-by: Jenkins
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Reviewed-by: Shahbaz Javeed <sjaveed@instructure.com>
Reviewed-by: Josh Orr <jgorr@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
fixes CNVS-34832
the arguments to these methods have not changed, just their names. and the
new methods became available in Rails 4, so we can start using them now
and prevent someone from doing old-style in the future
Change-Id: I61aa5512995dc8f25f3f7bd009a6cfa0a030e274
Reviewed-on: https://gerrit.instructure.com/101401
Reviewed-by: Rob Orton <rob@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Adds logging to Canvas.timeout_protection to log when a Timeout::Error
occurs. Reverts part of CNVS-33152 as the logging from that is redundant
with logging added to timeout_protection.
fixes CNVS-33222
Change-Id: I693a92d3b4f4754805fc5addb30dd0f885118eac
Reviewed-on: https://gerrit.instructure.com/94802
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Spencer Olson <solson@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
The code now differentiates between three similar but different error
conditions that prevent an upload: 1) no response from the service, 2)
timing out when talking to the service, 3) skipping over the call due to
timeout protection.
This also changes the timeout protection names around all the crocodoc
calls to be unique.
fixes CNVS-33152
test plan:
- Confirm crocodoc upload and viewing still works
Change-Id: Ie0b1eca38bbcfd1b3f1c3765d772ea7fd28d8bbe
Reviewed-on: https://gerrit.instructure.com/94589
Tested-by: Jenkins
Reviewed-by: Cameron Matheson <cameron@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Keith T. Garner <kgarner@instructure.com>
Fixes PLAT-1478
Test Plan:
Enable Crocodoc
Create a TII assignment
Submit the assignment as a student
As a teacher go into speedgrader and leave feedback
As a student go into the submission details and view the feedback
As a teach go into speedgrader and view the assignment
Notice the presence of “Student Viewed Document” in the submission information
Change-Id: Icc0562ee2906ac48beb5c6985ac71e8293e7d088
Reviewed-on: https://gerrit.instructure.com/91076
Tested-by: Jenkins
Reviewed-by: Keith T. Garner <kgarner@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
SpeedGrader now shows the date a student viewed (canva|croco)doc. The
attachment.viewed_at is filled with a date when the attachment's owner
invokes a (canva|croco)doc session. This results in the instructor
being able to better confirm that their students are viewing their
feedback.
fixes CNVS-25136
test plan:
- Enable crocodocs
- create an assignment that takes a crocodocable document
- as a student, submit a crocodocable document
- as a teacher, go into speedgrader and view the assignment.
- Note the abscence of "Student Viewed Document" in the submission
information.
- as a student, go into the submission details and view the feedback
- as a teacher, go into speedgrader and view the assignment.
- Note the presence of "Student Viewed Document" in the submission
information.
- repeat the above process for canvadocs
Change-Id: I0a21cc6abe3d469628646e4d5771e8d6453cda61
Reviewed-on: https://gerrit.instructure.com/69783
Tested-by: Jenkins
Reviewed-by: Cameron Matheson <cameron@instructure.com>
QA-Review: KC Naegle <knaegle@instructure.com>
Product-Review: Christi Wruck
closes CNVS-22009
closes CNVS-22012
Test Plan:
* Enable "Moderated Grading" Feature
* Create an assignment that takes file uploads
as submissions and has Moderated Grading
checked
* Submit a PDF as a student
* As a teacher, open the assignment in speed grader
and make comments on the document preview in the
left pane (not to be confused with comments
on the submission)
* As a TA, open the assignment in speed grader
and make comments on the document preview (as above)
* As the student that submitted the assignment,
go to your submission and make comments on the document preview
* As a teacher, you should be able to view all the comments
made on the assignment
* As a TA, you should see the annotations that TA
has made
* As a student, you should see the annotations that
student has made
Change-Id: I3bbbade5a8bdfa1d0a7d2d1e16e667e95d1a7a9a
Reviewed-on: https://gerrit.instructure.com/61396
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
Tested-by: Jenkins
QA-Review: Clare Strong <clare@instructure.com>
Product-Review: Jeremy Stanley <jeremy@instructure.com>
closes CNVS-16086
Test plan:
* do something to make api calls to crocodoc time out
* try to preview a crocodoc document
* you should see an error that suggests you try again later
* repeat for canvadocs
Change-Id: I26619cbbe95940cf51027fb8ea50a7c727722c83
Reviewed-on: https://gerrit.instructure.com/42389
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
closes CNVS-13322
Test plan:
* consume endpoints on the submissions api
* attachments should now include a "preview_url" (it will display the
document)
* document previews should still work everywhere in canvas
(speedgrader, files, tinymce)
Change-Id: Ic11725832fa55e0deedf3bbce4a8b6a84f4ea29a
Reviewed-on: https://gerrit.instructure.com/36423
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Product-Review: Cameron Matheson <cameron@instructure.com>
Test plan:
make sure canvadocs/crocodoc still work in speedgrader
Change-Id: Ie5a7b8759206b0293757a2c2d820f0e7f5af164d
Reviewed-on: https://gerrit.instructure.com/36201
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>
This redirects to the session url (like canvadocs) instead of returning
a session url.
refs CNVS-13322
fixes CNVS-13445
Test plan:
* enable Crocodoc
* make multiple submissions to the assignment (with the same student)
* make sure you preview all submissions in the speedgrader (with
Crocodoc)
* disable Canvadocs
* make sure the student can preview the submission attachments in his
files page (in Crocodoc)
* also make sure that canvadocs still works (just one preview is fine)
Change-Id: Icbea4b8986039d1405300a09f54a878ba1cc288f
Reviewed-on: https://gerrit.instructure.com/35931
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>
closes#10956
Test plan:
* make a crocodocable homework submission
* preview the file in the user file's page and make sure it opens in
crocodoc (not google docs)
Change-Id: Ifa9557dbfba2f1253fa02b99ece20de7a7f9cd21
Reviewed-on: https://gerrit.instructure.com/14006
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Adds support for optionally viewing documents with Crocodoc.
closes#9865
Test plan:
* configure the crocodoc plugin
* add an assignment that allows file uploads
* make a submission for that assignment with a pdf or doc or ppt
- on the 'submission details' page, opening a preview of the
assignment should display it in crocodoc
- speedgrader should display the submission in crocodoc too
* make a submission with odt or rtf
- the submission should be displayed with scribd or google docs
* if you disable the crocodoc plugin, submissions could continue being
previewed in google docs or scribd
Change-Id: I7dd2547f8e2d907c98ebe894a7f1ee9d58f1e030
Reviewed-on: https://gerrit.instructure.com/13668
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Brad Horrocks