Commit Graph

3313 Commits

Author SHA1 Message Date
Calen Pennington
66ca31947a Remove semantically meaningless sections from course.xml by moving their attributes onto the contained element. If there is more than one contained element, turn the section into a sequence. Also handles includes 2012-06-26 14:10:15 -04:00
Calen Pennington
f0cf323488 Handle chapters as sequence modules 2012-06-26 12:15:03 -04:00
Calen Pennington
e9a00ffc5a Parse XModuleDescriptors on import using from_xml
Also:
Render all XModuleDescriptors in the cms the same way
Default them to editing raw xml, if there is no specific module for them
2012-06-26 11:56:21 -04:00
ichuang
9cea3f971f improved error handling - catch errors around lcp.get_html() 2012-06-24 12:40:56 -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
David Ormsbee
f041fc4a0b Merge pull request #135 from MITx/cpennington/cms-editing
Roundtrip HTML module editing working in the CMS
2012-06-22 10:06:51 -07:00
Calen Pennington
ced9136973 Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing 2012-06-22 11:40:19 -04:00
Calen Pennington
72eef72d8b Html Module can now be editing, saved, and re-opened 2012-06-22 10:58:18 -04:00
Calen Pennington
5bef1e14b2 Split problem metadata out from problem editing contents when rendering 2012-06-22 09:21:09 -04:00
Calen Pennington
17a4d7fd09 Call js module name dynamically, rather than statically calling the HTML module 2012-06-22 08:59:53 -04:00
Calen Pennington
69290c18c3 Live editing of html modules implemented, but no saving to the backend 2012-06-21 15:33:52 -04:00
Victor Shnayder
cf2c5cba4f bugfix: lcp score can apparently be 0/0 2012-06-21 10:59:48 -04:00
Victor Shnayder
a47459512d Progress tracking cleanup.
* use clearer names for the two status strings passed to js
* add functions to do canonical conversion of progress to js string
* fix updating bug in sequence.coffee
* add some todo comments and other docs to make future expansion easier
2012-06-21 10:59:48 -04:00
Victor Shnayder
13f24f4b02 Add scaffolding comments for progress tracking in video modules. 2012-06-21 10:59:47 -04:00
Victor Shnayder
cc8ebf3b08 minor edits to address Calen's comments. 2012-06-21 10:59:47 -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
Victor Shnayder
fd48e49ae5 Add Progress class and tests 2012-06-21 10:59:47 -04:00
Calen Pennington
82898978fa Cleanup intertwined descriptor and keystore code 2012-06-21 10:59:46 -04:00
Piotr Mitros
8516d631dc Courseware can have same random seed in multiple problems for exam. Slight hack. 2012-06-21 10:59:43 -04:00
Calen Pennington
da71515bfa Add categories and XModuleDescriptors for all module types that are used at the top level of a course 2012-06-21 10:59:43 -04:00
Calen Pennington
bb2910fce5 Read week headings from mongodb 2012-06-21 10:59:43 -04:00
Victor Shnayder
807256f05f added TODO comment 2012-06-21 10:59:40 -04:00
ichuang
d858fc0933 remove loncapa import in formularesponse_with_hint test (jenkins
import path not consistent with dev machines?)
2012-06-21 10:59:38 -04:00
ichuang
ede4ae08b9 added stringresponse_with_hint test 2012-06-21 10:59:38 -04:00
ichuang
77d38da927 add FormulaResponseWithHintTest test 2012-06-21 10:59:37 -04:00
ichuang
436794741b SymbolicResponseTest works if snuggletex war running ; back to skipping it for now 2012-06-21 10:59:37 -04:00
ichuang
6f3143528f fix i4xs in tests.py; move symbolicresponse.xml test back to where it should be 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
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
Victor Shnayder
95806847d0 bugfix: lcp score can apparently be 0/0 2012-06-20 17:20:34 -04:00
Victor Shnayder
5e7535fbfb Progress tracking cleanup.
* use clearer names for the two status strings passed to js
* add functions to do canonical conversion of progress to js string
* fix updating bug in sequence.coffee
* add some todo comments and other docs to make future expansion easier
2012-06-20 16:04:03 -04:00
Victor Shnayder
e5a791e031 Add scaffolding comments for progress tracking in video modules. 2012-06-20 16:04:03 -04:00
Calen Pennington
1b7b7e91e4 Merge branch 'master' into cpennington/cms-editing 2012-06-20 15:07:15 -04:00
Calen Pennington
1853b99861 Work in progress editing. Committing to allow kfiedler to work in parallel 2012-06-20 11:14:25 -04:00
Calen Pennington
c317521468 Merge pull request #126 from MITx/victor/progress-tracking
Victor/progress tracking
2012-06-20 07:33:48 -07:00
Victor Shnayder
e872f31835 minor edits to address Calen's comments. 2012-06-20 10:31:37 -04: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
Victor Shnayder
a126935369 Add Progress class and tests 2012-06-19 18:25:13 -04:00
Calen Pennington
6fb35c4773 Cleanup intertwined descriptor and keystore code 2012-06-19 11:31:13 -04:00
Calen Pennington
ef6630d733 Merge pull request #120 from MITx/cpennington/cms
CMS Beginnings
2012-06-18 13:01:39 -07:00
Calen Pennington
34a696cdf6 Merge branch 'master' into cpennington/cms
Conflicts:
	rakefile
	requirements.txt
2012-06-18 13:46:33 -04:00
Piotr Mitros
f391e9c51c Courseware can have same random seed in multiple problems for exam. Slight hack. 2012-06-18 12:10:44 -04:00
Calen Pennington
e67dfb70e4 Add categories and XModuleDescriptors for all module types that are used at the top level of a course 2012-06-18 11:22:36 -04:00
Calen Pennington
fe45de3833 Read week headings from mongodb 2012-06-18 11:20:57 -04:00
Victor Shnayder
a3561c96f7 added TODO comment 2012-06-13 10:18:53 -04:00
ichuang
17ca0e793c remove loncapa import in formularesponse_with_hint test (jenkins
import path not consistent with dev machines?)
2012-06-10 22:39:16 -04:00
ichuang
4f6d9143c0 added stringresponse_with_hint test 2012-06-10 22:06:13 -04:00
ichuang
b48b33e65e add FormulaResponseWithHintTest test 2012-06-10 21:27:11 -04:00
ichuang
a7d0f8322d SymbolicResponseTest works if snuggletex war running ; back to skipping it for now 2012-06-10 21:11:43 -04:00
ichuang
fdc4a14cf0 fix i4xs in tests.py; move symbolicresponse.xml test back to where it should be 2012-06-10 21:11:04 -04:00