Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
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
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
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
Calen Pennington
65d02819e8 Merge pull request #124 from MITx/cpennington/cms-pipeline 
Switch cms over to django pipeline
 2012-06-20 05:35:49 -07:00
Calen Pennington
ed6a658afe Add note about optional revision in location 2012-06-20 08:33:46 -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
e865b97269 Rename test directory for consistancy 2012-06-19 14:30:19 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 2012-06-19 14:30:19 -04:00
Calen Pennington
282372736d Add comment about None in Locations 2012-06-19 14:24:14 -04:00
Calen Pennington
47bf71ae10 Remove extra word in doc string 2012-06-19 14:17:05 -04:00
Calen Pennington
7914baccaa Change name of XModuleSystem to DescriptorSystem at usage sites 2012-06-19 11:36:22 -04:00
Calen Pennington
6fb35c4773 Cleanup intertwined descriptor and keystore code 2012-06-19 11:31:13 -04:00
Calen Pennington
5562def5b7 Add documentation of mongo query syntax usage 2012-06-19 11:29:48 -04:00
Calen Pennington
677c25ee68 Remove unused code 2012-06-19 11:29:14 -04:00
Calen Pennington
f1ffff1dc0 Cleanup and test Location, and add the ability to specify a revision 2012-06-19 11:29: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
f8434b3a6d Move libraries that can only be imported in the context of django into common/djangoapps 2012-06-18 13:48:26 -04:00
Calen Pennington
34a696cdf6 Merge branch 'master' into cpennington/cms 
Conflicts:
	rakefile
	requirements.txt
 2012-06-18 13:46:33 -04:00
Calen Pennington
79e81d69b4 Delay initializition of the MongoKeyStore until required 2012-06-18 13:41:53 -04:00
Calen Pennington
5404345b1f Make tests pass when running on cms 2012-06-18 13:21:06 -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
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
Victor Shnayder
a3561c96f7 added TODO comment 2012-06-13 10:18:53 -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
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
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
4f6d9143c0 added stringresponse_with_hint test 2012-06-10 22:06:13 -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
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
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