Commit Graph

30 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
Calen Pennington
6612beab46 Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again 2012-07-02 11:15:37 -04:00
Calen Pennington
79987666df Lazily load module definition and metadata as needed, rather than immediately 2012-07-02 10:50:27 -04:00
Calen Pennington
3cf29af8fe Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content 2012-07-02 10:17:59 -04:00
Calen Pennington
7ac8fecb38 Rename XModule[Descriptor].type to .category to be parallel to Location 2012-07-02 09:01:08 -04:00
Calen Pennington
87d80835c0 Initialize StudentModule with the max_score 2012-06-29 12:45:46 -04:00
Calen Pennington
f25478b3d4 Consolidate access to metadata, and allow some of it to be inherited between modules 2012-06-29 12:45:46 -04:00
Calen Pennington
3a26b98027 Remove errant print line left over from debugging 2012-06-29 12:45:18 -04:00
Calen Pennington
3fdae56a27 Remove dead code 2012-06-29 12:45:18 -04:00
Calen Pennington
d7ee03874d Make staff histograms work again 2012-06-29 12:45:18 -04:00
Calen Pennington
23195e9d76 Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken 2012-06-29 12:45:17 -04:00
Calen Pennington
7d16dbbcb4 Clean up module_render.py 2012-06-29 12:42:48 -04:00
Calen Pennington
2011861444 Get capa problems to display from a keystore 2012-06-29 12:42:48 -04:00
Calen Pennington
de07b8b345 Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js 2012-06-29 12:40:50 -04:00
ichuang
b59b80871a add edit link to module pages with filenames (html & problem)
uses new 'github_url' dict key in multicourse_settings
this replaces the previous "quickedit" functionality
2012-06-24 14:46:02 -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
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
Calen Pennington
51cd7566a0 Merge pull request #119 from MITx/victor/render-path-cleanup
put lambda function back in, as requested during code review
2012-06-18 10:21:41 -07:00
Victor Shnayder
7e73f0ede0 put lambda function back in, as requested during code review 2012-06-18 13:12:47 -04:00
Calen Pennington
4ce08cc358 Merge pull request #118 from MITx/victor/render-path-cleanup
Small cleanups in response to Calen + Piotr's comments
2012-06-18 09:12:55 -07: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
Victor Shnayder
96cbb3d33b Small cleanups in response to Calen + Piotr's comments 2012-06-18 12:04:10 -04:00
Victor Shnayder
e061e86424 Clean and refactor courseware/views.py and module_render.py
* Refactor index() so that it makes sense to me and hopefully others :)
* Rename preloaded cache of student modules to student_module_cache
* Fix line length and whitespace throughout
* add docstrings and other comments
* a few behavior-preserving tweaks to the code to make it clearer.
* Separate codepaths for with-module and without-module in index view
* Remove default chapter + section, since they don't exist anyway in course.xml
2012-06-15 18:29:04 -04:00
Victor Shnayder
c3a1d7788c clarify docstring for modx_dispatch 2012-06-13 10:18:54 -04:00
Victor Shnayder
17af925a8a add function docs to module_render.py 2012-06-13 10:18:54 -04:00
ichuang
6f14acee9e add MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] flag to settings 2012-06-10 22:34:30 -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
Calen Pennington
4a0969df9d Move tests for xmodules into the xmodule library, and make them run without django 2012-06-07 10:46:10 -04:00
Calen Pennington
91b306b35a Moving capa and xmodule out of djangoapps/courseware, and removing django references from them 2012-06-06 14:15:32 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00