Commit Graph

12296 Commits

Author SHA1 Message Date
Diana Huang
652a8eb440 New peer grading view on the lms side 2012-12-28 15:48:06 -05:00
Calen Pennington
84cb0ce99b Move inheritance logic out into a separate file in the modulestore 2012-12-28 14:56:42 -05:00
Calen Pennington
7f8b79694c Grade problems that have ungraded student modules 2012-12-28 14:55:32 -05:00
Calen Pennington
9c5a922eee Create tables for all known scopes, and add tests of the LmsKeyValueStore 2012-12-28 14:55:32 -05:00
Calen Pennington
7cb95aad47 WIP: Add grade publishing functionality 2012-12-28 14:55:32 -05:00
Calen Pennington
7679fda172 Remove debugging print statements 2012-12-28 14:54:13 -05:00
Calen Pennington
d61c91c139 Fix errors around error descriptors and custom tag modules 2012-12-28 14:53:30 -05:00
Calen Pennington
8693d288c8 Fix errors from running unit tests (some tests still fail) 2012-12-28 14:51:50 -05:00
Calen Pennington
2879853eee Pep8 fixes 2012-12-28 14:51:50 -05:00
Calen Pennington
fbd9499c51 Make debug message use the available request.user object 2012-12-28 14:51:50 -05:00
Calen Pennington
64848a32ee Delete get_instance_module and get_shared_instance_module, as they are obsolete with the new properties 2012-12-28 14:51:50 -05:00
Calen Pennington
13cab34a7d Always use the url form of the location when making StudentModules 2012-12-28 14:51:50 -05:00
Calen Pennington
306dbcff9c Rationalize StudentModule unicode and repr strings 2012-12-28 14:51:50 -05:00
Calen Pennington
3adb1e7109 Make grading not require get_instance_module 2012-12-28 14:51:50 -05:00
Calen Pennington
7977491ddf WIP: LMS Courseware appears to be working 2012-12-28 14:51:50 -05:00
Calen Pennington
01411ae66e WIP: Trying to get tests working 2012-12-28 14:48:47 -05:00
Calen Pennington
7e224f5847 Convert a bunch more references from metadata to fields 2012-12-28 14:45:46 -05:00
Calen Pennington
c5e3380b71 WIP: Save student state via StudentModule. Inheritance doesn't work 2012-12-28 14:45:46 -05:00
Calen Pennington
cbfc7b201a WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms 2012-12-28 14:44:31 -05:00
Calen Pennington
8ba4163557 WIP. Data loads, but not all of it 2012-12-28 14:39:13 -05:00
Diana Huang
d23eb93fbb add new peer grading service with some rudimentary logic 2012-12-28 13:35:35 -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
Don Mitchell
bd8661a8b5 Merge pull request #1211 from MITx/feature/cdodge/export
Feature/cdodge/export
2012-12-27 13:38:28 -08:00
Carlos Andrés Rocha
1ac41787a7 Fix broken display of courses in university profile 2012-12-21 16:38:17 -05:00
Carlos Andrés Rocha
8ac89c39a7 Use course metadata instead of setting attributes to display new course overlay 2012-12-21 11:12:21 -05:00
Carlos Andrés Rocha
22de7cbb4e Add logic to display courses by start date and show the new overlay 2012-12-20 20:05:11 -05:00
Chris Dodge
0bf79eb587 append some character, in this case a '_', if the course number is really a full-on number. The Wiki library interprets this incorrectly - to date we've always used non-numerical values. 2012-12-19 20:54:43 -05:00
JM Van Thong
e40b0d0d08 Fixed data order when loading json record from request. 2012-12-14 17:16:57 -05:00
Chris Dodge
95c6719447 initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from 2012-12-12 10:57:06 -05:00
Calen Pennington
96daea5c0a Ignore discussion modules with missing keys when building the global discussion info 2012-12-12 09:40:31 -05:00
Diana Huang
0e54592175 Add skip button logic to the LMS 2012-12-11 14:40:30 -05:00
Diana Huang
33f2d55a37 new test for problem lists 2012-12-11 14:40:30 -05:00
Chris Dodge
0e3a022086 fix broken tests from master -> CMS-master merge. Namely the change to unicode strings when reading files off disk. Also there was some work collisions on course_loads which removed Mongo testing. Make it so that explicitly test both XMLFilestores as well as Mongo 2012-12-11 11:21:08 -05:00
Kevin Chugh
6e108c7531 fix conflict 2012-12-10 19:30:04 -05:00
Victor Shnayder
85b5190c29 fix login hack. Uses new return-error-msg-if-not-logged-in behavior 2012-12-10 10:41:40 -05:00
Diana Huang
76f76a4ff8 Update tests and mock objects to work with the new API 2012-12-07 17:30:03 -05:00
JM Van Thong
27b8f01ffa Added the following analyzers: StudentsActive, OverallGradeDistribution, StudentsDropoffPerDay. 2012-12-07 17:26:33 -05:00
Diana Huang
4ccf7c351d Fix service errors so that individual problems can now be displayed
and graded
2012-12-07 17:01:27 -05:00
Diana Huang
7f9fcfffdf Add support for the new staff grading views on the backend 2012-12-07 17:01:27 -05:00
Kevin Chugh
368b59a9e6 updated tooltips 2012-12-07 15:39:53 -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
Calen Pennington
47ed02c9ea Remove more merge badness 2012-12-07 11:30:21 -05:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
2012-12-07 11:17:41 -05:00
Victor Shnayder
44a8f31d06 Change are-we-logged-in detection to be less hackish.
- has matching changes in controller staff_grading view.
2012-12-07 10:35:45 -05:00
Victor Shnayder
730cdd3b4f minor changes from pull request comments
- comments
- more info in log msg
- better error
2012-12-07 10:35:44 -05:00
Kevin Chugh
258b1fe9a5 thread responses create fixed 2012-12-06 22:12:17 -05:00
Kevin Chugh
14b0cc019f remove debug placeholders, finalize render of comments, flagging working on posts, replies, and comments 2012-12-06 16:26:08 -05:00
Kevin Chugh
deb3888a84 thread response flagging 2012-12-06 14:13:54 -05:00
Kevin Chugh
70b0b5beb8 update models 2012-12-06 10:43:51 -05:00