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 |
|
Vik Paruchuri
|
3e0cf9d234
|
Make rubric render more nicely
|
2013-01-14 11:53:23 -05:00 |
|
Vik Paruchuri
|
59e5b494a9
|
Proper rubric rendering for self assessment
|
2013-01-14 10:51:17 -05:00 |
|
Vik Paruchuri
|
2b4929562a
|
Fix up rubric rendering
|
2013-01-14 10:39:58 -05:00 |
|
Diana Huang
|
90c39d51ee
|
Fix wrong order in the text
|
2013-01-14 10:39:20 -05:00 |
|
Vik Paruchuri
|
0567e8f0aa
|
Factor out rubric rendering
|
2013-01-14 10:35:53 -05:00 |
|
Diana Huang
|
1680336da6
|
Fix some minor bugs in the staff grading interface
|
2013-01-14 10:22:22 -05:00 |
|
Vik Paruchuri
|
c7339ee664
|
Minor bug fix
|
2013-01-14 10:16:57 -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
|
7d0bb7b3fe
|
Minor string to boolean fix
|
2013-01-11 16:02:09 -05:00 |
|
Vik Paruchuri
|
682ac3455b
|
Address some comments from code review, fix rubric display
|
2013-01-11 15:51:37 -05:00 |
|
Vik Paruchuri
|
9a752f51c7
|
Fix rubric return, add in score field
|
2013-01-11 12:48:15 -05:00 |
|
Vik Paruchuri
|
7febe2c2c8
|
Integrate minimal rubric display
|
2013-01-11 12:43:57 -05:00 |
|
Vik Paruchuri
|
1dca370a7f
|
Better initial documentation of combined open ended
|
2013-01-11 09:50:43 -05:00 |
|
Vik Paruchuri
|
bcbf65e2b9
|
Code reformat, line length fix, change text names to variables
|
2013-01-11 09:45:10 -05:00 |
|
Diana Huang
|
5a211f566d
|
Make the rubric smaller so that we can accomodate more columns.
|
2013-01-11 09:31:38 -05:00 |
|
Vik Paruchuri
|
8dbbb021a7
|
Change value passing to hidden input type
|
2013-01-10 19:00:04 -05:00 |
|
Vik Paruchuri
|
c76786ae4e
|
Roll back hidden input changes
|
2013-01-10 19:00:04 -05:00 |
|
Vik Paruchuri
|
ee2990da4f
|
Change hidden div to input name
|
2013-01-10 19:00:04 -05:00 |
|
Vik Paruchuri
|
e4568c3a20
|
Use include clearfix in css
|
2013-01-10 19:00:04 -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
|
f4968e1e8e
|
Fix spacing error
|
2013-01-10 19:00:04 -05:00 |
|
Vik Paruchuri
|
cb203a6f55
|
Better error messages
|
2013-01-10 19:00:04 -05:00 |
|
Vik Paruchuri
|
62e9387095
|
Fix score passing from controller
|
2013-01-10 19:00:04 -05:00 |
|
Vik Paruchuri
|
742d9475c7
|
Parse int from score
|
2013-01-10 19:00:04 -05:00 |
|
Vik Paruchuri
|
c4b1c8d074
|
Correct peer grading score parsing
|
2013-01-10 19:00:04 -05:00 |
|
Vik Paruchuri
|
c267efb400
|
Add in a comment
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
5a3a537c1b
|
Support formatting of peer grading feedback
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
4a2875ccdd
|
Document open ended child
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
f858dce753
|
Document self assessment
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
5303086a10
|
Start commenting open ended module
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
134c3f3db0
|
Document open ended descriptor
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
2f841c8a33
|
Document combined open ended module
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
38a81b461f
|
Remove open ended grading stuff, fix JS variable
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
bc97a507e0
|
Next step logic
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
adcbfbb603
|
Fix reset
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
b13f94798f
|
Add in allow reset action
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
1ae94ce636
|
Hopefully allow for submission to be reset early
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
b6a49f33ad
|
parse out min and max score to advance
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
dcb33f1d5f
|
Fix prompt and rubric passing
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
3aa0daaa76
|
Add in proper prompt and rubric parsing
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
9e14e22c91
|
Move prompt and rubric to combined open ended instead of defining them in each task
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
3bf532e199
|
Check marks in each step
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
5150d6cdee
|
Add in better status indicators
|
2013-01-10 19:00:03 -05:00 |
|
Vik Paruchuri
|
bccafe6c31
|
Add in correctness display
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
7b08114805
|
More restyling, fix buttons
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
943c0ff820
|
Display results separately from submission logic
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
3620fd93d9
|
Create a result container and put results into it
|
2013-01-10 19:00:02 -05:00 |
|