Bridger Maxwell
3bd6ce55be
Merged in master branch.
2012-04-17 18:37:57 -04: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
David Ormsbee
a6fb97affa
Catch Exception instead of ValueError for accessing our general content cache -- exception thrown changed in django 1.4
2012-04-17 13:59:30 -04:00
Bridger Maxwell
a117d020a2
Removed python code in templates to be javascript.
2012-04-17 13:54:47 -04:00
David Ormsbee
2905ac7cfe
Merge pull request #20 from MITx/weighted_defaults
...
Fixed zero-score-possible bug.
2012-04-17 10:43:03 -07: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
David Ormsbee
84ba2168a5
Merge pull request #17 from MITx/weighted_defaults
...
fixed the default weight to not interfere with precedent
2012-04-17 07:52:33 -07: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
7b915cd123
Profile graph tooltips are a little more offset, so they don't appear under the mouse and flicker.
2012-04-16 17:45:53 -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
Lyla Fischer
287a086cfb
changed tests
2012-04-13 15:27:26 -04:00
Lyla Fischer
e49fd7002d
respones to code review
2012-04-13 14:34:09 -04:00
David Ormsbee
a71340d3a7
enable mathjax in askbot
2012-04-12 18:57:20 -04:00
David Ormsbee
c59d70d54f
Merge pull request #13 from MITx/pmitros/histogram
...
Pmitros/histogram
2012-04-12 11:53:18 -07:00
Lyla Fischer
bfff822287
AGH! midterm/final
2012-04-11 10:28:55 -04:00
Lyla Fischer
a49a2fc600
oops - final/midterm
2012-04-11 10:27:34 -04:00
Lyla Fischer
79a0a9bf7d
include the final once it exists
2012-04-11 10:09:42 -04:00
jm
a0e3e7b3e5
Added 1 new color
2012-04-10 14:36:50 -04:00
Lyla Fischer
718475662f
added weighting system for the midterm
2012-04-10 10:34:51 -04:00
Piotr Mitros
8c0503d33c
Added comments
2012-04-10 08:10:52 -04:00
Piotr Mitros
c06c6104ca
Grading histogram
2012-04-10 08:03:26 -04:00
David Ormsbee
86b413ff8c
fix syslogger errors
2012-04-09 17:17:03 -04:00
David Ormsbee
5afddedc94
add debug toolbar to content machines
2012-04-09 17:16:52 -04:00
David Ormsbee
a73ba49bef
syslog address needs to be a server, port tuple
2012-04-09 17:07:00 -04:00
David Ormsbee
ddb425dae6
point aws settings to syslog server
2012-04-09 17:04:18 -04:00
David Ormsbee
8f4696a1ea
add logging environment to ENV_TOKENS
2012-04-09 16:57:35 -04:00
David Ormsbee
0d07ebc921
Merge branch 'master' into move_settings
...
Conflicts:
static/simplewiki
2012-04-09 16:47:45 -04:00
David Ormsbee
29b3b0cfeb
remove unnecessary comments
2012-04-09 16:39:04 -04:00
David Ormsbee
be0fdf0cbc
add config for content machines
2012-04-09 16:32:54 -04:00
David Ormsbee
ef5b6f6537
remove LIB_URL from env config (it's always local)
2012-04-09 16:24:16 -04:00
Calen Pennington
22bd9b9443
Move deployed packages to /opt/packages
2012-04-09 16:17:20 -04:00
David Ormsbee
f6509a6858
use ENV_ROOT instead of BASE_DIR
2012-04-09 16:13:37 -04:00
