Commit Graph

424 Commits

Author SHA1 Message Date
Bracken Mosbacker cfe4b5ffc8 moved common cartridge folder up a level
refs #3396

Change-Id: I34eca357286e50b0d3d82c15e27dfb4015da45a4
Reviewed-on: https://gerrit.instructure.com/3041
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-18 08:09:08 -06:00
Bracken Mosbacker 76470f7592 a few changes for common cartridge validation
IMS fixed their validator to check for the correct
XSD documents. I made some minor changes so that
everything will validate

refs #3396

Change-Id: I8337c24e7aa979bdeaf4b533bd86667336d1c49f
Reviewed-on: https://gerrit.instructure.com/3040
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:27:20 -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
Bracken Mosbacker 53fc924ced finished export qti
This adds calculated/numeric questions to the common cartridge export
The assignment for graded quizzes will also get exported now

refs #3396

Change-Id: Iac9d5c18f57f3cb89a56d20e9320403ac1495356
Reviewed-on: https://gerrit.instructure.com/3038
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:27:07 -06:00
Bracken Mosbacker 5b84177988 export more quiz question types to qti
This adds exporting for matching, multiple dropdowns,
missing word, and fill in multiple blanks

refs #3396

Change-Id: Ie7dc75533e35a74137ff9a514cc6ca8b211aa3d7
Reviewed-on: https://gerrit.instructure.com/2926
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:26:58 -06:00
Bracken Mosbacker 1b1eb9785b added basic lti links to common cartridge export
refs #3396

Change-Id: Ia56a2dad35ec79e3fbc21cad6a573b3fc249825f
Reviewed-on: https://gerrit.instructure.com/2925
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:26:26 -06:00
Bracken Mosbacker e0eed5ad75 finished common cartridge-specific qti exporting
All of the non-CC-supported quiz question types
still need to be exported

refs #3396

Change-Id: I0a8225a402577994006e424189515e2b432a0d9d
Reviewed-on: https://gerrit.instructure.com/2924
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:26:17 -06:00
Bracken Mosbacker 6eee4a6b6b started qti export for common cartridge
refs #3396

Change-Id: I011f9e881154fb267498ba6d6ce96281aa74b9b7
Reviewed-on: https://gerrit.instructure.com/2923
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:26:11 -06:00
bracken c26578b9d9 added rubrics to common cartridge export
refs #3396

Change-Id: I7e0cfc426e1094f2d5be4e3b7d8d077a4671d09a
Reviewed-on: https://gerrit.instructure.com/2922
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:26:07 -06:00
bracken f529ee2131 added learning outcomes to common cartridge export
refs #3396

Change-Id: I7fbe2b12c76c000f5571ed88f4779c395aee92c8
Reviewed-on: https://gerrit.instructure.com/2921
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:26:04 -06:00
Bracken Mosbacker e696df904b added grading standards and assignment groups to common cartridge
refs #3396

Change-Id: I5bbd61a6fe65033ded75861f8c0f9d6dc0aa391c
Reviewed-on: https://gerrit.instructure.com/2920
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:26:01 -06:00
Bracken Mosbacker a66b10384c added external feeds to common cartridge export
also did a little refacter of the course settings to
make a place to put all the canvas-specific data

refs #3396

Change-Id: Ibc12b2939439738ef6525f51b5e783e9e9bca68b
Reviewed-on: https://gerrit.instructure.com/2919
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:25:59 -06:00
Bracken Mosbacker 10e6bf69b5 added context modules to common cartridge export
refs #3396

Change-Id: I6083b338028022061b6fdbbeebc5efbeaeb9c556
Reviewed-on: https://gerrit.instructure.com/2918
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:25:56 -06:00
Bracken Mosbacker 0d53e88cf7 added web resources to common cartridge export
refs #3396

Change-Id: Ida0dcb6a5571c6e6a2ed3f1d32e64ee273082e6d
Reviewed-on: https://gerrit.instructure.com/2917
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:25:53 -06:00
Bracken Mosbacker 71d5f7b6f1 enhance content zipper to export sub-folder as well
This is needed for exporting full courses

refs #3396

Change-Id: Ie90714ca35c5f5733be2a2a132fe33f90cfed0d2
Reviewed-on: https://gerrit.instructure.com/2916
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:25:51 -06:00
Bracken Mosbacker 7af70f6c91 add discussion topics to common cartridge export
This uses the defined discussion topic format for
CC, but references an additional xml file with
canvas-specific properties. These can also have
an embedded assignment

refs: #3396

Change-Id: Ibf33a7509b529e2a53a3d1a511aa251b013c7639
Reviewed-on: https://gerrit.instructure.com/2915
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:25:48 -06:00
Bracken Mosbacker bc80f97c5d separate syllabus from course settings
This allows non-canvas systems to import the syllabus
html without touching the proprietary settings file

refs #3396

Change-Id: I12b49e2ad7e2f7014acab43795c084b674af8dac
Reviewed-on: https://gerrit.instructure.com/2914
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:25:44 -06:00
Bracken Mosbacker 89ca5889fa add common cartridge assignment exporting
refs #3396

Change-Id: I1e96a0f1504d80c264569bee168917b97f4730ec
Reviewed-on: https://gerrit.instructure.com/2913
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:25:41 -06:00
Bracken Mosbacker 8aebf51d18 export wikis in common cartridge
refs #3396

Change-Id: I9a49709cf55ec04f3d7f1292c8d2aa051019a33c
Reviewed-on: https://gerrit.instructure.com/2912
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:25:38 -06:00
Bracken Mosbacker 274aac4a79 starting common cartridge exporting
This creates a manifest file and course settings document
and also started an .xsd for canvas-specific features

refs #3396

Change-Id: If8d11ba7a613db20373ba4cfc9c765eb9ef10b25
Reviewed-on: https://gerrit.instructure.com/2911
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-04-15 10:25:32 -06:00
Brian Palmer 5892093668 improve delayed jobs logging
Enable auto_flush on the rails logging, so that the log is flushed to
disk after each log line, rather than each 1000 log lines.

Also redirect stdout and stderr if we've daemonized.

Change-Id: Iea89db81b4ac29a63614eff37da9216d6346a6f2
Reviewed-on: https://gerrit.instructure.com/2895
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-30 16:36:13 -06:00
JT Olds e17e8fcf79 allowing multiple environment configuration extension files
Change-Id: I669e930cdf54cc58bd10c6e67ebda983643d0619
Reviewed-on: https://gerrit.instructure.com/2892
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-30 14:43:46 -06:00
Jon Jensen eeb37709cd properly support attachments > 2GB, another string -> text fix
Change-Id: Id0fe3304361ef631098322b398c70d4f437b91de
Reviewed-on: https://gerrit.instructure.com/2888
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-30 14:22:15 -06:00
Zach Wily dc0d205b89 make sure to get the right section on sis import
Change-Id: Ie08fbaea4babc960bdb3a859b14282eaaf4b27b9
Reviewed-on: https://gerrit.instructure.com/2887
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-30 14:20:44 -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 Palmer e93e5fde55 convert json string time to a Time object in page view update
refs #4052

This only happens when using the redis queue for page views.

Also avoid a mass assignment warning being logged.

Change-Id: Id8b38ecc59dce41987c3fe9ccdac7a311012220e
Reviewed-on: https://gerrit.instructure.com/2886
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-30 10:21:47 -06:00
Jon Jensen 9d62c0ccbb change some columns from string -> text, refs #4136
Change-Id: I2fede0eddcb3749e021b06a139fb35e3bb624e70
Reviewed-on: https://gerrit.instructure.com/2867
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-30 09:19:13 -06:00
Zach Wily ed48d0a2dc generate the recipient list for context messages synchronously; fixes #4140
We made generating the recipient list a delayed job, but the broadcast_policy
stuff runs asynchronously in a request, so it thought there was no one to send
a notification to. Make the recipient list synchronous for now to fix the bug
- in the future we may want to make the notification part async too, along
  with generating the recipient list.

Change-Id: Ib2648135c228c1531d446a74ceb58f82cf4b5ab1
Reviewed-on: https://gerrit.instructure.com/2881
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-30 08:25:51 -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
Brian Palmer 5058e00da7 use the redis-store gem rather than the github repo
Change-Id: I49e868a4fd368ee449e4dd1b33564178f87322c4
Reviewed-on: https://gerrit.instructure.com/2880
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-29 17:46:53 -06:00
JT Olds a16217d9f1 adding yui-compressor
Change-Id: I30d13183986cbb862d9b71c6b958b2f3c65baee0
Reviewed-on: https://gerrit.instructure.com/2866
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-03-29 15:46:11 -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 Palmer b1cb93095d optionally include needs_grading_count in the courses api
closes #3958

This will be pretty slow for somebody who is a teacher in a lot of
courses, but I guess it's not any worse than the dashboard. We might
want to cache this eventually.

Change-Id: I26d68bc285fba0747cdc960a67b75e0329acb6cf
Reviewed-on: https://gerrit.instructure.com/2864
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-29 15:25:46 -06:00
Zach Wily 42dcbb4157 order gems in Gemfile alphabetically
Change-Id: I61c7427c01a4aae9600c613cb9fadae2b11e9b66
Reviewed-on: https://gerrit.instructure.com/2865
Reviewed-by: Brian Whitmer <brian@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-29 15:23:55 -06:00
Brian Palmer ea66fb1881 include needs_grading_count in assignments api json, if authorized
refs #3958

Change-Id: Ia42b08303f62912e6aceb2f07529c561a1bc3686
Reviewed-on: https://gerrit.instructure.com/2862
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-29 15:09:38 -06:00
Zach Wily e4ab8c85af clean up calendar anchor
unpack returns an array, so we need to get the first element from it. This
worked before, but only by accident.

Change-Id: I2f3808d85c2452b7b926294c920cbaaf9ab9f6a5
Reviewed-on: https://gerrit.instructure.com/2863
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-29 15:00:44 -06:00
Brian Whitmer da288acd86 turnitin icons not showing dialog in gradebook
Change-Id: I733417dd3ede094428830d1bbfb59f76ba120f55
Reviewed-on: https://gerrit.instructure.com/2849
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-03-29 14:57:04 -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
Brian Whitmer ae720184c0 syntax warnings found in development mode
Change-Id: I95ad530f8a1d30834d25d4df7898e813f231ddcb
Reviewed-on: https://gerrit.instructure.com/2839
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-03-29 14:56:47 -06:00
Brian Whitmer 5a6b048430 order assignments in the wiki sidebar
Right now they're being ordered by id.  This
changes them to be alphabetical, which should
make them easier to look through.

fixes #4117

Change-Id: I341193e743823ac87880abcc140b0b13ab93d837
Reviewed-on: https://gerrit.instructure.com/2838
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-03-29 14:56:33 -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 Palmer 54c30ce1a8 clean up connection resetting in delayed jobs, fixes #4138
Going through connection_handler is the new Rails Way of doing this sort
of thing, and makes postgres happier.

Change-Id: I7f54323e68260b6901c40eeb1a7f4553f05cda4f
Reviewed-on: https://gerrit.instructure.com/2860
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-29 14:39:32 -06:00
Jon Jensen 2352bb9e10 new rspec-rails (and rspec) to fix sporadic failures
this gets us the fix in https://rspec.lighthouseapp.com/projects/5645/tickets/946

when running "rake spec" without specifying SPEC, vendor/plugins/respondus_soap_endpoint/spec_canvas/integration/respondus_endpoint_spec.rb
is the first to run. because we use transactional fixtures, whichever spec
runs first is the only one to load them, and integration tests were looking
for fixtures in test/fixures. so later tests that use fixtures (currently just
web_conferences stuff) would fail.

Change-Id: I63f6be79614afbf48301b48ca2c3d97135abfdaa
Reviewed-on: https://gerrit.instructure.com/2847
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-29 14:00:01 -06:00
Brian Palmer c14f66f81a correctly truncate text that contains MB chars, fixes #4135
TextHelper#truncate_html doesn't appear to have this issue, because it
always splits and truncates on word boundaries (using String#split()).

Change-Id: I8bf301055818d7080d8e12859707458ba41e89f4
Reviewed-on: https://gerrit.instructure.com/2851
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-03-29 10:07:59 -06:00
Brian Palmer 58aa885ad8 provide preview_url in submissions api response, closes #3957
I also had to change the api spec stuff a bit, which caused some changes
in other specs.

Change-Id: I62e87fa4c9e79716455ca47ca342c9eec86ddc39
Reviewed-on: https://gerrit.instructure.com/2848
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-03-29 08:49:50 -06:00
Brian Palmer e0ee703546 remove debugger statement
Change-Id: I9536a22d096208a88e33f45c7ec3e07aea654cd4
Reviewed-on: https://gerrit.instructure.com/2846
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-03-29 08:48:55 -06:00
Brian Palmer 65dad2aa72 add comment that i forgot to add a while back
Change-Id: Idedd3b18fd3d70c54e3383d9b3416f820b1db35d
Reviewed-on: https://gerrit.instructure.com/2844
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-03-29 08:48:28 -06:00