Commit Graph

4914 Commits

Author SHA1 Message Date
Will Daly
9ac8ef542f Overall message HTMl now correctly renders when multiple HTML tags are
passed as the message (even when there's no root tag)
2013-03-01 09:40:38 -05:00
Will Daly
952716af13 Added clean-up code for message HTML.
If overall message is a parseable XHTML tree,
it is inserted as a tree rather than text.
2013-03-01 09:40:38 -05:00
Will Daly
68cf4c4535 Added tests for HTMl rendering of problems
Added support for rendering response messages
2013-03-01 09:40:38 -05:00
Will Daly
9f6119a19a * Fixed a bug in CorrectMap in which overall_message was not copied
in the update() method
* Implemented CustomResponse behavior for returning overall_message,
  with unit tests
* Added additional CustomResponse unit tests for exception handling
2013-03-01 09:40:38 -05:00
Will Daly
3dd49881c3 * Wrote unit tests for correctmap.
* Fixed potential KeyError in correctmap.get_queue_time_str()
* Modified correctmap.get_npoints() to return 0 if answer is incorrect,
    even when npoints has been set.
* Added overall_message attribute to CorrectMap to allow
messages that apply to the entire question, not just an individual input
2013-03-01 09:40:38 -05:00
Arthur Barrett
3d4510ab0c fixed sass compiler issue with annotatable xmodule on cms 2013-02-28 18:35:32 -05:00
Victor Shnayder
136946a334 Merge remote-tracking branch 'origin/master' into feature/abarrett/annotatable_xmodule 2013-02-28 18:22:13 -05:00
Arthur Barrett
0461d72884 fixed tag prompt default text 2013-02-28 16:31:15 -05:00
Arthur Barrett
179a4af5e7 fixed failing annotationinput test and refactored response factory 2013-02-28 15:37:14 -05:00
Arthur Barrett
3f40781612 adjusted "incorrect" icon placement when no annotation options submitted. 2013-02-28 14:24:53 -05:00
Arthur Barrett
430449501e deleting test file 2013-02-28 14:06:46 -05:00
Christina Roberts
1b9d105e35 Merge pull request #1568 from MITx/bug/christina/misc
Don't require text tag around multiple choice/checkbox answers.
2013-02-28 10:48:08 -08:00
Arthur Barrett
6b74dcf782 adding unit test for annotationinput 2013-02-28 13:38:29 -05:00
cahrens
2be42b8f51 Don't require text tag around multiple choice/checkbox answers.
https://edx.lighthouseapp.com/projects/102637/tickets/196
2013-02-28 13:33:04 -05:00
Arthur Barrett
15f6edc2f2 Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-28 13:11:40 -05:00
Arthur Barrett
bc6a085fdf converted annotationinput tests to the new responsetype testing format. 2013-02-28 13:10:37 -05:00
Vasyl Nakvasiuk
e9dacfae09 remove self.contents from ConditionalModule 2013-02-28 20:07:59 +02:00
Christina Roberts
69ef622afd Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor
Fix latex high-level source editor in current version of cms / studio
2013-02-28 10:02:09 -08:00
Arthur Barrett
1da644fcb3 merge from master. resolved conflict with test_responsetypes.py by using the version from master. 2013-02-28 11:22:32 -05:00
Christina Roberts
1ebc3b314d Merge pull request #1566 from MITx/fix/cdodge/optimize-metadata-tree-computation
Fix/cdodge/optimize metadata tree computation
2013-02-28 07:28:48 -08:00
Diana Huang
9429262ca4 Merge pull request #1563 from MITx/fix/will/capa_response_unit_tests
Fix/will/capa response unit tests
2013-02-28 07:05:15 -08:00
Will Daly
71d0a367aa Fixed an error in the JavascriptResponseTest: coffee files
were not being compiled before the LoncapaProblem initializer was
called.
2013-02-28 09:45:27 -05:00
Chris Dodge
8a7211da05 remove unused import commands (which were used for temporary profiling). Also change get_lms_link_for_item() to preserve the previous argument ordering. Apparently all callers may not use argument name conventions for the 'preview' argument. 2013-02-28 09:40:30 -05:00
ichuang
9fe9e2fbf6 upadte latex2edx url in latex-problem template 2013-02-28 04:21:50 +00:00
Chris Dodge
905199b5eb restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive. 2013-02-27 22:37:13 -05:00
Chris Dodge
e42cdfbd29 turn off metadata inheritence for a quick test 2013-02-27 21:45:17 -05:00
Chris Dodge
d0bbb0f6c9 use a different query to get all collections. Also don't apply inheritance to course modules, because that's ultimately a no-op 2013-02-27 20:43:49 -05:00
cahrens
e47d11bedc Bug fix for #214.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/214-Via-Tender-Numerical-Input-answer-0-a-tolerance-is-not-accepted#ticket-214-4
2013-02-27 17:36:28 -05:00
cahrens
c0f0ef0cd2 Bug fix for #214.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/214-Via-Tender-Numerical-Input-answer-0-a-tolerance-is-not-accepted#ticket-214-4
2013-02-27 17:34:08 -05:00
Will Daly
7e48de1ef3 Reset responsetypes.py to version on master 2013-02-27 17:22:26 -05:00
Will Daly
487afad50d Merge branch 'master' into feature/will/move_correct_mark_for_multiple_choice 2013-02-27 16:58:35 -05:00
Arthur Barrett
bc49d50fc2 fixed the max points in the annotation response 2013-02-27 16:53:17 -05:00
Will Daly
043d316d53 Removed test files that are now replaced with XML Factories 2013-02-27 16:40:48 -05:00
Will Daly
ce7256eda9 Removed unused SymbolicResponseXMLFactory 2013-02-27 16:40:05 -05:00
Arthur Barrett
8f89768d62 added annotationresponse grade test 2013-02-27 16:29:25 -05:00
Will Daly
c1324ec21d Modified CodeResponse to use XML factory 2013-02-27 16:25:19 -05:00
Will Daly
6e4c418a11 Updated JavscriptResponse to use XML factory 2013-02-27 15:26:29 -05:00
Arthur Barrett
2f4d6f7bbf fixed doc block for annotationinput 2013-02-27 15:25:04 -05:00
Will Daly
3f81fe010c Implemented tests for ImageResponse 2013-02-27 15:05:21 -05:00
Arthur Barrett
1a0220c765 added a validation check on the input choice attribute 2013-02-27 15:04:30 -05:00
Arthur Barrett
44a68e6903 added partially correct icon from marco 2013-02-27 14:36:14 -05:00
Will Daly
53b3b79f96 Implemented tests of hints for <formularesponse> 2013-02-27 14:13:49 -05:00
Arthur Barrett
b84d0ba8ba updated comments 2013-02-27 14:04:49 -05:00
Arthur Barrett
9f8e172be9 show the status mark next to the submitted tag instead of at the bottom of the problem. 2013-02-27 13:35:10 -05:00
Will Daly
9fe305e02b Modified ChoiceGroup to display correct/incorrect indicators
(check or x) next to the option the user selected (check boxes or radio
buttons).
2013-02-27 13:05:29 -05:00
Arthur Barrett
25fb210338 move return link to problem header 2013-02-27 12:45:58 -05:00
Carlos Andrés Rocha
2ca303c95d Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
Feature/cas/manual policy merged
2013-02-27 09:02:07 -08:00
Arthur Barrett
afa7fca15a Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-27 11:58:38 -05:00
Vasyl Nakvasiuk
9186e61702 use shortcut get_display_items 2013-02-27 18:52:17 +02:00
Vasyl Nakvasiuk
81bfa46f2e fix caching problem in conditional_module 2013-02-27 18:34:09 +02:00