ichuang
1494cbbd85
Merged root URL prefix from Ike. Errors should be attributed to pmitros.
2012-05-10 23:17:34 -04:00
ichuang
cd78267056
Update djangoapps/courseware/module_render.py
2012-05-10 23:24:11 -03:00
pmitros
de4e22a344
Merge pull request #39 from MITx/ps-fix-reset-answer
...
Do not double-append the XML path in caps module
2012-05-10 16:32:05 -07:00
Prem Sichanugrist
d879db5e10
Do not double-append the XML path in caps module
...
This fixes the bug in answers reset feature
2012-05-10 19:08:51 -04:00
Calen Pennington
5011f60d45
Merge branch 'master' into anonymous_user
...
Conflicts:
djangoapps/courseware/module_render.py
djangoapps/courseware/modules/capa_module.py
2012-05-10 09:17:26 -04:00
pmitros
c1b255fdf3
Merge pull request #18 from MITx/grade-refactor
...
Grade refactor
2012-05-09 15:00:25 -07:00
Piotr Mitros
f511a5e0dd
Changed parameters from **args based on code review
2012-05-09 17:37:54 -04:00
Calen Pennington
6b10c0760b
Merge branch 'master' into anonymous_user
...
Conflicts:
djangoapps/student/views.py
2012-05-08 13:54:57 -04:00
Piotr Mitros
f187a9e312
Capa no longer requires local filestore
2012-05-07 21:24:40 -04:00
Piotr Mitros
aab9b15cd4
Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename.
2012-05-07 20:59:08 -04:00
Piotr Mitros
e1ac5e9f30
Moved extra settings into state. Added fs module for aux content
2012-05-07 20:13:30 -04:00
Prem Sichanugrist
a39c2c194d
Rewrite Courseware navigation
2012-05-07 18:01:21 -04:00
Calen Pennington
1bd608e598
Make showanswer and rerandomize propogate downwards in course.xml
2012-05-07 15:36:13 -04:00
Calen Pennington
83ea75b7d8
Rename simplewiki settings file
2012-05-07 15:01:43 -04:00
Calen Pennington
49f402e3e7
Remove debug print statements
2012-05-07 14:56:27 -04:00
Calen Pennington
47c832647c
Call user_groups even for anonymous users
2012-05-07 14:56:17 -04:00
Piotr Mitros
ddcf68362a
Videos now support annotations w/o verticals
2012-05-07 10:42:48 -04:00
pmitros
3cddaa4619
Merge pull request #19 from MITx/pmitros/histogram
...
Draws histogram for scores
2012-05-07 06:59:04 -07:00
Calen Pennington
2a073a236a
Re-raise an integrity error during user creation if it's not caused by something we know to check for
2012-05-04 14:41:56 -04:00
Calen Pennington
90b7737b0d
Catch user integrity errors, and then try and figure out what caused them (which removes a race condition)
2012-05-03 15:16:05 -04:00
Calen Pennington
0871d95f98
Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository
2012-04-30 15:18:47 -04:00
Calen Pennington
58731a1c3a
Add a showanswer='always' option
2012-04-30 14:38:01 -04:00
Calen Pennington
faf0782d60
If rerandomize won't show different values, don't show the reset button
2012-04-30 14:37:39 -04:00
Calen Pennington
8ecb979339
Cleaning up imports
2012-04-30 14:36:16 -04:00
Calen Pennington
e6015eb9e7
Make showanswer and rerandomize propogate downwards in course.xml
2012-04-30 14:30:48 -04:00
Piotr Mitros
fd3e571478
Took out print
2012-04-24 18:42:13 -04:00
Piotr Mitros
58a0a7d0d6
Case sensitivity bug fix
2012-04-24 18:27:54 -04:00
Calen Pennington
26a3e6cdf4
Merge pull request #11 from MITx/move_settings
...
Reorganize settings files for different environments
2012-04-19 07:52:02 -07:00
Bridger Maxwell
e9247920af
Moved potential failure outside of unrelated try/catch block that would have masked the missing settings.DATA_DIR
2012-04-17 18:28:59 -04:00
Bridger Maxwell
f987f99a06
Changed CourseGrader to be an abstract base class.
2012-04-17 18:17:43 -04:00
Bridger Maxwell
9ee09ec93a
Put graders into their own file. Incorporated other feedback from pull request.
2012-04-17 18:07:56 -04:00
Bridger Maxwell
e780e4d87e
Put in precaution to be sure that any problems with a possible score of 0 are not graded.
2012-04-17 11:53:11 -04:00
Bridger Maxwell
da3424f67a
Fixed zero-score-possible bug.
2012-04-17 11:45:24 -04:00
Bridger Maxwell
b2891273b5
Made sure that histogram graph doesn't show up for modules without scores. Modified look of histogram graph.
2012-04-17 00:40:29 -04:00
Bridger Maxwell
386835153b
Added histogram graph for courseware administrators.
2012-04-17 00:17:12 -04:00
Bridger Maxwell
3e293f2a3d
Merge branch 'master' into grade-refactor
2012-04-16 22:17:45 -04:00
Bridger Maxwell
a763edab40
Just a bit of cleanup. No code changes
2012-04-16 22:15:58 -04:00
Bridger Maxwell
fcb530f1e3
Course settings are now defined in DATA_DIR/course_settings.py. Used by importing courseware.course_settings. The grader is defined in these settings files.
2012-04-16 22:10:08 -04:00
Bridger Maxwell
79ffd72521
Updated tests for new weighting method.
2012-04-16 17:28:18 -04:00
Bridger Maxwell
e3b397870f
Moved the weighting of problems to when problem scores are retrieved.
2012-04-16 16:57:24 -04:00
Bridger Maxwell
3860f333d6
Added parser for creating graders from a dictionary representation.
2012-04-16 16:13:51 -04:00
Lyla Fischer
f9a04406c2
fixed the default weight to not interfere with precedent
2012-04-16 12:25:22 -04:00
Bridger Maxwell
795fba0448
Got settings.GENERATE_RANDOM_PROFILE_SCORES working again. Mostly used for design previews.
2012-04-15 17:05:07 -04:00
Bridger Maxwell
02e92e0b31
Added comments explaining the grader protocol.
2012-04-15 16:48:06 -04:00
Bridger Maxwell
97f4f1b7ba
Added more tests and documentation to grade refactor.
2012-04-15 16:07:16 -04:00
Bridger Maxwell
03ea89f67f
Added some tests to the grading refactor. Fixed some bugs found during testing.
2012-04-14 18:42:20 -04:00
Bridger Maxwell
9ced4685c3
Merged in weighted_grades. Put in a holdover to stop crash when score.possible = 0
2012-04-13 18:14:08 -04:00
David Ormsbee
eff95c267e
Merge pull request #15 from MITx/weighted_grading
...
added weighting system for the midterm
It'd be nice to move the Score.__sub__ as we discussed, but that shouldn't hold up merging the rest so it can be put on the staging environments and tested more thoroughly.
2012-04-13 14:06:40 -07:00
Bridger Maxwell
812810a670
Converted gradebook to refactored grading format.
2012-04-13 16:32:39 -04:00
Lyla Fischer
7853af5415
more tests
2012-04-13 16:29:12 -04:00
