Commit Graph

162 Commits

Author SHA1 Message Date
Jon Jensen 8c2d97f436 allow html answers for multiple-choice/multiple-answers, closes #4206
Change-Id: I49626c4d2f24ac73336dba006f01fdc83792eda2
Reviewed-on: https://gerrit.instructure.com/3155
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-21 13:23:23 -06:00
Brian Palmer d8a71830ea more precise caching of assignment lists, and expire every hour
otherwise we might still display "tomorrow" when midnight rolls over and
things are now due "today", for example.

Change-Id: Iebba1f2b9d7bee3831e61ef062bd4caffb162a21
Reviewed-on: https://gerrit.instructure.com/3175
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-21 11:29:20 -06:00
Brian Palmer c1fa2933a8 fix adding/deleting assignment rubric on quiz edit page as well, fixes #4303
Change-Id: I1135f822a8b9ebc7f1584148bdce87de89bda56e
Reviewed-on: https://gerrit.instructure.com/3169
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-20 16:08:38 -06:00
Zach Wily 4c2c170219 show that the lockdown browser is required on quiz page
Change-Id: I6af9d2dcd772227911ba6d30db833e0b60203dc8
Reviewed-on: https://gerrit.instructure.com/3167
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-20 14:52:23 -06:00
Brian Palmer 48e130d765 fix adding/deleting assignment rubric on quiz page, fixes #4303
Change-Id: I96954fd271f9759b45c05eac640b4bf909d18a6d
Reviewed-on: https://gerrit.instructure.com/3160
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-20 14:45:12 -06:00
Brian Palmer a3d2a6e3b8 optionally show download url for lockdown browser
Change-Id: I88c4b44d30fe661853d3a3a42dcc8b8ea00876e9
Reviewed-on: https://gerrit.instructure.com/3158
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-20 10:28:01 -06:00
Zach Wily f122fa7e28 adding ldb requirement for viewing quiz results
Change-Id: Id011290fbd5d8ad791b016450671c88c7cba30bc
Reviewed-on: https://gerrit.instructure.com/3152
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-20 10:11:21 -06:00
Brian Whitmer 35d5a40170 add brief description to external tools
External tools require Basic LTI, which needs to be stated
a little more explicitly in the UI or people are going to
be confused.

Change-Id: I9086a2e48c68300ae7aca2277aa209093b812f3f
Reviewed-on: https://gerrit.instructure.com/3144
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-04-19 11:35:43 -06:00
Brian Palmer 3f1499ebec fix quiz settings not showing actual scoring_policy value
Change-Id: I149d8e9bf18207baf909f9f62425bf19f7086d15
Reviewed-on: https://gerrit.instructure.com/3135
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-18 15:52:35 -06:00
Brian Palmer 27adf9b16a Merge branch 'ims_cc'
Change-Id: I7fc8590ab50d9ec062fd3cf609aa11f034ed582f
2011-04-18 10:20:36 -06:00
Bracken Mosbacker c06affd551 fix regex typo and hide the course export option
refs #3396

Change-Id: I08ef2324757c302a6d807a065e9acb13b3380dac
Reviewed-on: https://gerrit.instructure.com/3086
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-18 08:09:44 -06:00
Bracken Mosbacker cf6908801a fixes to make importing a canvas cartridge from ui work
this commit fixes a bunch of problems with importing
a whole export package and updates the UI

refs #3396

Change-Id: Ia344b385e06df2f08bb75878234a7712a036e4b3
Reviewed-on: https://gerrit.instructure.com/3085
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-18 08:09:34 -06:00
Bracken Mosbacker bb8bc24cd7 start canvas cartridge importing
started the framework for importing the canvas flavored
common cartridge packages. There is also some minor
refactoring of the export step to allow for easy testing
of both exporting and importing

course settings, assignment groups, and external tools
are imported and tested with this commit

refs #3396

Change-Id: I4e8a2ebfc9df7e31f8859b189fea23f9584d7ef4
Reviewed-on: https://gerrit.instructure.com/3042
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-18 08:09:16 -06:00
Zach Wily 9c0448cc58 fix uploading files to eportfolios; fixes #4273
We renamed 'upload' to 'attachment' and missed a couple spots.

Change-Id: I5f53f59e135a7887ff106803f70d9c4d52596e79
Reviewed-on: https://gerrit.instructure.com/3124
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-16 13:41:54 -06:00
Cody Cutrer 86f61efc3a ui and db migration to add voice comment to contextmessage
Fixes #3535

Change-Id: I0e299397c003d5a7fa24a72ffc848d0b7b6694ea
Reviewed-on: https://gerrit.instructure.com/3081
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-04-15 14:01:17 -06:00
Zach Wily 2d7e77a23c create video media comments on submissions and in speedgrader
Change-Id: Ic5c63768beaf0416e9ef5d4c383f2f23e95f9d65
Reviewed-on: https://gerrit.instructure.com/3107
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-04-15 10:46:57 -06:00
Bracken Mosbacker fc4cc9ff46 added ui for course exports
refs #3396

Change-Id: I07c30535e042dada7c7d4174a7bb8148b7f6b1fb
Reviewed-on: https://gerrit.instructure.com/3039
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:27:14 -06:00
Cody Cutrer d3ff9cf279 show artifact details on learning outcome results page
Closes #3864.

Change-Id: Iecac9f1cef80982dd4a74d2cf5dbecdd787a0431
Reviewed-on: https://gerrit.instructure.com/3046
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-15 09:03:12 -06:00
Cody Cutrer e849494724 dont show click to test a different score tooltip fixes #4056
Change-Id: I7bf08a6e214f4139a330189275440691b358cd0b
Reviewed-on: https://gerrit.instructure.com/3098
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-15 09:02:18 -06:00
Cody Cutrer c3729fec79 Soup up grade_summary. Closes #3863.
* Include rubric_assessments inline, rather than linking to submission page
 * Add link to "Show All Details", expands all rubric_assessments and comments sections

Change-Id: I93065908fa181a337a6497d5e3142324cfed6479
Reviewed-on: https://gerrit.instructure.com/3036
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-13 11:06:09 -06:00
Cody Cutrer 7746b8b72c Don't use AJAX to delete a topic from its own page.
Well, not quite so obviously, anyway (Rails is generating some
JavaScript and a form behind the scenes).  Anyhow, doing it this way,
the controller renders html and a proper redirect, and the browser
respects it.  Fixes #4070.

Change-Id: I5477a12f746f4335202f7dd628f65da531038e23
Reviewed-on: https://gerrit.instructure.com/3022
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-11 15:43:01 -06:00
Cody Cutrer bb84334ee9 Add modules to links list in wiki sidebar. Closes #3824.
* Add modules to wiki sidebar
 * Fix redirect from courses/:id/modules/:module_id to courses/:id/modules#module_:module_id, rather than just courses/:id/modules
 * Auto-expand the specified module when you access modules/#module_:module_id

Change-Id: Iaa2ab30dc462fec753fe67928fb101212cff440a
Reviewed-on: https://gerrit.instructure.com/3021
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-11 14:47:37 -06:00
Cody Cutrer bb76753301 Fix updating observer stats from AJAX. Fixes #3020.
Change-Id: I62f117bf69b4651115db82cf865ef9da400ec0e1
Reviewed-on: https://gerrit.instructure.com/3014
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-11 14:36:25 -06:00
Brian Whitmer d4431fef57 add sis id to UI for courses, sections, pseudonyms
refs #4231

Change-Id: I243de9ee8efb2ef6609dca99a9b38bc2200cb573
Reviewed-on: https://gerrit.instructure.com/3011
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-11 10:44:37 -06:00
Ryan Shaw 0d3ada1392 don't assume i'm editing a student user, fixes #3918
Change-Id: I51fcb9ab73f8686609ae010ab64bda61536a65c8
Reviewed-on: https://gerrit.instructure.com/3003
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-11 09:58:08 -06:00
Ryan Shaw ab071e0e1c fix capitalization in speedgrader
Change-Id: I373b37f4871b0b48106c41d81c661a91c10042ef
Reviewed-on: https://gerrit.instructure.com/3002
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-11 09:56:19 -06:00
Bracken Mosbacker 5ee8313865 added index page for external course migrations
closes #4230

Change-Id: Ibc550f1fc2b5fb5a0498982d676e98848530cab2
Reviewed-on: https://gerrit.instructure.com/3013
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-11 09:14:14 -06:00
Cody Cutrer 6283c3a7fc Delegate to CAS for auth. Closes #4130
Change-Id: I6bd3ef11314f75dd14b2fa9d835ecc40e43b5f3b
Reviewed-on: https://gerrit.instructure.com/2994
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-08 15:17:39 -06:00
Zach Wily 3b62117855 show the SpeedGrader link on all assignments; fixes #4173
It turns out that teachers like to use the SpeedGrader even for assignments
that aren't turned in online, instead of the Gradebook. That might change with
the improved Gradebook though.

Change-Id: I8b8b0620873a4adcc1f91db260d3cbfc02410071
Reviewed-on: https://gerrit.instructure.com/2980
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-07 15:51:13 -06:00
Brian Whitmer b1a9f2aa78 minor avatar fixes
- td where it should be a th
- missing a js file to report inappropriate pictures

Change-Id: Ifff7fd3b5ba307349bd06666b4c04d9a07c6e20e
Reviewed-on: https://gerrit.instructure.com/2970
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-07 12:52:38 -06:00
Brian Whitmer 44403d1c7e send kaltura requests through canvas
This solves a few problems.

- will make it easier to support HTML5 video playback
  for systems that don't handle flash
- first step toward making it possible for canvas
  installs to migrate from one kaltura instance to
  another by making a place for us to put some
  additional logic if necessary
- third parties getting data from us are no longer
  forced to find and handle media comments in order
  for them to work, since this adds a fallback url

refs #4083

Change-Id: I729aaf88378a30bda2126bfca2b2a48ec14bb386
Reviewed-on: https://gerrit.instructure.com/2901
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-04-07 12:52:22 -06:00
Jon Jensen ce0040958e BigBlueButton integration, refs #3319
Change-Id: Iaa38c753592f1b39d272487b3c0f231646168014
Reviewed-on: https://gerrit.instructure.com/2962
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-04-06 16:15:30 -06:00
Brian Whitmer 339f591334 UI for viewing details of a specific error report
Change-Id: Ib861649aa3baa9afee503d88137939872289eeec
Reviewed-on: https://gerrit.instructure.com/2966
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-06 11:51:01 -06:00
Brian Whitmer 34419410e6 quiz statistics revamp
Quiz statistics weren't supported for all question
types.  Also added a csv export of the raw quiz
results data, with an attempt to make the data
meaningful even for complex question types.

fixes #4134

Change-Id: I55d1a21eed1cd6813fe0500190a1c0cc5fc038ab
Reviewed-on: https://gerrit.instructure.com/2850
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-05 17:06:35 -06:00
Jon Jensen c6b7a45ad8 string validations/fixes, closes #4154. wiki fixes, closes #3973, #4168
proactively found and fixed varchar(255)'s where we relied on mysql's
silent truncation. added validations for places where we want to
enforce these limits

made it so you can reuse titles/urls of deleted wiki pages, and added
validations to ensure sane urls and prevent orphaned pages

Change-Id: I15bcc0c7a751efba1a0f7548e9989ad2ea1792bf
Reviewed-on: https://gerrit.instructure.com/2935
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-05 11:22:50 -06:00
Ryan Shaw 2b30507887 was loading a custom stylesheet if it was set to ""
Change-Id: Id6727173ae7c2dda1fe92f52df7899dfdaf2d94c
Reviewed-on: https://gerrit.instructure.com/2951
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-04-05 11:06:05 -06:00
Brian Whitmer d95bd6ac7a deleting a user from an account sometimes deletes them from everything
If a user's logins are all part of one account and you enroll them in
a course in another account, then go to their page in that account and
you'll see a link to delete them from the root account. Deleting them
from that root account will delete them from everywhere, which is not
the intended behavior. The logic was only checking logins, not
enrollments, and also was just checking the number of root accounts, not
if there were any *different* root accounts.

fixes #4108

Change-Id: Id7584c8766420b3ae8bb557444785513dca201b9
Reviewed-on: https://gerrit.instructure.com/2819
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-04-01 14:25:11 -06:00
Brian Whitmer 52ce635619 link quiz group to question bank in UI
Change-Id: Ib97cb26108d330226a501fbd7ab259e29790ce37
Reviewed-on: https://gerrit.instructure.com/2661
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-30 11:56:09 -06:00
Brian Whitmer 5e9f3eaba7 option to require initial post before seeing replies
Teachers can specify that before students see any
messages in a topic they need to post at least once
in the topic themselves.  This is used for
assignment topics or to help encourage students
to think for themselves instead of just posting
"what he said".

fixes #3871

Change-Id: I946b71ec47bfe135f06faff68598c6f19c088a27
Reviewed-on: https://gerrit.instructure.com/2370
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-29 22:56:45 -06:00
Brian Whitmer 0078485fdb "Submission Details" link in gradebook should link to speed grader
The link in the gradebook to see information should link to the
speed grader instead of to the submission grades page, which has
less information.

fixes #4115

Change-Id: I6e9beae2d0e4ead7f0da0e025dcc5137d98893d3
Reviewed-on: https://gerrit.instructure.com/2837
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-29 22:56:27 -06:00
Ryan Shaw 38ff217c7c fix missing submissions on gradebook showing only section
the problem was that it was using a global js variable
'id_maps' to know which student was on which row.
when I removed rows not in this section, the rows
would be off.

Change-Id: Ifb4813cae5074c351a16767e1bda4dbaf2092b61
Reviewed-on: https://gerrit.instructure.com/2856
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-29 15:33:55 -06:00
Brian Whitmer 0b9860f9df make open enrollment configurable on root account
Change-Id: Id6604bc6972902b3f505a985d5d05ce0da477a51
Reviewed-on: https://gerrit.instructure.com/2840
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-29 14:56:55 -06:00
Zach Wily 45d38fbc97 fix displaying matching question distractors; fixes #3902
Change-Id: I7bb6df94adab2d360981f83edbb3e192a274b027
Reviewed-on: https://gerrit.instructure.com/2861
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-29 14:47:21 -06:00
Zach Wily 1b1d607a9b fix score display on quiz moderation; fixes #4003
Also did a couple other tweaks:

  * Fixed the "Time" display when reloading via ajax (wasn't checking for the
    right workflow_state
  * Hide the "Attempts" column on quizzes that have an unlimited # of
    since it doesn't contain any useful data (always "--").

Change-Id: I21182193005d7415594b9c0531c03d619a31c262
Reviewed-on: https://gerrit.instructure.com/2857
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-29 14:45:37 -06:00
Zach Wily bace2a985d link to calendar correctly from course details; fixes #4110
Change-Id: Ifdc72df086e7225fce6ec33ee8664e9b23b8efc4
Reviewed-on: https://gerrit.instructure.com/2855
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-29 14:44:51 -06:00
Brian Whitmer 76bfff3157 topic podcasts
Each topic can now have its own podcast stream.  Teachers
have to manually turn on the podcast for the topic, and
can specify whether student comments show up in the stream
or not.

fixes #3538

Change-Id: I19b1b44fc2eec864cfeb298163ef34a0b0181067
Reviewed-on: https://gerrit.instructure.com/2369
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-28 14:32:16 -06:00
Brian Whitmer d00f705c59 catch early clicks on "#" links
If a page hasn't finished loading and a user clicks on a
"#" link (javascript-enabled), then it'll jump them to
the top of the page unexpectedly because the listener
isn't ready yet.  This commit will catch all those early
clicks and replay them after dom ready.

fixes #4109

Change-Id: I19a0b8a56e39eead693764d660ed6197ff6b0528
Reviewed-on: https://gerrit.instructure.com/2793
Reviewed-by: Ryan Shaw <ryan@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-25 15:42:46 -06:00
Brian Whitmer b7f1d5ae18 align question banks to outcomes
Question banks can be aligned to outcomes that
are part of the same context.  Whenever students
take a quiz with questions from the bank they'll
get evaluated for the linked outcomes based on
the points they got for each bank question.

Also fixed a bug which may or may not have existed
before this commit that unexpectedly deleted quiz
submissions when a user tried to re-take a quiz.

refs #3317

Change-Id: I744af3915672a5e260b078503e0bc648c238eca9
Reviewed-on: https://gerrit.instructure.com/2641
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-03-25 15:39:56 -06:00
Brian Palmer 7dd66b09a4 remove the varying limits on assignments_needing_grading
We were doing the query 3 times with different limits, so they weren't
getting cached. So it's actually more efficient to use the default limit of
15 and then just truncate the result array.

Change-Id: I2e4699574a64146585e2e8c533296e32a0c2be33
Reviewed-on: https://gerrit.instructure.com/2826
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-25 14:14:03 -06:00
Brian Palmer dbfdd06e34 remove the hidden course_role divs and db lookup
These are no longer used and can have a significant db cost.

Change-Id: I8fcf7cfe3a20e056310d760d97ca3a04ca387bb7
Reviewed-on: https://gerrit.instructure.com/2825
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-25 13:46:08 -06:00