Arjun Singh
a23c51e39c
Merged two multiple-choice-like response types into a single response; created inputtypes for checkboxes and radio buttons adn cleaned up the code a bit. Fixed checkbox responses.
2012-07-19 10:25:51 -07:00
ichuang
77dfc2ade7
Merge pull request #224 from MITx/fix_optioninput
...
minor patch to fix optioninput; merging this in now, to unblock berkeley's changes to MC; passes my tests.
2012-07-19 10:16:02 -07:00
ichuang
b814e6a08d
Merge pull request #221 from MITx/kimth/lms-coderesponse
...
CodeResponse restricted to only one answer field
2012-07-19 08:25:03 -07:00
ichuang
0903ba9c1f
fix optioninput to preserve author's ordering of options
2012-07-19 11:15:14 -04:00
kimth
ff4716ef76
Further simplification after restricting to one answer field
2012-07-19 10:57:14 -04:00
kimth
bff86c32ca
CodeResponse restricted to only one answer field
2012-07-19 10:47:12 -04:00
Calen Pennington
49ee12963f
Merge pull request #185 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-07-19 06:29:48 -07:00
kimth
cc9f9a9df8
queuekey generated from LoncapaProblem seed + system time
2012-07-18 14:10:41 -04:00
kimth
84eb3efa8a
Implemented 'initial_display' for CodeResponse
2012-07-18 11:08:17 -04:00
kimth
1ddc3b560b
Deep copy of CorrectMap was implied by code. Made it actually the case
2012-07-17 18:33:56 -04:00
kimth
631517ccdd
Queue callback consumes queuekey
2012-07-17 17:01:28 -04:00
kimth
0b538fdac8
Fixed bug in answer prefetching in LoncapaProblem._preprocess_problem
2012-07-17 16:58:55 -04:00
kimth
d9432a15ba
Drop immediate seed prior to queuekey generation
2012-07-17 15:26:40 -04:00
kimth
934b37c195
Remove json import from capa_problem -- needed for debug
2012-07-17 11:12:23 -04:00
kimth
269468ba6e
CorrectMap.is_queued and .is_right_queuekey defaults to False if answer_id not found
2012-07-17 10:47:10 -04:00
kimth
0958485b46
update_score: edit existing CorrectMap rather than starting with empty CorrectMap
2012-07-17 10:31:21 -04:00
Arjun Singh
8365c2fdad
Merge branch 'master' into ccp0101/capa_pythonpath
2012-07-16 16:54:51 -04:00
Arjun Singh
0682401841
Allows for additional paths when executing code in a loncapa problem. Adds a default path of data/course/code.
2012-07-16 16:53:38 -04:00
kimth
093ac9d101
CorrectMap in LMS keeps track of problems as being queued
2012-07-16 16:19:35 -04:00
kimth
838a8624c9
Add docstring to 'score_update' path
2012-07-16 11:28:26 -04:00
Mike Chen
412a907a8a
allow additional (python) path for scripts in capa problem.
2012-07-16 23:16:39 +08:00
kimth
6d3516a754
CodeResponse for queued code checking
2012-07-13 13:45:38 -04:00
Calen Pennington
9fdd5b1134
Don't dump the entire LoncapaProblem text in the unicode string
2012-07-11 22:18:40 -04:00
Calen Pennington
5463f2f348
Log the correct id attribute in capa_problem
2012-07-11 22:18:40 -04:00
Calen Pennington
78f2a1ebe7
Add comments to LoncapaProblem constructor with types
2012-07-11 22:18:40 -04:00
ichuang
314c572825
fix capa_problem to call each responder's get_answers() just once
2012-07-10 22:30:32 -04:00
David Ormsbee
56d873097c
add pyparsing to requirements for capa lib
2012-07-10 14:12:32 -04:00
Calen Pennington
fdd9663699
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/modulestore/xml.py
lms/djangoapps/courseware/views.py
lms/templates/index.html
lms/templates/info.html
lms/templates/main.html
lms/templates/navigation.html
requirements.txt
2012-07-10 13:39:19 -04:00
Calen Pennington
cfd6890d68
Merge remote-tracking branch 'origin/master' into cpennington/cms-github
...
Conflicts:
common/lib/xmodule/xmodule/xml_module.py
2012-07-10 08:50:54 -04:00
ichuang
9b90068e03
Merge branch 'stable-edx4edx' of github.com:MITx/mitx
...
Conflicts:
common/lib/xmodule/seq_module.py
common/lib/xmodule/xmodule/capa_module.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/djangoapps/multicourse/multicourse_settings.py
2012-07-08 16:52:36 -04:00
ichuang
74e01bb07a
fixed two bugs in inputtypes: textline with quotes crashed problems, and
...
choice without text caused error
2012-07-06 09:49:08 -04:00
Calen Pennington
9d1dc37b44
Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
...
Conflicts:
cms/djangoapps/contentstore/management/commands/import.py
cms/djangoapps/contentstore/views.py
cms/envs/common.py
cms/envs/dev.py
cms/envs/test.py
cms/static/sass/README.txt
cms/static/sass/_base.scss
cms/static/sass/_calendar.scss
cms/static/sass/base-style.scss
cms/templates/base.html
cms/templates/index.html
cms/templates/widgets/header.html
cms/templates/widgets/module-dropdown.html
cms/templates/widgets/navigation.html
cms/templates/widgets/problem-edit.html
cms/urls.py
common/djangoapps/pipeline_mako/__init__.py
common/djangoapps/util/views.py
common/lib/capa/capa_problem.py
common/lib/capa/templates/textinput_dynamath.html
common/lib/mitxmako/middleware.py
common/lib/mitxmako/shortcuts.py
common/lib/mitxmako/template.py
common/lib/xmodule/capa_module.py
common/lib/xmodule/seq_module.py
common/lib/xmodule/setup.py
common/lib/xmodule/test_files/symbolicresponse.xml
common/lib/xmodule/test_files/test_files/symbolicresponse.xml
common/lib/xmodule/tests/__init__.py
common/lib/xmodule/tests/test_files/symbolicresponse.xml
common/lib/xmodule/vertical_module.py
common/lib/xmodule/video_module.py
common/lib/xmodule/x_module.py
lms/djangoapps/courseware/content_parser.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/static/coffee/spec/helper.coffee
lms/static/coffee/spec/modules/video/video_player_spec.coffee
lms/static/coffee/spec/modules/video/video_volume_control_spec.coffee
lms/static/coffee/src/modules/problem.coffee
lms/static/coffee/src/modules/sequence.coffee
lms/static/coffee/src/modules/video/video_player.coffee
lms/static/coffee/src/modules/video/video_volume_control.coffee
lms/static/js/vendor/jquery-1.6.2.min.js
lms/static/js/vendor/jquery-ui-1.8.16.custom.min.js
lms/static/sass/application.scss
lms/static/sass/courseware/_sequence-nav.scss
lms/static/sass/courseware/_video.scss
lms/templates/main.html
lms/urls.py
rakefile
requirements.txt
2012-07-05 16:22:50 -04:00
Calen Pennington
e9ee1566d6
Modularize capa and mitxmako so that xmodule can properly depend on them
2012-07-05 12:48:18 -04:00
ichuang
a5f3d8a900
fix handling of tail in inputtypes.math (needed saxutils.escape)
2012-07-04 16:06:07 -04:00
ichuang
d8b22ff12f
add hidden attribute to textline and textbox inputtypes, for javascript problems
2012-07-04 14:13:13 -04:00
Calen Pennington
8cf848b191
Handle the filename for capa_module in the xml_module code, rather than specially in capa_module
2012-07-02 10:51:01 -04:00
ichuang
7f4ebcb6a9
pep8 fixes - inputtypes
2012-06-29 23:22:40 -04:00
ichuang
fedf216bde
Exception, err -> Exception as err
2012-06-29 23:18:58 -04:00
ichuang
547e19625a
exception as err
2012-06-29 23:09:26 -04:00
ichuang
8283636e39
inputtypes: if externalresponse server message is bad, don't crash
2012-06-29 14:50:11 -04:00
ichuang
7814805c1a
improve capa error handling a bit - for better user experience
...
- if no answer given, then symbolicresponse + customrepsonse now
give an error message, instead of doing nothing
- in capa_module if lcp.grade_answers fails, in DEBUG mode display
alert with useful error message
2012-06-23 16:23:27 -04:00
ichuang
3cd02f6edc
Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx
2012-06-21 21:31:36 -04:00
ichuang
93b8ad3e4d
Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx
2012-06-21 16:46:56 -04:00
Kyle Fiedler
82023f6bd3
Added styles for more basic html elements and reworked design of textinput
2012-06-21 15:41:36 -04:00
Victor Shnayder
04dd8ee6d1
Initial progress display.
...
* add module_from_xml param to I4xSystem
* use it to implement xmodule.get_children()
* fix a few comments here and there
* Render-time progress display for seq and vertical modules.
- Computes fraction of subproblems done.
* Pass problem state back to js during ajax calls.
* general cleanup in capa_module.py
* add progress_changed and progress fields to json returned from each ajax handler
* Coffeescript changes to hook up sequence tracking of problem progress
* net result: sequence 'a' tags now have a progress class
* properly set css class on initial load
* fire event when progress changes after ajax calls
* also save state in 'progress' property of problems-wrapper tag
* event handler finds those tags, computes updated progress
2012-06-21 10:59:47 -04:00
ichuang
31871a0548
modify capa_problem to add <include file="foo"> functionality
2012-06-21 10:59:43 -04:00
Victor Shnayder
866c6a6a9e
add comment/explanation to eia.py
2012-06-21 10:59:40 -04:00
ichuang
6572a542e5
typo in correctmap
2012-06-21 10:59:39 -04:00
ichuang
6f35f4887f
private methods start with _ (in capa_problem)
2012-06-21 10:59:39 -04:00
ichuang
929bfc4085
capa_problem log.error + raise -> log.debug + # FIXME
2012-06-21 10:59:39 -04:00
