Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,055 Commits 1 Branch 0 Tags
2f5ea630e7adcb854b0abb341741797cd55d9ddf
Commit Graph

2797 Commits

Author SHA1 Message Date
Diana Huang
f8adfc6244 Merge pull request #1602 from MITx/fix/will/capa_xmodule_unit_tests 
Fix/will/capa xmodule unit tests
 2013-03-06 06:03:17 -08:00
Will Daly
c7d80a91ee Changed name of survey_question to is_survey_question for clarity 2013-03-05 17:30:38 -05:00
Will Daly
43d8574e92 Refactored use of test_system in xmodule unit tests 
so that a new one is created for each test
 2013-03-05 17:26:15 -05:00
Will Daly
73281a43c9 Added tests for get_problem_html, including error conditions 2013-03-05 17:02:12 -05:00
Will Daly
40d7e8addf Moved problem HTML error handling to its own function 2013-03-05 15:43:47 -05:00
Will Daly
608552429f Refactored capa module HTML rendering, isolating logic for 
determining which buttons to show
 2013-03-05 15:35:14 -05:00
Christina Roberts
e093431d75 Merge pull request #1581 from MITx/feature/vik/advanced-studio 
Feature/vik/advanced studio
 2013-03-05 12:28:29 -08:00
Vik Paruchuri
9475c6edac Address review comments 2013-03-05 14:41:08 -05:00
Will Daly
42043d2ccc Added tests for capa module save_problem() 2013-03-05 12:01:04 -05:00
Will Daly
6ec3b94d0c Added test for capa module closed() method; modified 
closed() to handle edge cases
 2013-03-05 11:47:41 -05:00
Will Daly
49784009d5 Fixed incorrect doc string 2013-03-05 11:23:14 -05:00
Will Daly
21af0493fd Added unit tests for capa_module reset_problem() 2013-03-05 11:21:28 -05:00
cahrens
cc234d45e7 Don't collapse multiple underscores for asset names. 
#202
 2013-03-05 10:55:27 -05:00
Vik Paruchuri
d03fe79e07 Small metadata naming fix 2013-03-05 10:36:22 -05:00
chrisndodge
59250225d9 Merge pull request #1592 from MITx/fix/cdodge/optimize-instructor-dashboard 
additional courseware view optimizations. Do a 'depth' fetch on the sele...
 2013-03-04 17:19:53 -08:00
Chris Dodge
6ce3493f00 add comment 2013-03-04 19:59:18 -05:00
Jay Zoldak
22420adc9a Merge pull request #1594 from MITx/bug/dhm/course_update_js 
Provide convenience converter of the grading policy but don't save it on
 2013-03-04 13:29:10 -08:00
Will Daly
9743f6bea9 Fixed indentation in capa module. 
Added test of HTML output for successful check to capa module unit tests
 2013-03-04 16:16:38 -05:00
Don Mitchell
0c4a52567e Provide convenience converter of the grading policy but don't save it on 
the object.
 2013-03-04 16:13:29 -05:00
Will Daly
d148906851 Added unit tests for capa module check_problem() method 2013-03-04 16:06:14 -05:00
Christina Roberts
d0eefc6a67 Merge pull request #1580 from MITx/bug/dhm/course_update_js 
Fix for script tags w/in json objects being oddly evaluated on html page
 2013-03-04 12:42:42 -08:00
Don Mitchell
020e1e94fb Move side effecting of definition for grader to the course_module and 
don't make caller responsible.
 2013-03-04 15:38:47 -05:00
Victor Shnayder
df5ad6ba42 Merge pull request #1574 from MITx/fix/will/cs191_matrix_style_bug 
Fix/will/cs191 matrix style bug
 2013-03-04 12:28:12 -08:00
Chris Dodge
a81e9a673c additional courseware view optimizations. Do a 'depth' fetch on the selected section so that it does a more efficient set of queries to the database. Also, in the CachingDescriptorSystem, if we have a 'cache miss', when we do the actual fetch (which creates a new 'system'), keep that fetched data around in our own collection, in case it is queried again 2013-03-04 14:59:45 -05:00
David Ormsbee
9d2a2cbc2f Merge pull request #1555 from MITx/feature/jkarni/foldit-api 
Feature/jkarni/foldit api
 2013-03-04 11:40:43 -08:00
Will Daly
1cc8950780 Added comments for make_dict_of_responses() in capa module 2013-03-04 12:45:13 -05:00
Will Daly
082216395c Added unit test for conversion of GET parameters for capa module. 
Added error checking for possible error cases
 2013-03-04 12:38:11 -05:00
Ned Batchelder
7c8a90229e Use 'is None' and 'is not None' 2013-03-04 10:57:25 -05:00
Ned Batchelder
97f1e04282 Fix some 2-space indents 2013-03-04 10:57:25 -05:00
Will Daly
548f9b85a8 Changed response_msg argument default to '' 2013-03-01 17:07:23 -05:00
Vik Paruchuri
4400f94196 Fix some xml issues in yaml 2013-03-01 16:41:18 -05:00
Will Daly
28a502ea97 Fixed a bug in CorrectMaps.get_npoints(), which would return 1 
when npoints=0.
 2013-03-01 16:40:54 -05:00
chrisndodge
c236b2c8a9 Merge pull request #1550 from MITx/feature/cdodge/add-test-delete 
add another command line argument to allow users to only simulate a dele...
 2013-03-01 13:29:06 -08:00
Victor Shnayder
88bfdd01ce Merge pull request #1561 from MITx/feature/will/move_correct_mark_for_multiple_choice 
Feature/will/move correct mark for multiple choice
 2013-03-01 12:52:26 -08:00
Chris Dodge
0047295695 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/add-test-delete 2013-03-01 15:48:23 -05:00
Will Daly
d6df7e2d96 Added comments to clean_message_html 2013-03-01 15:04:01 -05:00
Vik Paruchuri
9f020e228b Add in some dummy values 2013-03-01 14:50:40 -05:00
Vik Paruchuri
a818191297 Prelim support for combinedopenended and peergrading types 2013-03-01 14:12:04 -05:00
Vik Paruchuri
c24ba23e54 Move self assessment templates 2013-03-01 13:45:55 -05:00
Vik Paruchuri
b0c2559de8 Switch around template locations 2013-03-01 13:43:01 -05:00
Vik Paruchuri
b3d0abbd05 Start to move around templates 2013-03-01 13:31:54 -05:00
VikParuchuri
d186e5d186 Merge pull request #1538 from MITx/diana/fix-import-export 
Fix studio import and export for CombinedOpenEnded, PeerGrading XModules
 2013-03-01 09:32:08 -08:00
David Ormsbee
d6957f3e7e Merge pull request #1508 from MITx/feature/ichuang/fix-save-button-messages-and-add-capa-survey-mode 
Fix capa save button msgs & add simple capa survey mode
 2013-03-01 08:26:21 -08:00
Will Daly
8265181477 If there are multiple inputs, but only one message specified, 
the message is now applied to the entire response.
 2013-03-01 11:17:31 -05:00
e0d
4e10eb10e3 locking deps versions based on pip freeze in production. 2013-03-01 10:15:07 -05:00
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