Commit Graph

69 Commits

Author SHA1 Message Date
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
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
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
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
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
Bridger Maxwell
a431ad19c7 Changed size of circuit schematic to be the same as old editor 2012-04-09 15:25:55 -04:00
pmitros
90cd57f6ad Merge pull request #12 from MITx/check_button
Number of attempts remaining shown below -- not on button.
2012-04-09 08:14:44 -07:00
Bridger Maxwell
245a3d97a8 Simplified the parameters for AssignmentFormatGrader 2012-04-08 01:58:21 -04:00
Bridger Maxwell
c1e6dd8005 Added single section grader. Midterm and Final are now graded. 2012-04-08 00:38:00 -04:00
Bridger Maxwell
779c247512 Weighted scores now working in the refactor and show up correctly on the profile graph. Dropped score markers are back too. 2012-04-07 19:21:19 -04:00
Bridger Maxwell
04221210de Weighted section grading is mostly working, but the final grade isn't on the graph yet. 2012-04-06 15:47:21 -04:00
Bridger Maxwell
b0e2ea3a63 Still working on grades refactor. Not working yet, but reached a checkpoint. 2012-04-06 15:04:49 -04:00
Bridger Maxwell
a0eb072aff Refactoring grades. Adding more generic grading classes. Probably broken right now. Just committing to save progress. 2012-04-05 21:29:38 -04:00
Bridger Maxwell
60caf0aa10 Added grades SectionPercentage namedtuple. Fixed bug where problem ids were being used for section labels in graph. 2012-04-05 16:56:16 -04:00
Bridger Maxwell
202659cb1b Merged in master branch 2012-04-05 14:50:36 -04:00
Lyla Fischer
abee617622 check button and "we already started" announcement
Changed the format of the check/submit button so that the exam
submission makes more sense; added a disclaimer to the enrollment
number so that new students know that they will be disadvantaged.
2012-04-05 14:18:22 -04:00
Piotr Mitros
df637d32a2 Typo in gradebook 2012-04-03 15:56:14 -04:00
Bridger Maxwell
5aa68c9bb9 Removed code accidentally left in. 2012-04-02 14:47:02 -04:00
Bridger Maxwell
3dee54429d More comments on mdx_circuit.py. Incorporated some pull request feedback. 2012-04-01 15:15:39 -04:00
Bridger Maxwell
6f2f218bea The wiki creation page now uses the edit template, so it has the unsaved changes confirmation and Codemirror editor. 2012-03-30 06:03:10 -07:00
Bridger Maxwell
4938fb63da Set size of wiki circuits 2012-03-29 16:39:06 -07:00
Piotr Mitros
cd1226814a Typo 2012-03-29 15:01:45 -04:00
Piotr Mitros
1ddf41ab1c Missed one conversion to complex 2012-03-29 15:00:39 -04:00
Piotr Mitros
1c5945db9c Fixed bug with showing answers related to complex numbers 2012-03-29 14:46:53 -04:00
Kyle Fiedler
162fa59441 Merge branch 'master' into pmitros/name-change
Conflicts:
	static/css/application.css
	static/css/marketing.css
2012-03-29 11:08:41 -04:00
Piotr Mitros
37452f3a58 Moved from type to isinstance
* Parallel and exponentials in calc were broken because of this. Confirmed working
* Added test cases for the above
* Fixed a broken test case
2012-03-29 09:43:45 -04:00
Bridger Maxwell
b2fbf537e4 Properly escaping the schematic html attributes. 2012-03-29 00:16:03 -07:00
Piotr Mitros
686b1bf6bd Moved site, is_secure, etc. into render_to_string shortcut, and fixed bugs in the shortcut. We should test this pretty well, since this touches a lot of templates 2012-03-28 19:44:22 -04:00
Piotr Mitros
9a7c0451ab Better logging. Tested and fixed bugs in previous commits 2012-03-28 17:45:43 -04:00
Piotr Mitros
25ca62d952 Proper e-mail address validation 2012-03-28 17:20:35 -04:00
Piotr Mitros
adf483a96b type converted to isinstance 2012-03-28 17:11:14 -04:00
Bridger Maxwell
f95aa496fa Better compatibility with the Codemirror editor and the markdown circuit extension. 2012-03-28 14:09:21 -07:00