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

61 Commits

Author SHA1 Message Date
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
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
ichuang
a2e2b6e445 allow javascript in problem xml 2012-06-20 23:37:40 -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
748398fca1 for externalresponse - fallback to script code if <answer> code not provided 2012-06-17 22:36:39 -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
ichuang
46b45969d0 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-09 18:36:27 -04:00
ichuang
ae44d86e27 add msg to textinput_dynamath 2012-06-09 18:36:27 -04:00
Prem Sichanugrist
ac4f09ac4e Replace dynamite code with tested version 2012-06-08 11:16:03 -04:00
Prem Sichanugrist
c340ffe0a3 Fix code formatting 2012-06-08 10:40:25 -04:00
ichuang
9d0dfd2f02 fix dogfood wrt lms / xmodule reorg; fix textinput_dynamath call 2012-06-07 22:03:47 -04:00
Calen Pennington
af8155641b Move remaining capa templates from courseware into common module 2012-06-07 16:41:01 -04:00
Calen Pennington
f78be58141 Cleaning up pep8 issues, including extraneous imports 2012-06-07 16:41:01 -04:00
Calen Pennington
f2309b3112 Remove references to djangosettings from responsetypes.py 2012-06-07 16:41:01 -04:00
Calen Pennington
f2423ca15e Add a local system with a mako render function for testing problems 2012-06-07 16:39:56 -04:00
Calen Pennington
684be8d257 Move capa templates into the capa library 2012-06-07 16:39:56 -04:00
David Ormsbee
8643b72550 Change inaccurate comment. 2012-06-07 16:39:56 -04:00
David Ormsbee
46e108e15b remove assumption that LoncapaProblem.fileobject is actually a file on the filesystem 2012-06-07 16:39:55 -04:00