Merge pull request #621 from edx/fix/vik/oe-issues

Fix/vik/oe issues

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -13,8 +13,11 @@ import textwrap
 
 log = logging.getLogger("mitx.courseware")
 
-V1_SETTINGS_ATTRIBUTES = ["display_name", "max_attempts", "graded", "accept_file_upload",
-                          "skip_spelling_checks", "due", "graceperiod", "weight"]
+V1_SETTINGS_ATTRIBUTES = [
+    "display_name", "max_attempts", "graded", "accept_file_upload",
+    "skip_spelling_checks", "due", "graceperiod", "weight", "min_to_calibrate",
+    "max_to_calibrate", "peer_grader_count", "required_peer_grading",
+]
 
 V1_STUDENT_ATTRIBUTES = ["current_task_number", "task_states", "state",
                          "student_attempts", "ready_to_reset"]
@@ -37,7 +40,7 @@ DEFAULT_DATA = textwrap.dedent("""\
         </p>
 
         <p>
-        Write a persuasive essay to a newspaper reflecting your vies on censorship in libraries. Do you believe that certain materials, such as books, music, movies, magazines, etc., should be removed from the shelves if they are found offensive? Support your position with convincing arguments from your own experience, observations, and/or reading.
+        Write a persuasive essay to a newspaper reflecting your views on censorship in libraries. Do you believe that certain materials, such as books, music, movies, magazines, etc., should be removed from the shelves if they are found offensive? Support your position with convincing arguments from your own experience, observations, and/or reading.
         </p>
 
     </prompt>
@@ -244,6 +247,34 @@ class CombinedOpenEndedFields(object):
         values={"min" : 0 , "step": ".1"},
         default=1
     )
+    min_to_calibrate = Integer(
+        display_name="Minimum Peer Grading Calibrations",
+        help="The minimum number of calibration essays each student will need to complete for peer grading.",
+        default=3,
+        scope=Scope.settings,
+        values={"min" : 1, "max" : 20, "step" : "1"}
+    )
+    max_to_calibrate = Integer(
+        display_name="Maximum Peer Grading Calibrations",
+        help="The maximum number of calibration essays each student will need to complete for peer grading.",
+        default=6,
+        scope=Scope.settings,
+        values={"min" : 1, "max" : 20, "step" : "1"}
+    )
+    peer_grader_count = Integer(
+        display_name="Peer Graders per Response",
+        help="The number of peers who will grade each submission.",
+        default=3,
+        scope=Scope.settings,
+        values={"min" : 1, "step" : "1", "max" : 5}
+    )
+    required_peer_grading = Integer(
+        display_name="Required Peer Grading",
+        help="The number of other students each student making a submission will have to grade.",
+        default=3,
+        scope=Scope.settings,
+        values={"min" : 1, "step" : "1", "max" : 5}
+    )
     markdown = String(
         help="Markdown source of this module",
         default=textwrap.dedent("""\

common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

@@ -106,6 +106,11 @@ class CombinedOpenEndedV1Module():
         self.accept_file_upload = instance_state.get('accept_file_upload', ACCEPT_FILE_UPLOAD) in TRUE_DICT
         self.skip_basic_checks = instance_state.get('skip_spelling_checks', SKIP_BASIC_CHECKS) in TRUE_DICT
 
+        self.required_peer_grading = instance_state.get('required_peer_grading', 3)
+        self.peer_grader_count = instance_state.get('peer_grader_count', 3)
+        self.min_to_calibrate = instance_state.get('min_to_calibrate', 3)
+        self.max_to_calibrate = instance_state.get('max_to_calibrate', 6)
+
         due_date = instance_state.get('due', None)
 
         grace_period_string = instance_state.get('graceperiod', None)
@@ -131,6 +136,12 @@ class CombinedOpenEndedV1Module():
             'close_date': self.timeinfo.close_date,
             's3_interface': self.system.s3_interface,
             'skip_basic_checks': self.skip_basic_checks,
+            'control': {
+                'required_peer_grading': self.required_peer_grading,
+                'peer_grader_count': self.peer_grader_count,
+                'min_to_calibrate': self.min_to_calibrate,
+                'max_to_calibrate': self.max_to_calibrate,
+            }
         }
 
         self.task_xml = definition['task_xml']

common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py

@@ -118,6 +118,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
             'answer': self.answer,
             'problem_id': self.display_name,
             'skip_basic_checks': self.skip_basic_checks,
+            'control': json.dumps(self.control),
         })
         updated_grader_payload = json.dumps(parsed_grader_payload)
 

common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py

@@ -92,6 +92,7 @@ class OpenEndedChild(object):
         self.s3_interface = static_data['s3_interface']
         self.skip_basic_checks = static_data['skip_basic_checks']
         self._max_score = static_data['max_score']
+        self.control = static_data['control']
 
         # Used for progress / grading.  Currently get credit just for
         # completion (doesn't matter if you self-assessed correct/incorrect).

common/lib/xmodule/xmodule/tests/test_combined_open_ended.py

@@ -61,6 +61,12 @@ class OpenEndedChildTest(unittest.TestCase):
         's3_interface': "",
         'open_ended_grading_interface': {},
         'skip_basic_checks': False,
+        'control': {
+            'required_peer_grading': 1,
+            'peer_grader_count': 1,
+            'min_to_calibrate': 3,
+            'max_to_calibrate': 6,
+            }
     }
     definition = Mock()
     descriptor = Mock()
@@ -177,6 +183,12 @@ class OpenEndedModuleTest(unittest.TestCase):
         's3_interface': test_util_open_ended.S3_INTERFACE,
         'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
         'skip_basic_checks': False,
+        'control': {
+            'required_peer_grading': 1,
+            'peer_grader_count': 1,
+            'min_to_calibrate': 3,
+            'max_to_calibrate': 6,
+            }
     }
 
     oeparam = etree.XML('''

common/lib/xmodule/xmodule/tests/test_self_assessment.py

@@ -49,6 +49,12 @@ class SelfAssessmentTest(unittest.TestCase):
             's3_interface': test_util_open_ended.S3_INTERFACE,
             'open_ended_grading_interface': test_util_open_ended.OPEN_ENDED_GRADING_INTERFACE,
             'skip_basic_checks': False,
+            'control': {
+                'required_peer_grading': 1,
+                'peer_grader_count': 1,
+                'min_to_calibrate': 3,
+                'max_to_calibrate': 6,
+                }
         }
 
         self.module = SelfAssessmentModule(get_test_system(), self.location,

lms/djangoapps/open_ended_grading/open_ended_notifications.py

@@ -146,19 +146,7 @@ def combined_notifications(course, user):
 
     #Get the time of the last login of the user
     last_login = user.last_login
-
-    #Find the modules they have seen since they logged in
-    last_module_seen = StudentModule.objects.filter(student=user, course_id=course_id,
-                                                    modified__gt=last_login).values('modified').order_by(
-        '-modified')
-    last_module_seen_count = last_module_seen.count()
-
-    if last_module_seen_count > 0:
-        #The last time they viewed an updated notification (last module seen minus how long notifications are cached)
-        last_time_viewed = last_module_seen[0]['modified'] - datetime.timedelta(seconds=(NOTIFICATION_CACHE_TIME + 60))
-    else:
-        #If they have not seen any modules since they logged in, then don't refresh
-        return {'pending_grading': False, 'img_path': img_path, 'response': notifications}
+    last_time_viewed = last_login - datetime.timedelta(seconds=(NOTIFICATION_CACHE_TIME + 60))
 
     try:
         #Get the notifications from the grading controller