Commit Graph

112 Commits

Author SHA1 Message Date
Vik Paruchuri
0f212cc8f2 Fix course id passing, template rendering 2013-01-29 19:31:02 -05:00
Vik Paruchuri
6b7ba37999 Combined notification view 2013-01-29 19:30:04 -05:00
Vik Paruchuri
22a2bdaa3d Disable student problem list caching, build out notifications 2013-01-29 19:30:04 -05:00
Vik Paruchuri
4112f8ad8e Pass back dictionaries where needed from notifications functions 2013-01-29 19:30:04 -05:00
Vik Paruchuri
68db8b0d77 Refactor tab logic, start adding in combined notifications view 2013-01-29 19:30:04 -05:00
Vik Paruchuri
61d62f274e Fix issue with parsing of open ended list 2013-01-29 19:30:03 -05:00
Vik Paruchuri
f4574c75db Proper config dictionary generation for controller query 2013-01-29 19:30:03 -05:00
Vik Paruchuri
693337593e Properly parse url for grading controller 2013-01-29 19:30:03 -05:00
Vik Paruchuri
e6dd07a41e Fix parameter passing 2013-01-29 19:30:03 -05:00
Vik Paruchuri
b0599ea133 Fix queries and some controller query stuff 2013-01-29 19:30:03 -05:00
Vik Paruchuri
2191f3e228 Add in open ended problems view 2013-01-29 19:30:03 -05:00
Vik Paruchuri
d28228639e Add in controller query stuff 2013-01-29 19:25:56 -05:00
Vik Paruchuri
c62ce7822e Add in service support for getting the grading status list 2013-01-29 19:23:36 -05:00
Vik Paruchuri
43783e4ff0 Add in an item to check for combined notifications 2013-01-29 19:23:36 -05:00
Vik Paruchuri
7b65f56121 Add service to query controller for eta of submission and to check if name is unique 2013-01-29 19:23:36 -05:00
Diana Huang
14d9633fa6 Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests 2013-01-28 14:58:50 -05:00
Diana Huang
1d4b674c79 Address code review feedback 2013-01-28 10:57:06 -05:00
Diana Huang
8d64bfdbdb Update tests to handle rubric scores 2013-01-28 08:41:39 -05:00
Diana Huang
47c24d8e7e Raise smarter exceptions when parsing rubrics. 2013-01-25 13:33:35 -05:00
Diana Huang
3ec2a83ec1 Merge branch 'diana/open-ended-ui-updates' into tests/diana/update-oe-unit-tests
Fix

Conflicts:
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
2013-01-25 10:35:55 -05:00
Diana Huang
210cdf870e Updates to the mock peer grading service and new tests. 2013-01-24 09:41:24 -05:00
Diana Huang
dc3dd41aa7 Update tests to cover the peer grading service 2013-01-24 08:58:24 -05:00
Diana Huang
2e791043e8 Merge branch 'master' into diana/open-ended-ui-updates
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
2013-01-18 09:21:38 -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
77fe6ed452 Merge branch 'master' into feature/diana/rubric-input 2013-01-15 14:48:40 -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
Vik Paruchuri
4ffa00b400 Add in notifications, peer grading tab, tab image 2013-01-14 15:00:13 -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
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
52164f58ff Fix self.get call in peer grading service 2013-01-11 11:39:32 -05:00
Diana Huang
81bb2dc979 Better and clearer comments along with some fixes
for code review issues
2013-01-10 16:45:19 -05:00
Diana Huang
ef6d77b116 Clean up names and refactor out some common logic 2013-01-10 15:33:17 -05:00
Diana Huang
084a3c33c8 Update comments and remove some unnecessary code 2013-01-10 15:20:46 -05:00
Diana Huang
0bfb1feed4 Log better exceptions 2013-01-10 15:06:16 -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
c4d1b2e643 Use correct user id and make the reload button a back button 2013-01-09 14:41:23 -05:00
Diana Huang
f0f25296b2 Update documentation 2013-01-08 15:54:49 -05:00
Diana Huang
b7473f8017 Make mock service return useful data 2013-01-07 15:40:01 -05:00
Diana Huang
e1ec4eec71 Get tests to pass by creating a mock peer grading service 2013-01-07 14:46:32 -05:00