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

52 Commits

Author SHA1 Message Date
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
51a790173f Only set the default etree parser options in the module that is starting the xml parsing 2012-07-02 10:35:40 -04:00
Calen Pennington
b5cd01841c Merge remote-tracking branch 'origin/master' into cpennington/lms-descriptors 
Conflicts:
	lms/djangoapps/courseware/grades.py
 2012-07-02 10:31:26 -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
2a9eba3886 Removing content_parser 2012-06-29 12:45:46 -04:00
Calen Pennington
c7f95695c5 Fix check_course command 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
c837cf797d Remove some unused code from content_parser 2012-06-29 12:45:18 -04:00
Calen Pennington
506c281bcc Make gradesheet work again 2012-06-29 12:45:18 -04:00
Calen Pennington
35af8101d7 Make grade graph on profile work correctly 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
Bridger Maxwell
cbe5c612b4 Used dictionary update for cleaner course settings code. 2012-06-28 14:04:50 -04:00
Bridger Maxwell
201f093981 Removed old import. 2012-06-28 12:34:45 -04:00
Bridger Maxwell
621680e340 Removed old global course settings file. 2012-06-28 12:31:29 -04:00
Bridger Maxwell
51d6b3f096 Changed course settings to be a json file. Moved it to its own file. 2012-06-28 12:04:03 -04:00
Calen Pennington
2fde7f4c6d Minor fixes from pull request 131 2012-06-28 08:39:12 -04:00
Bridger Maxwell
bf4f946f0d Put in a fix for the Profile page (a bug was showing up for new users). A basecamp discussion will be started on the issue. 2012-06-27 14:47:16 -04:00
Victor Shnayder
0f52b31ac1 Make the LMS check_course command work again. 2012-06-21 15:23:47 -04:00
Victor Shnayder
da204cf5d8 Started update of check_course script. It runs again now. 
TODO:
  - support picking a different course name
  - make it use current module rendering path, get that working.
 2012-06-21 11:48:19 -04:00
Victor Shnayder
98d513ac80 bugfix and added comments 
* wasn't passing namespace properly in parse_course_file
 2012-06-21 11:45:49 -04:00
Victor Shnayder
63b3999ef1 Big refactor of content_parser 
* Separate out all xml processing code from django code
* Preparing to move the content parsing parts into common/lib/xmodule (?)
 2012-06-20 19:16:55 -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
b24c4d4626 Fix render of lms index with no chapter or section. 2012-06-20 11:31:21 -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
Calen Pennington
7710e7a6a4 Merge pull request #125 from MITx/victor/fix_accordion 
Fix accordion rendering bug
 2012-06-20 05:36:41 -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
Victor Shnayder
39c57af849 remove obsolete comment 2012-06-19 16:37:33 -04:00
Victor Shnayder
a6fc27acd6 Fix accordion rendering bug 
* needed to clean the chapter and section vars before rendering
 2012-06-19 16:19: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
8728b417f1 Make truefalse test point to the correct test file 2012-06-06 14:25:23 -04:00
Calen Pennington
97a9a66c52 Move CAPA problem specific xml parsing utilities out of content_parser into xmodule 2012-06-06 14:15:33 -04:00