Commit Graph

1156 Commits

Author SHA1 Message Date
Victor Shnayder
be947770c0 Merge pull request #917 from MITx/victor/make-problemset-sequential
Make problemset render as a sequential, not a vertical.
2012-10-23 10:30:52 -07:00
Victor Shnayder
1806699f26 typos 2012-10-18 20:25:52 -04:00
Victor Shnayder
5177e8c656 Catch unicode errors in contextualize_text and deal with them. 2012-10-18 20:23:49 -04:00
kimth
57f49353d8 Fix CR showanswer template 2012-10-15 22:09:19 +00:00
Victor Shnayder
38bd83858b Make problemset render as a sequential, not a vertical.
- Piotr requested this.  Hopefully it doesn't break anything, but we should run it by the content fellows before merging.
2012-10-15 12:52:21 -04:00
Victor Shnayder
4594d37bf2 Merge pull request #900 from MITx/feature/ichuang-fix-capa_module-reset-string-bug
reset_problem in capa_module should always return dicts not strings
2012-10-14 10:36:49 -07:00
ichuang
3c8830f3b0 reset_problem in capa_module should always return dicts not strings
this is for the master branch (versus cms-master)
2012-10-14 12:57:58 -04:00
Victor Shnayder
15d4af26a5 Merge pull request #899 from MITx/feature/victor/capa-ajax
Make chem preview more robust
2012-10-14 08:40:39 -07:00
Victor Shnayder
f4d8df94dd Make chem preview more robust
- give the preview div an id, use that to look it up instead of dancing around in the DOM
2012-10-14 11:35:32 -04:00
arjun810
1ec0fae801 Merge pull request #891 from MITx/feature/victor/capa-ajax
Feature/victor/capa ajax
2012-10-13 17:05:44 -07:00
kimth
113e8b97b6 Toggle shouldn't follow anchor 2012-10-13 16:19:54 +00:00
kimth
3b461ee11f choicegroup should only process choices belonging to its input_id 2012-10-13 06:13:33 +00:00
Victor Shnayder
adae176943 merge 2012-10-12 23:06:39 -04:00
Victor Shnayder
48de4b40ee Fix my js_loader patch
* still call the callback when skipping duplicate file.  This updates the completed flags, and so the overall "we're done" callback fires properly.
2012-10-12 22:52:02 -04:00
Victor Shnayder
1c18ad9607 make loader only load scripts once per run, midway through fixing multiple chem equations per page 2012-10-12 19:18:58 -04:00
Victor Shnayder
619e9f18ac Merge pull request #884 from MITx/feature/victor/capa-ajax
address Ike's comments.
2012-10-12 14:08:11 -07:00
Victor Shnayder
54d1f2afac address Ike's comments. 2012-10-12 17:03:11 -04:00
ichuang
fd5c7c622c Merge pull request #862 from MITx/feature/victor/capa-ajax
Feature/victor/capa ajax

I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
2012-10-12 13:51:10 -07:00
Victor Shnayder
d78e041c2d Testing and small fixes
- make chemical_equations_equal return False instead of raising errors.
- make tests not choke on unicode
- get full coverage
2012-10-12 15:32:36 -04:00
Victor Shnayder
f6f2663b77 fix arrows list 2012-10-12 14:08:21 -04:00
Victor Shnayder
b6f7427e22 make tests pass again 2012-10-12 14:02:22 -04:00
Victor Shnayder
19d3cb3870 Add a chemicalequationinput with live preview
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one.  This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
2012-10-12 13:52:48 -04:00
Victor Shnayder
c420c67b82 Actually implement exact vs factors-don't-matter comparisons in chemcalc 2012-10-11 17:40:26 -04:00
David Ormsbee
9c0e554992 Merge pull request #855 from MITx/bug/tomg/nested-hints
tweaked collapsible selector to target the proper section
2012-10-11 10:25:21 -07:00
Lyla Fischer
0cdbd170c2 fixed documentation 2012-10-11 12:23:06 -04:00
Lyla Fischer
331f35145f fixed default tolerance on numericalresponse 2012-10-11 11:59:27 -04:00
Александр
64565692ab removed obsolete crystalresponse 2012-10-11 18:41:25 +03:00
Александр
2b200b6e20 changed cryst inputtype to be similar to textline 2012-10-11 18:40:05 +03:00
Александр
dfb9b49c4d added new inputtypes to list, due to that check button appears 2012-10-11 18:37:10 +03:00
Александр
c7654b4d1e cryst inputtypes template - same as textline + js files 2012-10-11 18:33:49 +03:00
Victor Shnayder
2b6e935985 Initial refactor of inputtypes into classes.
- for now, wraps existing render functions as separate classes
- a bit of cleanup in how it's called from capa_problem
- initial tests to make sure things are testable.
2012-10-11 11:26:49 -04:00
Victor Shnayder
cb291871b1 Better error checking when content authors mess up answers to numerical response problems.
- give different errors when student or author stuff is messed up (I was seeing "No way to interpret '3' as a number" :P)
- preserve traceback in exception
2012-10-11 11:25:40 -04:00
Victor Shnayder
8cdd5b35c0 add note about randomization, based on discussion with Piotr 2012-10-11 11:15:58 -04:00
Tom Giannattasio
00e2f093b9 removed extra padding on nested sections 2012-10-10 16:19:03 -04:00
Tom Giannattasio
6f60af71fd tweaked collapsible selector to target the proper section; functionality like this should have its own class to avoid selector conflicts, but it may be too late to fix this now 2012-10-10 16:14:32 -04:00
Victor Shnayder
db17580710 Chemcalc refactor, improvement
* Move tests into a separate file
* add a chemical_equations_equal function to compare equations, not expressions
* rename some internal functions with a leading _
2012-10-10 15:49:09 -04:00
Victor Shnayder
d10b568c13 Add chemcalc to capa package, to context for customresponse 2012-10-10 15:49:09 -04:00
Victor Shnayder
c30f57022b Move more tests around, start prep for inputtype refactor 2012-10-10 15:48:33 -04:00
Александр
f374a33606 added not hidden field 2012-10-10 20:54:17 +03:00
Александр
42bd9e8b9e added test information 2012-10-10 19:36:03 +03:00
Александр
c4359b6f24 added crystresponse 2012-10-10 19:35:09 +03:00
kimth
61b3857134 Don't function call on null 2012-10-10 03:46:17 +00:00
Александр
708c11a1ea added input type 2012-10-09 19:13:54 +03:00
Александр
758e76dc14 added js to input for cr 2012-10-09 15:08:43 +03:00
Victor Shnayder
9e02b3ce34 Move tests around:
- move progress tests into test_progress.py
- move grader tests into test_graders.py
- move the capa tests into capa/tests/
2012-10-08 15:52:18 -04:00
Victor Shnayder
61e574ee22 Revert "Make script type checking more strict"
Don't want to break existing problems.

This reverts commit 811422a18d.
2012-10-08 13:05:30 -04:00
Victor Shnayder
811422a18d Make script type checking more strict
- check for known script type instead of ignoring js and perl
2012-10-08 10:59:39 -04:00
Victor Shnayder
3765226b85 shorter impl of is_file 2012-10-08 10:58:59 -04:00
Victor Shnayder
ef1dda67b3 formatting in xqueue_interface.py 2012-10-08 10:58:38 -04:00
Victor Shnayder
93cc9a8e5b formatting cleanup in responsetypes and inputtypes 2012-10-08 10:58:04 -04:00