Feature idde

.gitignore

@@ -19,6 +19,9 @@ cms/envs/private.py
 .redcar/
 codekit-config.json
 
+### NFS artifacts
+.nfs*
+
 ### OS X artifacts
 *.DS_Store
 .AppleDouble

common/lib/xmodule/xmodule/capa_module.py

@@ -23,6 +23,7 @@
 from .fields import Timedelta, Date
 from django.utils.timezone import UTC
 from django.utils.translation import ugettext as _
+from .util.duedate import get_extended_due_date
 
 log = logging.getLogger("edx.courseware")
 
@@ -96,6 +97,14 @@ class CapaFields(object):
         values={"min": 0}, scope=Scope.settings
     )
     due = Date(help="Date that this problem is due by", scope=Scope.settings)
+    extended_due = Date(
+        help="Date that this problem is due by for a particular student. This "
+             "can be set by an instructor, and will override the global due "
+             "date if it is set to a date that is later than the global due "
+             "date.",
+        default=None,
+        scope=Scope.user_state,
+    )
     graceperiod = Timedelta(
         help="Amount of time after the due date that submissions will be accepted",
         scope=Scope.settings
@@ -192,7 +201,7 @@ def __init__(self, *args, **kwargs):
         """
         super(CapaModule, self).__init__(*args, **kwargs)
 
-        due_date = self.due
+        due_date = get_extended_due_date(self)
 
         if self.graceperiod is not None and due_date:
             self.close_date = due_date + self.graceperiod

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -20,6 +20,7 @@
     "accept_file_upload",
     "skip_spelling_checks",
     "due",
+    "extended_due",
     "graceperiod",
     "weight",
     "min_to_calibrate",
@@ -262,6 +263,14 @@ class CombinedOpenEndedFields(object):
         help="Date that this problem is due by",
         scope=Scope.settings
     )
+    extended_due = Date(
+        help="Date that this problem is due by for a particular student. This "
+             "can be set by an instructor, and will override the global due "
+             "date if it is set to a date that is later than the global due "
+             "date.",
+        default=None,
+        scope=Scope.user_state,
+    )
     graceperiod = Timedelta(
         help="Amount of time after the due date that submissions will be accepted",
         scope=Scope.settings

common/lib/xmodule/xmodule/foldit_module.py

@@ -8,6 +8,7 @@
 from xmodule.xml_module import XmlDescriptor
 from xblock.fields import Scope, Integer, String
 from .fields import Date
+from .util.duedate import get_extended_due_date
 
 
 log = logging.getLogger(__name__)
@@ -20,6 +21,14 @@ class FolditFields(object):
     required_level = Integer(default=4, scope=Scope.settings)
     required_sublevel = Integer(default=5, scope=Scope.settings)
     due = Date(help="Date that this problem is due by", scope=Scope.settings)
+    extended_due = Date(
+        help="Date that this problem is due by for a particular student. This "
+             "can be set by an instructor, and will override the global due "
+             "date if it is set to a date that is later than the global due "
+             "date.",
+        default=None,
+        scope=Scope.user_state,
+    )
 
     show_basic_score = String(scope=Scope.settings, default='false')
     show_leaderboard = String(scope=Scope.settings, default='false')
@@ -40,7 +49,7 @@ def __init__(self, *args, **kwargs):
             show_leaderboard="false"/>
         """
         super(FolditModule, self).__init__(*args, **kwargs)
-        self.due_time = self.due
+        self.due_time = get_extended_due_date(self)
 
     def is_complete(self):
         """

common/lib/xmodule/xmodule/modulestore/inheritance.py

@@ -21,6 +21,14 @@ class InheritanceMixin(XBlockMixin):
         scope=Scope.settings
     )
     due = Date(help="Date that this problem is due by", scope=Scope.settings)
+    extended_due = Date(
+        help="Date that this problem is due by for a particular student. This "
+             "can be set by an instructor, and will override the global due "
+             "date if it is set to a date that is later than the global due "
+             "date.",
+        default=None,
+        scope=Scope.user_state,
+    )
     giturl = String(help="url root for course data git repository", scope=Scope.settings)
     xqa_key = String(help="DO NOT USE", scope=Scope.settings)
     graceperiod = Timedelta(

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

@@ -132,7 +132,9 @@ def __init__(self, system, location, definition, descriptor,
             'peer_grade_finished_submissions_when_none_pending', False
         )
 
-        due_date = instance_state.get('due', None)
+        due_date = instance_state.get('extended_due', None)
+        if due_date is None:
+            due_date = instance_state.get('due', None)
 
         grace_period_string = instance_state.get('graceperiod', None)
         try:

common/lib/xmodule/xmodule/peer_grading_module.py

@@ -7,9 +7,10 @@
 from pkg_resources import resource_string
 from .capa_module import ComplexEncoder
 from .x_module import XModule, module_attr
-from xmodule.raw_module import RawDescriptor
-from xmodule.modulestore.exceptions import ItemNotFoundError, NoPathToItem
+from .raw_module import RawDescriptor
+from .modulestore.exceptions import ItemNotFoundError, NoPathToItem
 from .timeinfo import TimeInfo
+from .util.duedate import get_extended_due_date
 from xblock.fields import Dict, String, Scope, Boolean, Float
 from xmodule.fields import Date, Timedelta
 
@@ -46,6 +47,14 @@ class PeerGradingFields(object):
     due = Date(
         help="Due date that should be displayed.",
         scope=Scope.settings)
+    extended_due = Date(
+        help="Date that this problem is due by for a particular student. This "
+             "can be set by an instructor, and will override the global due "
+             "date if it is set to a date that is later than the global due "
+             "date.",
+        default=None,
+        scope=Scope.user_state,
+    )
     graceperiod = Timedelta(
         help="Amount of grace to give on the due date.",
         scope=Scope.settings
@@ -128,7 +137,8 @@ def __init__(self, *args, **kwargs):
                 self.linked_problem = self.system.get_module(linked_descriptors[0])
 
         try:
-            self.timeinfo = TimeInfo(self.due, self.graceperiod)
+            self.timeinfo = TimeInfo(
+                get_extended_due_date(self), self.graceperiod)
         except Exception:
             log.error("Error parsing due date information in location {0}".format(self.location))
             raise
@@ -556,7 +566,7 @@ def peer_grading(self, _data=None):
             except (NoPathToItem, ItemNotFoundError):
                 continue
             if descriptor:
-                problem['due'] = descriptor.due
+                problem['due'] = get_extended_due_date(descriptor)
                 grace_period = descriptor.graceperiod
                 try:
                     problem_timeinfo = TimeInfo(problem['due'], grace_period)

common/lib/xmodule/xmodule/seq_module.py

@@ -3,15 +3,17 @@
 
 from lxml import etree
 
-from xmodule.mako_module import MakoModuleDescriptor
-from xmodule.xml_module import XmlDescriptor
-from xmodule.x_module import XModule
-from xmodule.progress import Progress
-from xmodule.exceptions import NotFoundError
 from xblock.fields import Integer, Scope
 from xblock.fragment import Fragment
 from pkg_resources import resource_string
 
+from .exceptions import NotFoundError
+from .fields import Date
+from .mako_module import MakoModuleDescriptor
+from .progress import Progress
+from .x_module import XModule
+from .xml_module import XmlDescriptor
+
 log = logging.getLogger(__name__)
 
 # HACK: This shouldn't be hard-coded to two types
@@ -25,6 +27,15 @@ class SequenceFields(object):
     # NOTE: Position is 1-indexed.  This is silly, but there are now student
     # positions saved on prod, so it's not easy to fix.
     position = Integer(help="Last tab viewed in this sequence", scope=Scope.user_state)
+    due = Date(help="Date that this problem is due by", scope=Scope.settings)
+    extended_due = Date(
+        help="Date that this problem is due by for a particular student. This "
+             "can be set by an instructor, and will override the global due "
+             "date if it is set to a date that is later than the global due "
+             "date.",
+        default=None,
+        scope=Scope.user_state,
+    )
 
 
 class SequenceModule(SequenceFields, XModule):

common/lib/xmodule/xmodule/tests/test_capa_module.py

@@ -78,17 +78,10 @@ def answer_key(cls, input_num=2):
 
     @classmethod
     def create(cls,
-               graceperiod=None,
-               due=None,
-               max_attempts=None,
-               showanswer=None,
-               rerandomize=None,
-               force_save_button=None,
                attempts=None,
                problem_state=None,
                correct=False,
-               done=None,
-               text_customization=None
+               **kwargs
                ):
         """
         All parameters are optional, and are added to the created problem if specified.
@@ -109,24 +102,7 @@ def create(cls,
         location = Location(["i4x", "edX", "capa_test", "problem",
                              "SampleProblem{0}".format(cls.next_num())])
         field_data = {'data': cls.sample_problem_xml}
-
-        if graceperiod is not None:
-            field_data['graceperiod'] = graceperiod
-        if due is not None:
-            field_data['due'] = due
-        if max_attempts is not None:
-            field_data['max_attempts'] = max_attempts
-        if showanswer is not None:
-            field_data['showanswer'] = showanswer
-        if force_save_button is not None:
-            field_data['force_save_button'] = force_save_button
-        if rerandomize is not None:
-            field_data['rerandomize'] = rerandomize
-        if done is not None:
-            field_data['done'] = done
-        if text_customization is not None:
-            field_data['text_customization'] = text_customization
-
+        field_data.update(kwargs)
         descriptor = Mock(weight="1")
         if problem_state is not None:
             field_data.update(problem_state)
@@ -379,6 +355,13 @@ def test_closed(self):
                                     due=self.yesterday_str)
         self.assertTrue(module.closed())
 
+    def test_due_date_extension(self):
+
+        module = CapaFactory.create(
+            max_attempts="1", attempts="0", due=self.yesterday_str,
+            extended_due=self.tomorrow_str)
+        self.assertFalse(module.closed())
+
     def test_parse_get_params(self):
 
         # Valid GET param dict

common/lib/xmodule/xmodule/tests/test_util_duedate.py

@@ -0,0 +1,52 @@
+import mock
+import unittest
+
+from ..util import duedate
+
+
+class TestGetExtendedDueDate(unittest.TestCase):
+    """
+    Test `get_extended_due_date` function.
+    """
+
+    def call_fut(self, node):
+        """
+        Call function under test.
+        """
+        fut = duedate.get_extended_due_date
+        return fut(node)
+
+    def test_no_due_date(self):
+        """
+        Test no due date.
+        """
+        node = object()
+        self.assertEqual(self.call_fut(node), None)
+
+    def test_due_date_no_extension(self):
+        """
+        Test due date without extension.
+        """
+        node = mock.Mock(due=1, extended_due=None)
+        self.assertEqual(self.call_fut(node), 1)
+
+    def test_due_date_with_extension(self):
+        """
+        Test due date with extension.
+        """
+        node = mock.Mock(due=1, extended_due=2)
+        self.assertEqual(self.call_fut(node), 2)
+
+    def test_due_date_extension_is_earlier(self):
+        """
+        Test due date with extension, but due date is later than extension.
+        """
+        node = mock.Mock(due=2, extended_due=1)
+        self.assertEqual(self.call_fut(node), 2)
+
+    def test_extension_without_due_date(self):
+        """
+        Test non-sensical extension without due date.
+        """
+        node = mock.Mock(due=None, extended_due=1)
+        self.assertEqual(self.call_fut(node), None)

common/lib/xmodule/xmodule/util/duedate.py

@@ -0,0 +1,18 @@
+"""
+Miscellaneous utility functions.
+"""
+
+
+def get_extended_due_date(node):
+    """
+    Gets the actual due date for the logged in student for this node, returning
+    the extendeded due date if one has been granted and it is later than the
+    global due date, otherwise returning the global due date for the unit.
+    """
+    due_date = getattr(node, 'due', None)
+    if not due_date:
+        return due_date
+    extended = getattr(node, 'extended_due', None)
+    if not extended or extended < due_date:
+        return due_date
+    return extended

lms/djangoapps/courseware/grades.py

@@ -19,6 +19,7 @@
 from xmodule import graders
 from xmodule.capa_module import CapaModule
 from xmodule.graders import Score
+from xmodule.util.duedate import get_extended_due_date
 from .models import StudentModule
 from .module_render import get_module, get_module_for_descriptor
 
@@ -353,7 +354,7 @@ def _progress_summary(student, request, course):
                     'scores': scores,
                     'section_total': section_total,
                     'format': module_format,
-                    'due': section_module.due,
+                    'due': get_extended_due_date(section_module),
                     'graded': graded,
                 })
 

lms/djangoapps/courseware/module_render.py

@@ -14,7 +14,7 @@
 from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.http import HttpResponse
-from django.views.decorators.csrf import csrf_exempt, csrf_protect
+from django.views.decorators.csrf import csrf_exempt
 
 from capa.xqueue_interface import XQueueInterface
 from courseware.access import has_access
@@ -36,6 +36,7 @@
 from xmodule.modulestore import Location
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
+from xmodule.util.duedate import get_extended_due_date
 from xmodule_modifiers import replace_course_urls, replace_jump_to_id_urls, replace_static_urls, add_histogram, wrap_xblock
 from xmodule.lti_module import LTIModule
 
@@ -110,7 +111,7 @@ def toc_for_course(user, request, course, active_chapter, active_section, field_
                 sections.append({'display_name': section.display_name_with_default,
                                  'url_name': section.url_name,
                                  'format': section.format if section.format is not None else '',
-                                 'due': section.due,
+                                 'due': get_extended_due_date(section),
                                  'active': active,
                                  'graded': section.graded,
                                  })