Commit Graph

510 Commits

Author SHA1 Message Date
Diana Huang
bb867ba3b4 Use the new CombinedOpenEndedRubric class for everything
related to rubric rendering. Remove the old input type.
2013-01-14 14:46:44 -05:00
Diana Huang
ae65bb0332 Merge branch 'master' into feature/diana/rubric-input
Conflicts:
	common/lib/capa/capa/inputtypes.py
2013-01-14 13:40:45 -05:00
Diana Huang
cc4095807f Handle scores if they exist in the xml 2013-01-14 13:38:44 -05:00
Vik Paruchuri
ad1e73fa86 Clean up capa by removing message post actions that aren't needed 2013-01-14 13:12:38 -05:00
Diana Huang
90c39d51ee Fix wrong order in the text 2013-01-14 10:39:20 -05:00
Diana Huang
1680336da6 Fix some minor bugs in the staff grading interface 2013-01-14 10:22:22 -05:00
Diana Huang
f3e8d01e08 Pull out old rubric and score selection logic
and set up the new rubric
2013-01-11 17:29:39 -05:00
Vik Paruchuri
b0d3bcc516 Fix feedback response for peer grading so that students can respond to multiple feedback items 2013-01-10 19:00:04 -05:00
Vik Paruchuri
38a81b461f Remove open ended grading stuff, fix JS variable 2013-01-10 19:00:03 -05:00
Vik Paruchuri
9d3f8ed0e5 Support open ended in combined open ended module 2013-01-10 18:59:58 -05:00
Vik Paruchuri
54c763d8c4 set up template for open ended xmodule 2013-01-10 18:59:58 -05:00
Diana Huang
6bebb1b7a5 Merge branch 'master' into feature/diana/rubric-input 2013-01-09 15:45:22 -05:00
Diana Huang
e88fbd26e3 Merge branch 'master' into feature/diana/rubric-input 2013-01-04 14:12:18 -05:00
ichuang
c555bf5a8d fix capa to add contextualize_text for optionresponse and multiplechoice 2013-01-03 22:57:24 -05:00
Vik Paruchuri
b01666f6d6 Fix error messages 2013-01-03 11:52:35 -05:00
Vik Paruchuri
5567477c67 Pass through initial display and answer 2013-01-03 11:52:35 -05:00
Vik Paruchuri
0c3eb67d5c More descriptive error message 2013-01-03 11:52:35 -05:00
Vik Paruchuri
cce6b70103 Fixes to log entire state on errors, format feedback better 2013-01-03 11:52:05 -05:00
Vik Paruchuri
68f0f7e0a8 Handle unicode feedback 2013-01-03 11:50:57 -05:00
Vik Paruchuri
a4eb76017b Display max score as well as score 2013-01-03 11:50:57 -05:00
Vik Paruchuri
9559c7b426 Patch "correct" answer display 2013-01-03 11:50:57 -05:00
Vik Paruchuri
37af39ef8d Change names 2013-01-03 11:50:57 -05:00
Vik Paruchuri
2c469cad75 Wire in submit message 2013-01-03 11:49:01 -05:00
Vik Paruchuri
1ac75b9420 Add in message passing pipeline 2013-01-03 11:47:41 -05:00
Diana Huang
09ed3d12a2 Hook up the backend into the new feedback response for scores 2013-01-03 11:40:41 -05:00
Diana Huang
8f4efb0456 Hook up new radio buttons to the Javascript 2013-01-03 11:40:41 -05:00
Diana Huang
69ae1cc268 Clean up the styling and make the evaluation parts collapsible. 2013-01-03 11:40:41 -05:00
Diana Huang
54c541de45 Fix up the feedback-on-feedback styling and add radio button score selection. 2013-01-03 11:40:41 -05:00
Vik Paruchuri
fa97187a31 Patch naming issue 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b06ce84afd Wire in submit message 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b71233fd50 Add in message passing pipeline 2013-01-03 11:40:41 -05:00
Vik Paruchuri
ce3b84d0e5 Message passing in lms 2013-01-03 11:40:41 -05:00
Vik Paruchuri
b782f712b9 Add in more js to handle student feedback 2013-01-03 11:40:41 -05:00
Vik Paruchuri
634b586085 Integrate new ajax action 2013-01-03 11:40:41 -05:00
Vik Paruchuri
d663d23257 Work on adding in a new ajax post type 2013-01-03 11:40:41 -05:00
Diana Huang
11d5eea2b9 Add in CSS updates and fixes to the template so that it will work. 2012-12-19 11:52:37 -05:00
Diana Huang
8a0dae01f0 Add in some sorting and validation of the options list 2012-12-18 14:32:10 -05:00
Diana Huang
dfe438dc73 Initial work on the rubric input type including the most basic parsing
without error handling
2012-12-18 13:02:17 -05:00
Jay Zoldak
cc54c37359 Exclude settings.py files from coverage reports and configure titles for the reports. 2012-12-17 15:00:11 -05:00
Diana Huang
3b805fac1a Merge pull request #1123 from MITx/bugfix/victor/open-ended-parsing
Fix for issues in open ended parsing
2012-12-11 10:24:53 -08:00
Vik Paruchuri
b4fffc798c Fix for issues in open ended parsing 2012-12-11 13:14:34 -05:00
Victor Shnayder
df578de11f Merge pull request #1119 from MITx/diana/open-ended-response-styling
Updates to the styling of open ended problems
2012-12-10 11:36:04 -08:00
Vik Paruchuri
ab84042435 Fix raised error 2012-12-10 14:24:00 -05:00
Diana Huang
7279d11cf2 Add a reload button to open-ended input problems 2012-12-10 14:16:00 -05:00
Victor Shnayder
ed1f4bdd85 Check for none. 2012-12-10 14:10:19 -05:00
Diana Huang
cc72870aac Make oepn-ended responses and self-assessment answers use
the same CSS
2012-12-10 11:00:28 -05:00
David Ormsbee
7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading
Feature/victor/instructor grading
2012-12-07 08:44:58 -08:00
Victor Shnayder
7190e484f1 Use a namedtuple for parsing ScoreMessages 2012-12-07 10:35:44 -05:00
Victor Shnayder
bf593c6603 clean up imports 2012-12-07 10:35:44 -05:00
Victor Shnayder
42f8afb083 address minor code review comments 2012-12-07 10:35:44 -05:00