Commit Graph

73 Commits

Author SHA1 Message Date
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
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
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
ichuang
071170072a util: tol.endswith 2012-06-21 10:59:39 -04:00
ichuang
0995116a83 responsetypes - minor edits 2012-06-21 10:59:39 -04:00
ichuang
f64614b8ce fix correctmap set_dict bug - make __getitem__ call self.cmap.__getitem__ 2012-06-21 10:59:39 -04:00
ichuang
3e2ef6b8dc revert logging instantiation to use 'mitx.' + __name__ 2012-06-21 10:59:39 -04:00
ichuang
0b61199f8f removed unused answer_map parameter from capa_problem.lcp.preprocess_problem 2012-06-21 10:59:39 -04:00
ichuang
39dc5d0446 capa_problem and responsetypes pep8 and pyflakes 2012-06-21 10:59:38 -04:00
ichuang
c1c47bdae1 fix capa_problems pep8 2012-06-21 10:59:38 -04:00
ichuang
6dedf644e1 added StringResponse (with hints)
for hints, still to be done: numericalhint, optionhint
no default hint processing done yet (ie hintmode = on_request)
2012-06-21 10:59:37 -04:00
ichuang
47e0317b7c fix xmodule/capa tests to use new CorrectMap 2012-06-21 10:59:37 -04:00
ichuang
225a4d87c6 fixes to schematicresponse to work with new CorrectMap 2012-06-21 10:59:37 -04:00
ichuang
d56e6e1a11 django pipeline working now (with new pip -e git+git...) 2012-06-21 10:59:37 -04:00
ichuang
8030bce0c0 bugfixes - correctmap should reinit self.cmap on init 2012-06-21 10:59:37 -04:00
ichuang
70e942fe2b fourth pass in capa cleanup:
- Added hints + hintmethod
  - hintgroup compatible with loncapa spec
  - also does hintfn for custom hints (can do answer history)
  - GenericResponse -> LoncapaResponse
  - moved response type tags into responsetype classes
  - capa_problem should use __future__ division
  - hints stored in CorrectMap, copied to 'feedback' in SimpleInput for display
2012-06-21 10:59:36 -04:00
ichuang
57c1aa7b3d third pass in capa cleanup: correct_map -> CorrectMap
- added correctmap.py with CorrectMap class
  - messages subsumed into CorrectMap
  - response get_score called with old CorrectMap so hints based on history are possible
2012-06-21 10:59:36 -04:00
ichuang
a3d24d41f5 second pass in capa cleanup:
- each response can now render its own xhtml
  - cleaned up LoncapaProblem.extract_html
2012-06-21 10:59:36 -04:00
ichuang
ff9f8c9779 responsetypes - fix comment 2012-06-21 10:59:36 -04:00
ichuang
f1a12a2604 first pass in capa cleanup:
- responsetype used to be instantiated multiple times(!) in capa_problem
     now it is instantiated once, and stored in self.responders
   - responsetypes.GenericResponse restructured; each superclass
     show now provide setup_response (and not __init__), and may
     provide get_max_score(); general __init__ provided to
     clean up superclasses.
2012-06-21 10:59:36 -04:00
ichuang
ec0b451e7f add msg to textinput_dynamath 2012-06-21 10:59:36 -04:00
Calen Pennington
e9d5f85745 Merge pull request #115 from MITx/capa-include
modify capa_problem to add <include file="foo"> functionality
2012-06-20 07:34:19 -07:00
Victor Shnayder
b963d8b534 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-19 18:28:45 -04:00
ichuang
ce74f9779f modify capa_problem to add <include file="foo"> functionality 2012-06-15 22:40:02 -04:00
Victor Shnayder
600899c16c add comment/explanation to eia.py 2012-06-13 10:18:54 -04:00
ichuang
5031c838cc typo in correctmap 2012-06-12 13:52:34 -04:00
ichuang
a0e628f761 private methods start with _ (in capa_problem) 2012-06-12 13:50:57 -04:00
ichuang
4366529a6d capa_problem log.error + raise -> log.debug + # FIXME 2012-06-12 13:46:30 -04:00
ichuang
d68f0a3b32 util: tol.endswith 2012-06-12 13:43:14 -04:00
ichuang
2ffc8819e5 responsetypes - minor edits 2012-06-12 13:40:03 -04:00
ichuang
462823c317 fix correctmap set_dict bug - make __getitem__ call self.cmap.__getitem__ 2012-06-12 13:36:33 -04:00
ichuang
0edab5eeef revert logging instantiation to use 'mitx.' + __name__ 2012-06-12 13:27:49 -04:00
ichuang
9ae00c6732 removed unused answer_map parameter from capa_problem.lcp.preprocess_problem 2012-06-11 22:28:09 -04:00
ichuang
6bcb40b52f capa_problem and responsetypes pep8 and pyflakes 2012-06-10 22:27:40 -04:00
ichuang
6d444de05b fix capa_problems pep8 2012-06-10 22:20:56 -04:00
ichuang
855112f8e7 added StringResponse (with hints)
for hints, still to be done: numericalhint, optionhint
no default hint processing done yet (ie hintmode = on_request)
2012-06-10 21:59:29 -04:00
ichuang
f4a3c54481 fix xmodule/capa tests to use new CorrectMap 2012-06-10 21:05:21 -04:00
ichuang
2af525f19c fixes to schematicresponse to work with new CorrectMap 2012-06-10 20:52:10 -04:00
ichuang
989a74ba3f django pipeline working now (with new pip -e git+git...) 2012-06-10 20:05:33 -04:00
ichuang
5eda2f3a63 bugfixes - correctmap should reinit self.cmap on init 2012-06-10 18:41:54 -04:00
ichuang
5ac13e03aa fourth pass in capa cleanup:
- Added hints + hintmethod
  - hintgroup compatible with loncapa spec
  - also does hintfn for custom hints (can do answer history)
  - GenericResponse -> LoncapaResponse
  - moved response type tags into responsetype classes
  - capa_problem should use __future__ division
  - hints stored in CorrectMap, copied to 'feedback' in SimpleInput for display
2012-06-10 17:17:57 -04:00
ichuang
c724affe31 third pass in capa cleanup: correct_map -> CorrectMap
- added correctmap.py with CorrectMap class
  - messages subsumed into CorrectMap
  - response get_score called with old CorrectMap so hints based on history are possible
2012-06-09 23:29:08 -04:00
ichuang
7b3c79698f second pass in capa cleanup:
- each response can now render its own xhtml
  - cleaned up LoncapaProblem.extract_html
2012-06-09 21:29:11 -04:00
ichuang
7b3ad55307 responsetypes - fix comment 2012-06-09 18:36:27 -04:00