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

558 Commits

Author SHA1 Message Date
Bridger Maxwell
a9d67c3e8d Added has_score attribute to xmodule, for problem-like xmodules. 2012-08-07 15:20:47 -04:00
Bridger Maxwell
98d4d44e45 Fixed test from previous commit. 2012-08-07 14:49:00 -04:00
Bridger Maxwell
735488fa51 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 2012-08-07 14:40:37 -04:00
Bridger Maxwell
638a5059da Added stores_state attribute for xmoduledescriptors as a way to declare if the module stores state in the database. 2012-08-07 14:34:05 -04:00
Bridger Maxwell
f872e41d1d Added descriptor to xmodule init. Now xmodules have pointer to their descriptor. 2012-08-07 13:43:30 -04:00
thomasxiii
258b9eb530 Merge pull request #349 from MITx/feature/kfiedler/courseware-style 
A bunch of various fixes and de-styling
 2012-08-07 10:20:10 -07:00
kimth
05646fbed7 Provide default xqueue in ModuleSystem 2012-08-07 11:54:09 -04:00
kimth
a9a19f40c3 Merge master 2012-08-07 11:51:44 -04:00
kimth
501f2ccf14 CodeResponse uses 'is_file' helper function 2012-08-07 11:30:21 -04:00
kimth
f6202e5631 Tests provide xqueue params, rather than ModuleSystem.__init__ 2012-08-07 11:16:48 -04:00
Victor Shnayder
b4e400ba56 Make tests pass again again 
* Move lazyproperty decorator into xmodule so it's accessible during tests
* add default xqueue to test system
 2012-08-07 11:08:56 -04:00
Victor Shnayder
932a9be747 Make tests pass again 
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
 2012-08-07 11:06:47 -04:00
Victor Shnayder
55edb1ef32 always export metadata in alphabetical order 2012-08-07 11:06:47 -04:00
Victor Shnayder
47b9441af5 a few pep8 cleanups 2012-08-07 11:06:47 -04:00
Victor Shnayder
5523c2883e Generate error module url_names using sha1 
* means we get the same url_name on each import of the same data.
 2012-08-07 11:06:47 -04:00
Victor Shnayder
ecf432ad78 Make the simple course pass roundtrip test: 
- add 'type' and 'points' to capa_module metadata
- replace old 'title' tag with display_name
 2012-08-07 11:06:47 -04:00
Victor Shnayder
79e0bc25f8 Make url_names on error descriptors unique 2012-08-07 11:06:47 -04:00
Victor Shnayder
e6e290f525 Make initial import-export tests pass. 
TODO:
* need unique slugs for errors so they don't overwrite each other on export.
  - try to preserve origin slug.  If not possible, generate random one.

* figure out what metadata to strip.  e.g.
 ({'data': '<problem><p><h1>Finger Exercise 1...'},
    {'data': '<problem points="1" type="lecture"><p><h1>Finger Exercise 1...'},
    False)
  - where did points and type come from?  Do we want them there?


* separate broken and non-broken test courses
 2012-08-07 11:06:47 -04:00
Victor Shnayder
b091dcabe0 metadata and file format cleanups 
* course.xml is special--has org and course attributes in addition to url_name
* strip data_dir from metadata on export
* more asserts
* work on roundtrip import-export test
 2012-08-07 11:06:47 -04:00
Victor Shnayder
6ed9052755 minor cleanups 2012-08-07 11:06:46 -04:00
Victor Shnayder
b285f50d92 Make unknown metadata persist accross import-export 
* +improve test.
 2012-08-07 11:06:46 -04:00
Victor Shnayder
d09e2261f3 New file structure--everything in own file 
* needed for CMS performance (can now save just an item, not whole tree)
* remove split_to_file methods
* simplified AttrMap logic
* write each descriptor to a separate file
* detect format on import and adjust appropriately.
* update tests
 2012-08-07 11:06:46 -04:00
ichuang
ca177570fa Merge pull request #356 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-07 07:56:23 -07:00
ichuang
4c25baee43 Merge pull request #355 from MITx/arjun/choicegroup_text 
Removing the <text> wrapper around choice text for radiogroup and checkboxgroup
 2012-08-07 07:55:01 -07:00
kimth
cb2fbfa54c Added test for answers file-to-filename conversion 2012-08-07 09:38:36 -04:00
kimth
ceeea66417 Fix overrzealous file_to_filename conversion and fix CapaProblem unit tests 2012-08-07 09:24:17 -04:00
Calen Pennington
e14ebaafc3 Merge pull request #345 from MITx/MITx/feature/bridger/fast_course_grading 
Fast grading
 2012-08-07 05:39:18 -07:00
Bridger Maxwell
3a52e86a87 Fixed weighting of individual problems. Unmodified problems have weight None, not 1. 2012-08-07 08:00:06 -04:00
Bridger Maxwell
8287e5a13f Fixed grading bug where list comprehension variable overrode local variable. 2012-08-07 07:33:35 -04:00
Arjun Singh
19fa50a882 Removing the <text> wrapper around choice text for radiogroup and checkboxgroup. 2012-08-07 02:38:23 -04:00
Arjun Singh
323fb18c74 Poor fix for a breaking change in which student answers that were arrays (e.g. those resulting from a checkbox group) would be converted to strings and graded incorrectly. 2012-08-07 00:14:48 -04:00
Arjun Singh
96746721c4 Fixed incorrect default argument so that tests run; however the new value is incorrect and needs to be fixed. 2012-08-07 00:11:39 -04:00
kimth
d3f4746f57 Don't contact queueing server on Django load 2012-08-06 19:02:40 -04:00
Bridger Maxwell
69ba80bf63 Merge branch 'master' into MITx/feature/bridger/fast_course_grading 2012-08-06 18:51:59 -04:00
kimth
18a7f58735 Handle xreply parsing errors more gracefully 2012-08-06 17:44:07 -04:00
kimth
b6e9e7a4bb Handle network errors more gracefully 2012-08-06 17:36:38 -04:00
kimth
ae11f91880 Queue submission reports queue length 2012-08-06 16:56:44 -04:00
Kyle Fiedler
99c3a7996a Fix color of speed dropdown 2012-08-06 16:49:29 -04:00
Bridger Maxwell
4fedca5bf9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
 2012-08-06 16:49:05 -04:00
kimth
00486819c2 Make CodeMirror more pleasant for 6.00 2012-08-06 16:47:24 -04:00
Bridger Maxwell
baa2b14405 Changed interface of StudentModuleCache. Other changes from code review. 2012-08-06 16:36:53 -04:00
kimth
c2e351523f Update ModuleSystem 2012-08-06 16:28:15 -04:00
kimth
4e6808bb47 Merge master 2012-08-06 16:26:25 -04:00
kimth
41e7d72ea8 Xqueue interface is embedded in ModuleSystem 2012-08-06 16:13:35 -04:00
kimth
7cc502c886 Refactor list of inputs in ajax 2012-08-06 15:44:27 -04:00
Calen Pennington
24f85bf202 Merge pull request #340 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-06 12:17:15 -07:00
kimth
110637c023 XqueueInterface is a singleton instantiated object 2012-08-06 15:06:19 -04:00
Bridger Maxwell
d7cab471f2 Accidentally had left a print statement commented out. 2012-08-06 14:00:45 -04:00
ichuang
a46a37d1c0 log.debug -> log.exception; revert log change in xml_module 2012-08-06 13:58:42 -04:00
Bridger Maxwell
ba42c0225d Moved the generation of the 'grading context' to a lazy property in course descriptor. 2012-08-06 13:57:41 -04:00