Commit Graph

372 Commits

Author SHA1 Message Date
Arjun Singh
6871326001 Adding information and an example for ChoiceResponse 2012-07-19 12:41:28 -07:00
Arjun Singh
85f5c93d92 Added MultipleChoiceResponse, TrueFalseResponse, and choicegroup back in. 2012-07-19 10:25:51 -07:00
Arjun Singh
a23c51e39c Merged two multiple-choice-like response types into a single response; created inputtypes for checkboxes and radio buttons adn cleaned up the code a bit. Fixed checkbox responses. 2012-07-19 10:25:51 -07:00
Arjun Singh
ab11a5f7ed Allowing for form fields to submit more than one value; e.g. checkbox inputs. 2012-07-19 10:25:51 -07:00
ichuang
77dfc2ade7 Merge pull request #224 from MITx/fix_optioninput
minor patch to fix optioninput; merging this in now, to unblock berkeley's changes to MC; passes my tests.
2012-07-19 10:16:02 -07:00
ichuang
b814e6a08d Merge pull request #221 from MITx/kimth/lms-coderesponse
CodeResponse restricted to only one answer field
2012-07-19 08:25:03 -07:00
ichuang
6ce2ab6025 fix for py2.6 compatbility 2012-07-19 11:19:42 -04:00
ichuang
0903ba9c1f fix optioninput to preserve author's ordering of options 2012-07-19 11:15:14 -04:00
kimth
ff4716ef76 Further simplification after restricting to one answer field 2012-07-19 10:57:14 -04:00
kimth
bff86c32ca CodeResponse restricted to only one answer field 2012-07-19 10:47:12 -04:00
Calen Pennington
49ee12963f Merge pull request #185 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
2012-07-19 06:29:48 -07:00
kimth
cc9f9a9df8 queuekey generated from LoncapaProblem seed + system time 2012-07-18 14:10:41 -04:00
kimth
84eb3efa8a Implemented 'initial_display' for CodeResponse 2012-07-18 11:08:17 -04:00
kimth
bb0601ff7a Further tests of CorrectMap in CodeResponse unit testing 2012-07-18 08:54:54 -04:00
Rocky Duan
7c480dd5b5 only enroll a given course once 2012-07-17 20:19:34 -04:00
kimth
1ddc3b560b Deep copy of CorrectMap was implied by code. Made it actually the case 2012-07-17 18:33:56 -04:00
kimth
15b42b68eb Unit tests for CodeResponse update_score 2012-07-17 18:20:03 -04:00
kimth
631517ccdd Queue callback consumes queuekey 2012-07-17 17:01:28 -04:00
Rocky Duan
ef2a8467e8 fix potential <script> tag escape bug 2012-07-17 17:00:36 -04:00
kimth
0b538fdac8 Fixed bug in answer prefetching in LoncapaProblem._preprocess_problem 2012-07-17 16:58:55 -04:00
kimth
d9432a15ba Drop immediate seed prior to queuekey generation 2012-07-17 15:26:40 -04:00
kimth
9b0e00efa2 Log both grading and queueing 2012-07-17 14:41:52 -04:00
Bridger Maxwell
2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start
Conflicts:
	common/djangoapps/student/views.py
2012-07-17 12:53:27 -04:00
Bridger Maxwell
615f11e27b Merge remote-tracking branch 'origin/master' into template_caching 2012-07-17 12:47:53 -04:00
Bridger Maxwell
938f0d1995 Changed check_course from a decorator to a regular function that throws exceptions. Much easier to understand now. 2012-07-17 11:12:42 -04:00
kimth
934b37c195 Remove json import from capa_problem -- needed for debug 2012-07-17 11:12:23 -04:00
David Ormsbee
28fc3ec18a Add overview.html, a simple one page place where course staff can control a course about page. 2012-07-17 10:54:21 -04:00
Bridger Maxwell
8ebaf8a761 Merge remote-tracking branch 'origin/master' into course_start
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/urls.py
2012-07-17 10:52:39 -04:00
kimth
269468ba6e CorrectMap.is_queued and .is_right_queuekey defaults to False if answer_id not found 2012-07-17 10:47:10 -04:00
kimth
0958485b46 update_score: edit existing CorrectMap rather than starting with empty CorrectMap 2012-07-17 10:31:21 -04:00
David Ormsbee
373db8704d Add number property to CourseDescriptor and switch templates to use it. 2012-07-17 08:22:15 -04:00
David Ormsbee
27ec1b4dcf Change course listing to show course numbers + title 2012-07-17 08:22:15 -04:00
David Ormsbee
d20eb07722 Allow UTF-8 chars in about sections. 2012-07-17 08:22:15 -04:00
Bridger Maxwell
36408a8d5a Removing lms/static/sass/application.css again. 2012-07-16 17:33:51 -04:00
Arjun Singh
8365c2fdad Merge branch 'master' into ccp0101/capa_pythonpath 2012-07-16 16:54:51 -04:00
Arjun Singh
0682401841 Allows for additional paths when executing code in a loncapa problem. Adds a default path of data/course/code. 2012-07-16 16:53:38 -04:00
kimth
093ac9d101 CorrectMap in LMS keeps track of problems as being queued 2012-07-16 16:19:35 -04:00
Bridger Maxwell
bde93aea99 Merge remote-tracking branch 'origin/master' into template_caching
Conflicts:
	lms/templates/footer.html
	lms/templates/signup_modal.html
2012-07-16 16:19:26 -04:00
Bridger Maxwell
70e2f7c0d5 Merged with master. Moved a bunch of static template files to their own urls (without /t/template). 2012-07-16 15:32:22 -04:00
Bridger Maxwell
960c8619e5 Added a cache_if_anonymous decorator. 2012-07-16 13:40:17 -04:00
Victor Shnayder
49576f9ddb address comments in pull #178 2012-07-16 13:34:05 -04:00
Bridger Maxwell
4f4e751321 Merge 2012-07-16 12:42:49 -04:00
kimth
838a8624c9 Add docstring to 'score_update' path 2012-07-16 11:28:26 -04:00
Bridger Maxwell
264e324c50 Changed format of start date parsing to ISO 8601 2012-07-16 11:27:13 -04:00
Mike Chen
412a907a8a allow additional (python) path for scripts in capa problem. 2012-07-16 23:16:39 +08:00
Calen Pennington
fabe1d41d1 Merge pull request #180 from MITx/kimth/lms-coderesponse
CodeResponse for external/queued grading of student code
2012-07-16 07:55:54 -07:00
Bridger Maxwell
eb7ae3540c Added a simple, specific cache for the static_template_pages. 2012-07-16 09:12:50 -04:00
Bridger Maxwell
cd2eacc675 Moved static template views to one folder. Removed the stub view functions from student and used static_template_views instead. 2012-07-13 17:42:23 -04:00
kimth
e7c25c9999 Remove reset button being on all the time (for debug) 2012-07-13 13:57:29 -04:00
kimth
6d3516a754 CodeResponse for queued code checking 2012-07-13 13:45:38 -04:00