Calen Pennington
|
308fe26b65
|
Clean up pep8 E128 issues
|
2013-06-20 09:08:25 -04:00 |
|
Vik Paruchuri
|
701bdc55c0
|
Minor fixes
|
2013-04-16 11:55:54 -04:00 |
|
Vik Paruchuri
|
9cca3072c3
|
Fix skip behavior for staff
|
2013-04-09 13:53:51 -04:00 |
|
Calen Pennington
|
531eb80eb2
|
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
lms/djangoapps/open_ended_grading/tests.py
|
2013-03-13 12:18:04 -04:00 |
|
Vik Paruchuri
|
554cb752fa
|
Pep8 cleanup
|
2013-03-12 12:20:11 -04:00 |
|
Vik Paruchuri
|
cb4a7c663c
|
A somewhat working state for notifications. Combined open ended and peer grading xmodules still have significant errors.
|
2013-03-04 18:54:52 -05:00 |
|
Vik Paruchuri
|
72d069825d
|
Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed
Conflicts:
lms/templates/instructor/staff_grading.html
|
2013-02-19 15:21:09 -05:00 |
|
Vik Paruchuri
|
8b12f26626
|
Fix error messages to staff
|
2013-02-13 18:24:33 -05:00 |
|
Vik Paruchuri
|
b9bf96520e
|
Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports
|
2013-02-11 18:43:47 -05:00 |
|
Vik Paruchuri
|
0f71f5b92e
|
Finish settings refactor
|
2013-02-11 17:36:33 -05:00 |
|
Vik Paruchuri
|
9bca4ebf21
|
Start to refactor grading settings
|
2013-02-11 17:32:11 -05:00 |
|
Diana Huang
|
f3bb429915
|
Get and pass the new submission flagged information through
the controller to the backend.
|
2013-02-11 09:23:55 -05:00 |
|
Calen Pennington
|
cfae1cdf62
|
Pep8 autofixes
|
2013-02-06 11:13:50 -05:00 |
|
Vik Paruchuri
|
7984c4dfcb
|
Move over grading service to xmodule
|
2013-02-05 13:10:56 -05:00 |
|
Diana Huang
|
1d4b674c79
|
Address code review feedback
|
2013-01-28 10:57:06 -05:00 |
|
Diana Huang
|
8b3fb33fe3
|
Update tests to handle rubric scores
|
2013-01-16 09:47:54 -05:00 |
|
Diana Huang
|
9b2faa4987
|
Merge branch 'master' into feature/diana/rubric-input
|
2013-01-16 09:02:51 -05:00 |
|
Vik Paruchuri
|
ef2b069409
|
Add staff grading notifications
|
2013-01-15 15:34:09 -05:00 |
|
Diana Huang
|
3d2ae66cf5
|
Refactor out rubric rendering and pass along
the right information for peer grading
|
2013-01-15 13:46:18 -05:00 |
|
Diana Huang
|
48be0b15a1
|
Clean up on staff grading code path and
the beginnings of peer grading.
|
2013-01-15 11:21:10 -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
|
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 |
|
Diana Huang
|
4909b84966
|
Clean up code and make the arguments for get and post more logical.
|
2013-01-10 14:51:32 -05:00 |
|
Diana Huang
|
19bc657487
|
Use correct version of the grader id.
|
2013-01-10 12:44:54 -05:00 |
|
Diana Huang
|
f0f25296b2
|
Update documentation
|
2013-01-08 15:54:49 -05:00 |
|
Diana Huang
|
125945de90
|
Refactor get and post logic into new GradingService
|
2012-12-28 13:34:07 -05:00 |
|
Diana Huang
|
ecf04b3e49
|
Refactor existing grading logic into a new app.
|
2012-12-28 11:29:29 -05:00 |
|