Commit Graph

151 Commits

Author SHA1 Message Date
Bracken Mosbacker ae498ae7e7 don't fail when converting qti item without identifier
some qti questions that are converted don't have an identifier
like they're supposed to. This allows those questions to still
be processed without causing an error

refs #5546

Change-Id: I2bc931a65095fca2e73beaaf578f99037e5e09e3
Reviewed-on: https://gerrit.instructure.com/6400
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-10-26 12:31:03 -06:00
Brian Palmer 325bf6951d still allow password auth in respondus api for delegated auth accounts
fixes #6007

Change-Id: I6b2ca51962639fedeea8658c0b6c51d8544dcf6f
Reviewed-on: https://gerrit.instructure.com/6274
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-18 14:36:17 -06:00
Brian Palmer deb4b3091f fix typo in qti_exporter
import is a rake method

Change-Id: I469209c44133568a8c638412f8f3da2bc6992588
Reviewed-on: https://gerrit.instructure.com/6069
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-10-10 13:39:11 -06:00
Bracken Mosbacker 94b8560986 don't send email for exported state if configured not to
There are a couple small changes for the bulk migration tool

refs #5449

Change-Id: I357f69c8ccdc3ef7e08cfb274091ebd3a222105c
Reviewed-on: https://gerrit.instructure.com/6023
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-07 14:03:50 -06:00
Bracken Mosbacker cccf8499e8 update vista qti specs to use full conversion process
refs #5449

Change-Id: Idbc69a638316bd29323ad6e17dd510675c7ff086
Reviewed-on: https://gerrit.instructure.com/6011
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-06 09:17:42 -06:00
Brian Palmer 2a86db2121 delayed job in_delayed_job flag
and send_later_unless_in_job method

Change-Id: I19affbea751fa340428b0b6a56045828ee87cd0a
Reviewed-on: https://gerrit.instructure.com/5996
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-10-05 15:11:02 -06:00
Bryan Madsen 20535f8fd1 create a text log of failed parallel tests
Change-Id: Ia1681235bb8a9f7c9f88da9b67c0b739b480e285
Reviewed-on: https://gerrit.instructure.com/5929
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-10-03 14:23:53 -06:00
Brian Palmer 03088f4093 show help if no option given to script/delayed_job
Change-Id: If3cb33f4b09e2129dc3d5c8c7637dd9877dd2c35
Reviewed-on: https://gerrit.instructure.com/5924
Tested-by: Hudson <hudson@instructure.com>
Tested-by: JT Olds <jt@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-09-30 15:43:15 -06:00
Brian Palmer 0279c645d4 fix crummy return value
it was returning an array, which was being implicitly joined with #to_s.
but in 1.9, Array#to_s is an alias for Array#inspect, rather than
Array#join

Change-Id: I63f4f64b56b2edab9e5225f118716b9f6ee29d1b
Reviewed-on: https://gerrit.instructure.com/5836
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
2011-09-27 10:29:04 -06:00
Brian Palmer 60aa7baf5e add encoding magic comments to files with utf-8 chars
Change-Id: Ieba9245724da8aeeb816d7f178bb704b3dcda80f
Reviewed-on: https://gerrit.instructure.com/5832
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-09-27 10:27:35 -06:00
Bryan Madsen d259963460 enable parallelization of selenium tests
Change-Id: I2cbe3f19df3df1442a45479337607bb829b54188
Reviewed-on: https://gerrit.instructure.com/5739
Reviewed-by: Brian Palmer <brianp@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-09-26 15:45:35 -06:00
Bracken Mosbacker 349eacb763 add assessment importing to common cartridge importer
refs #4153

Change-Id: I60a4e8d88f8d121f8b928564f257819b3bca1d26
Reviewed-on: https://gerrit.instructure.com/5726
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-23 13:28:03 -06:00
Bracken Mosbacker d6a02307cb added an import package identifier
This will allow a UI where the user doesn't need to identify
the type of package they're uploading. For now it's only used
for common cartridge/canvas cartridge packages.

refs #4153

Change-Id: I2488777316660c9af60f544884429de7355f358f
Reviewed-on: https://gerrit.instructure.com/5701
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-09-23 13:27:28 -06:00
Bracken Mosbacker 81a10db574 moved migration classes into a proper namespace
refs #4153

Change-Id: I08035c5e6439d46c8ca61fb9409b1c2972567933
Reviewed-on: https://gerrit.instructure.com/5700
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-23 13:27:16 -06:00
Brian Palmer c07f06987d implement the new respondus polling publish api, closes #5479
Change-Id: I99da53ad8254175d0a353751cccfa74f49475a89
Reviewed-on: https://gerrit.instructure.com/5671
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-09-19 16:52:35 -06:00
Brian Palmer aca57db5ae oauth token support in the respondus soap api, closes #5564
Change-Id: I980e3553da935f650343b6c3deae466c6cd6aded
Reviewed-on: https://gerrit.instructure.com/5653
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-09-14 14:17:32 -06:00
Brian Palmer b4b8574601 specs for respondus qti import, fixes #5386
Change-Id: I575985b96f78705b2924126dd9d261e175e05f2c
Reviewed-on: https://gerrit.instructure.com/5505
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-09-08 16:35:54 -06:00
Brian Palmer 4719240cad support respondus TF questions, refs #5386
Change-Id: I8e5c52ea3cd6df3647dbdc24059e33efcc2a064f
Reviewed-on: https://gerrit.instructure.com/5504
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-09-08 16:35:24 -06:00
Brian Palmer 5682794b79 support MT distractors in respondus qti import, refs #5386
Change-Id: Ie4fd8eef708158fb95c17ca52dcac8feeca439de
Reviewed-on: https://gerrit.instructure.com/5503
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-09-08 16:13:25 -06:00
Brian Palmer 43368a23e7 support respondus numerical questions, refs #5386
Change-Id: I5f3906f6c8ce42f367767a96fb4c6ca402a3f6de
Reviewed-on: https://gerrit.instructure.com/5502
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-09-08 16:12:59 -06:00
Brian Palmer 32510f5c95 support respondus text-only questions, refs #5386
Change-Id: I915014e58798cfc273b3e81818d791051029feea
Reviewed-on: https://gerrit.instructure.com/5501
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-09-08 16:04:37 -06:00
Brian Palmer 6a3cd56100 support for respondus FIMB questions, refs #5386
Change-Id: I81ae1c352f18826d7bcbcfe751f97e194a81a518
Reviewed-on: https://gerrit.instructure.com/5490
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-09-08 16:03:50 -06:00
Brian Palmer 71bccbac17 eliminate next-job strand subquery, closes #5485
Change-Id: I500ea891ad67ef37702aae39c5734bed90052793
Reviewed-on: https://gerrit.instructure.com/5373
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-09-02 15:16:23 -06:00
Cody Cutrer a580766f90 add singleton support to DelayedJob
Change-Id: I4ec34f8a025d11c3198ca990bb3586a947f04dcc
Reviewed-on: https://gerrit.instructure.com/5319
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-29 12:10:46 -06:00
Bracken Mosbacker 15c6635af0 allow importing question bank packages with the same ids
A qti-specific import allowed this before, but now it can
be configured for other migration types

closes #5044

Change-Id: I96e63725ca42937980c73f80f794848848cd59b1
Reviewed-on: https://gerrit.instructure.com/5268
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-25 14:00:31 -06:00
Brian Palmer 158fe8c10d fix respondus qti imports feedback positioning, closes #5302
put it on the individual answer or the question as appropriate, and
don't put the correct answer feedback on both the correct and incorrect
question feedback.

Change-Id: I63671d2c6ee6caa63e0e17b0d37c13ad3725cfef
Reviewed-on: https://gerrit.instructure.com/5251
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-08-24 20:51:58 -06:00
Brian Palmer dbe0d239e9 add html/image support to quiz question/answer feedback
closes #5284

Change-Id: I51aad86e8b389ab1f3d6b700ebcef968803f0b10
Reviewed-on: https://gerrit.instructure.com/5097
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-08-24 10:09:22 -06:00
Brian Palmer 9dc77019ce configurable ttl for delayed job redis stats
Change-Id: Ifc76034c3c92bbe77f67fc4e65cc3834fdd9b08f
Reviewed-on: https://gerrit.instructure.com/5193
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-08-23 09:11:41 -06:00
Jon Jensen 46fbd65c0b Merge remote-tracking branch 'origin/dev/conversations'
Conflicts:
	app/models/course.rb
	app/views/context/inbox.html.erb

Change-Id: I62c650ebd0bb20dd1f0a9a43843bf7f8d0b86c83
2011-08-20 08:22:14 -06:00
Jacob Fugal 834e38eaa1 conversations intro slideshow
Change-Id: Icb3be1ae4f33b374c5f3eafc4c30aa9c8e3ef2ad
Reviewed-on: https://gerrit.instructure.com/5152
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-19 23:31:40 -06:00
Brian Palmer 4923464480 clean up delayed jobs plugin dir
remove a handful of now-unused files from the original shopify plugin

Change-Id: I7042e661724ec1148214b69d08ff470fc159e256
Reviewed-on: https://gerrit.instructure.com/4808
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-08-16 15:26:54 -06:00
Brian Palmer be34b30439 typo causing qti/respondus question groups to fail to import
Change-Id: I3752d278cdc7ba78892429b7a79ab08992d95649
Reviewed-on: https://gerrit.instructure.com/5095
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-16 10:40:22 -06:00
Brian Palmer 2f80779bcf typo causing qti/respondus question groups to fail to import
Change-Id: I3752d278cdc7ba78892429b7a79ab08992d95649
Reviewed-on: https://gerrit.instructure.com/5095
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-08-16 10:28:25 -06:00
Bracken Mosbacker 6c148bc686 qti importer tweeks to support new qti source
refs #55

Change-Id: I6c87d40440eb5bfd6801a21c354e28025d52de48
Reviewed-on: https://gerrit.instructure.com/5089
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-15 15:36:45 -06:00
Bracken Mosbacker 97875c1dfb qti options hash refactor
refs #55

Change-Id: I791f596eca1d236cef77282f8be3dcc24abd8a8b
Reviewed-on: https://gerrit.instructure.com/5088
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-15 15:36:35 -06:00
Bracken Mosbacker ba585cf7d6 add support for another flavor of qti
There is a coresponding commit in the python qti tool

refs #55

Change-Id: Iab00905b66676ee3c10b536a9478cfaf49d4b44e
Reviewed-on: https://gerrit.instructure.com/5087
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-15 15:36:27 -06:00
Bracken Mosbacker e095d9cf75 have qti specs use qti migrator and fix matching bug
This is the first of a few commits converting the QTI
specs to using the python QTI migration tool so that
the full qti import stack is tested.

This also uncovered a bug with BB8 matching questions
that this commit fixes

refs #4422

Change-Id: I0f3ebda5c77fbc9e451ab602ff00f59ab5014511
Reviewed-on: https://gerrit.instructure.com/4020
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-15 15:35:43 -06:00
Cody Cutrer cd036b9525 remove mailbox cruft
Change-Id: I73e2507e0e3b2d126f37a475c0e1ddc74bc5781d
Reviewed-on: https://gerrit.instructure.com/4931
Tested-by: Hudson <hudson@instructure.com>
Tested-by: Selenium <selenium@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-05 12:25:10 -06:00
Brian Palmer 8259d2b51c create a unique temp directory for each job, underneath the master tmpdir
This way it's easy to tell what job created a file, and it makes cleanup
more reliable, since Dir.mktmpdir will remove the whole directory when
the job ends and the block exits.

Closes #5093

I was a bit worried about the performance impact of making a new
directory for every single job, but on an active job server of ours, it
only seems to add about 160 microseconds per job.

Change-Id: Id4318da20cac75e6ba232ec2250b78c38485f9e4
Reviewed-on: https://gerrit.instructure.com/4811
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
2011-07-28 12:43:06 -06:00
Brian Palmer e06d3ba422 support publishNow respondus setting, closes #5137
Change-Id: Iae961cd08579525e311a8a70c04bd2186f8382a8
Reviewed-on: https://gerrit.instructure.com/4803
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-07-28 12:42:58 -06:00
Brian Palmer 6cd7e209af log job id and worker id with all log lines for delayed jobs
closes #5094

Change-Id: I257ade8d7a07d75392eca64377bd3c1655521045
Reviewed-on: https://gerrit.instructure.com/4796
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-07-25 13:25:53 -06:00
Brian Palmer 9855c5d68e spec for qti migration tool duplicate use file fix, closes #5126
Change-Id: If1be7cdedde60a75e3e12a5f710676cf89366d4d
Reviewed-on: https://gerrit.instructure.com/4773
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-22 14:37:24 -06:00
Brian Palmer a7f85fe70a move select_text from settings to metadata
YAML was serializing this with the PluginSetting settings hash, and
barfing when trying to load it back in.

Change-Id: I318e90506299c9c46fc7978c2b53de98d1b5deee
Reviewed-on: https://gerrit.instructure.com/4764
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
2011-07-22 13:58:56 -06:00
Brian Palmer 3f5d10ca0d fix migration
Change-Id: I0881a5fd1db3fc96dff99a94d7e791801529ae4e
Reviewed-on: https://gerrit.instructure.com/4752
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
2011-07-22 13:57:55 -06:00
JT Olds b801cccc81 disable stdout while requiring erubis rails helpers
until
http://rubyforge.org/tracker/index.php?func=detail&aid=28337&group_id=1320&atid=5201
is applied

Change-Id: I3d64b75d9a8e7ba85a77170d07f693e444138705
Reviewed-on: https://gerrit.instructure.com/4722
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-07-19 13:43:57 -06:00
Cody Cutrer 7f5cc0693b optimize AdheresToPolicy
Basically, don't call a bazillion procs everytime you check_policy;
just the "given" statement.  Everything else is evaluated just once,
and cached on the class.  This does lose functionality (the ability
to access the instance inside of set_policy, and set methods), but
none of it was currently in use.

Change-Id: I736879d98beb4115a2e8c492931c755076291d08
Reviewed-on: https://gerrit.instructure.com/4665
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: JT Olds <jt@instructure.com>
2011-07-14 13:25:28 -06:00
Bracken Mosbacker 177d2e5108 fix url references for imported quizzes
closes #5056

Change-Id: I1ffb23fab8ba1b4178d9ab1a7e229ca794a9de4e
Reviewed-on: https://gerrit.instructure.com/4668
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-07-13 15:40:59 -06:00
Brian Palmer a19ca65edb recover as best we can when a job fails to fail, fixes #4951
Change-Id: I2be24518f337463f866f62789e6d1b8be6eac0e6
Reviewed-on: https://gerrit.instructure.com/4501
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-06-30 14:03:04 -06:00
Jon Jensen c9501256ca i18n rest of vendor/plugins (and lib/canvas/plugin stragglers)
Change-Id: I7379afbcc0461ba10e41a14a55ef87b00871f9f7
Reviewed-on: https://gerrit.instructure.com/4345
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
2011-06-23 12:51:55 -06:00
Brian Palmer 41c9ee358c fix sometimes-failing periodic job spec
Change-Id: Ib8aaa6869276440df2d4a3667b2be958bd115fae
Reviewed-on: https://gerrit.instructure.com/4325
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-06-22 10:14:08 -06:00