Merge pull request #1300 from edx/christina/fix-rounding-error

Grading rounding error.

cms/djangoapps/contentstore/features/grading.feature

@@ -59,6 +59,17 @@ Feature: CMS.Course Grading
         And I go back to the main course page
         Then I do see the assignment name "New Type"
 
+    # Note that "7" is a special weight because it revealed rounding errors (STUD-826).
+    Scenario: Users can set weight to Assignment types
+        Given I have opened a new course in Studio
+        And I am viewing the grading settings
+        When I add a new assignment type "New Type"
+        And I set the assignment weight to "7"
+        And I press the "Save" notification button
+        Then the assignment weight is displayed as "7"
+        And I reload the page
+        Then the assignment weight is displayed as "7"
+
     Scenario: Settings are only persisted when saved
         Given I have opened a new course in Studio
         And I have populated the course

cms/djangoapps/contentstore/features/grading.py

@@ -106,6 +106,22 @@ def add_assignment_type(step, new_name):
     new_assignment._element.send_keys(new_name)
 
 
+@step(u'I set the assignment weight to "([^"]*)"$')
+def set_weight(step, weight):
+    weight_id = '#course-grading-assignment-gradeweight'
+    weight_field = world.css_find(weight_id)[-1]
+    old_weight = world.css_value(weight_id, -1)
+    for count in range(len(old_weight)):
+        weight_field._element.send_keys(Keys.END, Keys.BACK_SPACE)
+    weight_field._element.send_keys(weight)
+
+
+@step(u'the assignment weight is displayed as "([^"]*)"$')
+def verify_weight(step, weight):
+    weight_id = '#course-grading-assignment-gradeweight'
+    assert_equal(world.css_value(weight_id, -1), weight)
+
+
 @step(u'I have populated the course')
 def populate_course(step):
     step.given('I have added a new section')

cms/static/coffee/spec/main.coffee

@@ -141,6 +141,7 @@ define([
 
     "coffee/spec/models/course_spec", "coffee/spec/models/metadata_spec",
     "coffee/spec/models/module_spec", "coffee/spec/models/section_spec",
+    "coffee/spec/models/settings_course_grader_spec",
     "coffee/spec/models/settings_grading_spec", "coffee/spec/models/textbook_spec",
     "coffee/spec/models/upload_spec",
 

cms/static/coffee/spec/models/settings_course_grader_spec.coffee

+define ["js/models/settings/course_grader"], (CourseGrader) ->
+    describe "CourseGraderModel", ->
+        describe "parseWeight", ->
+            it "converts a float to an integer", ->
+                model = new CourseGrader({weight: 7.0001, min_count: 3.67, drop_count: 1.88}, {parse:true})
+                expect(model.get('weight')).toBe(7)
+                expect(model.get('min_count')).toBe(3)
+                expect(model.get('drop_count')).toBe(1)
+
+            it "converts a string to an integer", ->
+                model = new CourseGrader({weight: '7.0001', min_count: '3.67', drop_count: '1.88'}, {parse:true})
+                expect(model.get('weight')).toBe(7)
+                expect(model.get('min_count')).toBe(3)
+                expect(model.get('drop_count')).toBe(1)
+
+            it "does a no-op for integers", ->
+                model = new CourseGrader({weight: 7, min_count: 3, drop_count: 1}, {parse:true})
+                expect(model.get('weight')).toBe(7)
+                expect(model.get('min_count')).toBe(3)
+                expect(model.get('drop_count')).toBe(1)

cms/static/js/models/settings/course_grader.js

@@ -10,13 +10,13 @@ var CourseGrader = Backbone.Model.extend({
     },
     parse : function(attrs) {
         if (attrs['weight']) {
-            if (!_.isNumber(attrs.weight)) attrs.weight = parseInt(attrs.weight, 10);
+            attrs.weight = parseInt(attrs.weight, 10);
         }
         if (attrs['min_count']) {
-            if (!_.isNumber(attrs.min_count)) attrs.min_count = parseInt(attrs.min_count, 10);
+            attrs.min_count = parseInt(attrs.min_count, 10);
         }
         if (attrs['drop_count']) {
-            if (!_.isNumber(attrs.drop_count)) attrs.drop_count = parseInt(attrs.drop_count, 10);
+            attrs.drop_count = parseInt(attrs.drop_count, 10);
         }
         return attrs;
     },

cms/static/js/models/settings/course_grading_policy.js

@@ -17,10 +17,10 @@ var CourseGradingPolicy = Backbone.Model.extend({
             // interesting race condition: if {parse:true} when newing, then parse called before .attributes created
             if (this.attributes && this.has('graders')) {
                 graderCollection = this.get('graders');
-                graderCollection.reset(attributes.graders);
+                graderCollection.reset(attributes.graders, {parse:true});
             }
             else {
-                graderCollection = new CourseGraderCollection(attributes.graders);
+                graderCollection = new CourseGraderCollection(attributes.graders, {parse:true});
                 graderCollection.course_location = attributes['course_location'] || this.get('course_location');
             }
             attributes.graders = graderCollection;

cms/templates/edit_subsection.html

@@ -114,9 +114,8 @@ require(["domReady!", "jquery", "js/models/location", "js/views/overview_assignm
     // I believe that current (New Section/New Subsection) cause full page reloads which means these aren't needed globally
     // but we really should change that behavior.
     if (!window.graderTypes) {
-        window.graderTypes = new CourseGraderCollection();
+        window.graderTypes = new CourseGraderCollection(${course_graders|n}, {parse:true});
         window.graderTypes.course_location = new Location('${parent_location}');
-        window.graderTypes.reset(${course_graders|n});
     }
 
     $(".gradable-status").each(function(index, ele) {

cms/templates/overview.html

@@ -25,9 +25,8 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v
   // I believe that current (New Section/New Subsection) cause full page reloads which means these aren't needed globally
   // but we really should change that behavior.
   if (!window.graderTypes) {
-    window.graderTypes = new CourseGraderCollection();
+    window.graderTypes = new CourseGraderCollection(${course_graders|n}, {parse:true});
     window.graderTypes.course_location = new Location('${parent_location}');
-    window.graderTypes.reset(${course_graders|n});
   }
 
   $(".gradable-status").each(function(index, ele) {