Vik Paruchuri
|
be3d8cbb86
|
Fix small issue with graded callback
|
2013-01-14 18:00:53 -05:00 |
|
Vik Paruchuri
|
78a94a4e20
|
Fix naming bug
|
2013-01-14 17:50:20 -05:00 |
|
Vik Paruchuri
|
6f9c0a7d72
|
Minor fix for when grade is ready to submit
|
2013-01-14 17:47:44 -05:00 |
|
Vik Paruchuri
|
e748d59d78
|
Bug fixes
|
2013-01-14 17:42:21 -05:00 |
|
Vik Paruchuri
|
e5c6414d39
|
Adding score selection back into staff grading view
|
2013-01-14 17:35:41 -05:00 |
|
Vik Paruchuri
|
50f951d9df
|
Bug fixes
|
2013-01-14 17:14:55 -05:00 |
|
Vik Paruchuri
|
6427a7dac5
|
Rubric html change
|
2013-01-14 16:03:53 -05:00 |
|
Vik Paruchuri
|
f5600c2b8a
|
Make things more robust, ensure that a rubric is specified properly before combined open ended module will render
|
2013-01-14 15:42:38 -05:00 |
|
Diana Huang
|
79c8efcb68
|
Update the rubric renderer
|
2013-01-14 15:02:24 -05:00 |
|
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 |
|
VikParuchuri
|
a64111a6e7
|
Merge pull request #1242 from MITx/feature/vik/integrate-sa-and-oe
Feature/vik/integrate sa and oe
|
2013-01-14 10:06:43 -08:00 |
|
Vik Paruchuri
|
1316728aaa
|
Minor naming fix
|
2013-01-14 12:32:31 -05:00 |
|
Vik Paruchuri
|
0e11deffcf
|
Fix staff and peer grading settings to not fail catastrophically
|
2013-01-14 12:31:50 -05:00 |
|
Vik Paruchuri
|
a64806656a
|
Integrate rubric into self assessment
|
2013-01-14 12:20:27 -05:00 |
|
Vik Paruchuri
|
16f06ae7b7
|
Fix some minor html
|
2013-01-14 11:57:09 -05:00 |
|
Vik Paruchuri
|
3e0cf9d234
|
Make rubric render more nicely
|
2013-01-14 11:53:23 -05:00 |
|
Vik Paruchuri
|
2b4929562a
|
Fix up rubric rendering
|
2013-01-14 10:39:58 -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 |
|
Diana Huang
|
a0c0005e95
|
Updates to the javascript and the grading controller
to handle rubric input
|
2013-01-14 08:58:33 -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
|
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
|
52164f58ff
|
Fix self.get call in peer grading service
|
2013-01-11 11:39:32 -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
|
af705ca1af
|
Remove html
|
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 |
|
Vik Paruchuri
|
24bfe44049
|
Some restyling, automatically check for feedback, remove reload button
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
5273d44788
|
Fix css and display current step
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
a3c1f7c9f4
|
Feedback submission moved
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
f70434970e
|
Make everything look a bit nicer
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
9788535416
|
Get rid of open ended message
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
5b0181c925
|
Status moved to the right
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
9a4ee350d7
|
JS tweaks, move feedback into its own template
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
e46ecdb6e2
|
Move skip button
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
8d80fcfb86
|
Add button to skip post assessment
|
2013-01-10 19:00:02 -05:00 |
|
Vik Paruchuri
|
d4dd0cd84c
|
Html changes
|
2013-01-10 19:00:01 -05:00 |
|
Vik Paruchuri
|
ea6945a3fe
|
Collapsible feedback
|
2013-01-10 19:00:01 -05:00 |
|
Vik Paruchuri
|
d9ea0fcda0
|
display feedback in status box
|
2013-01-10 19:00:01 -05:00 |
|
Vik Paruchuri
|
a7c64b8e2d
|
Add collapsible
|
2013-01-10 19:00:01 -05:00 |
|
Vik Paruchuri
|
b6774ed2e8
|
Add back check for feedback button. Can always remove later
|
2013-01-10 19:00:01 -05:00 |
|
Vik Paruchuri
|
792e57ac62
|
Remove check for feedback button
|
2013-01-10 19:00:01 -05:00 |
|
Vik Paruchuri
|
146e0919f1
|
Work on alerts, transitions between pages
|
2013-01-10 19:00:01 -05:00 |
|
Vik Paruchuri
|
0ec1db8169
|
Add in a message area
|
2013-01-10 19:00:01 -05:00 |
|
Vik Paruchuri
|
5e38433494
|
Add in static data for max score and max attempts
|
2013-01-10 19:00:01 -05:00 |
|